Browse Source

修改提示框,\n

lijuncheng0816
lijuncheng 1 month ago
parent
commit
be5db4daa2
  1. 9
      .env.production
  2. 4
      src/manifest.json
  3. 4
      src/mycomponents/common/comMessage.vue
  4. 47
      src/mycomponents/job/jobAccept.vue
  5. 10
      src/mycomponents/scan/winComScanBalance.vue
  6. 10
      src/mycomponents/scan/winComScanBalanceLocation.vue
  7. 22
      src/mycomponents/scan/winScanPackAndLocation.vue
  8. 2
      src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
  9. 2
      src/pages/container/record/containerBindRecord.vue
  10. 2
      src/pages/container/record/containerUnBindRecord.vue
  11. 4
      src/pages/count/job/countBlindDetail.vue
  12. 4
      src/pages/count/job/countDetail.vue
  13. 4
      src/pages/count/job/countDetail1.vue
  14. 4
      src/pages/count/job/countLightDetail.vue
  15. 2
      src/pages/count/record/countRecord.vue
  16. 4
      src/pages/customerReturn/job/returnDetail.vue
  17. 2
      src/pages/customerReturn/record/returnRecord.vue
  18. 2
      src/pages/customerReturn/request/customerReturnRequestCreate.vue
  19. 2
      src/pages/deliver/job/deliverDetail.vue
  20. 2
      src/pages/deliver/record/deliverRecord.vue
  21. 2
      src/pages/deliver/request/deliverRequestCreate.vue
  22. 2
      src/pages/fg/receiptByPlan.vue
  23. 2
      src/pages/fg/receiptNoPlan.vue
  24. 6
      src/pages/inspect/job/inspectDetail.vue
  25. 6
      src/pages/inspect/job/inspectFullDetail.vue
  26. 6
      src/pages/inspect/job/inspectResult.vue
  27. 2
      src/pages/inventoryMove/coms/comMove.vue
  28. 2
      src/pages/inventoryMove/coms/comMoveRecord.vue
  29. 4
      src/pages/inventoryMove/job/inventoryMoveDetail.vue
  30. 14
      src/pages/issue/coms/comScanIssuePack.vue
  31. 2
      src/pages/issue/job/issueDetail.vue
  32. 4
      src/pages/issue/job/issueJob.vue
  33. 2
      src/pages/issue/record/directIssue.vue
  34. 2
      src/pages/issue/record/directIssue1.vue
  35. 2
      src/pages/issue/record/directIssue2.vue
  36. 2
      src/pages/issue/record/issueRecord.vue
  37. 2
      src/pages/issue/record/issueRecordV1.vue
  38. 2
      src/pages/issue/request/issueRequestCreate.vue
  39. 2
      src/pages/issue/request/issueScanRequest.vue
  40. 2
      src/pages/material/materialDowngrade.vue
  41. 2
      src/pages/package/job/overPackageJobDetail.vue
  42. 2
      src/pages/package/record/mergePackageRecord.vue
  43. 2
      src/pages/package/record/overPackageRecord.vue
  44. 2
      src/pages/package/record/splitPackageRecord.vue
  45. 4
      src/pages/productDismantle/job/productDismantleDetail.vue
  46. 2
      src/pages/productDismantle/record/productDismantleRecord.vue
  47. 4
      src/pages/productPutaway/job/productPutawayDetail.vue
  48. 4
      src/pages/productPutaway/job/productPutawayJob.vue
  49. 2
      src/pages/productPutaway/record/productPutawayRecord.vue
  50. 2
      src/pages/productPutaway/request/putawayRequestCreate.vue
  51. 4
      src/pages/productReceipt/job/ccProductReceiptDetail.vue
  52. 4
      src/pages/productReceipt/job/ccProductReceiptJob.vue
  53. 4
      src/pages/productReceipt/job/completeReceiveJobDetail.vue
  54. 2
      src/pages/productReceipt/job/fgProductReceiptDetail.vue
  55. 4
      src/pages/productReceipt/job/productReceiptDetail.vue
  56. 4
      src/pages/productReceipt/job/productReceiptJob.vue
  57. 4
      src/pages/productReceipt/job/scrapReceiptDetail.vue
  58. 4
      src/pages/productReceipt/job/semiProductReceiptDetail.vue
  59. 2
      src/pages/productReceipt/record/productReceiptRecord.vue
  60. 12
      src/pages/productRecycle/job/productRecycleJobDetail.vue
  61. 2
      src/pages/productRecycle/record/productRecycleRecord.vue
  62. 6
      src/pages/productionReceipt/job/productionReceiptDetail.vue
  63. 4
      src/pages/productionReceipt/job/productionReceiptJob.vue
  64. 2
      src/pages/productionReceipt/record/productionReceiptRecord.vue
  65. 2
      src/pages/productionReturn/coms/comReturn.vue
  66. 4
      src/pages/productionReturn/job/returnDetail.vue
  67. 2
      src/pages/productionReturn/record/returnToHold.vue
  68. 2
      src/pages/productionReturn/record/returnToStore.vue
  69. 2
      src/pages/productionReturn/request/returnRequestCreate.vue
  70. 6
      src/pages/purchaseReceipt/job/receiptDetail.vue
  71. 4
      src/pages/purchaseReceipt/job/receiptJob.vue
  72. 18
      src/pages/purchaseReturn/job/returnDetail.vue
  73. 2
      src/pages/purchaseReturn/record/returnRecord.vue
  74. 2
      src/pages/purchaseReturn/request/returnRequestCreate.vue
  75. 4
      src/pages/putaway/job/putawayDetail.vue
  76. 12
      src/pages/putaway/job/putawayJob.vue
  77. 2
      src/pages/putaway/record/putawayRecord.vue
  78. 2
      src/pages/putaway/record/putawayRecord_bat.vue
  79. 2
      src/pages/putaway/request/putawayRequestCreate.vue
  80. 10
      src/pages/repleinsh/coms/comScanReplishPack.vue
  81. 2
      src/pages/repleinsh/job/repleinshDetail.vue
  82. 6
      src/pages/repleinsh/job/repleinshJob.vue
  83. 2
      src/pages/repleinsh/record/directRepleinshRecord.vue
  84. 2
      src/pages/repleinsh/record/directRepleinshRecord1.vue
  85. 2
      src/pages/repleinsh/record/repleinshRecord.vue
  86. 2
      src/pages/repleinsh/record/repleinshRecordV1.vue
  87. 4
      src/pages/scrap/job/scrapJobDetail.vue
  88. 2
      src/pages/scrap/record/scrapRecord.vue
  89. 2
      src/pages/scrap/request/scrapRequestCreate.vue
  90. 2
      src/pages/stockUp/job/stockUpJobDetail.vue
  91. 4
      src/pages/transfer/coms/comTransferRecord.vue
  92. 4
      src/pages/transfer/job/issueDetail.vue
  93. 4
      src/pages/transfer/job/receiptDetail.vue
  94. 2
      src/pages/transfer/job/transferDetail.vue
  95. 2
      src/pages/transfer/record/deliverRecord.vue
  96. 2
      src/pages/transfer/record/receiptRecord.vue
  97. 4
      src/pages/unPlanned/job/issueJobDetail.vue
  98. 4
      src/pages/unPlanned/job/receiptJobDetail.vue
  99. 2
      src/pages/unPlanned/record/issueRecord.vue
  100. 2
      src/pages/unPlanned/record/receiptRecord.vue

