From 5add2a7e6b572065ac099b063eb7b1bf2cf29287 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Mon, 1 Apr 2024 14:49:46 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=BB=9F=E8=AE=A1=E4=B8=AD=20?=
=?UTF-8?q?=E6=94=B6=E8=B4=A7=20=E5=87=BA=E8=B4=A7=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/FilterDialog.vue | 62 +++---
.../components/ProductTypeDialog.vue | 4 +-
.../components/SupplierDialog.vue | 196 ++++++++----------
src/PagesStatistics/customerRanking.vue | 114 +++++-----
src/PagesStatistics/receivePanel.vue | 4 +-
src/PagesStatistics/shipmentPanel.vue | 2 +-
src/PagesStatistics/supplierRanking.vue | 105 +++++-----
src/components/Echarts/echarts.vue | 30 ++-
src/services/customer.ts | 11 +
src/services/supplier.ts | 8 +
10 files changed, 290 insertions(+), 246 deletions(-)
diff --git a/src/PagesStatistics/components/FilterDialog.vue b/src/PagesStatistics/components/FilterDialog.vue
index 7027ab9..942206c 100644
--- a/src/PagesStatistics/components/FilterDialog.vue
+++ b/src/PagesStatistics/components/FilterDialog.vue
@@ -4,7 +4,7 @@
筛选
-
+
@@ -12,20 +12,27 @@
-
-
-
-
-
-
-
- 重置
-
+
+
+
+
@@ -35,6 +42,7 @@
:show="showDialog.showSupplier"
@handleDialog="(v:boolean) => {handleDialog('showSupplier', v)}"
@changeUser="changeUser"
+ :isShipment="isShipment"
>
reactive({
project: {
id: -1,
- reProductsName: ''
+ name: ''
},
user: {
- id: -1
+ id: -1,
+ name: ''
}
});
@@ -86,9 +95,18 @@ const changeUser = (obj:any) => {
state.user = obj
}
const changeProduct = (obj:any) => {
- state.project = obj
+ state.project = {...obj, name: obj.reProductsName}
+}
+const resetState = () => {
+ state.project = {
+ id: -1,
+ name: ''
+ }
+ state.user = {
+ id: -1,
+ name: ''
+ }
}
-
const handleOk = () => {
emit("changeOther",{userId: state.user.id, productId: state.project.id})
emit("handleDialog", false);
@@ -112,17 +130,13 @@ const handleOk = () => {
font-size: 27rpx !important;
}
}
- .btn-layout {
- align-items: center;
- justify-content: center;
+ .btn-box1 {
+ flex-direction: row;
display: flex;
- margin-top: 35rpx;
- .btn {
- width: 80%;
- text-align: center;
- ::v-deep button {
- border-radius: 43rpx;
- }
+ align-items: center;
+ margin-top: 30rpx;
+ ::v-deep button + button {
+ margin-left: 50rpx;
}
}
}
diff --git a/src/PagesStatistics/components/ProductTypeDialog.vue b/src/PagesStatistics/components/ProductTypeDialog.vue
index 6e906e1..96c99c6 100644
--- a/src/PagesStatistics/components/ProductTypeDialog.vue
+++ b/src/PagesStatistics/components/ProductTypeDialog.vue
@@ -49,6 +49,7 @@ const props = defineProps<{
}>();
const emit = defineEmits(["handleDialog", "changeProduct"]);
const handleClose = () => {
+ debugger
emit("handleDialog", false);
};
@@ -84,8 +85,7 @@ onMounted(() => {