From 09366286f2716d9a4bf4f42f87aa6158cb893ffc Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 23 May 2024 11:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/job/jobComMainDetailCard.vue |  9 +++++++++
 src/pages/deliver/coms/comDeliverJobCard.vue  |  6 +++++-
 src/pages/deliver/job/deliverJob.vue          | 18 ++++++++++++++----
 3 files changed, 28 insertions(+), 5 deletions(-)

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 @@
 			<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"
 				:objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}"></itemCompareQty>
 			<div class="u-p-l-10">
+				
 				<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber">
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
@@ -14,6 +15,10 @@
 					<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode">
 					</to-location>
 				</div>
+				<view class="card_view " v-if="isShowDeliverType">
+					<text class="card_packing_code card_content ">发货类型</text>
+					<text class="card_content ">{{dataContent.deliverType?'三方库发货':'寄售库发货'}}</text>
+				</view>
 			</div>
 		</view>
 	</view>
@@ -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 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+		<jobComMainDetailCard :isShowDeliverType="isShowDeliverType" :dataContent="dataContent"></jobComMainDetailCard>
 	</job-com-main-card>
 </template>
 
@@ -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 @@
 					<uni-swipe-action-item
 						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
 						@click="swipeClick($event,item)">
-						<com-deliver-job-card :dataContent="item" @click='openJobDetail(item)'></com-deliver-job-card>
+						<com-deliver-job-card :isShowDeliverType="true" :dataContent="item" @click='openJobDetail(item)'></com-deliver-job-card>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
@@ -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,