diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index 29b416c5..3433fa4a 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -243,7 +243,7 @@
}
if (this.allList.length < this.dataContent.packQty) {
- this.$refs.comMessage.showQuestionMessage("扫描数量小于计划数量,是否提交?", res => {
+ this.$refs.comMessage.showQuestionMessage("扫描数量小于包装规格数量,是否提交?", res => {
if (res) {
this.commit()
}
@@ -332,7 +332,7 @@
throw new Error("未查找到单据信息")
}
uni.hideLoading()
- this.showCommitSuccessMessage("提交成功
生成报工记录
", list)
+ this.showCommitSuccessMessage("提交成功
生成装配收货记录
"+list[0].requestNumber, list)
} catch (error) {
uni.hideLoading()
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 01c962df..60733308 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -353,13 +353,13 @@ import { Exception } from 'sass';
{
column: "status",
action: "in",
- value: '1,2',
+ value: '1,2,3',
},
- {
- column: "accept_user_id",
- action: "==",
- value: this.$store.state.user.id
- }
+ // {
+ // column: "accept_user_id",
+ // action: "==",
+ // value: this.$store.state.user.id
+ // }
// {
// column: "fromLocationCode",
// action: "==",
@@ -384,11 +384,24 @@ import { Exception } from 'sass';
list.push(item)
}
})
- if (list.length > 1) {
- this.$refs.jobList.openList(list)
- } else {
- this.selectItem(list[0])
+ if(list.length==1){
+ //待处理
+ if(list[0].status==1){
+ 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+"]承接"+"
任务号["+list[0].number+"]扫描["+result.scanMessage+"]")
+ }
+ }else if(list[0].status==3){
+ this.showMessage("该任务已经完成
承接人["+list[0].acceptUserName+"]
任务号["+list[0].number+"]扫描["+result.scanMessage+"]")
+ }
+ }else {
+ this.showMessage("查询到多条任务
"+"扫描["+result.scanMessage+"]")
}
+
} else {
this.showMessage("未查找到任务
"+"扫描["+result.scanMessage+"]")
}