From 461ef6c5aac44da10ca579cd7d14ae6686f4a4b5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 12月 2024 17:58:45 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
index 2105c59..42f2329 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
@@ -73,7 +73,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> -->
@@ -104,7 +103,7 @@
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
- 浣嶇疆锛歿{ item.areacode }}
+ 浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
</text>
</u-col>
</u-row>
@@ -336,6 +335,7 @@
gridable: true,
kwbhAllowed: false,
enumList: [],
+ areaCodeEnum: [],
};
},
components: {
@@ -348,6 +348,11 @@
}).then((res) => {
this.enumList = res.result || [];
});
+ getenumDataList({
+ EnumName: "AreaCodeEnum",
+ }).then((res) => {
+ this.areaCodeEnum = res.result || [];
+ });
},
onLoad() {
this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -357,6 +362,10 @@
methods: {
getEnumName(value) {
const name = this.enumList.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
+ getAreaCodeEnumName(value) {
+ const name = this.areaCodeEnum.find((item) => item.value === value);
return name ? name.name : "";
},
// 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
@@ -382,7 +391,7 @@
this.singlist = [];
},
- //鑾峰彇瀹瑰櫒鐨勪俊鎭�
+ //鑾峰彇
getContainerData(param) {
if (!this.warehouse.upi) {
uni.showToast({
@@ -401,10 +410,12 @@
uni.showToast({
title: "鏁版嵁涓嶅瓨鍦�",
icon: "none",
- duration: 2000,
+ duration: 5000,
});
+ this.singlist = [];
return;
}
+
this.singlist = res.result;
});
},
--
Gitblit v1.9.3