From 798f4389d38165880b7b6093da07a07bab2383b7 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Thu, 14 Mar 2024 11:14:12 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=20=E5=AF=B9=E6=8E=A5=E5=B8=B8?=
=?UTF-8?q?=E7=94=A8=E5=BA=94=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/PagesStatistics/index.vue | 48 ++++--------
src/PagesStatistics/static/01.png | Bin 0 -> 6511 bytes
src/PagesStatistics/static/02.png | Bin 0 -> 7131 bytes
src/PagesStatistics/static/03.png | Bin 0 -> 6914 bytes
src/PagesStatistics/static/04.png | Bin 0 -> 5471 bytes
src/PagesStatistics/static/05.png | Bin 0 -> 8575 bytes
src/PagesStatistics/static/06.png | Bin 0 -> 7030 bytes
src/PagesStatistics/static/07.png | Bin 0 -> 5512 bytes
src/components/Title/index.vue | 2 +-
src/pagesApp/receiveCl.vue | 119 ++++++++++++++++++++--------
src/pagesApp/shipmentCl.vue | 126 +++++++++++++++++++-----------
src/pagesApp/shipmentDetail.vue | 122 ++++++++++++++++++-----------
src/pagesApp/supplierMgt.vue | 51 +++++++++---
src/pagesReceive/pricing.vue | 6 --
src/services/profile.ts | 11 ++-
src/services/shipment.ts | 1 +
src/types/order.d.ts | 7 ++
src/types/user.d.ts | 20 +++++
src/utils/enum.ts | 6 ++
19 files changed, 340 insertions(+), 179 deletions(-)
create mode 100644 src/PagesStatistics/static/01.png
create mode 100644 src/PagesStatistics/static/02.png
create mode 100644 src/PagesStatistics/static/03.png
create mode 100644 src/PagesStatistics/static/04.png
create mode 100644 src/PagesStatistics/static/05.png
create mode 100644 src/PagesStatistics/static/06.png
create mode 100644 src/PagesStatistics/static/07.png
diff --git a/src/PagesStatistics/index.vue b/src/PagesStatistics/index.vue
index 839b80c..8cd26a4 100644
--- a/src/PagesStatistics/index.vue
+++ b/src/PagesStatistics/index.vue
@@ -8,10 +8,10 @@
{{ child.title }}
@@ -30,9 +30,7 @@ const list = reactive([
title: "收货",
child: [
{
- icon: "1-1.png",
- width: "42.31rpx",
- height: "50rpx",
+ icon: "01.png",
title: "收货汇总",
fn: (item: any) => {
uni.navigateTo({
@@ -41,9 +39,7 @@ const list = reactive([
}
},
{
- icon: "1-2.png",
- width: "44.23rpx",
- height: "44.23rpx",
+ icon: "02.png",
title: "供应商排行",
fn: (item: any) => {
uni.navigateTo({
@@ -58,9 +54,7 @@ const list = reactive([
title: "出货",
child: [
{
- icon: "2-1.png",
- width: "42.31rpx",
- height: "50rpx",
+ icon: "03.png",
title: "出货汇总",
fn: (item: any) => {
uni.navigateTo({
@@ -69,9 +63,7 @@ const list = reactive([
}
},
{
- icon: "2-2.png",
- width: "46.15rpx",
- height: "46.15rpx",
+ icon: "04.png",
title: "客户排行",
fn: (item: any) => {
uni.navigateTo({
@@ -85,9 +77,7 @@ const list = reactive([
title: "账本",
child: [
{
- icon: "3-1.png",
- width: "46.15rpx",
- height: "46.79rpx",
+ icon: "05.png",
title: "经营概况",
fn: (item: any) => {
uni.navigateTo({
@@ -96,9 +86,7 @@ const list = reactive([
}
},
{
- icon: "3-2.png",
- width: "48.08rpx",
- height: "44.23rpx",
+ icon: "06.png",
title: "供应商对账",
fn: (item: any) => {
uni.navigateTo({
@@ -107,9 +95,7 @@ const list = reactive([
}
},
{
- icon: "3-3.png",
- width: "43.59rpx",
- height: "43.59rpx",
+ icon: "07.png",
title: "客户对账",
fn: (item: any) => {
uni.navigateTo({
@@ -124,15 +110,15 @@ const list = reactive([
diff --git a/src/pagesApp/receiveCl.vue b/src/pagesApp/receiveCl.vue
index b959fc9..8623399 100644
--- a/src/pagesApp/receiveCl.vue
+++ b/src/pagesApp/receiveCl.vue
@@ -11,96 +11,119 @@
>
-
+
- 收货单号:SHD20230901132333
- 上海奉贤两网融合(大磅)
+ 收货单号:{{ item.receiptNumber }}
+ {{ item.deviceName }}
- 现场照片
+ 现场照片
- 吴小勇
- 轻二
+ {{ item.userName }}
+ {{ item.productName }}
- 定价人:谭兵
- 过磅时间:2023-09-01 13:23:33
+ 定价人:{{ item.pricingUserName }}
+ 过磅时间:{{ item.tareTime }}
-
- {{ item.name }}:{{ item.isBefore ? item.unit : "" }}
- {{ item.num }}
- {{ item.isBefore ? "" : item.unit }}
-
+
+
+
+ {{ item.buttonType === 0 ? "扣杂" : "扣点" }}:
+ {{
+ item.buttonType === 0
+ ? item[cItem.enName as string]
+ : item["points"]
+ }}
+ {{ item.buttonType === 0 ? cItem.unit : "%" }}
+
+
+
+ {{ cItem.name }}:{{ cItem.isBefore ? cItem.unit : "" }}
+ {{ item[cItem.enName as string] }}
+ {{ cItem.isBefore ? "" : cItem.unit }}
+
+