9
.env.production

@ -1,12 +1,11 @@
VITE_BASE_URL=http://172.22.32.8:81/api/admin-api VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.22.32.8:81/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_isDevelopment=false
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' VITE_JMREPORT_BASE_URL='http://172.21.32.13:90'

4
src/manifest.json

@ -3,8 +3,8 @@
"package" : "uni.UNI43932FE", "package" : "uni.UNI43932FE",
"appid" : "__UNI__C9CF4BF", "appid" : "__UNI__C9CF4BF",
"description" : "", "description" : "",
"versionName" : "1.0.50", "versionName" : "1.0.51",
"versionCode" : 50, "versionCode" : 51,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

4
src/mycomponents/common/comMessage.vue

@ -13,10 +13,10 @@
<image class="icon" :src="icon" /> <image class="icon" :src="icon" />
</slot> </slot>
<slot name="content"> <slot name="content">
<text class="content" :style="{'color': textColor?textColor:'#000'}" v-if="textColor"> <text class="content" :style="{'color': textColor?textColor:'#000'}" >
{{content}} {{content}}
</text> </text>
<rich-text class="content" :nodes="content" v-else></rich-text> <!-- <rich-text class="content" :nodes="content" v-else></rich-text> -->
</slot> </slot>
<view class='split_line'></view> <view class='split_line'></view>

47
src/mycomponents/job/jobAccept.vue

@ -0,0 +1,47 @@
<template>
<!-- style="margin-top: 10rpx;margin-bottom: 10rpx;" class="uni-flex uni-row space-between u-col-center" -->
<view class="task_item" style="margin-left: 15rpx; margin-right: 15rpx;">
<view class="uni-flex space-between u-col-center">
<view class="uni-flex uni-row u-col-center">
<text style="font-size: 32rpx;" >承接人:{{dataContent.acceptUserName}}</text>
</view>
<view class="uni-flex uni-row u-col-center">
<text style="font-size: 32rpx;" class="center">承接时间:{{formatDate(dataContent.acceptTime)}}</text>
</view>
</view>
</view>
</template>
<script>
import {
dateFormat
} from '@/common/basic.js';
export default {
components: {
},
data() {
return {
};
},
watch: {},
props: {
dataContent: {
type: Object,
default: {}
}
},
methods: {
formatDate: function(val) {
return dateFormat(val)
}
}
}
</script>
<style lang="scss">
</style>

10
src/mycomponents/scan/winComScanBalance.vue

