From ec63534e04c68e067dcb0380e56f2e5312de24a3 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 27 九月 2024 17:18:41 +0800
Subject: [PATCH] 字典取值判断附加值还是名称

---
 pages/modal/3018_2.vue |    6 +++---
 pages/modal/5602.vue   |    4 ++--
 pages/modal/5601.vue   |    4 ++--
 pages/modal/3037_2.vue |    4 ++--
 pages/modal/3200.vue   |    4 ++--
 manifest.json          |    4 ++--
 pages/modal/5600.vue   |    6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4827c13..d387186 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "MoboxPDA",
     "appid" : "__UNI__56D451E",
     "description" : "",
-    "versionName" : "1.1.28",
-    "versionCode" : 1128,
+    "versionName" : "1.1.29",
+    "versionCode" : 1129,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 4ff0b35..294b0f0 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -470,12 +470,12 @@
 					var itemName = '';
 					(res.dict_item_list || []).forEach((item) => {
 						if (item.is_default == '1')
-							itemName = item.name;
+							itemName =item.value ? item.value : item.name
 						list.push({
-							text: item.name,
+							text: item.value ? item.value : item.name,
 							value: item.id,
 						});
-					});
+					});						
 					//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
 					if (itemName) {
 						formItem.value = itemName;
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 9bbe82b..47a95a1 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -489,9 +489,9 @@
 					var itemName = '';
 					(result.dict_item_list || []).forEach((item) => {
 						if (item.is_default == '1')
-							itemName = item.name;
+							itemName = item.value ? item.value : item.name
 						list.push({
-							text: item.name,
+							text: item.value ? item.value : item.name,
 							value: item.id,
 						});
 					});
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 3ca938b..88d33e9 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -582,9 +582,9 @@
 						var itemName = '';
 						(result.dict_item_list || []).forEach((item) => {
 							if (item.is_default == '1')
-								itemName = item.name;
+								itemName = item.value ? item.value : item.name
 							list.push({
-								text: item.name,
+								text: item.value ? item.value : item.name,
 								value: item.id,
 							});
 						});
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 5d85cca..2052001 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -459,10 +459,10 @@
 					var itemName = '';
 					(result.dict_item_list || []).forEach((item) => {
 						if (item.is_default == '1')
-							itemName = item.name;
+							itemName = item.value ? item.value : item.name
 						list.push({
-						text: item.name,
-						value: item.id,
+							text: item.value ? item.value : item.name,
+							value: item.id,
 						});
 					});
 					//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 326a540..91689ac 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -456,9 +456,9 @@
 					var itemName = '';
 					(result.dict_item_list || []).forEach((item) => {
 						if (item.is_default == '1')
-							itemName = item.name;
+							itemName = item.value ? item.value : item.name
 						list.push({
-							text: item.name,
+							text: item.value ? item.value : item.name,
 							value: item.id,
 						});
 					});
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 6894290..9a7f4fb 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -471,9 +471,9 @@
 					var itemName = '';
 					(result.dict_item_list || []).forEach((item) => {
 						if (item.is_default == '1')
-							itemName = item.name;
+							itemName = item.value ? item.value : item.name
 						list.push({
-							text: item.name,
+							text: item.value ? item.value : item.name,
 							value: item.id,
 						});
 					});

--
Gitblit v1.9.1