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 4 months ago
parent
commit
2ea7adafb1
  1. 19
      src/mycomponents/common/comMessage.vue
  2. 50
      src/pages/customerReturn/job/returnDetail.vue
  3. 54
      src/pages/inventoryMove/job/inventoryMoveDetail.vue
  4. 6
      src/pages/package/job/overPackageJobDetail.vue
  5. 46
      src/pages/productReceipt/job/scrapReceiptDetail.vue
  6. 53
      src/pages/productRecycle/job/productRecycleJobDetail.vue
  7. 51
      src/pages/purchaseReturn/job/returnDetail.vue
  8. 51
      src/pages/scrap/job/scrapJobDetail.vue
  9. 49
      src/pages/unPlanned/job/issueJobDetail.vue

19
src/mycomponents/common/comMessage.vue

@ -13,7 +13,7 @@
<image class="icon" :src="icon" />
</slot>
<slot name="content">
<rich-text class="content" :nodes="content">
<rich-text class="content" :nodes="content" :style="{'color': textColor}" :key='count'>
</rich-text>
</slot>
<view class='split_line'></view>
@ -62,7 +62,9 @@
isDisabled: true, // true
seconds: 0,
success: () => {} ,//
version:""
version:"",
textColor:'#000',
count:0
}
},
@ -151,8 +153,9 @@
},
// (+
showQuestionMessage(mContent, callback) {
this.showSelectModal("疑问", mContent, callback);
showQuestionMessage(mContent,textColor, 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({
iconType: mIconType,
content: mContent,
textColor:textColor,
success: function(res) {
if (callback != undefined) {
if (res.confirm == true) {
@ -396,6 +400,11 @@
this.cancelColor = '#666F83'
}
if (data.textColor) {
this.textColor = data.textColor
} else {
this.textColor = '#000'
}
if (data.showConfirmButton === false || data.showConfirmButton === true) {
this.showConfirmButton = data.showConfirmButton
} else {

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

@ -339,25 +339,43 @@
if (!this.checkLocation()) {
return
}
//
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 => {
//
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.openScanPopup();
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.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount +
// "][" + this.subList.length + "]", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
},
submitJob() {

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

@ -354,27 +354,45 @@
this.showErrorMessage("扫描数为0,请先扫描")
return;
}
//
//
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 => {
//
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.openScanPopup();
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.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount +
// "][" + this
// .subList.length + "]", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
},
submitJob() {

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

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

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

@ -295,22 +295,40 @@
return
}
//
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 +
"]");
//
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) {
// 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 +
// "]");
// }
// }
},

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

@ -318,26 +318,45 @@
this.showErrorMessage("扫描数为0,请先扫描")
return;
}
//
//
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 => {
//
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.openScanPopup();
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.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount +
// "][" + this
// .subList.length + "]", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
},
submitJob() {

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

@ -350,26 +350,45 @@
this.showErrorMessage("扫描数为0,请先扫描")
return;
}
//
//
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 => {
//
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.openScanPopup();
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.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount +
// "][" + this
// .subList.length + "]", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
},
submitJob() {

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

@ -286,25 +286,44 @@
this.showErrorMessage("扫描数为0,请先扫描")
return;
}
//
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 => {
//
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.openScanPopup();
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.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount +
// "][" + this
// .subList.length + "]", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
},
submitJob() {

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

@ -280,25 +280,44 @@
this.showErrorMessage("扫描数为0,请先扫描")
return;
}
//
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 => {
//
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.openScanPopup();
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.$refs.comMessage.showErrorMessage(',<br>' + "[" + this.scanCount +
// "][" + this
// .subList.length + "]", res => {
// if (res) {
// this.openScanPopup();
// }
// });
// }
// }
},

Loading…
Cancel
Save