Browse Source

Merge branch 'hella_online_20240919' into master_hella

hella_online_20240924
陈薪名 4 months ago
parent
commit
a72bb6a7df
  1. 20
      src/pages/count/job/countLightDetail.vue

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

@ -478,10 +478,10 @@
commit() { commit() {
this.calcAllCount() this.calcAllCount()
this.calcScanCount() this.calcScanCount()
if(!this.scanCount){ // if(!this.scanCount){
this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交'); // this.$refs.comMessage.showErrorMessage(',');
return // return
} // }
if (this.scanCount == this.allCount) { if (this.scanCount == this.allCount) {
this.submitJob(); this.submitJob();
} else if (this.scanCount < this.allCount) { } else if (this.scanCount < this.allCount) {
@ -528,11 +528,13 @@
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
countJobSubmit(params).then(res => { countJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { const str =res.data || ''
this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data) this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + str)
} else { // if (res.data) {
this.showErrorMessage("提交失败[" + res.msg + "]") // this.showCommitSuccessMessage("\n\n" + res.data)
} // } else {
// this.showErrorMessage("[" + res.msg + "]")
// }
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)

Loading…
Cancel
Save