From c1c1b1f95b0880cd58afadb98d6933287fe6311c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 15 12月 2024 16:41:37 +0800
Subject: [PATCH] 22

---
 LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue |   67 +++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue b/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
index 72465ae..38fb9ea 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
@@ -23,7 +23,7 @@
           >
             <u-input
               v-model.trim="warehouse.upi"
-                @focus="warehouse.upi = ''"
+              @focus="warehouse.upi = ''"
               @confirm="getContainerData(1)"
               placeholder="璇峰綍鍏ユ垨鎵爜"
               class="width"
@@ -53,6 +53,7 @@
         </u-col>
       </u-row> -->
     </u-form>
+    
     <!-- 鍒楄〃 -->
     <view class="margin_top10rpx">
       <u-swipe-action
@@ -73,7 +74,6 @@
               :class="item.checked ? 'bg_item' : ''"
               class="fontSize32rpx width margin_auto background_fff padding10 relative box_sizing transition"
             >
-              <!-- 閮ㄤ欢鍚嶇О upi銆佹潗鏂欍�佸昂瀵革紝浣嶇疆銆佹澘浠剁姸鎬� -->
               <u-row>
                 <u-col span="12" class="flex align-center">
                   <!-- <u-checkbox v-model="item.checked" size="50rpx"></u-checkbox> -->
@@ -94,6 +94,13 @@
                   </text>
                 </u-col>
               </u-row>
+			  <u-row>
+			    <u-col span="12">
+			      <text class="color_80 padding_left25rpx">
+			        <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+			      </text>
+			    </u-col>
+			  </u-row>
               <u-row>
                 <u-col span="12">
                   <text class="color_80 padding_left25rpx">
@@ -104,7 +111,7 @@
               <u-row>
                 <u-col span="12">
                   <text class="color_80 padding_left25rpx">
-                    浣嶇疆锛歿{ item.areacode }}
+                    浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
                   </text>
                 </u-col>
               </u-row>
@@ -130,13 +137,13 @@
                   </text>
                 </u-col>
               </u-row>
-              <u-row>
-                <u-col span="12">
-                  <text class="color_80 padding_left25rpx">
-                    <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
-                  </text>
-                </u-col>
-              </u-row>
+			   <u-row>
+			  			    <u-col span="12">
+			  			      <text class="color_80 padding_left25rpx">
+			  			        鏍囪锛歿{ getUpiFlagEnumName(item.upiFlag) }}
+			  			      </text>
+			  			    </u-col>
+			  			  </u-row>
               <u-row>
                 <u-col span="12">
                   <text class="color_80 padding_left25rpx">
@@ -344,7 +351,9 @@
       gridFocus: false,
       gridable: true,
       kwbhAllowed: false,
-	  enumList: [],
+      enumList: [],
+      areaCodeEnum: [],
+	  upiFlagEnum: [],
     };
   },
   components: {
@@ -352,24 +361,41 @@
     ModalCode,
   },
   created() {
-	getenumDataList({
+    getenumDataList({
       EnumName: "UpiStatusEnum",
     }).then((res) => {
       this.enumList = res.result || [];
     });
+
+    getenumDataList({
+      EnumName: "AreaCodeEnum",
+    }).then((res) => {
+      this.areaCodeEnum = res.result || [];
+    });
+   getenumDataList({
+   	  EnumName: "UpiFlagEnum",
+   	}).then((res) => {
+   	  this.upiFlagEnum = res.result || [];
+   	});
   },
   onLoad() {
     this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
   },
-  mounted() {
-    
-  },
+  mounted() {},
 
   methods: {
-	getEnumName(value) {
+    getEnumName(value) {
       const name = this.enumList.find((item) => item.value === value);
-      return name? name.name : "";
+      return name ? name.name : "";
     },
+    getAreaCodeEnumName(value) {
+      const name = this.areaCodeEnum.find((item) => item.value === value);
+      return name ? name.name : "";
+    },
+	 getUpiFlagEnumName(value) {
+		  const name = this.upiFlagEnum.find((item) => item.value === value);
+		  return name ? name.name : "";
+		},
     // 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
     open(index) {
       // 鍏堝皢姝ｅ湪琚搷浣滅殑swipeAction鏍囪涓烘墦寮�鐘舵�侊紝鍚﹀垯鐢变簬props鐨勭壒鎬ч檺鍒讹紝
@@ -387,7 +413,7 @@
       this.materlist = this.singlist[index];
       this.detailshow = true;
     },
- 
+
     rest() {
       this.warehouse.upi = "";
       this.warehouse.upi = "";
@@ -406,14 +432,14 @@
         return;
       }
       getBhbMaterialList({
-        upi: this.warehouse.upi
+        upi: this.warehouse.upi,
       }).then((res) => {
         const result = res.result;
         if (Array.isArray(result) && result.length == 0) {
           uni.showToast({
             title: "娌℃湁鏌ュ埌鏁版嵁",
             icon: "none",
-            duration: 2000,
+            duration: 5000,
           });
           this.singlist = [];
           return;
@@ -430,7 +456,6 @@
       this.warehouse.upi = "";
     },
   },
-
 };
 </script>
 <style lang="scss">

--
Gitblit v1.9.3