From bb06d9c95c485b40ba7a76dbee916dda435e37b1 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 31 Jul 2024 23:25:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/job/jobComMainDetailCard.vue |  7 +--
 src/pages/count/coms/comFuzzyCountJobCard.vue | 24 +++++---
 src/pages/deliver/coms/comDeliverJobCard.vue  |  6 +-
 src/pages/deliver/job/deliverJob.vue          |  2 +-
 src/pages/issue/coms/comIssueJobCard.vue      | 59 ++++++++++---------
 5 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 1914d213..b9e768db 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -12,16 +12,13 @@
 				<view class="u-flex u-row-between">
 					<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
 					</location>
-					<level  title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== underfind  && dataContent.priority !== null ">
+					<level  title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== undefined  && dataContent.priority !== null ">
 					</level>
 				</view>
 				
 				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
 				</to-location>
-				<view class="card_view " v-if="isShowDeliverType">
-					<text class="card_packing_code card_content ">发货类型</text>
-					<text class="card_content ">{{dataContent.deliverType=='CUST'?'寄售库发货':'三方库发货'}}</text>
-				</view>
+			
 			</div>
 		</view>
 	</view>
diff --git a/src/pages/count/coms/comFuzzyCountJobCard.vue b/src/pages/count/coms/comFuzzyCountJobCard.vue
index bbb0adf1..b7db984a 100644
--- a/src/pages/count/coms/comFuzzyCountJobCard.vue
+++ b/src/pages/count/coms/comFuzzyCountJobCard.vue
@@ -1,17 +1,25 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<view class="card_view">
-			<text class="card_packing_code ">盘点计划</text>
-			<text class="card_content ">{{dataContent.planNumber}}</text>
-		</view>
-		<view v-if="dataContent.countRange!=undefined" class="">
-			<view v-for="(range, index) in dataContent.countRange" :key="index">
+		<view class="task_item"   style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx; ">
+			<view class="task_text">
 				<view class="card_view">
-					<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
-					<text class="card_content ">{{range.value}}</text>
+					<text class="card_packing_code ">盘点计划</text>
+					<text class="card_content ">{{dataContent.planNumber}}</text>
+				</view>
+			</view>
+
+			<view v-if="dataContent.countRange!=undefined" class="">
+				<view class="task_text">
+					<view v-for="(range, index) in dataContent.countRange" :key="index">
+						<view class="card_view">
+							<text class="card_location ">{{getCountScopeName(range.type)}}</text>
+							<text class="card_content ">{{range.value}}</text>
+						</view>
+					</view>
 				</view>
 			</view>
 		</view>
+
 	</job-com-main-card>
 </template>
 
diff --git a/src/pages/deliver/coms/comDeliverJobCard.vue b/src/pages/deliver/coms/comDeliverJobCard.vue
index e81c01b8..3b948557 100644
--- a/src/pages/deliver/coms/comDeliverJobCard.vue
+++ b/src/pages/deliver/coms/comDeliverJobCard.vue
@@ -1,6 +1,10 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<jobComMainDetailCard :isShowDeliverType="isShowDeliverType" :dataContent="dataContent"></jobComMainDetailCard>
+		<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
+		<view class="card_view " style="margin-left: 10px;">
+			<text class="card_packing_code ">发货类型</text>
+			<text class="card_content ">{{dataContent.deliverType=='CUST'?'寄售库发货':'三方库发货'}}</text>
+		</view>
 	</job-com-main-card>
 </template>
 
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 0ab0f649..5547d67f 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 :isShowDeliverType="true" :dataContent="item" @click='openJobDetail(item)'></com-deliver-job-card>
+						<com-deliver-job-card :dataContent="item" @click='openJobDetail(item)'></com-deliver-job-card>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
diff --git a/src/pages/issue/coms/comIssueJobCard.vue b/src/pages/issue/coms/comIssueJobCard.vue
index 00761e5c..92157886 100644
--- a/src/pages/issue/coms/comIssueJobCard.vue
+++ b/src/pages/issue/coms/comIssueJobCard.vue
@@ -1,39 +1,42 @@
 <template>
- 	<job-com-main-card :dataContent="dataContent">
-		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
-		<view class="" >
-			<text style="font-size: 32rpx; margin-left: 35rpx;">生产线</text>
-			<text style="font-size: 35rpx; margin-left: 10rpx; font-weight: bold;" >{{dataContent.productionLineCode}}</text>
-			
+	<job-com-main-card :dataContent="dataContent">
+		<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
+		<view class="task_item" style="margin-left: 15px;">
+			<view class="task_text">
+				<view class="card_view">
+					<text class="card_packing_code ">生产线</text>
+					<text class="card_content ">{{dataContent.productionLineCode}}</text>
+				</view>
+			</view>
 		</view>
 	</job-com-main-card>
- </template>
+</template>
 
- <script>
- 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+<script>
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
 	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
- 	export default {
- 		components: {
- 			jobComMainCard,
+	export default {
+		components: {
+			jobComMainCard,
 			jobComMainDetailCard
- 		},
- 		data() {
- 			return {};
- 		},
+		},
+		data() {
+			return {};
+		},
 
- 		props: {
- 			dataContent: {
- 				type: Object,
- 				default: {}
- 			},
- 		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
 
- 		methods: {
+		methods: {
 
- 		}
- 	}
- </script>
+		}
+	}
+</script>
 
- <style lang="scss">
+<style lang="scss">
 
- </style>
+</style>
\ No newline at end of file