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

---
 pages/modal/3018_2.vue |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 483a96a..b2bd8bb 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -235,7 +235,8 @@
 
 					}
 				})
-			} else if (e.index == 1) {
+			} 
+			else if (e.index == 1) {
 				//鍒锋柊
 				uni.redirectTo({
 					url: '../modal/3018_2?param=' + JSON.stringify(this.$data.param) +
@@ -319,7 +320,7 @@
 					class_id: class_id,
 					ui_style_id: style_id,
 				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async(ret) => {
+				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
 					// console.log(ret);
 					if (ret.err_code == 0) {
 						var styledef = "";
@@ -332,8 +333,7 @@
 								.style_def);
 						}
 						const styledefHead = styledef ? JSON.parse(styledef) : {};
-						for (let i in styledefHead.form.items)
-						{
+						for (let i in styledefHead.form.items) {
 							const ele = styledefHead.form.items[i]
 							if (ele.name != "Layout") {
 								ele.show = true
@@ -352,10 +352,9 @@
 									}
 								}
 							} else {
-								for (let j in ele.setting.colList)
-								{
+								for (let j in ele.setting.colList) {
 									const col = ele.setting.colList[j]
-							
+
 									if (col) {
 										col.show = true
 										if (col?.useDict) {
@@ -382,7 +381,7 @@
 						$this.setData({
 							head_styledef: styledefHead
 						})
-			
+
 						if ($this.head_styledef.event?.length > 0) {
 							$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
 								if (a.event_id == "initial") {
@@ -440,7 +439,7 @@
 						formModel[formItem.fieldId] = itemName;
 					}
 					formItem.dict = list;
-			
+
 					// $this.head_styledef.form.items[index].dictitem=success.result;
 					// this.$store.commit("classAttrList", $this.$data.classAttrList);
 				} catch (ex) {
@@ -742,6 +741,7 @@
 
 
 			ontap(item) { //鎵爜鍔熻兘
+					// console.log("ontap",item);
 				// 鎵撳紑钃濈墮閫傞厤鍣� 				// uni.openBluetoothAdapter({
 				//   success: function() {
@@ -789,13 +789,13 @@
 			},
 			onScanValue(item, value) {
 				const $this = this;
-				console.log("onScanValue", item);
+				//console.log("onScanValue", item);
 				if (item.oldvalue != value) {
 					item.oldvalue = value;
 					item.value = value;
-					var attr = value
+					var attr = item.fieldId;
 					$this.head_styledef.form.model[attr] = value;
-					if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�+					/*if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌� 						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
 						var findd = false
 						const items = $this.head_styledef.form.items || []
@@ -859,7 +859,7 @@
 							}
 						}
 					}
-
+					*/
 					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠� 					if (eventid) {
 						var obj_attr = this.head_styledef.form.model;
@@ -886,12 +886,12 @@
 				}
 			},
 			onClick(item) {
+				// console.log("onClick",item);
 				this.focusFieldId = item.fieldId
 			},
 			onevent(item) {
-				// console.log(e.target);
-				console.log(item);
-				if (item.oldvalue != item.value) {
+					// console.log("onevent",item);
+				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -922,8 +922,8 @@
 
 			},
 			onchange(item) {
-				console.log(item);
-				if (item.oldvalue != item.value) {
+				// console.log("onchange",item);
+				if (item.oldvalue != item.value&& item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;

--
Gitblit v1.9.1