sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

lijuncheng0816
lijuncheng 1 month ago
parent
07e193f3e2 cc1840e913
commit
2ea7adafb1
9 changed files with 273 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/mycomponents/common/comMessage.vue
  2. 54
      src/pages/customerReturn/job/returnDetail.vue
  3. 58
      src/pages/inventoryMove/job/inventoryMoveDetail.vue
  4. 6
      src/pages/package/job/overPackageJobDetail.vue
  5. 48
      src/pages/productReceipt/job/scrapReceiptDetail.vue
  6. 57
      src/pages/productRecycle/job/productRecycleJobDetail.vue
  7. 55
      src/pages/purchaseReturn/job/returnDetail.vue
  8. 55
      src/pages/scrap/job/scrapJobDetail.vue
  9. 55
      src/pages/unPlanned/job/issueJobDetail.vue

19
src/mycomponents/common/comMessage.vue
View File

@ -13,7 +13,7 @@
<image class="icon" :src="icon" /> <image class="icon" :src="icon" />
</slot> </slot>
<slot name="content"> <slot name="content">
<rich-text class="content" :nodes="content"> <rich-text class="content" :nodes="content" :style="{'color': textColor}" :key='count'>
</rich-text> </rich-text>
</slot> </slot>
<view class='split_line'></view> <view class='split_line'></view>
@ -62,7 +62,9 @@
isDisabled: true, //为 true 时，表示用户可以点击，反之则不可以 isDisabled: true, //为 true 时，表示用户可以点击，反之则不可以
seconds: 0, seconds: 0,
success: () => {} ,// 回调方法 success: () => {} ,// 回调方法
version:"" version:"",
textColor:'#000',
count:0
} }
}, },
@ -151,8 +153,9 @@
}, },
// 打开疑问弹框(取消+确定） // 打开疑问弹框(取消+确定）
showQuestionMessage(mContent, callback) { showQuestionMessage(mContent,textColor, callback) {
this.showSelectModal("疑问", mContent, callback); // this.textColor = textColor?textColor:'#000'
this.showSelectModal("疑问", mContent, callback,textColor);
}, },
// 打开警告弹框(确定+倒计时) // 打开警告弹框(确定+倒计时)
@ -246,10 +249,11 @@
}, },
// 初始化弹框并打开(取消+确定） // 初始化弹框并打开(取消+确定）
showSelectModal(mIconType, mContent, callback) { showSelectModal(mIconType, mContent, callback,textColor) {
this.showModal({ this.showModal({
iconType: mIconType, iconType: mIconType,
content: mContent, content: mContent,
textColor:textColor,
success: function(res) { success: function(res) {
if (callback != undefined) { if (callback != undefined) {
if (res.confirm == true) { if (res.confirm == true) {
@ -396,6 +400,11 @@
this.cancelColor = '#666F83' this.cancelColor = '#666F83'
} }
if (data.textColor) {
this.textColor = data.textColor
} else {
this.textColor = '#000'
}
if (data.showConfirmButton === false || data.showConfirmButton === true) { if (data.showConfirmButton === false || data.showConfirmButton === true) {
this.showConfirmButton = data.showConfirmButton this.showConfirmButton = data.showConfirmButton
} else { } else {

54
src/pages/customerReturn/job/returnDetail.vue
View File

@ -339,25 +339,43 @@
if (!this.checkLocation()) { if (!this.checkLocation()) {
return return
} }
// 提交的数量和任务数量不一致提示
//扫描数量和任务数量相等，直接提交 let str = ''
if (this.scanCount == this.subList.length) { this.detailSource.forEach((item) => {
this.submitJob(); item.subList.forEach(cur => {
} else if (this.scanCount < this.subList.length) { if (cur.qty != cur.handleQty) {
//扫描数量小于任务数量，判断是否允许部分提交 str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
if (this.jobContent.allowPartialComplete == "TRUE") { }
//提交 })
this.submitJob(); })
} else { if (str) {
//不允许部分提交，提示 str += '，是否确认提交?'
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
"]箱总共[" + this.subList.length + "]箱", res => { if (res) {
if (res) { this.submitJob()
this.openScanPopup(); }
} });
}); } else {
} this.submitJob()
} }
// //扫描数量和任务数量相等，直接提交
// if (this.scanCount == this.subList.length) {
// this.submitJob();
// } else if (this.scanCount < this.subList.length) {
// //扫描数量小于任务数量，判断是否允许部分提交
// if (this.jobContent.allowPartialComplete == "TRUE") {
// //提交
// this.submitJob();
// } else {
// //不允许部分提交，提示
// this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
// "]箱总共[" + this.subList.length + "]箱", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
}, },
submitJob() { submitJob() {

58
src/pages/inventoryMove/job/inventoryMoveDetail.vue
View File

@ -354,27 +354,45 @@
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")
return; return;
} }
// 提交的数量和任务数量不一致提示
//允许部分提交 let str = ''
//扫描数量和任务数量相等，直接提交 this.detailSource.forEach((item) => {
if (this.scanCount == this.subList.length) { item.subList.forEach(cur => {
this.submitJob(); if (cur.qty != cur.handleQty) {
} else if (this.scanCount < this.subList.length) { str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
//扫描数量小于任务数量，判断是否允许部分提交 }
if (this.jobContent.allowPartialComplete == "TRUE") { })
//提交 })
this.submitJob(); if (str) {
} else { str += '，是否确认提交?'
//不允许部分提交，提示 this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + if (res) {
"]箱总共[" + this this.submitJob()
.subList.length + "]箱", res => { }
if (res) { });
this.openScanPopup(); } else {
} this.submitJob()
});
}
} }
// //允许部分提交
// //扫描数量和任务数量相等，直接提交
// if (this.scanCount == this.subList.length) {
// this.submitJob();
// } else if (this.scanCount < this.subList.length) {
// //扫描数量小于任务数量，判断是否允许部分提交
// if (this.jobContent.allowPartialComplete == "TRUE") {
// //提交
// this.submitJob();
// } else {
// //不允许部分提交，提示
// this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
// "]箱总共[" + this
// .subList.length + "]箱", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
}, },
submitJob() { submitJob() {

6
src/pages/package/job/overPackageJobDetail.vue
View File

@ -35,16 +35,16 @@
</scroll-view> </scroll-view>
</view> </view>
<div style="background: white;"> <div style="background: white;">
<uni-collapse> <!-- <uni-collapse>
<uni-collapse-item> <uni-collapse-item>
<template v-slot:title> <template v-slot:title>
<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;"> <view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
打印设置 打印设置
</view> </view>
</template> </template>
<!-- <print ref="printService" @printCode="printCode" @templateCode="templateCode"></print> --> <print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse> -->
</div> </div>
<view class="page-footer"> <view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"

48
src/pages/productReceipt/job/scrapReceiptDetail.vue
View File

@ -295,22 +295,40 @@
return return
} }
// 提交的数量和任务数量不一致提示
//扫描数量和任务数量相等，直接提交 let str = ''
if (this.scanCount == this.subList.length) { this.detailSource.forEach((item) => {
this.submitJob(); item.subList.forEach(cur => {
} else if (this.scanCount < this.subList.length) { if (cur.qty != cur.handleQty) {
//扫描数量小于任务数量，判断是否允许部分提交 str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
if (this.jobContent.allowPartialComplete == "TRUE") { }
//提交 })
this.submitJob(); })
} else { if (str) {
//不允许部分提交，提示 str += '，是否确认提交?'
this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
.length + if (res) {
"]"); this.submitJob()
} }
});
} else {
this.submitJob()
} }
// //扫描数量和任务数量相等，直接提交
// if (this.scanCount == this.subList.length) {
// this.submitJob();
// } else if (this.scanCount < this.subList.length) {
// //扫描数量小于任务数量，判断是否允许部分提交
// if (this.jobContent.allowPartialComplete == "TRUE") {
// //提交
// this.submitJob();
// } else {
// //不允许部分提交，提示
// this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
// .length +
// "]");
// }
// }
}, },

57
src/pages/productRecycle/job/productRecycleJobDetail.vue
View File

@ -318,26 +318,45 @@
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")
return; return;
} }
//允许部分提交 // 提交的数量和任务数量不一致提示
//扫描数量和任务数量相等，直接提交 let str = ''
if (this.scanCount == this.subList.length) { this.detailSource.forEach((item) => {
this.submitJob(); item.subList.forEach(cur => {
} else if (this.scanCount < this.subList.length) { if (cur.qty != cur.handleQty) {
//扫描数量小于任务数量，判断是否允许部分提交 str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
if (this.jobContent.allowPartialComplete == "TRUE") { }
//提交 })
this.submitJob(); })
} else { if (str) {
//不允许部分提交，提示 str += '，是否确认提交?'
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
"]箱总共[" + this if (res) {
.subList.length + "]箱", res => { this.submitJob()
if (res) { }
this.openScanPopup(); });
} } else {
}); this.submitJob()
}
} }
// //允许部分提交
// //扫描数量和任务数量相等，直接提交
// if (this.scanCount == this.subList.length) {
// this.submitJob();
// } else if (this.scanCount < this.subList.length) {
// //扫描数量小于任务数量，判断是否允许部分提交
// if (this.jobContent.allowPartialComplete == "TRUE") {
// //提交
// this.submitJob();
// } else {
// //不允许部分提交，提示
// this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
// "]箱总共[" + this
// .subList.length + "]箱", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
}, },
submitJob() { submitJob() {

55
src/pages/purchaseReturn/job/returnDetail.vue
View File

@ -350,26 +350,45 @@
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")
return; return;
} }
// 提交的数量和任务数量不一致提示
let str = ''
this.detailSource.forEach((item) => {
item.subList.forEach(cur => {
if (cur.qty != cur.handleQty) {
str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
}
})
})
if (str) {
str += '，是否确认提交?'
this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
if (res) {
this.submitJob()
}
});
} else {
this.submitJob()
}
//允许部分提交 //允许部分提交
//扫描数量和任务数量相等，直接提交 //扫描数量和任务数量相等，直接提交
if (this.scanCount == this.subList.length) { // if (this.scanCount == this.subList.length) {
this.submitJob(); // this.submitJob();
} else if (this.scanCount < this.subList.length) { // } else if (this.scanCount < this.subList.length) {
//扫描数量小于任务数量，判断是否允许部分提交 // //扫描数量小于任务数量，判断是否允许部分提交
if (this.jobContent.allowPartialComplete == "TRUE") { // if (this.jobContent.allowPartialComplete == "TRUE") {
//提交 // //提交
this.submitJob(); // this.submitJob();
} else { // } else {
//不允许部分提交，提示 // //不允许部分提交，提示
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
"]箱总共[" + this // "]箱总共[" + this
.subList.length + "]箱", res => { // .subList.length + "]箱", res => {
if (res) { // if (res) {
this.openScanPopup(); // this.openScanPopup();
} // }
}); // });
} // }
} // }
}, },
submitJob() { submitJob() {

55
src/pages/scrap/job/scrapJobDetail.vue
View File

@ -286,25 +286,44 @@
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")
return; return;
} }
//扫描数量和任务数量相等，直接提交 // 提交的数量和任务数量不一致提示
if (this.scanCount == this.subList.length) { let str = ''
this.submitJob(); this.detailSource.forEach((item) => {
} else if (this.scanCount < this.subList.length) { item.subList.forEach(cur => {
//扫描数量小于任务数量，判断是否允许部分提交 if (cur.qty != cur.handleQty) {
if (this.jobContent.allowPartialComplete == "TRUE") { str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
//提交 }
this.submitJob(); })
} else { })
//不允许部分提交，提示 if (str) {
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + str += '，是否确认提交?'
"]箱总共[" + this this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
.subList.length + "]箱", res => { if (res) {
if (res) { this.submitJob()
this.openScanPopup(); }
} });
}); } else {
} this.submitJob()
} }
// //扫描数量和任务数量相等，直接提交
// if (this.scanCount == this.subList.length) {
// this.submitJob();
// } else if (this.scanCount < this.subList.length) {
// //扫描数量小于任务数量，判断是否允许部分提交
// if (this.jobContent.allowPartialComplete == "TRUE") {
// //提交
// this.submitJob();
// } else {
// //不允许部分提交，提示
// this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
// "]箱总共[" + this
// .subList.length + "]箱", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
}, },
submitJob() { submitJob() {

55
src/pages/unPlanned/job/issueJobDetail.vue
View File

@ -280,25 +280,44 @@
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")
return; return;
} }
//扫描数量和任务数量相等，直接提交 // 提交的数量和任务数量不一致提示
if (this.scanCount == this.subList.length) { let str = ''
this.submitJob(); this.detailSource.forEach((item) => {
} else if (this.scanCount < this.subList.length) { item.subList.forEach(cur => {
//扫描数量小于任务数量，判断是否允许部分提交 if (cur.qty != cur.handleQty) {
if (this.jobContent.allowPartialComplete == "TRUE") { str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
//提交 }
this.submitJob(); })
} else { })
//不允许部分提交，提示 if (str) {
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + str += '，是否确认提交?'
"]箱总共[" + this this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
.subList.length + "]箱", res => { if (res) {
if (res) { this.submitJob()
this.openScanPopup(); }
} });
}); } else {
} this.submitJob()
} }
// //扫描数量和任务数量相等，直接提交
// if (this.scanCount == this.subList.length) {
// this.submitJob();
// } else if (this.scanCount < this.subList.length) {
// //扫描数量小于任务数量，判断是否允许部分提交
// if (this.jobContent.allowPartialComplete == "TRUE") {
// //提交
// this.submitJob();
// } else {
// //不允许部分提交，提示
// this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
// "]箱总共[" + this
// .subList.length + "]箱", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
}, },

Write Preview
Loading…
Cancel
Save