From 016fe8296e58f28f30bf66fa71bdcd420e9e9d84 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期二, 20 八月 2024 15:55:16 +0800
Subject: [PATCH] test

---
 pages/modal/5602.vue |  156 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 103 insertions(+), 53 deletions(-)

diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index b1c4342..25973ec 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -185,8 +185,8 @@
 		data() {
 			return {
 				title: this.translateSys("sorting"),
-				ClsID: "Sorting_Detail",
-				ClsID2: "Sorting_Result",
+				ClsID: "Distribution_CNTR_Detail",
+				ClsID2: "Picking_Result",
 				param: {},
 				focusFieldId: "",
 				focusOldFieldId: "",
@@ -227,7 +227,7 @@
 				let that = this;
 				let keys = [];
 				let val, data;
-			
+
 				Object.keys(obj).forEach(function(key) {
 					keys = key.split(".");
 					val = obj[key];
@@ -244,7 +244,7 @@
 					});
 				});
 			},
-			
+
 			async loadData(paramValue) {
 				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� 				await this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
@@ -272,7 +272,7 @@
 						}
 					})
 				}
-					
+
 				//鍔犺浇鍒濆鐣岄潰
 				if (this.$data.param.Show_Welcom_Page) {
 					this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
@@ -285,8 +285,8 @@
 				await this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
 				await this.Detail2_UIstyleGetInfo(this.ClsID2, this.$data.param.Sub_Page[1].UI_Style.ID);
 
-			
-			console.log(this.$data.param);
+
+				console.log(this.$data.param);
 			},
 			changeSwiper(evt) {
 				let index = evt.target.current || evt.detail.current;
@@ -466,53 +466,47 @@
 					dict_name: dict.name
 				};
 				// console.log(dataInfo);
-				this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => {
-					// console.log(success);
-					if (success.err_code == 0) {
-						var list = [];
-						var itemName = '';
-						success.result.dict_item_list.forEach((item) => {
-							if (item.is_default == '1')
-								itemName = item.name;
-							list.push({
-								text: item.value,
-								value: item.name,
-							});
+				try {
+					const res = await this.getDictInfo(dataInfo)
+					var list = [];
+					var itemName = '';
+					res.result.dict_item_list.forEach((item) => {
+						if (item.is_default == '1')
+							itemName = item.name;
+						list.push({
+							text: item.value,
+							value: item.name,
 						});
-
-						if (type == 'mast') { //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
-							if (itemName) {
-								$this.head_styledef.form.items[index].value = itemName;
-								var attr = $this.head_styledef.form.items[index].fieldId;
-								$this.head_styledef.form.model[attr] = itemName;
-							}
-							$this.head_styledef.form.items[index].dict = list;
-							var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
-							$this.head_styledef = [];
-							$this.head_styledef = head_styledef;
-							// console.log($this.$data.detail1StyleDefList);
-						} else {
-							if (itemName) {
-								$this.detail1_styledef.form.items[index].value = itemName;
-								var attr = $this.detail1_styledef.form.items[index].fieldId;
-								$this.detail1_styledef.form.model[attr] = itemName;
-							}
-							$this.detail1_styledef.form.items[index].dict = list;
-							var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
-							$this.detail1_styledef = [];
-							$this.detail1_styledef = detail1_styledef;
-							// console.log($this.$data.detail1_styledef);
+					});
+					//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+					if (type == 'mast') { //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+						if (itemName) {
+							$this.head_styledef.form.items[index].value = itemName;
+							var attr = $this.head_styledef.form.items[index].fieldId;
+							$this.head_styledef.form.model[attr] = itemName;
 						}
-
+						$this.head_styledef.form.items[index].dict = list;
+						var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
+						$this.head_styledef = [];
+						$this.head_styledef = head_styledef;
+						// console.log($this.head_styledef);
 					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "9.1",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+						if (itemName) {
+							$this.detail1_styledef.form.items[index].value = itemName;
+							var attr = $this.detail1_styledef.form.items[index].fieldId;
+							$this.detail1_styledef.form.model[attr] = itemName;
+						}
+						$this.detail1_styledef.form.items[index].dict = list;
+						var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
+						$this.detail1_styledef = [];
+						$this.detail1_styledef = detail1_styledef;
+						// console.log($this.$data.detail1_styledef);
 					}
-				}).catch(ex => {
+
+
+					// $this.head_styledef.form.items[index].dictitem=success.result;
+					// this.$store.commit("classAttrList", $this.$data.classAttrList);
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
 						title: this.translateSys("error") + "9",
@@ -520,8 +514,38 @@
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
+				}
 			},
+			getDictInfo(info) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�+				const loginInfo = this.$store.getters.loginid
+				const mobxoSApi = this.$store.getters.getMobxoSApi
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
+						data: info,
+						method: 'POST',
+						dataType: "json",
+						success: (_res) => {
+							// console.log(_res);
+							const ret = _res.data
+							if (ret.err_code == 0) {
+								resolve(ret);
+							} else {
+								reject({
+									"errMsg": ret.err_msg
+								});
+							}
+						},
+						fail: (err) => {
+							// console.log(err);
+							reject(err);
+						}
+					})
+
+				})
+
+			},
+
 			onClick(item) {
 				this.focusFieldId = item.fieldId
 			},
@@ -535,7 +559,7 @@
 					var $this = this;
 
 					console.log(item);
-					if (item.oldvalue != item.value) {
+					if (item.oldvalue != item.value&& item.value.trim() != "") {
 						item.oldvalue = item.value;
 						var attr = item.fieldId;
 						this.head_styledef.form.model[attr] = item.value;
@@ -618,7 +642,7 @@
 			},
 			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
 				// console.log(item);
-				if (item.oldvalue != item.value) {
+				if (item.oldvalue != item.value&& item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -942,8 +966,34 @@
 													data.forEach(async (ele2, index) => {
 														if (ele.fieldId == ele2
 															.attr) {
+															if (ele.name ==
+																'Select' &&
+																ele2
+																.choice_list) {
+																const
+																	dictItemList = [];
+																const
+																	choiceList =
+																	ele2
+																	.choice_list ||
+																	[];
+																for (let d in
+																		choiceList) {
+																	const val =
+																		choiceList[
+																			d];
+																	dictItemList
+																		.push({
+																			text: val,
+																			value: val
+																		});
+																}
+																ele.dict =
+																	dictItemList;
+															}
 															ele.value = ele2
 																.value;
+
 														}
 													});
 												});

--
Gitblit v1.9.1