From 31a4cc5bf42f8a33bb5f89cc1eb8dc95f68383da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 25 Oct 2024 15:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=202024/8/3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/style/pdabasic.css                 |  2 +-
 src/mycomponents/location/locationCompare.vue | 33 ++++++++++---------
 .../productionReturn/job/returnDetail.vue     |  3 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/common/style/pdabasic.css b/src/common/style/pdabasic.css
index 841653fc..65f1521e 100644
--- a/src/common/style/pdabasic.css
+++ b/src/common/style/pdabasic.css
@@ -773,7 +773,7 @@ page {
 
 .page-footer {
 	/* color: #fff; */
-	line-height: 100rpx;
+	/* line-height: 100rpx; */
 	/* 不放大不缩小固定100rpx */
 	flex: 0 0 100rpx;
 	/* background-color: #00AAFF; */
diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue
index 76c47399..54d968be 100644
--- a/src/mycomponents/location/locationCompare.vue
+++ b/src/mycomponents/location/locationCompare.vue
@@ -1,30 +1,31 @@
 <template>
-  <view class="uni-flex u-col-center" style="padding-top: 15rpx; padding-bottom: 15rpx; padding-left: 10rpx; padding-right: 10rpx; font-size: 32rpx">
-    <view class="uni-flex u-row u-col-center" @click="showLocation">
-      <view class="flex u-row" v-if="isShowEdit">
-        <view>
-          <text style="font-size: 35rpx">{{ title }}</text>
-
-          <text style="font-size: 45rpx; color: #3fbaff">&nbsp {{ recommendLocationCode }}</text>
-          <text v-if="locationCode" style="font-size: 45rpx; color: #3fbaff">&nbsp/&nbsp{{ locationCode }}</text>
+  <view class="uni-flex u-col-center" style="padding-left: 10rpx;padding-right: 10rpx;
+	 font-size:32rpx;">
+    <view class="uni-flex uni-row u-col-center" @click="showLocation">
+      <view class="flex uni-row" v-if="isShowEdit"  >
+        <view >
+          <text style="font-size: 35rpx;">{{title}}</text>
+          <text style="font-size: 45rpx;color:#3FBAFF; font-weight: bold;">&nbsp {{recommendLocationCode}}</text>
+          <text v-if="locationCode" style="font-size: 45rpx;color:#3FBAFF;font-weight: bold;">&nbsp/&nbsp{{locationCode}}</text>
           <!-- <text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text> -->
         </view>
-        <image style="width: 45rpx; height: 45rpx; margin: 6rpx 10rpx 0px; display: inline-block" src="/static/icons/icons_edit.svg"></image>
+        <image style="width:45rpx;height: 45rpx; vertical-align:center" class="center" src="/static/icons/icons_edit.svg"></image>
       </view>
       <view class="" v-else>
-        <view>
-          <text style="font-size: 35rpx">{{ title }}</text>
-          <text style="font-size: 45rpx; color: #3fbaff">&nbsp {{ recommendLocationCode }}</text>
+        <view >
+          <text style="font-size: 35rpx;">{{title}}</text>
+          <text style="font-size: 45rpx;color:#3FBAFF;font-weight: bold;">&nbsp {{recommendLocationCode}}</text>
           <!-- <text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text> -->
         </view>
       </view>
 
-      <view class="uni-flex uni-row center" style="vertical-align: center" v-if="isDevlement()">
-        <!-- <text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制</text> -->
-        <image style="width: 26rpx; height: 26rpx; margin-top: 6rpx" src="/static/icons/icon_copy.svg" alt="" @click.stop="copy" />
+
+      <view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
+        <text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制</text>
       </view>
     </view>
-    <win-scan-location ref="scanLocationCode" :title="title" @getLocation="getLocation" :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
+    <win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
+                       :locationAreaTypeList="locationAreaTypeList"></win-scan-location>
   </view>
 </template>
 
diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue
index aaf3e51d..983baaf4 100644
--- a/src/pages/productionReturn/job/returnDetail.vue
+++ b/src/pages/productionReturn/job/returnDetail.vue
@@ -156,6 +156,7 @@ const getDetail = () => {
         detailSource.value = getDataSource(subList.value)
         titleInfo.value = subList.value[0]
         uni.hideLoading()
+        toLocationAreaTypeList.value = getDirectoryItemArray(jobContent.value.toAreaTypes)
       } else {
         showMessage('列表数据为0')
       }
@@ -315,7 +316,7 @@ const checkLocation = () => {
       comScanLocation.value.showLocation()
     })
 
-    return (isPass = false)
+    return isPass = false
   }
   return isPass
 }