From 1652caddff10990679dacd1822be6d1d5dc1bf65 Mon Sep 17 00:00:00 2001
From: cyy <cuiqian2004@163.com>
Date: 星期日, 16 六月 2024 18:43:07 +0800
Subject: [PATCH] 5600 action ext_data

---
 pages/modal/5600.vue |   55 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index f397786..c8e240b 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -306,7 +306,7 @@
 					:type="item.name=='Input'?'text':'number'" v-model="item.value" :disabled="item.disabled"
 					:placeholder="item.placeholder"
 					:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
-					:focus="focusMateria" @focus="ontap(item)" @keyup.enter="onEnterChange(item)"
+					:focus="focusFieldId == item.fieldId" @focus="ontap(index,item)" @keyup.enter="onEnterChange(item)"
 					@blur="onEnterChange(item)" />
 				<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
 					@click="onEnterChange(item)">&#xe568;</text>
@@ -478,7 +478,7 @@
 				title: '鐮佺洏',
 				ClsID: 'CG_Detail',
 				param: {},
-				focusMateria: false,
+				focusFieldId: "",
 				head_styledef: {
 					form: {
 						items: []
@@ -523,9 +523,8 @@
 			this.Detail2_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[1].UI_Style.ID);
 
 			console.log(this.$data.param);
-			//椤甸潰鍒濆鍖栬幏鍙栫劍鐐�-			// this.focusMateria=true; 
 		},
+			//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� 		methods: {
 			setData: function(obj) {
 				let that = this;
@@ -572,6 +571,14 @@
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'mast');
 							}
+							if($this.focusFieldId == "")
+							{
+								if(ele.name=='Input' || ele.name=='InputNumber')
+								{
+								    $this.setData({focusFieldId:ele.fieldId})
+								}
+							}
+						
 						});
 					} else {
 						uni.showModal({
@@ -745,13 +752,13 @@
 				});
 			},
 
-			ontap(item) { //鎵爜鍔熻兘
+			ontap(index,item) { //鎵爜鍔熻兘
 				// var $ele = e;
 				//console.log(e.target)
 				getApp().onScan((result) => {
 					console.log(result.decodedata);
 					item.value = result.decodedata;
-					uni.hideKeyboard();
+					// uni.hideKeyboard();
 					var $this = this;
 
 					// if(item.value=='B61DF51DD50645CEB9D152DD77D2466A'){
@@ -785,13 +792,17 @@
 							$this.onChange(onChangeEvent);
 						}
 						if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�-							$this.focusMateria = true; //鍒濆鍖栵紝绗簩涓緭鍏ユfocus灞炴�
-							// setTimeout(function(){
-							// 	$this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
-							setTimeout(function() {
-								uni.hideKeyboard();
-							}, 1000);
-							// },500);
+						 //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
+							const curIndex =  $this.head_styledef.form.items.findIndex((ele, index2, arr) => {
+							  return (ele.name=='Input' || ele.name=='InputNumber')  && index2 > index;
+							})
+							if(curIndex > -1){
+								$this.setData({focusFieldId: $this.head_styledef.form.items[curIndex].fieldId})
+							}
+							// setTimeout(function() {
+							// 	uni.hideKeyboard();
+							// }, 1000);
+				
 						}
 						// if(onSuffixClickCallbackEvent.id){   //鍚庡浘鏍囩偣鍑讳簨浠� 						//   this.onSuffixClick(onSuffixClickCallbackEvent);
@@ -1039,6 +1050,11 @@
 												} else if (value.page_name == $this.$data.param.Sub_Page[1].Name) {
 													$this.setData({detail2StyleDefList:[],detail2ExtData:{}})
 												}
+											}
+											else if (item.action_type == "set_dlg_current_edit_attr") {
+												if($this.focusFieldId == item.value)
+													$this.setData({focusFieldId: ""})
+												$this.setData({focusFieldId:item.value})
 											}
 											else if (item.action_type == "set_dlg_attr") {
 												// value = {"attr":"xxx", "value":"xxx"}
@@ -1488,6 +1504,9 @@
 						}))
 					});
 				});
+				const list = []
+				list.push({page_name:$this.param.Sub_Page[0].Name,item_list:jsonlist,ext_data:$this.detail1ExtData})
+				
 				// console.log(jsonlist);
 				$this.runCustomEvent(event, input_param, jsonlist, '1');
 				// jsonlist.forEach(async (json,key)=>{
@@ -1579,8 +1598,11 @@
 						}))
 					});
 				});
+				const list = []
+				list.push({page_name:$this.param.Sub_Page[1].Name,item_list:jsonlist,ext_data:$this.detail2ExtData})
+				
 				// console.log(jsonlist);
-				$this.runCustomEvent(event, input_param, jsonlist, '2');
+				$this.runCustomEvent(event, input_param, list, '2');
 				// jsonlist.forEach(async (json,key)=>{
 				// 	await $this.runCustomEvent(event,input_param,json,'2');
 				// });
@@ -1706,6 +1728,11 @@
 												$this.setData({detail2StyleDefList:[],detail2ExtData:{}})
 											}
 										}
+										else if (item.action_type == "set_dlg_current_edit_attr") {
+											if($this.focusFieldId == item.value)
+												$this.setData({focusFieldId: ""})
+											$this.setData({focusFieldId:item.value})
+										}
 									});
 								} else {
 									if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢

--
Gitblit v1.9.1