@ -214,11 +214,11 @@
var status = getInventoryStatusDesc(params.inventoryStatus) var status = getInventoryStatusDesc(params.inventoryStatus)
var areaType = getListLocationAreaTypeDesc(params.areaType) var areaType = getListLocationAreaTypeDesc(params.areaType)
var hint = var hint =
"按物料号 [" + params.itemCode + "] <br>" + "按物料号 [" + params.itemCode + "] \n" +
"包装号 [" + params.packingNumber + "] <br>" + "包装号 [" + params.packingNumber + "] \n" +
"批次 [" + params.batch + "] <br>" + "批次 [" + params.batch + "] \n" +
"状态 [" + status + "] <br>" + "状态 [" + status + "] \n" +
"库区 [" + areaType + "] <br>" + "库区 [" + areaType + "] \n" +
"未查找到库存余额" "未查找到库存余额"
this.showErrorMessage(hint) this.showErrorMessage(hint)
} else if (res.data.length == 1) { } else if (res.data.length == 1) {

10
src/mycomponents/scan/winComScanBalanceLocation.vue

@ -205,11 +205,11 @@
var status = getInventoryStatusDesc(params.inventoryStatus) var status = getInventoryStatusDesc(params.inventoryStatus)
var areaType = getListLocationAreaTypeDesc(params.areaType) var areaType = getListLocationAreaTypeDesc(params.areaType)
var hint = var hint =
"按物料号 [" + params.itemCode + "] <br>" + "按物料号 [" + params.itemCode + "] \n" +
"包装号 [" + params.packingNumber + "] <br>" + "包装号 [" + params.packingNumber + "] \n" +
"批次 [" + params.batch + "] <br>" + "批次 [" + params.batch + "] \n" +
"状态 [" + status + "] <br>" + "状态 [" + status + "] \n" +
"库区 [" + areaType + "] <br>" + "库区 [" + areaType + "] \n" +
"未查找到库存余额" "未查找到库存余额"
this.showErrorMessage(hint) this.showErrorMessage(hint)
} else if (res.data.length == 1) { } else if (res.data.length == 1) {

22
src/mycomponents/scan/winScanPackAndLocation.vue

@ -366,7 +366,7 @@
// //
mustHavaBalance(datas) { mustHavaBalance(datas) {
if (datas.length == 0) { if (datas.length == 0) {
this.showErrorMessage(this.getQueryCondition() + '<br>未查找到库存记录', res => { this.showErrorMessage(this.getQueryCondition() + '\n未查找到库存记录', res => {
this.packGetFocus(); this.packGetFocus();
}) })
} else if (datas.length == 1) { } else if (datas.length == 1) {
@ -378,7 +378,7 @@
// if (balance.qty > 0) { // if (balance.qty > 0) {
// this.packCallBack(balance); // this.packCallBack(balance);
// } else { // } else {
// this.showErrorMessage(this.getQueryCondition() + '<br>[' + balance.qty + "],<br>", // this.showErrorMessage(this.getQueryCondition() + '\n[' + balance.qty + "],\n",
// res => { // res => {
// this.packGetFocus(); // this.packGetFocus();
// }) // })
@ -398,7 +398,7 @@
// if (balance.qty > 0) { // if (balance.qty > 0) {
// this.packCallBack(balance); // this.packCallBack(balance);
// } else { // } else {
// this.showErrorMessage(this.getQueryCondition() + '<br>[' + balance.qty + "],", // this.showErrorMessage(this.getQueryCondition() + '\n[' + balance.qty + "],",
// res => { // res => {
// this.packGetFocus(); // this.packGetFocus();
// }) // })
@ -455,31 +455,31 @@
}, },
getQueryCondition() { getQueryCondition() {
let condition = '按照以下条件:<br>'; let condition = '按照以下条件:\n';
let label = this.scanResult.label; let label = this.scanResult.label;
let status = getInventoryStatusDesc(this.inventoryStatus); let status = getInventoryStatusDesc(this.inventoryStatus);
switch (this.managementPrecision) { switch (this.managementPrecision) {
case 'BY_PACKAGING': case 'BY_PACKAGING':
condition = condition + '物料号=[' + label.itemCode + ']<br>箱码=[' + label.packingNumber + condition = condition + '物料号=[' + label.itemCode + ']\n箱码=[' + label.packingNumber +
']<br>批次=[' + ']\n批次=[' +
label.batch + label.batch +
']<br>库位=[' + this.fromLocationCode + ']' ']\n库位=[' + this.fromLocationCode + ']'
break; break;
case 'BY_BATCH': case 'BY_BATCH':
condition = condition + '物料号=[' + label.itemCode + ']<br>批次=[' + condition = condition + '物料号=[' + label.itemCode + ']\n批次=[' +
label.batch + label.batch +
']<br>库位=[' + this.fromLocationCode + ']' ']\n库位=[' + this.fromLocationCode + ']'
break; break;
case 'BY_QUANTITY': case 'BY_QUANTITY':
condition = condition + '物料号=[' + label.itemCode + ']<br>库位=[' + this.fromLocationCode + ']' condition = condition + '物料号=[' + label.itemCode + ']\n库位=[' + this.fromLocationCode + ']'
break; break;
case 'BY_UNIQUEID': case 'BY_UNIQUEID':
condition = condition + '物料号=[' + label.itemCode + ']' condition = condition + '物料号=[' + label.itemCode + ']'
break; break;
} }
if (this.inventoryStatus.length > 0) { if (this.inventoryStatus.length > 0) {
condition = condition + '<br>库存状态=[' + status + ']' condition = condition + '\n库存状态=[' + status + ']'
} }
return condition; return condition;
}, },

2
src/mycomponents/scan/winScanPackAndLocationNoBalance.vue

@ -213,7 +213,7 @@
uni.hideLoading(); uni.hideLoading();
var hint = getListLocationTypeDesc(this.fromLocationTypeArray); var hint = getListLocationTypeDesc(this.fromLocationTypeArray);
this.showErrorMessage("库位[" + this.fromLocationCode + "]是" + this.showErrorMessage("库位[" + this.fromLocationCode + "]是" +
getLocationTypeName(type) + ",<br>需要的库位类型是[" + hint + "]", callback => { getLocationTypeName(type) + ",\n需要的库位类型是[" + hint + "]", callback => {
this.locationGetFocus(); this.locationGetFocus();
}) })
} }

2
src/pages/container/record/containerBindRecord.vue

@ -322,7 +322,7 @@
containerBindRecordSubmit(params).then(res => { containerBindRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成器具绑定记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成器具绑定记录\n" + res.data)
this.clear(); this.clear();
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")

2
src/pages/container/record/containerUnBindRecord.vue

@ -271,7 +271,7 @@
containerUnBindRecordSubmit(params).then(res => { containerUnBindRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成器具绑定记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成器具绑定记录\n" + res.data)
this.clear(); this.clear();
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")

4
src/pages/count/job/countBlindDetail.vue

@ -498,7 +498,7 @@
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]总共[" + this "]总共[" + this
.getTotalCount() + "]", res => { .getTotalCount() + "]", res => {
if (res) { if (res) {
@ -520,7 +520,7 @@
countJobSubmit(params).then(res => { countJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/count/job/countDetail.vue

@ -704,7 +704,7 @@
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]总共[" + this "]总共[" + this
.getTotalCount() + "]", res => { .getTotalCount() + "]", res => {
if (res) { if (res) {
@ -726,7 +726,7 @@
countJobSubmit(params).then(res => { countJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/count/job/countDetail1.vue

@ -493,7 +493,7 @@
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]总共[" + this "]总共[" + this
.getTotalCount() + "]", res => { .getTotalCount() + "]", res => {
if (res) { if (res) {
@ -515,7 +515,7 @@
// countJobSubmit(params).then(res => { // countJobSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // if (res.data) {
// this.showCommitSuccessMessage("<br><br>" + res.data) // this.showCommitSuccessMessage("\n\n" + res.data)
// } else { // } else {
// this.showErrorMessage("[" + res.msg + "]") // this.showErrorMessage("[" + res.msg + "]")
// } // }

4
src/pages/count/job/countLightDetail.vue

@ -503,7 +503,7 @@
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]总共[" + this "]总共[" + this
.getTotalCount() + "]", res => { .getTotalCount() + "]", res => {
if (res) { if (res) {
@ -525,7 +525,7 @@
countJobSubmit(params).then(res => { countJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/count/record/countRecord.vue

@ -404,7 +404,7 @@
} else { } else {
this.calcScanCount(); this.calcScanCount();
if (this.scanCount < this.subList.length) { if (this.scanCount < this.subList.length) {
this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList.length + this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList.length +
"]"); "]");
} }
} }

4
src/pages/customerReturn/job/returnDetail.vue

@ -368,7 +368,7 @@
// this.submitJob(); // this.submitJob();
// } else { // } else {
// // // //
// this.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount + // this.$refs.comMessage.showErrorMessage(',\n' + "[" + this.scanCount +
// "][" + this.subList.length + "]", res => { // "][" + this.subList.length + "]", res => {
// if (res) { // if (res) {
// this.openScanPopup(); // this.openScanPopup();
@ -396,7 +396,7 @@
customerReturnJobSubmit(params).then(res => { customerReturnJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成客户退货记录:" + res.data) this.showCommitSuccessMessage("提交成功\n生成客户退货记录:" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/customerReturn/record/returnRecord.vue

@ -263,7 +263,7 @@
customerReturnRecordSubmit(params).then(res => { customerReturnRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成客户退货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成客户退货记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/customerReturn/request/customerReturnRequestCreate.vue

@ -280,7 +280,7 @@
customerReturnRequestSubmit(params).then(res => { customerReturnRequestSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成客户退货申请<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成客户退货申请\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/deliver/job/deliverDetail.vue

@ -254,7 +254,7 @@
deliverJobSubmit(params).then(res => { deliverJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成发货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成发货记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/deliver/record/deliverRecord.vue

@ -290,7 +290,7 @@
deliverRecordSubmit(params).then(res => { deliverRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成制品发货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成制品发货记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/deliver/request/deliverRequestCreate.vue

@ -157,7 +157,7 @@
deliverRequestSubmit(params).then(res => { deliverRequestSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成成品发货申请<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成成品发货申请\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/fg/receiptByPlan.vue

@ -369,7 +369,7 @@ import { nextTick } from 'vue';
nextTick(()=>{ nextTick(()=>{
this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list) this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list)
}) })

2
src/pages/fg/receiptNoPlan.vue

@ -307,7 +307,7 @@
} else { // } else { //
createInspectRequestByPlan(list[0].requestNumber) createInspectRequestByPlan(list[0].requestNumber)
} }
this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list) this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list)
this.scanedQty = this.scanedQty + this.showList.length; this.scanedQty = this.scanedQty + this.showList.length;
this.showList = []; this.showList = [];
this.dataContent.handleQty = 0; this.dataContent.handleQty = 0;

6
src/pages/inspect/job/inspectDetail.vue

@ -349,7 +349,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -373,9 +373,9 @@
inspectJobSubmit(params).then(res => { inspectJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成到货检验记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成到货检验记录\n" + res.data)
createPutAwayRequest(res.data).then(putawayres => { createPutAwayRequest(res.data).then(putawayres => {
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data) this.showCommitSuccessMessage("生成上架申请单号\n" + putawayres.data)
}).catch(error => { }).catch(error => {
uni.hideLoading(); uni.hideLoading();
this.showErrorMessage(error); this.showErrorMessage(error);

6
src/pages/inspect/job/inspectFullDetail.vue

@ -369,7 +369,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -392,10 +392,10 @@
inspectJobSubmit(params).then(res => { inspectJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data) this.showCommitSuccessMessage("提交成功\n生成到货检验记录" + res.data)
// //
createPutAwayRequest(res.data).then(putawayres => { createPutAwayRequest(res.data).then(putawayres => {
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data) this.showCommitSuccessMessage("生成上架申请单号\n" + putawayres.data)
}).catch(error => { }).catch(error => {
uni.hideLoading(); uni.hideLoading();
this.showErrorMessage(error); this.showErrorMessage(error);

6
src/pages/inspect/job/inspectResult.vue

@ -543,11 +543,11 @@
if (res.data) { if (res.data) {
var hint = ""; var hint = "";
if (this.jobContent.nextAction == "FULL_INSPECT") { if (this.jobContent.nextAction == "FULL_INSPECT") {
hint = "提交成功<br>生成到货检验任务<br>" + res.data hint = "提交成功\n生成到货检验任务\n" + res.data
} else { } else {
hint = "提交成功<br>生成到货检验记录<br>" + res.data hint = "提交成功\n生成到货检验记录\n" + res.data
createPutAwayRequest(res.data).then(putawayres => { createPutAwayRequest(res.data).then(putawayres => {
this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data) this.showCommitSuccessMessage("生成上架申请单号\n" + putawayres.data)
}).catch(error => { }).catch(error => {
uni.hideLoading(); uni.hideLoading();
this.showErrorMessage(error); this.showErrorMessage(error);

2
src/pages/inventoryMove/coms/comMove.vue

@ -307,7 +307,7 @@
inventoryMoveRecordSubmit(params).then(res => { inventoryMoveRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成" + this.title + "记录<br>" + this.showCommitSuccessMessage("提交成功\n生成" + this.title + "记录\n" +
res.data) res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")

2
src/pages/inventoryMove/coms/comMoveRecord.vue

@ -358,7 +358,7 @@
inventoryMoveRecordSubmit(params).then(res => { inventoryMoveRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成" + this.title + "<br>" + this.showCommitSuccessMessage("提交成功\n生成" + this.title + "\n" +
res.data) res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")

4
src/pages/inventoryMove/job/inventoryMoveDetail.vue

@ -384,7 +384,7 @@
// this.submitJob(); // this.submitJob();
// } else { // } else {
// // // //
// this.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount + // this.$refs.comMessage.showErrorMessage(',\n' + "[" + this.scanCount +
// "][" + this // "][" + this
// .subList.length + "]", res => { // .subList.length + "]", res => {
// if (res) { // if (res) {
@ -413,7 +413,7 @@
inventoryMoveSubmit(params).then(res => { inventoryMoveSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成库存转移记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成库存转移记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

14
src/pages/issue/coms/comScanIssuePack.vue

@ -309,11 +309,11 @@
var status = getInventoryStatusDesc(params.inventoryStatus) var status = getInventoryStatusDesc(params.inventoryStatus)
var areaType = getListLocationAreaTypeDesc(params.areaType) var areaType = getListLocationAreaTypeDesc(params.areaType)
var hint = var hint =
"按物料号 [" + params.itemCode + "] <br>" + "按物料号 [" + params.itemCode + "] \n" +
"包装号 [" + params.packingNumber + "] <br>" + "包装号 [" + params.packingNumber + "] \n" +
"批次 [" + params.batch + "] <br>" + "批次 [" + params.batch + "] \n" +
"状态 [" + status + "] <br>" + "状态 [" + status + "] \n" +
"库区 [" + areaType + "] <br>" + "库区 [" + areaType + "] \n" +
"未查找到库存余额" "未查找到库存余额"
this.showErrorMessage(hint) this.showErrorMessage(hint)
} else if (res.data.length == 1) { } else if (res.data.length == 1) {
@ -606,8 +606,8 @@
batch: label.batch, batch: label.batch,
// qty: Number(balance.qty), // qty: Number(balance.qty),
// qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty), // qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
qty: balance.handleQty, qty: Number(balance.qty),
handleQty: balance.handleQty, handleQty: Number(balance.qty),
uom: balance.uom, uom: balance.uom,
inventoryStatus: balance.inventoryStatus, inventoryStatus: balance.inventoryStatus,
balance: balance, balance: balance,

2
src/pages/issue/job/issueDetail.vue

@ -310,7 +310,7 @@
issueJobSubmit(params).then(res => { issueJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成发料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成发料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/issue/job/issueJob.vue

@ -611,11 +611,11 @@
} }
} else { } else {
this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch + this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch +
"]物料号[" + result.label.itemCode + "]未查找到任务<br>" + "扫描[" + result "]物料号[" + result.label.itemCode + "]未查找到任务\n" + "扫描[" + result
.scanMessage + "]") .scanMessage + "]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
}) })
} catch (e) { } catch (e) {

2
src/pages/issue/record/directIssue.vue

@ -396,7 +396,7 @@
issueRecordSubmit(params).then(res => { issueRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成直接发料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/issue/record/directIssue1.vue

@ -388,7 +388,7 @@
issueRecordSubmit(params).then(res => { issueRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成直接发料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/issue/record/directIssue2.vue

@ -582,7 +582,7 @@
issueRecordSubmit(params).then(res => { issueRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成直接发料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/issue/record/issueRecord.vue

@ -437,7 +437,7 @@
issueRecordSubmit(params).then(res => { issueRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成直接发料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/issue/record/issueRecordV1.vue

@ -373,7 +373,7 @@
issueRecordSubmit(params).then(res => { issueRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成发料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成发料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败:【" + res.msg+"】") this.showErrorMessage("提交失败:【" + res.msg+"】")
} }

2
src/pages/issue/request/issueRequestCreate.vue

@ -188,7 +188,7 @@
issueRequestSubmit(params).then(res => { issueRequestSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成发料申请" + res.data) this.showCommitSuccessMessage("提交成功\n生成发料申请" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/issue/request/issueScanRequest.vue

@ -131,7 +131,7 @@
issueRequestSubmit(params).then(res => { issueRequestSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成发料申请[" + res.data+"]") this.showCommitSuccessMessage("提交成功\n生成发料申请[" + res.data+"]")
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/material/materialDowngrade.vue

@ -230,7 +230,7 @@
putawayRecordSubmit(params).then(res => { putawayRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/package/job/overPackageJobDetail.vue

@ -398,7 +398,7 @@
barcodeBase64: '', barcodeBase64: '',
}) })
}) })
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list) this.showCommitSuccessMessage("提交成功\n生成翻包记录\n", list)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/package/record/mergePackageRecord.vue

@ -242,7 +242,7 @@
mergePackageRecordSubmit(params).then(res => { mergePackageRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成合包记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成合包记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/package/record/overPackageRecord.vue

@ -452,7 +452,7 @@
barcodeBase64: '', barcodeBase64: '',
}) })
}) })
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list) this.showCommitSuccessMessage("提交成功\n生成翻包记录\n", list)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/package/record/splitPackageRecord.vue

@ -306,7 +306,7 @@
barcodeBase64: '', barcodeBase64: '',
}) })
}) })
this.showCommitSuccessMessage("提交成功<br>生成拆包记录<br>", list) this.showCommitSuccessMessage("提交成功\n生成拆包记录\n", list)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")

4
src/pages/productDismantle/job/productDismantleDetail.vue

@ -345,7 +345,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -373,7 +373,7 @@
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
// productDismantleJobSubmit(this.id, params).then(res => { // productDismantleJobSubmit(this.id, params).then(res => {
// if (res.data) { // if (res.data) {
// this.showCommitSuccessMessage("<br>" + res.data.Number, ) // this.showCommitSuccessMessage("\n" + res.data.Number, )
// } else { // } else {
// this.showErrorMessage("[" + res.msg + "]") // this.showErrorMessage("[" + res.msg + "]")
// } // }

2
src/pages/productDismantle/record/productDismantleRecord.vue

@ -243,7 +243,7 @@
// productDismantleRecordSubmit(params).then(res => { // productDismantleRecordSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // if (res.data) {
// this.showCommitSuccessMessage("<br>" + res.data, ) // this.showCommitSuccessMessage("\n" + res.data, )
// } else { // } else {
// this.showErrorMessage("[" + res.msg + "]") // this.showErrorMessage("[" + res.msg + "]")
// } // }

4
src/pages/productPutaway/job/productPutawayDetail.vue

@ -407,7 +407,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -456,7 +456,7 @@
productPutawayJobSubmit(params).then(res => { productPutawayJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成" + this.hintTitle + "记录<br>" + this.showCommitSuccessMessage("提交成功\n生成" + this.hintTitle + "记录\n" +
res.data) res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")

4
src/pages/productPutaway/job/productPutawayJob.vue

@ -411,10 +411,10 @@
this.selectItem(list[0]) this.selectItem(list[0])
} }
} else { } else {
this.showMessage("未查找到任务<br>" + "扫描[" + result.scanMessage + "]") this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
}) })
} catch (e) { } catch (e) {

2
src/pages/productPutaway/record/productPutawayRecord.vue

@ -303,7 +303,7 @@
productPutawayRecordSubmit(params).then(res => { productPutawayRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成制品上架记录\n" + res.data)
let removeId = []; let removeId = [];
this.detailSource.forEach(r => { this.detailSource.forEach(r => {
removeId.push(r.expectinNumber); removeId.push(r.expectinNumber);

2
src/pages/productPutaway/request/putawayRequestCreate.vue

@ -286,7 +286,7 @@
productPutawayRequestSubmit(params).then(res => { productPutawayRequestSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成制品上架申请<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成制品上架申请\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/productReceipt/job/ccProductReceiptDetail.vue

@ -366,7 +366,7 @@
} }
} else { } else {
// //
this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
.length + .length +
"]"); "]");
} }
@ -418,7 +418,7 @@
ccProductReceiptJobsubmit(params).then(res => { ccProductReceiptJobsubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/productReceipt/job/ccProductReceiptJob.vue

@ -416,10 +416,10 @@
this.selectItem(list[0]) this.selectItem(list[0])
} }
} else { } else {
this.showMessage("未查找到任务<br>" + "扫描[" + result.scanMessage + "]") this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
}) })
} catch (e) { } catch (e) {

4
src/pages/productReceipt/job/completeReceiveJobDetail.vue

@ -305,7 +305,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
.length + .length +
"]"); "]");
} }
@ -330,7 +330,7 @@
productReceiptJobsubmit(params).then(res => { productReceiptJobsubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成制品收货记录\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/productReceipt/job/fgProductReceiptDetail.vue

@ -495,7 +495,7 @@
productReceiptJobsubmit(params).then(res => { productReceiptJobsubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/productReceipt/job/productReceiptDetail.vue

@ -361,7 +361,7 @@
} }
} else { } else {
// //
this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
.length + .length +
"]"); "]");
} }
@ -413,7 +413,7 @@
productReceiptJobsubmit(params).then(res => { productReceiptJobsubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成预生产收货记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成预生产收货记录\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/productReceipt/job/productReceiptJob.vue

@ -413,10 +413,10 @@
this.selectItem(list[0]) this.selectItem(list[0])
} }
} else { } else {
this.showMessage("未查找到任务<br>" + "扫描[" + result.scanMessage + "]") this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
}) })
} catch (e) { } catch (e) {

4
src/pages/productReceipt/job/scrapReceiptDetail.vue

@ -324,7 +324,7 @@
// this.submitJob(); // this.submitJob();
// } else { // } else {
// // // //
// this.showMessage(',<br>' + "[" + this.scanCount + "][" + this.subList // this.showMessage(',\n' + "[" + this.scanCount + "][" + this.subList
// .length + // .length +
// "]"); // "]");
// } // }
@ -349,7 +349,7 @@
productReceiptJobsubmit(params).then(res => { productReceiptJobsubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成报废收货记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成报废收货记录\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/productReceipt/job/semiProductReceiptDetail.vue

@ -305,7 +305,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList this.showMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
.length + .length +
"]"); "]");
} }
@ -330,7 +330,7 @@
productReceiptJobsubmit(params).then(res => { productReceiptJobsubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成制品收货记录\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/productReceipt/record/productReceiptRecord.vue

@ -249,7 +249,7 @@
productionReceiptRecordSubmit(params).then(res => { productionReceiptRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成制品收货记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

12
src/pages/productRecycle/job/productRecycleJobDetail.vue

@ -249,8 +249,8 @@
if (itemDetail) { if (itemDetail) {
// //
if (itemDetail.scaned) { if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result
.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描") .fromLocationCode + "】\n状态【" + balanceStatus + "】\n已经扫描")
return; return;
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
@ -299,8 +299,8 @@
}); });
} }
} else { } else {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result
.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>不在任务列表中") .fromLocationCode + "】\n状态【" + balanceStatus + "】\n不在任务列表中")
} }
} }
@ -348,7 +348,7 @@
// this.submitJob(); // this.submitJob();
// } else { // } else {
// // // //
// this.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount + // this.$refs.comMessage.showErrorMessage(',\n' + "[" + this.scanCount +
// "][" + this // "][" + this
// .subList.length + "]", res => { // .subList.length + "]", res => {
// if (res) { // if (res) {
@ -469,7 +469,7 @@
}, },
showCommitSuccessMessage(number) { showCommitSuccessMessage(number) {
this.$refs.comMessage.showSuccessMessage('提交成功<br>生成制品回收记录<br>:' + number, res => { this.$refs.comMessage.showSuccessMessage('提交成功\n生成制品回收记录\n:' + number, res => {
navigateBack(1) navigateBack(1)
}) })
} }

2
src/pages/productRecycle/record/productRecycleRecord.vue

@ -251,7 +251,7 @@
productRecycleRecordSubmit(params).then(res => { productRecycleRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购退货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成采购退货记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg+"]") this.showErrorMessage("提交失败[" + res.msg+"]")
} }

6
src/pages/productionReceipt/job/productionReceiptDetail.vue

@ -384,7 +384,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -425,7 +425,7 @@
productionReceiptJobSubmit(params).then(res => { productionReceiptJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成发料接收记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成发料接收记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }
@ -449,7 +449,7 @@
// productionReceiptJobSubmit(params).then(res => { // productionReceiptJobSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // if (res.data) {
// this.showCommitSuccessMessage("<br><br>" + res.data) // this.showCommitSuccessMessage("\n\n" + res.data)
// } else { // } else {
// this.showErrorMessage("[" + res.msg + "]") // this.showErrorMessage("[" + res.msg + "]")
// } // }

4
src/pages/productionReceipt/job/productionReceiptJob.vue

@ -395,10 +395,10 @@
this.selectItem(list[0]) this.selectItem(list[0])
} }
} else { } else {
this.showMessage("未查找到任务<br>" + "扫描[" + result.scanMessage + "]") this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
}) })
} catch (e) { } catch (e) {

2
src/pages/productionReceipt/record/productionReceiptRecord.vue

@ -237,7 +237,7 @@
// productionReceiptRecordSubmit(params).then(res => { // productionReceiptRecordSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // if (res.data) {
// this.showCommitSuccessMessage("<br>" + res.data, ) // this.showCommitSuccessMessage("\n" + res.data, )
// } else { // } else {
// this.showErrorMessage("[" + res.msg + "]") // this.showErrorMessage("[" + res.msg + "]")
// } // }

2
src/pages/productionReturn/coms/comReturn.vue

@ -297,7 +297,7 @@
productionReturnRecordSubmit(params).then(res => { productionReturnRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成退料收货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成退料收货记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/productionReturn/job/returnDetail.vue

@ -352,7 +352,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -387,7 +387,7 @@
productionReturnJobSubmit(params).then(res => { productionReturnJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成生产退料记录:" + res.data) this.showCommitSuccessMessage("提交成功\n生成生产退料记录:" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/productionReturn/record/returnToHold.vue

@ -348,7 +348,7 @@
productionReturnRecordSubmit(params).then(res => { productionReturnRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成退料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成退料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/productionReturn/record/returnToStore.vue

@ -389,7 +389,7 @@
productionReturnRecordSubmit(params).then(res => { productionReturnRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成退料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成退料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/productionReturn/request/returnRequestCreate.vue

@ -201,7 +201,7 @@
productionReturnRequestCreate(params).then(res => { productionReturnRequestCreate(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成发料申请<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成发料申请\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

6
src/pages/purchaseReceipt/job/receiptDetail.vue

@ -461,7 +461,7 @@
}); });
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -478,7 +478,7 @@
this.showMessage("请输入拒收原因") this.showMessage("请输入拒收原因")
return; return;
} }
this.$refs.comMessage.showQuestionMessage('是否要拒收任务<br>[' + this.jobContent.asnNumber + ']?', res => { this.$refs.comMessage.showQuestionMessage('是否要拒收任务\n[' + this.jobContent.asnNumber + ']?', res => {
if (res) { if (res) {
uni.showLoading({ uni.showLoading({
title: "提交中....", title: "提交中....",
@ -525,7 +525,7 @@
if (!isCheckPrint) { if (!isCheckPrint) {
uni.hideLoading() uni.hideLoading()
// this.showCommitSuccessMessage("<br><br>" + res.data.number) // this.showCommitSuccessMessage("\n\n" + res.data.number)
uni.redirectTo({ uni.redirectTo({
url: '/pages/pointPutawayJob/index?number='+that.jobContent.number url: '/pages/pointPutawayJob/index?number='+that.jobContent.number
}) })

4
src/pages/purchaseReceipt/job/receiptJob.vue

@ -453,10 +453,10 @@
this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1) this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1)
} }
} else { } else {
this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]") this.showMessage("未查找到任务\n"+"扫描["+result.scanMessage+"]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error+"<br>扫描["+result.scanMessage+"]") this.showMessage(error+"\n扫描["+result.scanMessage+"]")
}) })
} catch (e) { } catch (e) {

18
src/pages/purchaseReturn/job/returnDetail.vue

@ -246,12 +246,12 @@
// let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); // let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
// //
if (itemDetail == undefined) { if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result
.fromLocationCode + "】<br>未找到明细") .fromLocationCode + "】\n未找到明细")
return; return;
} else { } else {
if (itemDetail.scaned) { if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】\n批次【" + batch + "】\n库位【" + result
.fromLocationCode + "】已经扫描") .fromLocationCode + "】已经扫描")
return; return;
} else { } else {
@ -286,8 +286,8 @@
// r.fromLocationCode == result.fromLocationCode // r.fromLocationCode == result.fromLocationCode
// }) // })
// if (itemDetail.scaned) { // if (itemDetail.scaned) {
// this.showErrorMessage("" + packingNumber + "<br>" + batch + "<br>" + result // this.showErrorMessage("" + packingNumber + "\n" + batch + "\n" + result
// .fromLocationCode + "<br>" + balanceStatus + "<br>") // .fromLocationCode + "\n" + balanceStatus + "\n")
// return; // return;
// } // }
@ -319,8 +319,8 @@
// } else { // } else {
// // // //
// if (itemDetail.scaned) { // if (itemDetail.scaned) {
// this.showErrorMessage("" + packingNumber + "<br>" + batch + "<br>" + result // this.showErrorMessage("" + packingNumber + "\n" + batch + "\n" + result
// .fromLocationCode + "<br>" + balanceStatus + "<br>") // .fromLocationCode + "\n" + balanceStatus + "\n")
// return; // return;
// } else { // } else {
// itemDetail.scaned = true; // itemDetail.scaned = true;
@ -380,7 +380,7 @@
// this.submitJob(); // this.submitJob();
// } else { // } else {
// // // //
// this.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount + // this.$refs.comMessage.showErrorMessage(',\n' + "[" + this.scanCount +
// "][" + this // "][" + this
// .subList.length + "]", res => { // .subList.length + "]", res => {
// if (res) { // if (res) {
@ -501,7 +501,7 @@
}, },
showCommitSuccessMessage(number) { showCommitSuccessMessage(number) {
this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => { this.$refs.comMessage.showSuccessMessage('提交成功\n生成退货记录:' + number, res => {
navigateBack(1) navigateBack(1)
}) })
} }

2
src/pages/purchaseReturn/record/returnRecord.vue

@ -254,7 +254,7 @@
purchaseReturnRecordSubmit(params).then(res => { purchaseReturnRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购退货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成采购退货记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/purchaseReturn/request/returnRequestCreate.vue

@ -215,7 +215,7 @@
purchaseReturnRequestCreate(params).then(res => { purchaseReturnRequestCreate(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购退货申请<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成采购退货申请\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败["+res.msg+"]") this.showErrorMessage("提交失败["+res.msg+"]")
} }

4
src/pages/putaway/job/putawayDetail.vue

@ -454,7 +454,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -485,7 +485,7 @@
putawayJobSubmit(params).then(res => { putawayJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

12
src/pages/putaway/job/putawayJob.vue

@ -395,26 +395,26 @@
if (list[0].acceptUserId == this.$store.state.user.id) { if (list[0].acceptUserId == this.$store.state.user.id) {
this.selectItem(list[0]) this.selectItem(list[0])
} else { } else {
this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "<br>任务号[" + this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "\n任务号[" +
list[0].number + "]扫描[" + result.scanMessage + "]") list[0].number + "]扫描[" + result.scanMessage + "]")
} }
} else if (list[0].status == 3) { } else if (list[0].status == 3) {
this.showMessage("该任务已经完成<br>承接人[" + list[0].acceptUserName + "]<br>任务号[" + this.showMessage("该任务已经完成\n承接人[" + list[0].acceptUserName + "]\n任务号[" +
list[0].number + "]扫描[" + result.scanMessage + "]") list[0].number + "]扫描[" + result.scanMessage + "]")
} }
} else { } else {
this.showMessage("查询到多条任务<br>" + "扫描[" + result.scanMessage + "]") this.showMessage("查询到多条任务\n" + "扫描[" + result.scanMessage + "]")
} }
} else { } else {
this.showMessage("未查找到任务<br>" + "扫描[" + result.scanMessage + "]") this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
}) })
} catch (e) { } catch (e) {
this.showMessage(e + "<br>扫描[" + result.scanMessage + "]") this.showMessage(e + "\n扫描[" + result.scanMessage + "]")
} }
}, },
} }

