diff --git a/.env.production b/.env.production index f6803774..9a603299 100644 --- a/.env.production +++ b/.env.production @@ -1,12 +1,11 @@ -VITE_BASE_URL=http://172.22.32.8:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api +VITE_BASE_URL=http://172.21.32.13:81/api/admin-api +VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' +VITE_TENANT='[{"text":"长春1379","value":1}]' # 是否是测试环境 VITE_isDevelopment=false - # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' +VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' diff --git a/src/manifest.json b/src/manifest.json index d51b4fd3..8853c26c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "uni.UNI43932FE", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.50", - "versionCode" : 50, + "versionName" : "1.0.51", + "versionCode" : 51, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue index 7770a1c6..85f72a16 100644 --- a/src/mycomponents/common/comMessage.vue +++ b/src/mycomponents/common/comMessage.vue @@ -13,10 +13,10 @@ - + {{content}} - + diff --git a/src/mycomponents/job/jobAccept.vue b/src/mycomponents/job/jobAccept.vue new file mode 100644 index 00000000..2c94f345 --- /dev/null +++ b/src/mycomponents/job/jobAccept.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue index b2b32600..eeb54da6 100644 --- a/src/mycomponents/scan/winComScanBalance.vue +++ b/src/mycomponents/scan/winComScanBalance.vue @@ -214,11 +214,11 @@ var status = getInventoryStatusDesc(params.inventoryStatus) var areaType = getListLocationAreaTypeDesc(params.areaType) var hint = - "按物料号 [" + params.itemCode + "]
" + - "包装号 [" + params.packingNumber + "]
" + - "批次 [" + params.batch + "]
" + - "状态 [" + status + "]
" + - "库区 [" + areaType + "]
" + + "按物料号 [" + params.itemCode + "] \n" + + "包装号 [" + params.packingNumber + "] \n" + + "批次 [" + params.batch + "] \n" + + "状态 [" + status + "] \n" + + "库区 [" + areaType + "] \n" + "未查找到库存余额" this.showErrorMessage(hint) } else if (res.data.length == 1) { diff --git a/src/mycomponents/scan/winComScanBalanceLocation.vue b/src/mycomponents/scan/winComScanBalanceLocation.vue index 8c857800..68f9ae8e 100644 --- a/src/mycomponents/scan/winComScanBalanceLocation.vue +++ b/src/mycomponents/scan/winComScanBalanceLocation.vue @@ -205,11 +205,11 @@ var status = getInventoryStatusDesc(params.inventoryStatus) var areaType = getListLocationAreaTypeDesc(params.areaType) var hint = - "按物料号 [" + params.itemCode + "]
" + - "包装号 [" + params.packingNumber + "]
" + - "批次 [" + params.batch + "]
" + - "状态 [" + status + "]
" + - "库区 [" + areaType + "]
" + + "按物料号 [" + params.itemCode + "] \n" + + "包装号 [" + params.packingNumber + "] \n" + + "批次 [" + params.batch + "] \n" + + "状态 [" + status + "] \n" + + "库区 [" + areaType + "] \n" + "未查找到库存余额" this.showErrorMessage(hint) } else if (res.data.length == 1) { diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index d155e0a7..91c712b1 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -366,7 +366,7 @@ //必须有库存 mustHavaBalance(datas) { if (datas.length == 0) { - this.showErrorMessage(this.getQueryCondition() + '
未查找到库存记录', res => { + this.showErrorMessage(this.getQueryCondition() + '\n未查找到库存记录', res => { this.packGetFocus(); }) } else if (datas.length == 1) { @@ -378,7 +378,7 @@ // if (balance.qty > 0) { // this.packCallBack(balance); // } else { - // this.showErrorMessage(this.getQueryCondition() + '
查找到库存记录数量为[' + balance.qty + "],
不可以进行操作", + // this.showErrorMessage(this.getQueryCondition() + '\n查找到库存记录数量为[' + balance.qty + "],\n不可以进行操作", // res => { // this.packGetFocus(); // }) @@ -398,7 +398,7 @@ // if (balance.qty > 0) { // this.packCallBack(balance); // } else { - // this.showErrorMessage(this.getQueryCondition() + '
查找到库存记录数量为[' + balance.qty + "],不可以进行操作", + // this.showErrorMessage(this.getQueryCondition() + '\n查找到库存记录数量为[' + balance.qty + "],不可以进行操作", // res => { // this.packGetFocus(); // }) @@ -455,31 +455,31 @@ }, getQueryCondition() { - let condition = '按照以下条件:
'; + let condition = '按照以下条件:\n'; let label = this.scanResult.label; let status = getInventoryStatusDesc(this.inventoryStatus); switch (this.managementPrecision) { case 'BY_PACKAGING': - condition = condition + '物料号=[' + label.itemCode + ']
箱码=[' + label.packingNumber + - ']
批次=[' + + condition = condition + '物料号=[' + label.itemCode + ']\n箱码=[' + label.packingNumber + + ']\n批次=[' + label.batch + - ']
库位=[' + this.fromLocationCode + ']' + ']\n库位=[' + this.fromLocationCode + ']' break; case 'BY_BATCH': - condition = condition + '物料号=[' + label.itemCode + ']
批次=[' + + condition = condition + '物料号=[' + label.itemCode + ']\n批次=[' + label.batch + - ']
库位=[' + this.fromLocationCode + ']' + ']\n库位=[' + this.fromLocationCode + ']' break; case 'BY_QUANTITY': - condition = condition + '物料号=[' + label.itemCode + ']
库位=[' + this.fromLocationCode + ']' + condition = condition + '物料号=[' + label.itemCode + ']\n库位=[' + this.fromLocationCode + ']' break; case 'BY_UNIQUEID': condition = condition + '物料号=[' + label.itemCode + ']' break; } if (this.inventoryStatus.length > 0) { - condition = condition + '
库存状态=[' + status + ']' + condition = condition + '\n库存状态=[' + status + ']' } return condition; }, diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue index 48412d12..f43c2bb1 100644 --- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -213,7 +213,7 @@ uni.hideLoading(); var hint = getListLocationTypeDesc(this.fromLocationTypeArray); this.showErrorMessage("库位[" + this.fromLocationCode + "]是" + - getLocationTypeName(type) + ",
需要的库位类型是[" + hint + "]", callback => { + getLocationTypeName(type) + ",\n需要的库位类型是[" + hint + "]", callback => { this.locationGetFocus(); }) } diff --git a/src/pages/container/record/containerBindRecord.vue b/src/pages/container/record/containerBindRecord.vue index 0bb57073..9db73af4 100644 --- a/src/pages/container/record/containerBindRecord.vue +++ b/src/pages/container/record/containerBindRecord.vue @@ -322,7 +322,7 @@ containerBindRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成器具绑定记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成器具绑定记录\n" + res.data) this.clear(); } else { this.showErrorMessage("提交失败[" + res.msg + "]") diff --git a/src/pages/container/record/containerUnBindRecord.vue b/src/pages/container/record/containerUnBindRecord.vue index 6c072a1f..2171fae6 100644 --- a/src/pages/container/record/containerUnBindRecord.vue +++ b/src/pages/container/record/containerUnBindRecord.vue @@ -271,7 +271,7 @@ containerUnBindRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成器具绑定记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成器具绑定记录\n" + res.data) this.clear(); } else { this.showErrorMessage("提交失败[" + res.msg + "]") diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue index 61c1ca16..cf5944ad 100644 --- a/src/pages/count/job/countBlindDetail.vue +++ b/src/pages/count/job/countBlindDetail.vue @@ -498,7 +498,7 @@ } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this .getTotalCount() + "]", res => { if (res) { @@ -520,7 +520,7 @@ countJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/count/job/countDetail.vue b/src/pages/count/job/countDetail.vue index 7f2bd19d..18d943ee 100644 --- a/src/pages/count/job/countDetail.vue +++ b/src/pages/count/job/countDetail.vue @@ -704,7 +704,7 @@ } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this .getTotalCount() + "]", res => { if (res) { @@ -726,7 +726,7 @@ countJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/count/job/countDetail1.vue b/src/pages/count/job/countDetail1.vue index ce60eb4e..98c74b6d 100644 --- a/src/pages/count/job/countDetail1.vue +++ b/src/pages/count/job/countDetail1.vue @@ -493,7 +493,7 @@ } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this .getTotalCount() + "]", res => { if (res) { @@ -515,7 +515,7 @@ // countJobSubmit(params).then(res => { // uni.hideLoading() // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data) + // this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data) // } else { // this.showErrorMessage("提交失败[" + res.msg + "]") // } diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue index ff66ec25..59a6865d 100644 --- a/src/pages/count/job/countLightDetail.vue +++ b/src/pages/count/job/countLightDetail.vue @@ -503,7 +503,7 @@ } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this .getTotalCount() + "]", res => { if (res) { @@ -525,7 +525,7 @@ countJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/count/record/countRecord.vue b/src/pages/count/record/countRecord.vue index 7260c414..81860241 100644 --- a/src/pages/count/record/countRecord.vue +++ b/src/pages/count/record/countRecord.vue @@ -404,7 +404,7 @@ } else { this.calcScanCount(); if (this.scanCount < this.subList.length) { - this.showMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + "]总共[" + this.subList.length + + this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList.length + "]"); } } diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue index b29b5b85..21afb6d1 100644 --- a/src/pages/customerReturn/job/returnDetail.vue +++ b/src/pages/customerReturn/job/returnDetail.vue @@ -368,7 +368,7 @@ // this.submitJob(); // } else { // //不允许部分提交，提示 - // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + // "]箱总共[" + this.subList.length + "]箱", res => { // if (res) { // this.openScanPopup(); @@ -396,7 +396,7 @@ customerReturnJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成客户退货记录:" + res.data) + this.showCommitSuccessMessage("提交成功\n生成客户退货记录:" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue index 9317f930..314fc6ad 100644 --- a/src/pages/customerReturn/record/returnRecord.vue +++ b/src/pages/customerReturn/record/returnRecord.vue @@ -263,7 +263,7 @@ customerReturnRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成客户退货记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成客户退货记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/customerReturn/request/customerReturnRequestCreate.vue b/src/pages/customerReturn/request/customerReturnRequestCreate.vue index a41a9bcf..f36714ce 100644 --- a/src/pages/customerReturn/request/customerReturnRequestCreate.vue +++ b/src/pages/customerReturn/request/customerReturnRequestCreate.vue @@ -280,7 +280,7 @@ customerReturnRequestSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成客户退货申请
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成客户退货申请\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue index 72f19b7b..836f8529 100644 --- a/src/pages/deliver/job/deliverDetail.vue +++ b/src/pages/deliver/job/deliverDetail.vue @@ -254,7 +254,7 @@ deliverJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成发货记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成发货记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue index c73e5ba5..82e7469a 100644 --- a/src/pages/deliver/record/deliverRecord.vue +++ b/src/pages/deliver/record/deliverRecord.vue @@ -290,7 +290,7 @@ deliverRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成制品发货记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成制品发货记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/deliver/request/deliverRequestCreate.vue b/src/pages/deliver/request/deliverRequestCreate.vue index 853cc3aa..b812c8b4 100644 --- a/src/pages/deliver/request/deliverRequestCreate.vue +++ b/src/pages/deliver/request/deliverRequestCreate.vue @@ -157,7 +157,7 @@ deliverRequestSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成成品发货申请
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成成品发货申请\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue index 0df01fb5..a64fb88e 100644 --- a/src/pages/fg/receiptByPlan.vue +++ b/src/pages/fg/receiptByPlan.vue @@ -369,7 +369,7 @@ import { nextTick } from 'vue'; nextTick(()=>{ - this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + list[0].requestNumber, list) + this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list) }) diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue index 885e5e12..8bb14470 100644 --- a/src/pages/fg/receiptNoPlan.vue +++ b/src/pages/fg/receiptNoPlan.vue @@ -307,7 +307,7 @@ } else { //创建检验申请 createInspectRequestByPlan(list[0].requestNumber) } - this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + list[0].requestNumber, list) + this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list) this.scanedQty = this.scanedQty + this.showList.length; this.showList = []; this.dataContent.handleQty = 0; diff --git a/src/pages/inspect/job/inspectDetail.vue b/src/pages/inspect/job/inspectDetail.vue index 7be5a0f8..5fd016ae 100644 --- a/src/pages/inspect/job/inspectDetail.vue +++ b/src/pages/inspect/job/inspectDetail.vue @@ -349,7 +349,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -373,9 +373,9 @@ inspectJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成到货检验记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成到货检验记录\n" + res.data) createPutAwayRequest(res.data).then(putawayres => { - this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) + this.showCommitSuccessMessage("生成上架申请单号\n" + putawayres.data) }).catch(error => { uni.hideLoading(); this.showErrorMessage(error); diff --git a/src/pages/inspect/job/inspectFullDetail.vue b/src/pages/inspect/job/inspectFullDetail.vue index 2373ccfa..912159c1 100644 --- a/src/pages/inspect/job/inspectFullDetail.vue +++ b/src/pages/inspect/job/inspectFullDetail.vue @@ -369,7 +369,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -392,10 +392,10 @@ inspectJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成到货检验记录" + res.data) + this.showCommitSuccessMessage("提交成功\n生成到货检验记录" + res.data) //创建完检验记录后创建上架申请 createPutAwayRequest(res.data).then(putawayres => { - this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) + this.showCommitSuccessMessage("生成上架申请单号\n" + putawayres.data) }).catch(error => { uni.hideLoading(); this.showErrorMessage(error); diff --git a/src/pages/inspect/job/inspectResult.vue b/src/pages/inspect/job/inspectResult.vue index 275cbddd..5b620b8a 100644 --- a/src/pages/inspect/job/inspectResult.vue +++ b/src/pages/inspect/job/inspectResult.vue @@ -543,11 +543,11 @@ if (res.data) { var hint = ""; if (this.jobContent.nextAction == "FULL_INSPECT") { - hint = "提交成功
生成到货检验任务
" + res.data + hint = "提交成功\n生成到货检验任务\n" + res.data } else { - hint = "提交成功
生成到货检验记录
" + res.data + hint = "提交成功\n生成到货检验记录\n" + res.data createPutAwayRequest(res.data).then(putawayres => { - this.showCommitSuccessMessage("生成上架申请单号
" + putawayres.data) + this.showCommitSuccessMessage("生成上架申请单号\n" + putawayres.data) }).catch(error => { uni.hideLoading(); this.showErrorMessage(error); diff --git a/src/pages/inventoryMove/coms/comMove.vue b/src/pages/inventoryMove/coms/comMove.vue index 3d5ca05e..ce96aa53 100644 --- a/src/pages/inventoryMove/coms/comMove.vue +++ b/src/pages/inventoryMove/coms/comMove.vue @@ -307,7 +307,7 @@ inventoryMoveRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成" + this.title + "记录
" + + this.showCommitSuccessMessage("提交成功\n生成" + this.title + "记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 48bcc383..871807fc 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -358,7 +358,7 @@ inventoryMoveRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成" + this.title + "
" + + this.showCommitSuccessMessage("提交成功\n生成" + this.title + "\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index db5c02ac..ce81a5da 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -384,7 +384,7 @@ // this.submitJob(); // } else { // //不允许部分提交，提示 - // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + // "]箱总共[" + this // .subList.length + "]箱", res => { // if (res) { @@ -413,7 +413,7 @@ inventoryMoveSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成库存转移记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成库存转移记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 830c4016..727849fe 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -309,11 +309,11 @@ var status = getInventoryStatusDesc(params.inventoryStatus) var areaType = getListLocationAreaTypeDesc(params.areaType) var hint = - "按物料号 [" + params.itemCode + "]
" + - "包装号 [" + params.packingNumber + "]
" + - "批次 [" + params.batch + "]
" + - "状态 [" + status + "]
" + - "库区 [" + areaType + "]
" + + "按物料号 [" + params.itemCode + "] \n" + + "包装号 [" + params.packingNumber + "] \n" + + "批次 [" + params.batch + "] \n" + + "状态 [" + status + "] \n" + + "库区 [" + areaType + "] \n" + "未查找到库存余额" this.showErrorMessage(hint) } else if (res.data.length == 1) { @@ -606,8 +606,8 @@ batch: label.batch, // qty: Number(balance.qty), // qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty), - qty: balance.handleQty, - handleQty: balance.handleQty, + qty: Number(balance.qty), + handleQty: Number(balance.qty), uom: balance.uom, inventoryStatus: balance.inventoryStatus, balance: balance, diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 13b15b2f..541e4808 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -310,7 +310,7 @@ issueJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成发料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成发料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 08324259..1748dddc 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -611,11 +611,11 @@ } } else { this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch + - "]物料号[" + result.label.itemCode + "]未查找到任务
" + "扫描[" + result + "]物料号[" + result.label.itemCode + "]未查找到任务\n" + "扫描[" + result .scanMessage + "]") } }).catch(error => { - this.showMessage(error + "
扫描[" + result.scanMessage + "]") + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") }) } catch (e) { diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index 3153d83f..457a6208 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -396,7 +396,7 @@ issueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成直接发料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/issue/record/directIssue1.vue b/src/pages/issue/record/directIssue1.vue index 4d552454..89085406 100644 --- a/src/pages/issue/record/directIssue1.vue +++ b/src/pages/issue/record/directIssue1.vue @@ -388,7 +388,7 @@ issueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成直接发料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/issue/record/directIssue2.vue b/src/pages/issue/record/directIssue2.vue index c5451866..300ec2af 100644 --- a/src/pages/issue/record/directIssue2.vue +++ b/src/pages/issue/record/directIssue2.vue @@ -582,7 +582,7 @@ issueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成直接发料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue index b9219f6f..ae2171e6 100644 --- a/src/pages/issue/record/issueRecord.vue +++ b/src/pages/issue/record/issueRecord.vue @@ -437,7 +437,7 @@ issueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成直接发料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/issue/record/issueRecordV1.vue b/src/pages/issue/record/issueRecordV1.vue index 478b634c..c63d50b0 100644 --- a/src/pages/issue/record/issueRecordV1.vue +++ b/src/pages/issue/record/issueRecordV1.vue @@ -373,7 +373,7 @@ issueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成发料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成发料记录\n" + res.data) } else { this.showErrorMessage("提交失败:【" + res.msg+"】") } diff --git a/src/pages/issue/request/issueRequestCreate.vue b/src/pages/issue/request/issueRequestCreate.vue index 63a82335..a3c553dc 100644 --- a/src/pages/issue/request/issueRequestCreate.vue +++ b/src/pages/issue/request/issueRequestCreate.vue @@ -188,7 +188,7 @@ issueRequestSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成发料申请" + res.data) + this.showCommitSuccessMessage("提交成功\n生成发料申请" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue index 3bc1ebd2..33ad2b6c 100644 --- a/src/pages/issue/request/issueScanRequest.vue +++ b/src/pages/issue/request/issueScanRequest.vue @@ -131,7 +131,7 @@ issueRequestSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成发料申请[" + res.data+"]") + this.showCommitSuccessMessage("提交成功\n生成发料申请[" + res.data+"]") } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/material/materialDowngrade.vue b/src/pages/material/materialDowngrade.vue index c479b151..cb4a19bc 100644 --- a/src/pages/material/materialDowngrade.vue +++ b/src/pages/material/materialDowngrade.vue @@ -230,7 +230,7 @@ putawayRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购上架记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 3dc06b4e..2d91d17b 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -398,7 +398,7 @@ barcodeBase64: '', }) }) - this.showCommitSuccessMessage("提交成功
生成翻包记录
", list) + this.showCommitSuccessMessage("提交成功\n生成翻包记录\n", list) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/package/record/mergePackageRecord.vue b/src/pages/package/record/mergePackageRecord.vue index 69fd8752..7fa7a928 100644 --- a/src/pages/package/record/mergePackageRecord.vue +++ b/src/pages/package/record/mergePackageRecord.vue @@ -242,7 +242,7 @@ mergePackageRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成合包记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成合包记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 3c4c8aa0..c87a4912 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -452,7 +452,7 @@ barcodeBase64: '', }) }) - this.showCommitSuccessMessage("提交成功
生成翻包记录
", list) + this.showCommitSuccessMessage("提交成功\n生成翻包记录\n", list) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue index b78ce07d..183a8bd3 100644 --- a/src/pages/package/record/splitPackageRecord.vue +++ b/src/pages/package/record/splitPackageRecord.vue @@ -306,7 +306,7 @@ barcodeBase64: '', }) }) - this.showCommitSuccessMessage("提交成功
生成拆包记录
", list) + this.showCommitSuccessMessage("提交成功\n生成拆包记录\n", list) } else { this.showErrorMessage("提交失败[" + res.msg + "]") diff --git a/src/pages/productDismantle/job/productDismantleDetail.vue b/src/pages/productDismantle/job/productDismantleDetail.vue index c8a8f7c5..e25735c9 100644 --- a/src/pages/productDismantle/job/productDismantleDetail.vue +++ b/src/pages/productDismantle/job/productDismantleDetail.vue @@ -345,7 +345,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -373,7 +373,7 @@ console.log("提交参数", JSON.stringify(params)); // productDismantleJobSubmit(this.id, params).then(res => { // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data.Number, ) + // this.showCommitSuccessMessage("提交成功\n生成采购收货记录" + res.data.Number, ) // } else { // this.showErrorMessage("提交失败[" + res.msg + "]") // } diff --git a/src/pages/productDismantle/record/productDismantleRecord.vue b/src/pages/productDismantle/record/productDismantleRecord.vue index 0ff35dbd..3175daf7 100644 --- a/src/pages/productDismantle/record/productDismantleRecord.vue +++ b/src/pages/productDismantle/record/productDismantleRecord.vue @@ -243,7 +243,7 @@ // productDismantleRecordSubmit(params).then(res => { // uni.hideLoading() // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data, ) + // this.showCommitSuccessMessage("提交成功\n生成采购收货记录" + res.data, ) // } else { // this.showErrorMessage("提交失败[" + res.msg + "]") // } diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 14510c85..1a970b6b 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -407,7 +407,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -456,7 +456,7 @@ productPutawayJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成" + this.hintTitle + "记录
" + + this.showCommitSuccessMessage("提交成功\n生成" + this.hintTitle + "记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index 0940fbe1..342de8ac 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -411,10 +411,10 @@ this.selectItem(list[0]) } } else { - this.showMessage("未查找到任务
" + "扫描[" + result.scanMessage + "]") + this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]") } }).catch(error => { - this.showMessage(error + "
扫描[" + result.scanMessage + "]") + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") }) } catch (e) { diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index 09d40be2..a90c28c2 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -303,7 +303,7 @@ productPutawayRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成制品上架记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成制品上架记录\n" + res.data) let removeId = []; this.detailSource.forEach(r => { removeId.push(r.expectinNumber); diff --git a/src/pages/productPutaway/request/putawayRequestCreate.vue b/src/pages/productPutaway/request/putawayRequestCreate.vue index 28c7b5f8..c486e6c6 100644 --- a/src/pages/productPutaway/request/putawayRequestCreate.vue +++ b/src/pages/productPutaway/request/putawayRequestCreate.vue @@ -286,7 +286,7 @@ productPutawayRequestSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成制品上架申请
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成制品上架申请\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue index e69f7fb3..36cb5c65 100644 --- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue @@ -366,7 +366,7 @@ } } else { //不允许部分提交，提示 - this.showMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + "]总共[" + this.subList + this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList .length + "]"); } @@ -418,7 +418,7 @@ ccProductReceiptJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue index d190d8ab..e79c2565 100644 --- a/src/pages/productReceipt/job/ccProductReceiptJob.vue +++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue @@ -416,10 +416,10 @@ this.selectItem(list[0]) } } else { - this.showMessage("未查找到任务
" + "扫描[" + result.scanMessage + "]") + this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]") } }).catch(error => { - this.showMessage(error + "
扫描[" + result.scanMessage + "]") + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") }) } catch (e) { diff --git a/src/pages/productReceipt/job/completeReceiveJobDetail.vue b/src/pages/productReceipt/job/completeReceiveJobDetail.vue index 73b5a7d4..2fb7b9aa 100644 --- a/src/pages/productReceipt/job/completeReceiveJobDetail.vue +++ b/src/pages/productReceipt/job/completeReceiveJobDetail.vue @@ -305,7 +305,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.showMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + "]总共[" + this.subList + this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList .length + "]"); } @@ -330,7 +330,7 @@ productReceiptJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成制品收货记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成制品收货记录\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index f2895ab2..fbfe4c8a 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -495,7 +495,7 @@ productReceiptJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index c4377232..24c63209 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -361,7 +361,7 @@ } } else { //不允许部分提交，提示 - this.showMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + "]总共[" + this.subList + this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList .length + "]"); } @@ -413,7 +413,7 @@ productReceiptJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成预生产收货记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成预生产收货记录\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 2e904488..5b9f5d69 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -413,10 +413,10 @@ this.selectItem(list[0]) } } else { - this.showMessage("未查找到任务
" + "扫描[" + result.scanMessage + "]") + this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]") } }).catch(error => { - this.showMessage(error + "
扫描[" + result.scanMessage + "]") + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") }) } catch (e) { diff --git a/src/pages/productReceipt/job/scrapReceiptDetail.vue b/src/pages/productReceipt/job/scrapReceiptDetail.vue index 8fe10e23..16cbdf0a 100644 --- a/src/pages/productReceipt/job/scrapReceiptDetail.vue +++ b/src/pages/productReceipt/job/scrapReceiptDetail.vue @@ -324,7 +324,7 @@ // this.submitJob(); // } else { // //不允许部分提交，提示 - // this.showMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + "]总共[" + this.subList + // this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList // .length + // "]"); // } @@ -349,7 +349,7 @@ productReceiptJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成报废收货记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成报废收货记录\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productReceipt/job/semiProductReceiptDetail.vue b/src/pages/productReceipt/job/semiProductReceiptDetail.vue index 860914fc..496a018c 100644 --- a/src/pages/productReceipt/job/semiProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/semiProductReceiptDetail.vue @@ -305,7 +305,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.showMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + "]总共[" + this.subList + this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList .length + "]"); } @@ -330,7 +330,7 @@ productReceiptJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成制品收货记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成制品收货记录\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productReceipt/record/productReceiptRecord.vue b/src/pages/productReceipt/record/productReceiptRecord.vue index 2bdda403..c17dada1 100644 --- a/src/pages/productReceipt/record/productReceiptRecord.vue +++ b/src/pages/productReceipt/record/productReceiptRecord.vue @@ -249,7 +249,7 @@ productionReceiptRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成制品收货记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成制品收货记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue index c893101a..a6530486 100644 --- a/src/pages/productRecycle/job/productRecycleJobDetail.vue +++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue @@ -249,8 +249,8 @@ if (itemDetail) { // 箱码、批次、库位、状态一致 if (itemDetail.scaned) { - this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result - .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描") + this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result + .fromLocationCode + "】\n状态【" + balanceStatus + "】\n已经扫描") return; } else { itemDetail.scaned = true; @@ -299,8 +299,8 @@ }); } } else { - this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result - .fromLocationCode + "】
状态【" + balanceStatus + "】
不在任务列表中") + this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result + .fromLocationCode + "】\n状态【" + balanceStatus + "】\n不在任务列表中") } } @@ -348,7 +348,7 @@ // this.submitJob(); // } else { // //不允许部分提交，提示 - // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + // "]箱总共[" + this // .subList.length + "]箱", res => { // if (res) { @@ -469,7 +469,7 @@ }, showCommitSuccessMessage(number) { - this.$refs.comMessage.showSuccessMessage('提交成功
生成制品回收记录
:' + number, res => { + this.$refs.comMessage.showSuccessMessage('提交成功\n生成制品回收记录\n:' + number, res => { navigateBack(1) }) } diff --git a/src/pages/productRecycle/record/productRecycleRecord.vue b/src/pages/productRecycle/record/productRecycleRecord.vue index 06a7554d..9f6002c7 100644 --- a/src/pages/productRecycle/record/productRecycleRecord.vue +++ b/src/pages/productRecycle/record/productRecycleRecord.vue @@ -251,7 +251,7 @@ productRecycleRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购退货记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成采购退货记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg+"]") } diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index b36e1f6f..10b0564b 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -384,7 +384,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -425,7 +425,7 @@ productionReceiptJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成发料接收记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -449,7 +449,7 @@ // productionReceiptJobSubmit(params).then(res => { // uni.hideLoading() // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成发料接收记录
" + res.data) + // this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data) // } else { // this.showErrorMessage("提交失败[" + res.msg + "]") // } diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index ee4863cf..5bc91f36 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -395,10 +395,10 @@ this.selectItem(list[0]) } } else { - this.showMessage("未查找到任务
" + "扫描[" + result.scanMessage + "]") + this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]") } }).catch(error => { - this.showMessage(error + "
扫描[" + result.scanMessage + "]") + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") }) } catch (e) { diff --git a/src/pages/productionReceipt/record/productionReceiptRecord.vue b/src/pages/productionReceipt/record/productionReceiptRecord.vue index f0b20c4b..fdc5bac0 100644 --- a/src/pages/productionReceipt/record/productionReceiptRecord.vue +++ b/src/pages/productionReceipt/record/productionReceiptRecord.vue @@ -237,7 +237,7 @@ // productionReceiptRecordSubmit(params).then(res => { // uni.hideLoading() // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data, ) + // this.showCommitSuccessMessage("提交成功\n生成采购收货记录" + res.data, ) // } else { // this.showErrorMessage("提交失败[" + res.msg + "]") // } diff --git a/src/pages/productionReturn/coms/comReturn.vue b/src/pages/productionReturn/coms/comReturn.vue index 9b81b788..0cb0a2cb 100644 --- a/src/pages/productionReturn/coms/comReturn.vue +++ b/src/pages/productionReturn/coms/comReturn.vue @@ -297,7 +297,7 @@ productionReturnRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成退料收货记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成退料收货记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue index 3d5c69c0..8bf54c4a 100644 --- a/src/pages/productionReturn/job/returnDetail.vue +++ b/src/pages/productionReturn/job/returnDetail.vue @@ -352,7 +352,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -387,7 +387,7 @@ productionReturnJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成生产退料记录:" + res.data) + this.showCommitSuccessMessage("提交成功\n生成生产退料记录:" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productionReturn/record/returnToHold.vue b/src/pages/productionReturn/record/returnToHold.vue index c18bb6f3..fcede127 100644 --- a/src/pages/productionReturn/record/returnToHold.vue +++ b/src/pages/productionReturn/record/returnToHold.vue @@ -348,7 +348,7 @@ productionReturnRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成退料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成退料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productionReturn/record/returnToStore.vue b/src/pages/productionReturn/record/returnToStore.vue index ee5bfaab..6ad0edba 100644 --- a/src/pages/productionReturn/record/returnToStore.vue +++ b/src/pages/productionReturn/record/returnToStore.vue @@ -389,7 +389,7 @@ productionReturnRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成退料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成退料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productionReturn/request/returnRequestCreate.vue b/src/pages/productionReturn/request/returnRequestCreate.vue index a204b7d6..15fd8be7 100644 --- a/src/pages/productionReturn/request/returnRequestCreate.vue +++ b/src/pages/productionReturn/request/returnRequestCreate.vue @@ -201,7 +201,7 @@ productionReturnRequestCreate(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成发料申请
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成发料申请\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 8fc65ab4..ba9aa9c6 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -461,7 +461,7 @@ }); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -478,7 +478,7 @@ this.showMessage("请输入拒收原因") return; } - this.$refs.comMessage.showQuestionMessage('是否要拒收任务
[' + this.jobContent.asnNumber + ']?', res => { + this.$refs.comMessage.showQuestionMessage('是否要拒收任务\n[' + this.jobContent.asnNumber + ']?', res => { if (res) { uni.showLoading({ title: "提交中....", @@ -525,7 +525,7 @@ if (!isCheckPrint) { uni.hideLoading() - // this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data.number) + // this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number) uni.redirectTo({ url: '/pages/pointPutawayJob/index?number='+that.jobContent.number }) diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index d484d78a..4a43391a 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -453,10 +453,10 @@ this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1) } } else { - this.showMessage("未查找到任务
"+"扫描["+result.scanMessage+"]") + this.showMessage("未查找到任务\n"+"扫描["+result.scanMessage+"]") } }).catch(error => { - this.showMessage(error+"
扫描["+result.scanMessage+"]") + this.showMessage(error+"\n扫描["+result.scanMessage+"]") }) } catch (e) { diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue index 9a83781e..09cb8434 100644 --- a/src/pages/purchaseReturn/job/returnDetail.vue +++ b/src/pages/purchaseReturn/job/returnDetail.vue @@ -246,12 +246,12 @@ // let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); //不存在提示 if (itemDetail == undefined) { - this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result - .fromLocationCode + "】
未找到明细") + this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result + .fromLocationCode + "】\n未找到明细") return; } else { if (itemDetail.scaned) { - this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result + this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result .fromLocationCode + "】已经扫描") return; } else { @@ -286,8 +286,8 @@ // r.fromLocationCode == result.fromLocationCode // }) // if (itemDetail.scaned) { - // this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result - // .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描") + // this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result + // .fromLocationCode + "】\n状态【" + balanceStatus + "】\n已经扫描") // return; // } @@ -319,8 +319,8 @@ // } else { // // 箱码、批次、库位、状态一致 // if (itemDetail.scaned) { - // this.showErrorMessage("箱码【" + packingNumber + "】
批次【" + batch + "】
库位【" + result - // .fromLocationCode + "】
状态【" + balanceStatus + "】
已经扫描") + // this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result + // .fromLocationCode + "】\n状态【" + balanceStatus + "】\n已经扫描") // return; // } else { // itemDetail.scaned = true; @@ -380,7 +380,7 @@ // this.submitJob(); // } else { // //不允许部分提交，提示 - // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + // "]箱总共[" + this // .subList.length + "]箱", res => { // if (res) { @@ -501,7 +501,7 @@ }, showCommitSuccessMessage(number) { - this.$refs.comMessage.showSuccessMessage('提交成功
生成退货记录:' + number, res => { + this.$refs.comMessage.showSuccessMessage('提交成功\n生成退货记录:' + number, res => { navigateBack(1) }) } diff --git a/src/pages/purchaseReturn/record/returnRecord.vue b/src/pages/purchaseReturn/record/returnRecord.vue index 8b5e36d4..7d040014 100644 --- a/src/pages/purchaseReturn/record/returnRecord.vue +++ b/src/pages/purchaseReturn/record/returnRecord.vue @@ -254,7 +254,7 @@ purchaseReturnRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购退货记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成采购退货记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/purchaseReturn/request/returnRequestCreate.vue b/src/pages/purchaseReturn/request/returnRequestCreate.vue index ccd0b691..923277af 100644 --- a/src/pages/purchaseReturn/request/returnRequestCreate.vue +++ b/src/pages/purchaseReturn/request/returnRequestCreate.vue @@ -215,7 +215,7 @@ purchaseReturnRequestCreate(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购退货申请
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成采购退货申请\n" + res.data) } else { this.showErrorMessage("提交失败["+res.msg+"]") } diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index cc18b893..494f8686 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -454,7 +454,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -485,7 +485,7 @@ putawayJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购上架记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index 389d8ea2..1621655f 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -395,26 +395,26 @@ if (list[0].acceptUserId == this.$store.state.user.id) { this.selectItem(list[0]) } else { - this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "
任务号[" + + this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "\n任务号[" + list[0].number + "]扫描[" + result.scanMessage + "]") } } else if (list[0].status == 3) { - this.showMessage("该任务已经完成
承接人[" + list[0].acceptUserName + "]
任务号[" + + this.showMessage("该任务已经完成\n承接人[" + list[0].acceptUserName + "]\n任务号[" + list[0].number + "]扫描[" + result.scanMessage + "]") } } else { - this.showMessage("查询到多条任务
" + "扫描[" + result.scanMessage + "]") + this.showMessage("查询到多条任务\n" + "扫描[" + result.scanMessage + "]") } } else { - this.showMessage("未查找到任务
" + "扫描[" + result.scanMessage + "]") + this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]") } }).catch(error => { - this.showMessage(error + "
扫描[" + result.scanMessage + "]") + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") }) } catch (e) { - this.showMessage(e + "
扫描[" + result.scanMessage + "]") + this.showMessage(e + "\n扫描[" + result.scanMessage + "]") } }, } diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index a40d2002..052df9f0 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -335,7 +335,7 @@ putawayRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购上架记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/putaway/record/putawayRecord_bat.vue b/src/pages/putaway/record/putawayRecord_bat.vue index 9a67134d..fc8b8ba8 100644 --- a/src/pages/putaway/record/putawayRecord_bat.vue +++ b/src/pages/putaway/record/putawayRecord_bat.vue @@ -314,7 +314,7 @@ putawayRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购上架记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/putaway/request/putawayRequestCreate.vue b/src/pages/putaway/request/putawayRequestCreate.vue index 5f7c3df6..1ea52af3 100644 --- a/src/pages/putaway/request/putawayRequestCreate.vue +++ b/src/pages/putaway/request/putawayRequestCreate.vue @@ -288,7 +288,7 @@ putawayRequestSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购上架申请
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成采购上架申请\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index d33794e2..9bfa5072 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -362,11 +362,11 @@ var status = getInventoryStatusDesc(params.inventoryStatus) var areaType = getListLocationAreaTypeDesc(params.areaType) var hint = - "按物料号 [" + params.itemCode + "]
" + - "包装号 [" + params.packingNumber + "]
" + - "批次 [" + params.batch + "]
" + - "状态 [" + status + "]
" + - "库区 [" + areaType + "]
" + + "按物料号 [" + params.itemCode + "] \n" + + "包装号 [" + params.packingNumber + "] \n" + + "批次 [" + params.batch + "] \n" + + "状态 [" + status + "] \n" + + "库区 [" + areaType + "] \n" + "未查找到库存余额" this.showErrorMessage(hint) } else if (res.data.length == 1) { diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index fabc2fed..e24a5d25 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -281,7 +281,7 @@ repleinshJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成补料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index b7b2f5e4..8ea2b7bb 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -549,11 +549,11 @@ } } else { this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch + - "]物料号[" + result.label.itemCode + "]未查找到任务
" + "扫描[" + result + "]物料号[" + result.label.itemCode + "]未查找到任务\n" + "扫描[" + result .scanMessage + "]") } }).catch(error => { - this.showMessage(error + "
扫描[" + result.scanMessage + "]") + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") }) } catch (e) { @@ -562,7 +562,7 @@ } // else // { - // this.showMessage(error + "
扫描[" + result.scanMessage + "]") + // this.showMessage(error + "\n扫描[" + result.scanMessage + "]") // } }, } diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue index 640bfd3f..a7773b00 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord.vue @@ -373,7 +373,7 @@ repleinshRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成直接补料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成直接补料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/repleinsh/record/directRepleinshRecord1.vue b/src/pages/repleinsh/record/directRepleinshRecord1.vue index a18eec6b..6683657d 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord1.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord1.vue @@ -382,7 +382,7 @@ repleinshRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成直接补料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成直接补料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue index c7378cfe..6786de85 100644 --- a/src/pages/repleinsh/record/repleinshRecord.vue +++ b/src/pages/repleinsh/record/repleinshRecord.vue @@ -448,7 +448,7 @@ repleinshRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成直接补料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成直接补料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/repleinsh/record/repleinshRecordV1.vue b/src/pages/repleinsh/record/repleinshRecordV1.vue index 8a1fab48..fb982f94 100644 --- a/src/pages/repleinsh/record/repleinshRecordV1.vue +++ b/src/pages/repleinsh/record/repleinshRecordV1.vue @@ -369,7 +369,7 @@ repleinshRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成补料记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg+"]") } diff --git a/src/pages/scrap/job/scrapJobDetail.vue b/src/pages/scrap/job/scrapJobDetail.vue index 87a6a3c9..41cb0ce1 100644 --- a/src/pages/scrap/job/scrapJobDetail.vue +++ b/src/pages/scrap/job/scrapJobDetail.vue @@ -315,7 +315,7 @@ // this.submitJob(); // } else { // //不允许部分提交，提示 - // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + // "]箱总共[" + this // .subList.length + "]箱", res => { // if (res) { @@ -337,7 +337,7 @@ scrapJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成报废出库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成报废出库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue index 2aac2ef0..2c5c7624 100644 --- a/src/pages/scrap/record/scrapRecord.vue +++ b/src/pages/scrap/record/scrapRecord.vue @@ -240,7 +240,7 @@ scrapRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成报废出库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成报废出库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/scrap/request/scrapRequestCreate.vue b/src/pages/scrap/request/scrapRequestCreate.vue index 9534b317..ef2ba7b4 100644 --- a/src/pages/scrap/request/scrapRequestCreate.vue +++ b/src/pages/scrap/request/scrapRequestCreate.vue @@ -257,7 +257,7 @@ scrapRequestCreate(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成报废出库申请
" + res.data, ) + this.showCommitSuccessMessage("提交成功\n生成报废出库申请\n" + res.data, ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue index d8271d72..0ba4fb25 100644 --- a/src/pages/stockUp/job/stockUpJobDetail.vue +++ b/src/pages/stockUp/job/stockUpJobDetail.vue @@ -270,7 +270,7 @@ stockUpJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成备货记录" + res.data) + this.showCommitSuccessMessage("提交成功\n生成备货记录" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/transfer/coms/comTransferRecord.vue b/src/pages/transfer/coms/comTransferRecord.vue index 6bc51e4c..064dc915 100644 --- a/src/pages/transfer/coms/comTransferRecord.vue +++ b/src/pages/transfer/coms/comTransferRecord.vue @@ -263,7 +263,7 @@ transferIssueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨出库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成调拨出库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -275,7 +275,7 @@ transferReceiptRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨入库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成调拨入库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue index aa501ee2..ac03934e 100644 --- a/src/pages/transfer/job/issueDetail.vue +++ b/src/pages/transfer/job/issueDetail.vue @@ -336,7 +336,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -367,7 +367,7 @@ transferIssueJobSubmit(params).then(res => { if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨出库记录" + res.data) + this.showCommitSuccessMessage("提交成功\n生成调拨出库记录" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue index 0ef38304..82369338 100644 --- a/src/pages/transfer/job/receiptDetail.vue +++ b/src/pages/transfer/job/receiptDetail.vue @@ -362,7 +362,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -400,7 +400,7 @@ transferReceiptJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨入库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成调拨入库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue index 806d09d2..d362914a 100644 --- a/src/pages/transfer/job/transferDetail.vue +++ b/src/pages/transfer/job/transferDetail.vue @@ -372,7 +372,7 @@ } else { this.scanCount = this.getScanCount(); if (this.scanCount < this.subList.length) { - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { diff --git a/src/pages/transfer/record/deliverRecord.vue b/src/pages/transfer/record/deliverRecord.vue index 0c753757..ea89bd50 100644 --- a/src/pages/transfer/record/deliverRecord.vue +++ b/src/pages/transfer/record/deliverRecord.vue @@ -252,7 +252,7 @@ transferIssueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨出库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成调拨出库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/transfer/record/receiptRecord.vue b/src/pages/transfer/record/receiptRecord.vue index 81a94e90..a9065644 100644 --- a/src/pages/transfer/record/receiptRecord.vue +++ b/src/pages/transfer/record/receiptRecord.vue @@ -232,7 +232,7 @@ transferReceiptRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨入库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成调拨入库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue index adb33b11..60aa60b6 100644 --- a/src/pages/unPlanned/job/issueJobDetail.vue +++ b/src/pages/unPlanned/job/issueJobDetail.vue @@ -309,7 +309,7 @@ // this.submitJob(); // } else { // //不允许部分提交，提示 - // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + // "]箱总共[" + this // .subList.length + "]箱", res => { // if (res) { @@ -332,7 +332,7 @@ unPlannedIssueJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成计划外出库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成计划外出库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index ed688942..d9049d28 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -264,7 +264,7 @@ this.submitJob(); } else { //不允许部分提交，提示 - this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount + + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]箱总共[" + this .subList.length + "]箱", res => { if (res) { @@ -314,7 +314,7 @@ unPlannedReceiptJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成计划外入库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成计划外入库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue index 89e1fb3a..7aeda84d 100644 --- a/src/pages/unPlanned/record/issueRecord.vue +++ b/src/pages/unPlanned/record/issueRecord.vue @@ -213,7 +213,7 @@ unPlannedIssueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data ) + this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/unPlanned/record/receiptRecord.vue b/src/pages/unPlanned/record/receiptRecord.vue index ad4c88d6..795c8f6a 100644 --- a/src/pages/unPlanned/record/receiptRecord.vue +++ b/src/pages/unPlanned/record/receiptRecord.vue @@ -260,7 +260,7 @@ unPlannedReceiptRecordbSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成计划外入库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成计划外入库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/unPlanned/request/issueRequestCreate.vue b/src/pages/unPlanned/request/issueRequestCreate.vue index 4647037c..1c0b9c0e 100644 --- a/src/pages/unPlanned/request/issueRequestCreate.vue +++ b/src/pages/unPlanned/request/issueRequestCreate.vue @@ -235,7 +235,7 @@ unPlannedIssueRequestCreate(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成计划外出库申请
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成计划外出库申请\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/unPlanned/request/receiptRequestCreate.vue b/src/pages/unPlanned/request/receiptRequestCreate.vue index 04dacd90..ca594f4d 100644 --- a/src/pages/unPlanned/request/receiptRequestCreate.vue +++ b/src/pages/unPlanned/request/receiptRequestCreate.vue @@ -184,7 +184,7 @@ unPlannedReceiptRequestCreate(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成计划外入库申请
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成计划外入库申请\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") }