From 3e6923b94f897f0aa06118388672e1598872f7ee Mon Sep 17 00:00:00 2001
From: admin <>
Date: Fri, 14 Jun 2024 11:04:19 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=20=E5=AE=A2=E6=88=B7=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=88=A0=E9=99=A4=E4=BC=98=E5=8C=96=20=E7=BB=8F?=
=?UTF-8?q?=E8=90=A5=E6=A6=82=E5=86=B5=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/PagesStatistics/businessOverview.vue | 26 ++++++++++++++++++++----
src/pagesApp/customerMgt.vue | 1 +
src/pagesApp/shipmentType.vue | 1 +
src/utils/http.ts | 12 ++---------
4 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/PagesStatistics/businessOverview.vue b/src/PagesStatistics/businessOverview.vue
index daa12a8..b65193e 100644
--- a/src/PagesStatistics/businessOverview.vue
+++ b/src/PagesStatistics/businessOverview.vue
@@ -22,7 +22,7 @@
{{ item.name }}:{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num) }}
+ >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, 2) }}
{{ item.isBefore ? "" : item.unit }}
@@ -33,7 +33,7 @@
{{ item.name }}:
{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num) }}
+ >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal) }}
{{ item.isBefore ? "" : item.unit }}
@@ -43,7 +43,7 @@
{{ item.name }}:{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num) }}
+ >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal)}}
{{ item.isBefore ? "" : item.unit }}
@@ -177,6 +177,7 @@ const gridList2 = reactive([
unit: "¥",
isBefore: true,
isHighLight: true,
+ decimal: 2,
},
{
name: "出货应收金额",
@@ -185,12 +186,15 @@ const gridList2 = reactive([
unit: "¥",
isBefore: true,
isHighLight: true,
+ decimal: 2,
},
{
name: "出货笔数",
enName: "orderOutNum",
- num: "2",
+ num: "",
isHighLight: true,
+ decimal: 0,
+
},
{
name: "",
@@ -202,6 +206,7 @@ const gridList2 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "出货净重(客户)",
@@ -209,6 +214,7 @@ const gridList2 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "出货重量(已结)",
@@ -216,6 +222,7 @@ const gridList2 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "结算总重量",
@@ -223,6 +230,7 @@ const gridList2 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "出货重量(未结)",
@@ -230,6 +238,7 @@ const gridList2 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "结算重量(已结)",
@@ -237,6 +246,7 @@ const gridList2 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "净重误差",
@@ -244,6 +254,7 @@ const gridList2 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "结算总量(未结)",
@@ -251,6 +262,7 @@ const gridList2 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
]);
const gridList3 = reactive([
@@ -261,6 +273,7 @@ const gridList3 = reactive([
unit: "KG",
isBefore: false,
isHighLight: true,
+ decimal: 2,
},
{
name: "收货笔数",
@@ -269,6 +282,7 @@ const gridList3 = reactive([
unit: "",
isBefore: false,
isHighLight: true,
+ decimal: 0,
},
{
name: "收货重量(已付)",
@@ -276,6 +290,7 @@ const gridList3 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "收货实付金额",
@@ -283,6 +298,7 @@ const gridList3 = reactive([
num: "",
unit: "¥",
isBefore: true,
+ decimal: 2,
},
{
name: "收货重量(未付)",
@@ -290,6 +306,7 @@ const gridList3 = reactive([
num: "",
unit: "KG",
isBefore: false,
+ decimal: 2,
},
{
name: "收货应付金额",
@@ -297,6 +314,7 @@ const gridList3 = reactive([
num: "",
unit: "¥",
isBefore: true,
+ decimal: 2,
},
]);
diff --git a/src/pagesApp/customerMgt.vue b/src/pagesApp/customerMgt.vue
index 64972f6..8f4dff5 100644
--- a/src/pagesApp/customerMgt.vue
+++ b/src/pagesApp/customerMgt.vue
@@ -102,6 +102,7 @@ const handleSearch = () => {
const deleteCustomer = (item: any) => {
CustomerApi.updateCustomUser({ isDeleted: true, id: item.id }).then((res) => {
if (res.code === 200) {
+ resetPageList();
getList();
}
});
diff --git a/src/pagesApp/shipmentType.vue b/src/pagesApp/shipmentType.vue
index 1e86456..8c3623d 100644
--- a/src/pagesApp/shipmentType.vue
+++ b/src/pagesApp/shipmentType.vue
@@ -119,6 +119,7 @@ const edit = (item: any) => {
const deleteType = (item: any) => {
GoodsApi.deleteById({ id: item.id }).then((res) => {
if (res.code === 200) {
+ resetPageList();
getList();
}
});
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 413e588..77b4258 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -157,10 +157,7 @@ export const http = (options: UniApp.RequestOptions) => {
console.log(res1);
if (res.statusCode >= 200 && res.statusCode < 300) {
if (
- res1.code === 1001 ||
- res1.code === 1002 ||
- res1.code === 1003 ||
- res1.code === 1004
+ [1001,1002,1003,1004].indexOf(res1.code) > -1
) {
uni.showToast({
icon: "none",
@@ -171,17 +168,12 @@ export const http = (options: UniApp.RequestOptions) => {
url: "/pagesLogin/login/index",
});
return;
- } else if ((res1 as any).code === 10001) {
+ } else if ([500,5001,10001].indexOf(res1.code) > -1) {
uni.showToast({
icon: "none",
title: (res1 as Data).message || "请求失败",
});
return;
- } else if ((res1 as any).code === 5001) {
- uni.showToast({
- icon: "none",
- title: (res1 as Data).message || "请求失败",
- });
}
resolve(res1 as Data);
} else {