From e2f9b051348696537e0382fd44c88bea5ac49fa6 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Mar 2024 11:56:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages.json | 4 +-
src/pages/stockUp/job/stockUpJobDetail.vue | 57 +++++++++++++++++-----
2 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 79b15b87..bbddbb58 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1182,7 +1182,7 @@
{
"path": "pages/stockUp/job/stockUpJob",
"style": {
- "navigationBarTitleText": "直接备货任务",
+ "navigationBarTitleText": "备货任务",
"enablePullDownRefresh": true,
"titleNView": {
// "autoBackButton": "true",
@@ -1209,7 +1209,7 @@
{
"path": "pages/stockUp/job/stockUpJobDetail",
"style": {
- "navigationBarTitleText": "直接备货任务详情",
+ "navigationBarTitleText": "备货任务详情",
"enablePullDownRefresh": true
}
},
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
index 6c5cd4e2..f91411fc 100644
--- a/src/pages/stockUp/job/stockUpJobDetail.vue
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -8,7 +8,7 @@
申请单号：{{jobContent.requestNumber}}
-
+
@@ -32,13 +32,28 @@
-
+
+
+
+
@@ -82,6 +97,7 @@
import comStockUpDetailCard from '@/pages/stockUp/coms/comStockUpDetailCard.vue'
import comScanStockUpPack from '@/pages/stockUp/coms/comScanStockUpPack.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
+ import locationCompare from '@/mycomponents/location/locationCompare.vue'
export default {
name: 'issueDetail',
@@ -90,7 +106,8 @@
winScanButton,
comStockUpDetailCard,
comScanStockUpPack,
- jobTop
+ jobTop,
+ locationCompare
},
data() {
return {
@@ -102,7 +119,9 @@
scanOptions: [],
status: "",
toLocationCode: "",
- jobStatus:""
+ jobStatus: "",
+ toLocationAreaTypeList: [],
+ jobToLocationCode: "",
};
},
@@ -134,7 +153,7 @@
onBackPress(e) {
//已经接收但是没提交任务
if (e.from == 'backbutton') {
- if (this.jobStatus=="2") {
+ if (this.jobStatus == "2") {
//取消承接任务
cancleTakeStockUpJob(this.id).then(res => {
uni.navigateBack();
@@ -176,10 +195,15 @@
if (res.data.subList.length > 0) {
that.jobContent = res.data;
that.jobStatus = res.data.status;
-
+
that.subList = res.data.subList;
that.detailSource = getDataSource(that.detailSource, that.subList)
- that.toLocationCode = that.subList[0].toLocationCode
+ // that.toLocationCode = that.subList[0].toLocationCode
+
+ that.fromLocationCode = that.subList[0].fromLocationCode
+ that.jobToLocationCode = that.subList[0].toLocationCode;
+ that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
+
that.resizeCollapse();
} else {
that.showMessage('列表数据为0');
@@ -191,6 +215,17 @@
})
},
+ scanLocationCode(location, code) {
+ // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+ this.toLocationCode = code
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ detail.toLocationCode = code
+ })
+ })
+ // })
+ },
+
closeScan() {
this.resizeCollapse();
},
@@ -277,7 +312,7 @@
record.supplierCode = r.supplierCode;
//使用在途库不改变管理模式
- if (this.toLocationCode ==null) {
+ if (this.toLocationCode == null) {
record.toPackingNumber = r
.packingNumber;
record.toBatch = r.batch;
@@ -458,4 +493,4 @@
// border-bottom-width: 1px;
// border-bottom-color: #ebeef5;
// }
-
+
\ No newline at end of file
From 44a8f369d52653fae8d444fcb1de9d880081ef35 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Mar 2024 15:02:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/stockUp/job/stockUpJobDetail.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
index f91411fc..02494e5e 100644
--- a/src/pages/stockUp/job/stockUpJobDetail.vue
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -42,7 +42,7 @@
:locationAreaTypeList="toLocationAreaTypeList">
-
+
@@ -279,7 +279,7 @@
stockUpJobsubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成发货记录" + res.data)
+ this.showCommitSuccessMessage("提交成功
生成备货记录" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
From 837339efb015795178aa8aa887358687cd6389ea Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Mar 2024 16:53:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/stockUp/job/stockUpJobDetail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
index 02494e5e..b2cbd248 100644
--- a/src/pages/stockUp/job/stockUpJobDetail.vue
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -219,7 +219,7 @@
// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code
this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
+ item.Items.forEach(detail => {
detail.toLocationCode = code
})
})