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

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

hella_online_20240904
lijuncheng 3 weeks ago
parent
e793757d55
commit
c318e9f47b
2 changed files with 96 additions and 93 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. 174
      src/pages/purchaseReceipt/job/receiptDetail.vue
  2. 15
      src/pages/putaway/job/putawayDetail.vue

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

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

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

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

Write Preview
Loading…
Cancel
Save