2
src/pages/putaway/record/putawayRecord.vue

@ -335,7 +335,7 @@
putawayRecordSubmit(params).then(res => { putawayRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/putaway/record/putawayRecord_bat.vue

@ -314,7 +314,7 @@
putawayRecordSubmit(params).then(res => { putawayRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购上架记录<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/putaway/request/putawayRequestCreate.vue

@ -288,7 +288,7 @@
putawayRequestSubmit(params).then(res => { putawayRequestSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购上架申请<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成采购上架申请\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

10
src/pages/repleinsh/coms/comScanReplishPack.vue

@ -362,11 +362,11 @@
var status = getInventoryStatusDesc(params.inventoryStatus) var status = getInventoryStatusDesc(params.inventoryStatus)
var areaType = getListLocationAreaTypeDesc(params.areaType) var areaType = getListLocationAreaTypeDesc(params.areaType)
var hint = var hint =
"按物料号 [" + params.itemCode + "] <br>" + "按物料号 [" + params.itemCode + "] \n" +
"包装号 [" + params.packingNumber + "] <br>" + "包装号 [" + params.packingNumber + "] \n" +
"批次 [" + params.batch + "] <br>" + "批次 [" + params.batch + "] \n" +
"状态 [" + status + "] <br>" + "状态 [" + status + "] \n" +
"库区 [" + areaType + "] <br>" + "库区 [" + areaType + "] \n" +
"未查找到库存余额" "未查找到库存余额"
this.showErrorMessage(hint) this.showErrorMessage(hint)
} else if (res.data.length == 1) { } else if (res.data.length == 1) {

2
src/pages/repleinsh/job/repleinshDetail.vue

@ -281,7 +281,7 @@
repleinshJobSubmit(params).then(res => { repleinshJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成补料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

6
src/pages/repleinsh/job/repleinshJob.vue

@ -549,11 +549,11 @@
} }
} else { } else {
this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch + this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch +
"]物料号[" + result.label.itemCode + "]未查找到任务<br>" + "扫描[" + result "]物料号[" + result.label.itemCode + "]未查找到任务\n" + "扫描[" + result
.scanMessage + "]") .scanMessage + "]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
}) })
} catch (e) { } catch (e) {
@ -562,7 +562,7 @@
} }
// else // else
// { // {
// this.showMessage(error + "<br>[" + result.scanMessage + "]") // this.showMessage(error + "\n[" + result.scanMessage + "]")
// } // }
}, },
} }

