Browse Source

修改报工提示,修改上架任务查询提示

hella_online_20240829
lijuncheng 2 months ago
parent
commit
8f350d3462
  1. 4
      src/pages/fg/receiptByPlan.vue
  2. 33
      src/pages/putaway/job/putawayJob.vue

4
src/pages/fg/receiptByPlan.vue

@ -243,7 +243,7 @@
} }
if (this.allList.length < this.dataContent.packQty) { if (this.allList.length < this.dataContent.packQty) {
this.$refs.comMessage.showQuestionMessage("扫描数量小于计划数量,是否提交?", res => { this.$refs.comMessage.showQuestionMessage("扫描数量小于包装规格数量,是否提交?", res => {
if (res) { if (res) {
this.commit() this.commit()
} }
@ -332,7 +332,7 @@
throw new Error("未查找到单据信息") throw new Error("未查找到单据信息")
} }
uni.hideLoading() uni.hideLoading()
this.showCommitSuccessMessage("提交成功<br>生成报工记录<br>", list) this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>"+list[0].requestNumber, list)
} catch (error) { } catch (error) {
uni.hideLoading() uni.hideLoading()

33
src/pages/putaway/job/putawayJob.vue

@ -353,13 +353,13 @@ import { Exception } from 'sass';
{ {
column: "status", column: "status",
action: "in", action: "in",
value: '1,2', value: '1,2,3',
}, },
{ // {
column: "accept_user_id", // column: "accept_user_id",
action: "==", // action: "==",
value: this.$store.state.user.id // value: this.$store.state.user.id
} // }
// { // {
// column: "fromLocationCode", // column: "fromLocationCode",
// action: "==", // action: "==",
@ -384,11 +384,24 @@ import { Exception } from 'sass';
list.push(item) list.push(item)
} }
}) })
if (list.length > 1) { if(list.length==1){
this.$refs.jobList.openList(list) //
} else { if(list[0].status==1){
this.selectItem(list[0]) this.selectItem(list[0])
}else if(list[0].status==2){
//
if(list[0].acceptUserId==this.$store.state.user.id){
this.selectItem(list[0])
}else {
this.showMessage("该任务已经被["+list[0].acceptUserName+"]承接"+"<br>任务号["+list[0].number+"]扫描["+result.scanMessage+"]")
}
}else if(list[0].status==3){
this.showMessage("该任务已经完成<br>承接人["+list[0].acceptUserName+"]<br>任务号["+list[0].number+"]扫描["+result.scanMessage+"]")
}
}else {
this.showMessage("查询到多条任务<br>"+"扫描["+result.scanMessage+"]")
} }
} else { } else {
this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]") this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]")
} }

Loading…
Cancel
Save