From 9fb38ff589aa3263c4b454e34278c7fd77c90ce6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 10 Sep 2024 14:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B7=E5=BC=8F2024/8/1=20?=
 =?UTF-8?q?00:17:33?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/job/jobComMainDetailCard.vue |  6 +--
 src/mycomponents/workStation/workStation.vue  | 47 ++++++++-----------
 src/pages/count/coms/comFuzzyCountJobCard.vue | 22 +++++----
 src/pages/deliver/coms/comDeliverJobCard.vue  |  4 ++
 src/pages/deliver/job/deliverJob.vue          |  2 +-
 src/pages/issue/coms/comIssueJobCard.vue      | 10 ++--
 src/pages/issue/coms/comIssueRequestCard.vue  |  8 ++++
 src/pages/issue/job/issueDetail.vue           |  9 ++--
 .../issue/request/issueRequestDetail.vue      |  3 +-
 src/pages/putaway/job/putawayDetail.vue       |  3 +-
 10 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index e38de2f8..002b4e59 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -7,13 +7,9 @@
         <batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch>
         <div class="u-flex justify-between u-p-b-16">
           <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>
+          <level title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== undefined && dataContent.priority !== null"> </level>
           <to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode || dataContent.locationCode"> </to-location>
         </div>
-        <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/mycomponents/workStation/workStation.vue b/src/mycomponents/workStation/workStation.vue
index 172d3e5e..c897924a 100644
--- a/src/mycomponents/workStation/workStation.vue
+++ b/src/mycomponents/workStation/workStation.vue
@@ -1,33 +1,26 @@
 <template>
-  <view class="header_job_top">
-    <view class="cen_card">
-      <view class="cell_box uni-flex uni-row">
-        <view class="cell_info" v-if="fromWarehouseCode != ''">
-          <view class="text_lightblue">仓库</view>
-          <view>{{ fromWarehouseCode }}</view>
-        </view>
-
-        <view class="cell_info">
-          <view class="text_lightblue">车间</view>
-          <view>{{ workshopCode }}</view>
-        </view>
-        <view class="cell_info">
-          <view class="text_lightblue">生产线</view>
-          <view>{{ productionLineCode }}</view>
-        </view>
-        <view class="cell_info">
-          <view class="text_lightblue">工位</view>
-          <view>{{ workStationCode }}</view>
-        </view>
-        <view class="cell_info">
-          <view class="text_lightblue">原材料库位</view>
-          <view>{{ rawLocationCode }}</view>
-        </view>
-        <!-- 	<view class="cell_info">
+  <view class="cen_card">
+    <view class="cell_box uni-flex uni-row">
+      <view class="cell_info">
+        <view class="text_lightblue">车间</view>
+        <view>{{ workshopCode }}</view>
+      </view>
+      <view class="cell_info">
+        <view class="text_lightblue">生产线</view>
+        <view>{{ productionLineCode }}</view>
+      </view>
+      <view class="cell_info">
+        <view class="text_lightblue">工位</view>
+        <view>{{ workStationCode }}</view>
+      </view>
+      <view class="cell_info">
+        <view class="text_lightblue">原料库位</view>
+        <view>{{ rawLocationCode }}</view>
+      </view>
+      <!-- 	<view class="cell_info">
 					<view class="text_lightblue">成品库位</view>
 					<view>{{ fgLocationCode }}</view>
 				</view> -->
-      </view>
     </view>
   </view>
 </template>
