From c43c3386689d1efc85894f9cf0197c5668611774 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 19 Aug 2024 11:13:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E3=80=81=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=89=AB?= =?UTF-8?q?=E7=88=B6=E5=AD=90=E5=8C=85=E8=A3=85=E9=99=90=E5=88=B6=E4=B8=8E?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=9B=B8=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/coms/comScanIssuePack.vue | 229 ++++++++++++++++-- .../repleinsh/coms/comRepleishDetailCard.vue | 3 +- .../repleinsh/coms/comScanReplishPack.vue | 63 ++++- src/pages/repleinsh/job/repleinshDetail.vue | 27 ++- 4 files changed, 291 insertions(+), 31 deletions(-) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 816e70bf..de0229f1 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -501,13 +501,22 @@ let item = that.toLocation.Items.find(r => r.itemCode == itemCode); that.fromLocationCode = balance.locationCode; let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode); - if (fromLocation &&!fromLocation.isNewAdd) { + //扫描的库位在列表中存在 + if (fromLocation){ + //不是在任务列表中的，是新加的库位 + // if(fromLocation.isNewAdd){ + + // }else { + // //在任务列表中。 + + // } + let batch = fromLocation.Batchs.find(r => r.batch == lot); if (batch != undefined) { if (batch.Records == undefined) { batch.Records = []; } - + let record = batch.Records.find(r => r.packingNumber == packingCode); if (record == undefined) { //如果有推荐箱码 @@ -531,7 +540,7 @@ } else { that.addRecord(batch, label, balance, packageInfo) } - + } else { that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱', res => { @@ -539,7 +548,7 @@ } ) } - + } else { if (this.jobContent.allowModifyBatch == "TRUE") { this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + @@ -562,8 +571,9 @@ }); } } - } else { - + + }else { + //扫描的不在任务列表中，询问是否可以添加， if (this.jobContent.allowModifyLocation == "TRUE") { this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode + "】与推荐的库位不一致,是否要继续发料?", res => { @@ -574,12 +584,155 @@ that.$emit("afterScan"); } }) - + } else { this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode + "】与推荐的库位不一致,不允许继续发料?") } } + + // if (fromLocation && !fromLocation.isNewAdd) { + // let batch = fromLocation.Batchs.find(r => r.batch == lot); + // if (batch != undefined) { + // if (batch.Records == undefined) { + // batch.Records = []; + // } + + // let record = batch.Records.find(r => r.packingNumber == packingCode); + // if (record == undefined) { + // //如果有推荐箱码 + // if (batch.Recommends != undefined && batch.Recommends.length > 0) { + // let recommend = batch.Recommends.find(r => r.packingNumber == packingCode); + // if (recommend != undefined) { + // that.addRecord(batch, label, balance, packageInfo) + // } else { + // //允许修改箱码 + // if (this.jobContent.allowModifyPackingNumber == 'TRUE') { + // that.addRecord(batch, label, balance, packageInfo); + // } else { + // that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细', + // res => { + // that.getfocus(); + // return; + // } + // ) + // } + // } + // } else { + // that.addRecord(batch, label, balance, packageInfo) + // } + + // } else { + // that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱', + // res => { + // that.getfocus(); + // } + // ) + // } + + // } else { + // if (this.jobContent.allowModifyBatch == "TRUE") { + // this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + + // '】的发料明细,是否要继续发料?', res => { + // if (res) { + // let batch = that.createBatchInfo(label, balance, packageInfo); + // //新增加的批次赋值details + // if (fromLocation.Batchs.length > 0) { + // batch.detail = fromLocation.Batchs[0].detail; + // } + // fromLocation.Batchs.unshift(batch); + // this.getfocus(); + // that.$emit("afterScan"); + // } + // }) + // } else { + // that.showErrorMessage('未查找到批次【' + lot + '】的发料明细', + // res => { + // that.getfocus(); + // }); + // } + // } + // } else { + // if (fromLocation&&fromLocation.isNewAdd) { + // let batch = fromLocation.Batchs.find(r => r.batch == lot); + // if (batch != undefined) { + // if (batch.Records == undefined) { + // batch.Records = []; + // } + + // let record = batch.Records.find(r => r.packingNumber == packingCode); + // if (record == undefined) { + // //如果有推荐箱码 + // if (batch.Recommends != undefined && batch.Recommends.length > 0) { + // let recommend = batch.Recommends.find(r => r.packingNumber == packingCode); + // if (recommend != undefined) { + // that.addRecord(batch, label, balance, packageInfo) + // } else { + // //允许修改箱码 + // if (this.jobContent.allowModifyPackingNumber == 'TRUE') { + // that.addRecord(batch, label, balance, packageInfo); + // } else { + // that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细', + // res => { + // that.getfocus(); + // return; + // } + // ) + // } + // } + // } else { + // that.addRecord(batch, label, balance, packageInfo) + // } + + // } else { + // that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱', + // res => { + // that.getfocus(); + // } + // ) + // } + + // } else { + // if (this.jobContent.allowModifyBatch == "TRUE") { + // this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + + // '】的发料明细,是否要继续发料?', res => { + // if (res) { + // let batch = that.createBatchInfo(label, balance, packageInfo); + // //新增加的批次赋值details + // if (fromLocation.Batchs.length > 0) { + // batch.detail = fromLocation.Batchs[0].detail; + // } + // fromLocation.Batchs.unshift(batch); + // this.getfocus(); + // that.$emit("afterScan"); + // } + // }) + // } else { + // that.showErrorMessage('未查找到批次【' + lot + '】的发料明细', + // res => { + // that.getfocus(); + // }); + // } + // } + // } else { + // if (this.jobContent.allowModifyLocation == "TRUE") { + // this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode + + // "】与推荐的库位不一致,是否要继续发料?", res => { + // if (res) { + // let locaion = that.createLocationInfo(label, balance, packageInfo); + // item.Locations.push(locaion); + // this.getfocus(); + // that.$emit("afterScan"); + // } + // }) + + // } else { + // this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode + + // "】与推荐的库位不一致,不允许继续发料?") + // } + // } + + // } } catch (e) { that.showErrorMessage(e.stack, res => { @@ -596,7 +749,7 @@ qty: balance.qty, uom: balance.uom, handleQty: 0, - isNewAdd:true, + isNewAdd: true, Batchs: [] } let batch = this.createBatchInfo(label, balance, packageInfo); @@ -656,12 +809,60 @@ }, addRecord(batch, label, balance, packageInfo) { - let record = this.creatRecord(label, balance, packageInfo); - batch.Records.push(record); - this.issueRecord.unshift(record) - this.calcBatchHandleQty(batch); - this.getfocus(); - this.$emit("afterScan"); + if (packageInfo.parentNumber) { + var checkData = batch.Records.find(r => { + if (r.packingNumber == packageInfo.parentNumber && + r.batch == balance.batch) { + return r; + } + }) + if (checkData) { + //提示已经扫描 + this.showErrorMessage("箱码[" + packageInfo.number + "]批次[" + balance.batch + + "]的父包装已经扫描") + } else { + let record = this.creatRecord(label, balance, packageInfo); + batch.Records.push(record); + this.issueRecord.unshift(record) + this.calcBatchHandleQty(batch); + this.getfocus(); + this.$emit("afterScan"); + } + } else { + //扫描的是父包装 + var checkData = batch.Records.find(r => { + if (r.parentPackingNumber == packageInfo.number && + r.batch == balance.batch) { + return r; + } + }) + if (checkData) { + //是否移除 + this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentPackingNumber + "]" + "批次[" + + balance + .batch + "]是父包装，是否移除子包装", res => { + if (res) { + batch.Records = []; + let record = this.creatRecord(label, balance, packageInfo); + batch.Records.push(record); + this.issueRecord.unshift(record) + this.calcBatchHandleQty(batch); + this.getfocus(); + this.$emit("afterScan"); + } + }) + console.log("扫描的是父包装，是否移除子包装") + } else { + let record = this.creatRecord(label, balance, packageInfo); + batch.Records.push(record); + this.issueRecord.unshift(record) + this.calcBatchHandleQty(batch); + this.getfocus(); + this.$emit("afterScan"); + } + + } + }, getfocus() { diff --git a/src/pages/repleinsh/coms/comRepleishDetailCard.vue b/src/pages/repleinsh/coms/comRepleishDetailCard.vue index ff845985..8903e9c0 100644 --- a/src/pages/repleinsh/coms/comRepleishDetailCard.vue +++ b/src/pages/repleinsh/coms/comRepleishDetailCard.vue @@ -35,7 +35,8 @@ {{record.parentPackingNumber}} --> + :isShowStatus='true' + :isShowBatch="batch.packingNumber!=null"> diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index 37db779d..c1190568 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -433,7 +433,7 @@ that.fromLocationCode = balance.locationCode; let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode); //如果库存余额中的库位与任务推荐的不一致 - if (fromLocation && !fromLocation.isNewAdd) { + if (fromLocation ) { let batch = fromLocation.Batchs.find(r => r.batch == lot); if (batch != undefined) { if (batch.Records == undefined) { @@ -479,6 +479,7 @@ batch.detail = fromLocation.Batchs[0].detail; } fromLocation.Batchs.unshift(batch); + this.getfocus(); } }) } else { @@ -539,6 +540,7 @@ batch: label.batch, qty: 0, uom: label.uom, + handleQty: Number(balance.qty), Records: [] } let record = {} @@ -624,10 +626,61 @@ } else { record = this.creatRecordByBalance(balance, packageInfo); } - batch.Records.push(record); - this.issueRecord.unshift(record) - this.calcBatchHandleQty(batch); - this.getfocus(); + + if (packageInfo.parentNumber) { + var checkData = batch.Records.find(r => { + if (r.packingNumber == packageInfo.parentNumber && + r.batch == packageInfo.batch) { + return r; + } + }) + if (checkData) { + //提示已经扫描 + this.showErrorMessage("箱码[" + packageInfo.number + "]批次[" + packageInfo.batch + + "]的父包装已经扫描") + } else { + batch.Records.push(record); + this.issueRecord.unshift(record) + this.calcBatchHandleQty(batch); + this.getfocus(); + } + } else { + //扫描的是父包装 + var checkData = batch.Records.find(r => { + if (r.parentPackingNumber == packageInfo.number && + r.batch == packageInfo.batch) { + return r; + } + }) + if (checkData) { + //是否移除 + this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentPackingNumber + "]" + "批次[" + + packageInfo + .batch + "]是父包装，是否移除子包装", res => { + if (res) { + batch.Records=[] + batch.Records.push(record); + this.issueRecord.unshift(record) + this.calcBatchHandleQty(batch); + this.getfocus(); + } + }) + console.log("扫描的是父包装，是否移除子包装") + } else { + batch.Records.push(record); + this.issueRecord.unshift(record) + this.calcBatchHandleQty(batch); + this.getfocus(); + } + + } + + + + + + + }, getfocus() { diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 894906db..432f3eb8 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -189,6 +189,11 @@ that.jobStatus = res.data.status that.subList = res.data.subList; that.toLocationCode = that.subList[0].toLocationCode + that.subList[0].itemCode ="255.707-01" + that.subList[0].fromLocationCode ="S12-01-1" + that.subList[0].batch ="20240728" + that.jobContent.allowModifyLocation="TRUE" + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.detailSource, that.subList) if (that.scanMessage) { @@ -335,17 +340,17 @@ return } console.log("提交参数", JSON.stringify(params)); - repleinshJobSubmit(params).then(res => { - uni.hideLoading() - if (res.data) { - this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) - } else { - this.showErrorMessage("提交失败[" + res.msg + "]") - } - }).catch(error => { - uni.hideLoading() - this.showErrorMessage(error) - }) + // repleinshJobSubmit(params).then(res => { + // uni.hideLoading() + // if (res.data) { + // this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) + // } else { + // this.showErrorMessage("提交失败[" + res.msg + "]") + // } + // }).catch(error => { + // uni.hideLoading() + // this.showErrorMessage(error) + // }) }, setParams() { From 513e2da8a94b7cac5e79adc02dd25d77e44e427b Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 19 Aug 2024 11:19:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/coms/comScanReplishPack.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index c1190568..b0345e9e 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -26,6 +26,7 @@ From 4482bffe6b7d373754f82394be86800577e4d95a Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 19 Aug 2024 11:20:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index 5230d74c..45abd37f 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "uni.UNI43932FE", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.64", - "versionCode" : 64, + "versionName" : "1.0.65", + "versionCode" : 65, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From 24fe84795c84c8414525c9cf0b6f75f27d34a2a3 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 19 Aug 2024 11:37:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?HL-5339=E6=97=A0=E8=AE=A1=E5=88=92=E5=AE=8C?= =?UTF-8?q?=E5=B7=A5=EF=BC=8C=E8=B6=85=E8=BF=87=E6=8A=A5=E5=B7=A5=E6=95=B0?= =?UTF-8?q?=E8=BF=98=E5=8F=AF=E4=BB=A5=E5=9C=A8=E6=89=AB=E6=8F=8F=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E5=88=B0=E6=8A=A5=E5=B7=A5=E6=95=B0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9B=E8=B6=85=E8=BF=87=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=95=B0=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=AF=E5=86=8D=E6=AC=A1=E6=89=AB=E6=8F=8F=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=9C=A8=E6=89=AB=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/fg/receiptNoPlan.vue | 35 +++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue index 8bb14470..25cb7dcb 100644 --- a/src/pages/fg/receiptNoPlan.vue +++ b/src/pages/fg/receiptNoPlan.vue @@ -395,12 +395,22 @@ calcFgQty() { this.dataContent.handleQty = this.showList.length; - if (this.dataContent.handleQty == this.dataContent.packQty) { - if (this.$refs.scanPopup) { - this.$refs.scanPopup.closeScanPopup(); + if(parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty) <= parseFloat(this.dataContent.packQty)){ + if(parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty)){ + if (this.$refs.scanPopup) { + this.$refs.scanPopup.closeScanPopup(); + } + this.commit() + } + }else{ + if (parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.packQty)) { + if (this.$refs.scanPopup) { + this.$refs.scanPopup.closeScanPopup(); + } + this.commit() } - this.commit() } + }, scanPopupGetFocus() { @@ -416,15 +426,22 @@ getH5BatchPrintingLable( number) { let _this = this batchPrintingLable(number).then(resLable => { - console.log('batchPrintingLable', resLable) const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712` const webData = { token: storage.getStorage(storage.constant.token), asn_number: resLable.data } - uni.navigateTo({ - url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` - }); + + if ( this.scanedQty + this.showList.length == this.dataContent.planQty) { + uni.redirectTo({ + url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` + }); + }else{ + uni.navigateTo({ + url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` + }); + } + }) }, @@ -432,7 +449,7 @@ let _this = this // #ifdef APP if (pointData.length > 0) { - if (this.scanedQty + this.showList.length == this.dataContent.planQty) { + if ( this.scanedQty + this.showList.length == this.dataContent.planQty) { uni.redirectTo({ url: `/pages/point/index?points=${JSON.stringify(pointData)}` }); From d6b0371037e4d69ceeacd9afaa60521f65bf53b8 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 19 Aug 2024 14:14:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?HL-5323PDA=20=E7=9B=B4=E6=8E=A5=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E6=89=AB=E6=8F=8F=E7=9A=84=E4=BA=8B=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BD=99=E9=A2=9D=E4=B8=AD=E7=9A=84=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=9C=A8=E4=B8=8A=E6=9E=B6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/putaway/record/putawayRecord.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index 5fc5f1d9..b1b5c250 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -410,6 +410,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; + submitItem.itemName = item.itemName; // detail.toInventoryStatus = detail.inventoryStatus // detail.toLocationCode = detail.toLocationCode From b6692a83252f7a1c8f8d23ab42f3e31487ccf1e1 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 19 Aug 2024 14:17:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/job/repleinshDetail.vue | 26 +++++++++------------ 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 432f3eb8..80d3bb6d 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -189,10 +189,6 @@ that.jobStatus = res.data.status that.subList = res.data.subList; that.toLocationCode = that.subList[0].toLocationCode - that.subList[0].itemCode ="255.707-01" - that.subList[0].fromLocationCode ="S12-01-1" - that.subList[0].batch ="20240728" - that.jobContent.allowModifyLocation="TRUE" that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.detailSource, that.subList) @@ -340,17 +336,17 @@ return } console.log("提交参数", JSON.stringify(params)); - // repleinshJobSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + repleinshJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) }, setParams() {