diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue index 464570e5..bde92e15 100644 --- a/src/mycomponents/job/jobComMainDetailCard.vue +++ b/src/mycomponents/job/jobComMainDetailCard.vue @@ -4,6 +4,7 @@
+ @@ -14,6 +15,10 @@
+ + 发货类型 + {{dataContent.deliverType?'三方库发货':'寄售库发货'}} + @@ -65,6 +70,10 @@ type: Boolean, default: true }, + isShowDeliverType: { + type: Boolean, + default: false + }, }, diff --git a/src/pages/deliver/coms/comDeliverJobCard.vue b/src/pages/deliver/coms/comDeliverJobCard.vue index dfb3bb26..e81c01b8 100644 --- a/src/pages/deliver/coms/comDeliverJobCard.vue +++ b/src/pages/deliver/coms/comDeliverJobCard.vue @@ -1,6 +1,6 @@ @@ -21,6 +21,10 @@ type: Object, default: {} }, + isShowDeliverType: { + type: Boolean, + default: false + }, }, methods: { diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue index 38f09253..47bbb31f 100644 --- a/src/pages/deliver/job/deliverJob.vue +++ b/src/pages/deliver/job/deliverJob.vue @@ -11,7 +11,7 @@ - + @@ -72,9 +72,12 @@ status: '1,2', //待处理 、进行中 detailOptions: [], detailGiveupOptions: [], + businessType:'' }; }, - + onLoad(option) { + this.businessType = option.businessType + }, onShow() { this.getList('refresh'); }, @@ -129,7 +132,7 @@ var filters = [] if (this.checkedToday) { filters.push({ - column: "request_time", + column: "create_time", action: "betweeen", value: this.todayTime }) @@ -140,7 +143,14 @@ action: "in", value: this.status }) - + if(this.businessType&&this.businessType.length>0){ + // 成品发货任务:businessType=Deliver 自制备件发货任务:businessType=ZZBJDeliver + filters.push({ + column: "businessType", + action: "==", + value: this.businessType + }) + } var params = { filters: filters, pageNo: this.pageNo,