From 46fe9ed699e21dd36c5f88cb6389432e253be248 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 11 Oct 2023 23:37:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=98=E7=82=B9=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=9F=BA=E7=A1=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.hbuilderx/launch.json | 2 +-
api/user.js | 12 +
manifest.json | 4 +-
.../pages/PickingScanList/PickingScanList.vue | 54 +-
pagesHome/pages/ScanUp/ScanUp.vue | 63 +-
.../SelfPickupDetails/SelfPickupDetails.vue | 339 +-
pagesHome/pages/StockUplist/StockUplist.vue | 30 +-
pagesHome/pages/pickingScan/pickingScan.vue | 2 +-
pagesTask/pages/dynamicCheck/dynamicCheck.vue | 188 +-
.../dynamicCheckDetails.vue | 216 +-
unpackage/cache/apk/apkurl | 2 +-
unpackage/cache/apk/cmManifestCache.json | 2 +-
unpackage/dist/build/app-plus/app-service.js | 4 +-
unpackage/dist/build/app-plus/app.css | 2 +-
unpackage/dist/build/app-plus/manifest.json | 4 +-
.../pagesHome/pages/DownGoods/DownGoods.css | 2 +-
.../pagesHome/pages/MergeTray/MergeTray.css | 2 +-
.../PeopleSortingDetail.css | 2 +-
.../pagesHome/pages/Relocation/Relocation.css | 2 +-
.../pagesHome/pages/ScanUp/ScanUp.css | 2 +-
.../dist/dev/app-plus/app-config-service.js | 2 +-
unpackage/dist/dev/app-plus/app-service.js | 7898 ++++++++++++-----
unpackage/dist/dev/app-plus/app.css | 63 +-
unpackage/dist/dev/app-plus/manifest.json | 6 +-
.../dev/app-plus/pages/taskList/taskList.css | 268 +
.../CustomerOrdersDetails.css | 293 +
.../pagesHome/pages/DownGoods/DownGoods.css | 28 +-
.../pagesHome/pages/MergeTray/MergeTray.css | 33 +
.../pages/PeopleScanUp/PeopleScanUp.css | 10 +-
.../pagesHome/pages/Relocation/Relocation.css | 43 +-
.../pagesHome/pages/ScanUp/ScanUp.css | 40 +-
.../pages/inventoryenter/inventoryenter.css | 7 +-
.../pages/StockUplist/StockUplist.js | 23 +-
.../pages/pickingScan/pickingScan.js | 2 +-
34 files changed, 6772 insertions(+), 2878 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 07d9281..179fe2d 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -16,7 +16,7 @@
"type" : "uniCloud"
},
{
- "playground" : "standard",
+ "playground" : "custom",
"type" : "uni-app:app-android"
}
]
diff --git a/api/user.js b/api/user.js
index db91394..b93f895 100644
--- a/api/user.js
+++ b/api/user.js
@@ -144,6 +144,18 @@ export function billLadingdetailList(data) {
data
});
}
+/**
+ * 自提零订单详情
+ * @param {Object} data
+ */
+export function billLadingzeroBillData(data) {
+
+ return request({
+ url: `logpm-distribution/app/billLading/zeroBillData`,
+ method: "post",
+ data
+ });
+}
/**
* 生成库存品包条码
* @param {Object} data
diff --git a/manifest.json b/manifest.json
index 34cb0ee..e16afa0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "货无忧测试版",
"appid" : "__UNI__EB22F37",
"description" : "",
- "versionName" : "10.1.3",
- "versionCode" : 1013,
+ "versionName" : "10.1.4",
+ "versionCode" : 1014,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pagesHome/pages/PickingScanList/PickingScanList.vue b/pagesHome/pages/PickingScanList/PickingScanList.vue
index bd50d20..e47a997 100644
--- a/pagesHome/pages/PickingScanList/PickingScanList.vue
+++ b/pagesHome/pages/PickingScanList/PickingScanList.vue
@@ -15,27 +15,29 @@
-
-
- 客户:{{item.customer}}
-
-
-
- 备货是否完成:{{item.stockupStatusStr}}
- 备货类型:{{item.typeServiceStr}}
+
+
+
+ 客户:{{item.customer}}
-
+
- 订单总数
- {{item.orderNum}}
+ 备货是否完成:{{item.stockupStatusStr}}
+ 备货类型:{{item.typeServiceStr}}
- 计划件数
- {{item.planNum}}
+
+ 订单总数
+ {{item.orderNum}}
+
+
+ 计划件数
+ {{item.planNum}}
+
-
+
@@ -45,9 +47,6 @@
+
\ No newline at end of file
diff --git a/pagesHome/pages/StockUplist/StockUplist.vue b/pagesHome/pages/StockUplist/StockUplist.vue
index 7a8c957..ddc5f9f 100644
--- a/pagesHome/pages/StockUplist/StockUplist.vue
+++ b/pagesHome/pages/StockUplist/StockUplist.vue
@@ -352,7 +352,30 @@
}
})
}
-
+
+ // 查看模式
+ if (item.completeStact) {
+ return tiplists.value.setdetails({
+ title: '产看零担物料明细',
+ isshow: true,
+ tipstate: 4,
+ inpList,
+ inputtext: '',
+ confirmTxt: '关闭',
+ isonecheck: true,
+ success: async (deta) => {
+ tiplists.value.setdetails({ isshow: false })
+ },
+ cancel: (details) => {
+ tiplists.value.setdetails({ isshow: false })
+ },
+ close: (details) => {
+ tiplists.value.setdetails({ isshow: false })
+ }
+ })
+ }
+
+ // 提交模式
tiplists.value.setdetails({
title: '设置零担物料数量',
isshow: true,
@@ -363,7 +386,7 @@
isonecheck: true,
success: async (deta) => {
console.log('deta :>> ', deta);
- if (deta.inpList.length === 0) return tiplists.value.setdetails({ isshow: false })
+ if (deta.inpList.length === 0 || item.completeStact) return tiplists.value.setdetails({ isshow: false })
let data = {
reservationId: details.reservationId,
typeService: details.items.typeService,
@@ -385,7 +408,7 @@
const res = await postZeroStockUp(data)
console.log('res :>> ', res);
-
+
/* if (deta.checklist.length == 0) {
uni.showToast({
title: '请选择货位',
@@ -394,6 +417,7 @@
return
} */
tiplists.value.setdetails({ isshow: false })
+ initpage()
},
cancel: (details) => {
tiplists.value.setdetails({ isshow: false })
diff --git a/pagesHome/pages/pickingScan/pickingScan.vue b/pagesHome/pages/pickingScan/pickingScan.vue
index 83b6f76..ed591b4 100644
--- a/pagesHome/pages/pickingScan/pickingScan.vue
+++ b/pagesHome/pages/pickingScan/pickingScan.vue
@@ -187,7 +187,7 @@
// url: '/pagesHome/pages/PickingScanList/PickingScanList?id=' + item.id + '&stockupArea=' + item.stockupArea,
// })
- uni.redirectTo({
+ uni.reLaunch({
url: '/pagesHome/pages/PickingScanList/PickingScanList?id=' + item.id + '&stockupArea=' + item.stockupArea,
})
}
diff --git a/pagesTask/pages/dynamicCheck/dynamicCheck.vue b/pagesTask/pages/dynamicCheck/dynamicCheck.vue
index dd3ec1c..5ead8cf 100644
--- a/pagesTask/pages/dynamicCheck/dynamicCheck.vue
+++ b/pagesTask/pages/dynamicCheck/dynamicCheck.vue
@@ -1,94 +1,96 @@
-
-
-
-
-
-
-
-
- 任务编号:
- 123
-
-
- 商城名称:
- 123
-
-
- 品牌:
- 213
-
-
- 盘点时间:
- 1231
- 123
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
index 98b62b9..8bd623d 100644
--- a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
+++ b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
@@ -10,30 +10,110 @@
-
+ 搜索
+
+
+
+
+
+ 定制品
+
+
+ 库存品
+
+
+ 零担
+
-
-
+
+ 批量操作
+
+ 反选
+
+
+
+ 批量删除
+
+
+ 批量删除
+
+
+ 状态修改
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+