@@ -65,6 +58,6 @@ const props = defineProps({
 <style scoped>
 .cell_info {
   flex: 1;
-  width:0px
+  width: 0px;
 }
 </style>
diff --git a/src/pages/count/coms/comFuzzyCountJobCard.vue b/src/pages/count/coms/comFuzzyCountJobCard.vue
index 55c94f34..49380a8f 100644
--- a/src/pages/count/coms/comFuzzyCountJobCard.vue
+++ b/src/pages/count/coms/comFuzzyCountJobCard.vue
@@ -1,14 +1,20 @@
 <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_packing_code">{{ getCountScopeName(range.type) }}</text>
+              <text class="card_content">{{ range.value }}</text>
+            </view>
+          </view>
         </view>
       </view>
     </view>
diff --git a/src/pages/deliver/coms/comDeliverJobCard.vue b/src/pages/deliver/coms/comDeliverJobCard.vue
index 032a0066..6132b1c0 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>
+    <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 999c452a..bceb91cf 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -4,7 +4,7 @@
     <job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"> </job-filter>
     <view v-if="jobList.length > 0" class="u-m-20">
       <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in jobList" :key="index" :options="item.status == '2' ? detailGiveupOptions : detailOptions" bg-color="rgba(255,255,255,0)" class="u-m-b-20" @click="swipeClick">
-        <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>
       </u-swipe-action>
       <job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></job-list-popup>
       <job-info-popup ref="jobInfoPopupRef"></job-info-popup>
diff --git a/src/pages/issue/coms/comIssueJobCard.vue b/src/pages/issue/coms/comIssueJobCard.vue
index c327f790..dd806c76 100644
--- a/src/pages/issue/coms/comIssueJobCard.vue
+++ b/src/pages/issue/coms/comIssueJobCard.vue
@@ -1,9 +1,13 @@
 <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>
+    <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>
diff --git a/src/pages/issue/coms/comIssueRequestCard.vue b/src/pages/issue/coms/comIssueRequestCard.vue
index 70741f72..b8f87584 100644
--- a/src/pages/issue/coms/comIssueRequestCard.vue
+++ b/src/pages/issue/coms/comIssueRequestCard.vue
@@ -1,6 +1,14 @@
 <template>
   <request-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>
   </request-com-main-card>
 </template>
 
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 85b69315..9ab47809 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -5,17 +5,20 @@
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
-        <!-- <view class="header_item">
+        <view class="header_item">
+          <work-station :workshopCode="jobContent.workShopCode" :productionLineCode="jobContent.detailProductionLineCode" :workStationCode="jobContent.detailWorkStationCode" :rawLocationCode="jobContent.detailToLocationCode"> </work-station>
+          <!-- <view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view> -->
+        </view>
       </view>
     </view>
     <view class="page-main">
       <scroll-view scroll-y="true" class="page-main-scroll">
         <view v-for="(toLocation, index) in detailSource">
-          <view class="u-p-20">
+          <!-- <view class="u-p-20">
             <work-station :workshopCode="jobContent.workShopCode" :productionLineCode="toLocation.productionLineCode" :workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"> </work-station>
-          </view>
+          </view> -->
           <com-issue-detail-card ref="comIssueDetailCardRef" :dataContent="toLocation" @updateData="updateData"> </com-issue-detail-card>
           <view class="split_line"></view>
         </view>
diff --git a/src/pages/issue/request/issueRequestDetail.vue b/src/pages/issue/request/issueRequestDetail.vue
index 4fd44986..e063b7d2 100644
--- a/src/pages/issue/request/issueRequestDetail.vue
+++ b/src/pages/issue/request/issueRequestDetail.vue
@@ -4,11 +4,12 @@
       <view class="page-header-box">
         <view class="header_job_top">
           <request-top :dataContent="requestContent"></request-top>
+        </view>
+        <view class="header_item">
           <work-station :workshopCode="requestContent.workshopCode" :productionLineCode="titleInfo.productionLineCode" :workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.toLocationCode"></work-station>
         </view>
       </view>
     </view>
-    <view class="split_line"></view>
     <view class="page-main">
       <scroll-view scroll-y="true" class="page-main-scroll">
         <view class="detail-list">
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 3ae8c6cd..b1893cf2 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -6,7 +6,6 @@
           <job-top :dataContent="jobContent"></job-top>
         </view>
         <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view>
-        <view class="split_line"></view>
       </view>
     </view>
 
@@ -33,7 +32,7 @@
 
     <win-scan-button @goScan="openScanPopup"></win-scan-button>
     <!-- <winScanPackAndLocationNoBalance ref="scanPopup" @getResult="getScanResult" :allowNullBalance="true"> </winScanPackAndLocationNoBalance> -->
-    <winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult="getScanResult" :noShowBalanceMessage="true"> </winScanPackAndLocation>
+    <winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult="getScanResult" :noShowBalanceMessage="true"></winScanPackAndLocation>
     <com-message ref="comMessageRef" />
   </view>
 </template>