From 44ad7670226912941925680e0d9ea96fb8724f1f Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 13 Dec 2023 17:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mycomponents/detail/comRequestDetailCard.vue | 1 -
mycomponents/scan/winScanPackAndLocation.vue | 1 -
.../deliver/request/deliverRequestCreate.vue | 61 +++++++++----------
pages/inspect/job/inspectFullDetail.vue | 34 +++++------
pages/issue/job/issueDetail.vue | 1 -
pages/issue/request/issueRequest.vue | 8 ---
6 files changed, 47 insertions(+), 59 deletions(-)
diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue
index 4be275d2..96110434 100644
--- a/mycomponents/detail/comRequestDetailCard.vue
+++ b/mycomponents/detail/comRequestDetailCard.vue
@@ -75,7 +75,6 @@
watch: {
dataContent(newVal) {
var test =this.dataContent
- debugger
this.requestItem = newVal.subList[0];
},
},
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index 62b61d78..e3ec3242 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -139,7 +139,6 @@
this.$refs.popup.open('bottom');
this.fromInventoryStatuses = jobContent.outInventoryStatuses
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
- debugger
this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
},
diff --git a/pages/deliver/request/deliverRequestCreate.vue b/pages/deliver/request/deliverRequestCreate.vue
index 76134316..fb2d7209 100644
--- a/pages/deliver/request/deliverRequestCreate.vue
+++ b/pages/deliver/request/deliverRequestCreate.vue
@@ -64,7 +64,7 @@
detailOptions: [],
scanOptions: [],
fromType: "",
- dataContent:{}
+ dataContent: {}
}
},
@@ -167,39 +167,38 @@
},
-
- setRequestParams(){
+
+ setRequestParams() {
var subList = []
this.detailSource.subList.forEach(detail => {
- debugger
- detail.soNumber = detail.package.soNumber;
- detail.soLine = detail.package.soLine;
- detail.remark =""
- // soNumber: 926926926,
- // soLine: 926,
- // itemCode: THILDD0A691AG,
- // remark: ,
- // qty: 2,
- // uom: EA
- subList.push(detail)
+ detail.soNumber = detail.package.soNumber;
+ detail.soLine = detail.package.soLine;
+ detail.remark = ""
+ // soNumber: 926926926,
+ // soLine: 926,
+ // itemCode: THILDD0A691AG,
+ // remark: ,
+ // qty: 2,
+ // uom: EA
+ subList.push(detail)
})
-
- this.detailSource.subList = subList
- this.detailSource.deliverPlanNumber = "DP20231130-0001"
- this.detailSource.customerCode = this.detailSource.customerCode
- this.detailSource.customerDockCode = ""
- this.detailSource.carrierCode = ""
- this.detailSource.transferMode = ""
- this.detailSource.vehiclePlateNumber = ""
- this.detailSource.remark = ""
- this.detailSource.dueTime = ""
- this.detailSource.departmentCode = "研发部门"
- this.detailSource.status = 1
- this.detailSource.autoCommit = "FALSE"
- this.detailSource.autoAgree = "FALSE"
- this.detailSource.autoExecute = "FALSE"
- this.detailSource.directCreateRecord = "FALSE"
-
+
+ this.detailSource.subList = subList
+ this.detailSource.deliverPlanNumber = "DP20231130-0001"
+ this.detailSource.customerCode = this.detailSource.customerCode
+ this.detailSource.customerDockCode = ""
+ this.detailSource.carrierCode = ""
+ this.detailSource.transferMode = ""
+ this.detailSource.vehiclePlateNumber = ""
+ this.detailSource.remark = ""
+ this.detailSource.dueTime = ""
+ this.detailSource.departmentCode = "研发部门"
+ this.detailSource.status = 1
+ this.detailSource.autoCommit = "FALSE"
+ this.detailSource.autoAgree = "FALSE"
+ this.detailSource.autoExecute = "FALSE"
+ this.detailSource.directCreateRecord = "FALSE"
+
return this.detailSource;
},
showCommitSuccessMessage(hint) {
diff --git a/pages/inspect/job/inspectFullDetail.vue b/pages/inspect/job/inspectFullDetail.vue
index bdab4d99..12d6754b 100644
--- a/pages/inspect/job/inspectFullDetail.vue
+++ b/pages/inspect/job/inspectFullDetail.vue
@@ -330,23 +330,23 @@
commit() {
this.scanCount = getScanCount(this.subList);
- if (this.scanCount == 0) {
- this.showErrorMessage("扫描数为0,请先扫描")
- return;
+ // if (this.scanCount == 0) {
+ // this.showErrorMessage("扫描数为0,请先扫描")
+ // return;
+ // }
+ //如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
+ if (this.jobContent.allowPartialComplete == "TRUE") {
+ this.submitJob();
+ } else {
+ //不允许部分提交，提示
+ this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
+ "]箱总共[" + this
+ .subList.length + "]箱", res => {
+ if (res) {
+ this.openScanPopup();
+ }
+ });
}
- //如果是全检，必须全部扫描
- if (this.scanCount == this.subList.length) {
- this.submitJob();
- } else {
- //不允许部分提交，提示
- this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this
- .subList.length + "]箱", res => {
- if (res) {
- this.openScanPopup();
- }
- });
- }
},
submitJob() {
@@ -455,7 +455,7 @@
list.push(detail)
})
})
- this.jobContent.notPassedQty = Number(this.jobContent.failedQty)+ Number(this.jobContent.crackQty)
+ this.jobContent.notPassedQty = Number(this.jobContent.failedQty) + Number(this.jobContent.crackQty)
this.jobContent.subList = list
this.jobContent.nextAction = "PARTIAL_OK";
return this.jobContent;
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index d58f7ad5..5860906e 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -140,7 +140,6 @@
methods: {
resizeCollapse() {
this.$nextTick(r => {
- // debugger;
this.$refs.comIssueDetailCard.forEach(r => {
r.resizeCollapse();
})
diff --git a/pages/issue/request/issueRequest.vue b/pages/issue/request/issueRequest.vue
index d562b237..c09f2418 100644
--- a/pages/issue/request/issueRequest.vue
+++ b/pages/issue/request/issueRequest.vue
@@ -373,18 +373,10 @@
},
requestConfirmsss(action, item) {
- debugger;
uni.navigateTo({
url: './issueRequestDetail?type=add&item=' + item.id
});
}
-
- // requestConfirm(action, item) {
- // debugger;
- // uni.navigateTo({
- // url: './issueRequestDetail?type=add&item=' + item.id
- // });
- // }
}