2
src/pages/repleinsh/record/directRepleinshRecord.vue

@ -373,7 +373,7 @@
repleinshRecordSubmit(params).then(res => { repleinshRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成直接补料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成直接补料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/repleinsh/record/directRepleinshRecord1.vue

@ -382,7 +382,7 @@
repleinshRecordSubmit(params).then(res => { repleinshRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成直接补料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成直接补料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/repleinsh/record/repleinshRecord.vue

@ -448,7 +448,7 @@
repleinshRecordSubmit(params).then(res => { repleinshRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成直接补料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成直接补料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/repleinsh/record/repleinshRecordV1.vue

@ -369,7 +369,7 @@
repleinshRecordSubmit(params).then(res => { repleinshRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成补料记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg+"]") this.showErrorMessage("提交失败[" + res.msg+"]")
} }

4
src/pages/scrap/job/scrapJobDetail.vue

@ -315,7 +315,7 @@
// this.submitJob(); // this.submitJob();
// } else { // } else {
// // // //
// this.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount + // this.$refs.comMessage.showErrorMessage(',\n' + "[" + this.scanCount +
// "][" + this // "][" + this
// .subList.length + "]", res => { // .subList.length + "]", res => {
// if (res) { // if (res) {
@ -337,7 +337,7 @@
scrapJobSubmit(params).then(res => { scrapJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成报废出库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成报废出库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/scrap/record/scrapRecord.vue

@ -240,7 +240,7 @@
scrapRecordSubmit(params).then(res => { scrapRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成报废出库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成报废出库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/scrap/request/scrapRequestCreate.vue

@ -257,7 +257,7 @@
scrapRequestCreate(params).then(res => { scrapRequestCreate(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成报废出库申请<br>" + res.data, ) this.showCommitSuccessMessage("提交成功\n生成报废出库申请\n" + res.data, )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/stockUp/job/stockUpJobDetail.vue

@ -270,7 +270,7 @@
stockUpJobsubmit(params).then(res => { stockUpJobsubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成备货记录" + res.data) this.showCommitSuccessMessage("提交成功\n生成备货记录" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/transfer/coms/comTransferRecord.vue

@ -263,7 +263,7 @@
transferIssueRecordSubmit(params).then(res => { transferIssueRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成调拨出库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }
@ -275,7 +275,7 @@
transferReceiptRecordSubmit(params).then(res => { transferReceiptRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成调拨入库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成调拨入库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/transfer/job/issueDetail.vue

@ -336,7 +336,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -367,7 +367,7 @@
transferIssueJobSubmit(params).then(res => { transferIssueJobSubmit(params).then(res => {
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录" + res.data) this.showCommitSuccessMessage("提交成功\n生成调拨出库记录" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/transfer/job/receiptDetail.vue

@ -362,7 +362,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -400,7 +400,7 @@
transferReceiptJobSubmit(params).then(res => { transferReceiptJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成调拨入库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成调拨入库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/transfer/job/transferDetail.vue

@ -372,7 +372,7 @@
} else { } else {
this.scanCount = this.getScanCount(); this.scanCount = this.getScanCount();
if (this.scanCount < this.subList.length) { if (this.scanCount < this.subList.length) {
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {

2
src/pages/transfer/record/deliverRecord.vue

@ -252,7 +252,7 @@
transferIssueRecordSubmit(params).then(res => { transferIssueRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成调拨出库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/transfer/record/receiptRecord.vue

@ -232,7 +232,7 @@
transferReceiptRecordSubmit(params).then(res => { transferReceiptRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成调拨入库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成调拨入库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/unPlanned/job/issueJobDetail.vue

@ -309,7 +309,7 @@
// this.submitJob(); // this.submitJob();
// } else { // } else {
// // // //
// this.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount + // this.$refs.comMessage.showErrorMessage(',\n' + "[" + this.scanCount +
// "][" + this // "][" + this
// .subList.length + "]", res => { // .subList.length + "]", res => {
// if (res) { // if (res) {
@ -332,7 +332,7 @@
unPlannedIssueJobSubmit(params).then(res => { unPlannedIssueJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成计划外出库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成计划外出库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

4
src/pages/unPlanned/job/receiptJobDetail.vue

@ -264,7 +264,7 @@
this.submitJob(); this.submitJob();
} else { } else {
// //
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount +
"]箱总共[" + this "]箱总共[" + this
.subList.length + "]箱", res => { .subList.length + "]箱", res => {
if (res) { if (res) {
@ -314,7 +314,7 @@
unPlannedReceiptJobSubmit(params).then(res => { unPlannedReceiptJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成计划外入库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/unPlanned/record/issueRecord.vue

@ -213,7 +213,7 @@
unPlannedIssueRecordSubmit(params).then(res => { unPlannedIssueRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购收货记录<br>" + res.data ) this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data )
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

2
src/pages/unPlanned/record/receiptRecord.vue

@ -260,7 +260,7 @@
unPlannedReceiptRecordbSubmit(params).then(res => { unPlannedReceiptRecordbSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data) this.showCommitSuccessMessage("提交成功\n生成计划外入库记录\n" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save