Browse Source

HL-5725修改采购上架任务状态显示

hella_online_20240904
lijuncheng 3 months ago
parent
commit
c318e9f47b
  1. 174
      src/pages/purchaseReceipt/job/receiptDetail.vue
  2. 15
      src/pages/putaway/job/putawayDetail.vue

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

@ -517,93 +517,93 @@
this.managementList = res.list;
var params = this.setParams();
let that =this
purchaseReceiptJobSubmit(params).then(res => {
if (res.data) {
let isCheckPrint = getSwitchInfoByCode(this.switchCode)
if (!isCheckPrint) {
uni.hideLoading()
// this.showCommitSuccessMessage("\n\n" + res.data.number)
uni.redirectTo({
url: '/pages/pointPutawayJob/index?number='+that.jobContent.number
})
} else {
// if (res.data == '') {
// this.showCommitSuccessMessage(res.data)
// const purchaseReceiptDetailPointParams = {
// printDeafult: this.printDeafult,
// templateDeafult: this.templateDeafult,
// }
// uni.setStorageSync('purchaseReceiptDetailPointParams', purchaseReceiptDetailPointParams)
// } else {
// this.showErrorMessage(res.data)
// }
uni.showLoading({
title: "提交成功,将跳转到打印页面",
mask: true
});
//
let timerCount = 0
const timer1 = setInterval(async () => {
if (timerCount == 15) {
clearInterval(timer1)
this.showErrorMessage("上架任务生成异常,请到收货记录里重新生成上架申请")
return;
}
await getPutawayJobList({
filters: [{
column: "purchaseReceiptRecordNumber",
action: "in",
value: res.data.number
}],
pageNo: 1,
pageSize: 1000,
}).then(res1 => {
timerCount = timerCount + 1
if (res1.data && res1.data.list && res1
.data
.list.length && (res1.data.total >= res
.data.detailCount)) {
uni.hideLoading()
clearInterval(timer1)
const dataParams = {
toLocationCode: res1.data.list[
0]
.toLocationCode,
number: res1.data.list[0]
.number,
creator: res1.data.list[0]
.creator,
createTime: res1.data.list[0]
.createTime,
ids: res1.data.list.map(item =>
item.masterId).join(
',')
}
console.log(dataParams)
uni.hideLoading()
uni.redirectTo({
url: '/pages/pointPutawayJob/index?number='+that.jobContent.number+'&data=' +
encodeURIComponent(JSON.stringify(dataParams))
})
}
})
}, 2000)
}
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.$refs.comMessage.showErrorMessage(error, res => {
if (res) {
navigateBack(1)
}
});
})
// purchaseReceiptJobSubmit(params).then(res => {
// if (res.data) {
// let isCheckPrint = getSwitchInfoByCode(this.switchCode)
// if (!isCheckPrint) {
// uni.hideLoading()
// // this.showCommitSuccessMessage("\n\n" + res.data.number)
// uni.redirectTo({
// url: '/pages/pointPutawayJob/index?number='+that.jobContent.number
// })
// } else {
// // if (res.data == '') {
// // this.showCommitSuccessMessage(res.data)
// // const purchaseReceiptDetailPointParams = {
// // printDeafult: this.printDeafult,
// // templateDeafult: this.templateDeafult,
// // }
// // uni.setStorageSync('purchaseReceiptDetailPointParams', purchaseReceiptDetailPointParams)
// // } else {
// // this.showErrorMessage(res.data)
// // }
// uni.showLoading({
// title: ",",
// mask: true
// });
// //
// let timerCount = 0
// const timer1 = setInterval(async () => {
// if (timerCount == 15) {
// clearInterval(timer1)
// this.showErrorMessage("")
// return;
// }
// await getPutawayJobList({
// filters: [{
// column: "purchaseReceiptRecordNumber",
// action: "in",
// value: res.data.number
// }],
// pageNo: 1,
// pageSize: 1000,
// }).then(res1 => {
// timerCount = timerCount + 1
// if (res1.data && res1.data.list && res1
// .data
// .list.length && (res1.data.total >= res
// .data.detailCount)) {
// uni.hideLoading()
// clearInterval(timer1)
// const dataParams = {
// toLocationCode: res1.data.list[
// 0]
// .toLocationCode,
// number: res1.data.list[0]
// .number,
// creator: res1.data.list[0]
// .creator,
// createTime: res1.data.list[0]
// .createTime,
// ids: res1.data.list.map(item =>
// item.masterId).join(
// ',')
// }
// console.log(dataParams)
// uni.hideLoading()
// uni.redirectTo({
// url: '/pages/pointPutawayJob/index?number='+that.jobContent.number+'&data=' +
// encodeURIComponent(JSON.stringify(dataParams))
// })
// }
// })
// }, 2000)
// }
// } else {
// this.showErrorMessage("[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.$refs.comMessage.showErrorMessage(error, res => {
// if (res) {
// navigateBack(1)
// }
// });
// })
} else {
uni.hideLoading();
this.showErrorMessage(res.message);

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

@ -16,7 +16,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
:isShowStatus="false" @remove="updateData" @updateData="updateData"
:isShowStatus="true" @remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</comJobDetailCard>
</view>
@ -43,7 +43,6 @@
</winScanPackAndLocationNoBalance> -->
<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'
:noShowBalanceMessage="false">
</winScanPackAndLocation>
@ -194,6 +193,10 @@
if (res.data.subList.length > 0) {
that.jobContent = res.data;
that.jobStatus = res.data.status
//
res.data.subList.forEach(item => {
item.inventoryStatus = item.inspectResult
})
that.subList = res.data.subList;
that.detailSource = getTreeDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode
@ -461,10 +464,10 @@
} else {
//
this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
if (res) {
this.openScanPopup();
}
});
if (res) {
this.openScanPopup();
}
});
}
}
},

Loading…
Cancel
Save