From a2f5317f01290597eb44aaf80aa535ff468a61c5 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 05 六月 2025 17:10:46 +0800
Subject: [PATCH] 3202 set_subtable_page_content

---
 pages/modal/5600.vue |  558 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 299 insertions(+), 259 deletions(-)

diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 3db80aa..85050d8 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-page-modal-5600">
+	<view class="uni-page-modal-5600" :class="largeMode?'large-mode':''">
 		<!-- 琛ㄥご鏍峰紡 -->
 		<view class="view-header">
 			<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
@@ -20,7 +20,7 @@
 						:placeholder="item.placeholder"
 						:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
 						:focus="focusFieldId == item.fieldId" @focus="ontap(index,item)" @click="onClick(item)"
-						@keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)"  :maxlength="-1"/>
+						@keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)" :maxlength="-1" />
 					<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
 						@click="classAttr_extButton(item)">&#xe568;</text>
 				</view>
@@ -59,7 +59,7 @@
 													<input class="uni-input" v-if="!item.disabled"
 														:type="item.name=='InputNumber'?'number':'text'"
 														v-model="item.value" :disabled="item.disabled"
-														:placeholder="item.placeholder"  :maxlength="-1"/>
+														:placeholder="item.placeholder" :maxlength="-1" />
 												</view>
 												<!-- 鏍呮牸甯冨眬 -->
 												<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
@@ -73,7 +73,7 @@
 															<input class="uni-input" v-if="!cols.disabled"
 																:type="cols.name=='InputNumber'?'number':'text'"
 																v-model="cols.value" :disabled="cols.disabled"
-																:placeholder="cols.placeholder"  :maxlength="-1"/>
+																:placeholder="cols.placeholder" :maxlength="-1" />
 														</view>
 													</uni-col>
 												</uni-row>
@@ -132,7 +132,7 @@
 										</div>
 										<div class="dv-panel-button">
 											<checkbox v-if="param.Sub_Page[1].Select_Button==true" :value="ii"
-												v-model:checked="style.SelBut_Checked" />
+											:checked="style.SelBut_Checked" />
 											<!-- <text></text> -->
 
 											<!-- <button type="primary" @click="savaDataObj(style,ii)" v-if="param.Sub_Page[1].OK_Button==true">淇濆瓨</Button> -->
@@ -163,7 +163,7 @@
 				</div>
 			</view>
 		</view>
-	<view>
+		<view>
 			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
 				<view class="popup-header">{{check_list.title}}</view>
 				<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
@@ -192,7 +192,9 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from  '@/js/Base64.js';
 	import {
 		appGetInfo,
 		dictGetInfo
@@ -205,11 +207,9 @@
 	} from "@/api/data.js"
 
 	export default {
-		modules: {
-			Base64,
-		},
 		data() {
 			return {
+					largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys("coding_disk"),
 				ClsID: 'CG_Detail',
 				param: {},
@@ -238,10 +238,9 @@
 				selectAttrObj: {},
 				okLoading: false,
 				ok2Loading: false,
-				
-				
+
+
 				global_attr: [],
-				refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 				popupType: "center",
 				check_list: {},
 				popupParam: {},
@@ -252,9 +251,9 @@
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.title = options.titlename;
-			this.$data.param = JSON.parse(options.param);
-			// console.log(this.$data.param);
+			this.title = options.titlename;
+			this.param = JSON.parse(options.param);
+			// console.log(this.param);
 			this.loadData(options.paramValue)
 		},
 		//椤甸潰鍒濆鍖栬幏鍙栫劍鐐�@@ -282,11 +281,11 @@
 			},
 			async loadData(paramValue) {
 				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�-				await this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
+				await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID);
 				//浼犲叆鍙傛暟鍊� 				if (paramValue) {
 					const attrs = paramValue.attrs || [];
-					(this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+					(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
 						if (ele.name != "Layout") {
 							attrs.forEach(async (ele2, index2) => {
 								if (ele.fieldId == ele2.name) {
@@ -309,17 +308,17 @@
 				}
 
 				//鍔犺浇鍒濆鐣岄潰
-				if (this.$data.param.Show_Welcom_Page) {
-					this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
-					this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
-					this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
+				if (this.param.Show_Welcom_Page) {
+					this.param.Welcome_Page.Img = this.param.Welcome_Page.Img.replace(/ /g, '+');
+					this.param.Welcome_Page.Width = parseInt(this.param.Welcome_Page.Width);
+					this.param.Welcome_Page.Height = parseInt(this.param.Welcome_Page.Height);
 				}
 				//鍔犺浇Tab椤电
-				this.$data.items.push(this.$data.param.Sub_Page[0].Name);
-				this.$data.items.push(this.$data.param.Sub_Page[1].Name);
-				await this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
-				await this.Detail2_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[1].UI_Style.ID);
-				console.log(this.$data.param);
+				this.items.push(this.param.Sub_Page[0].Name);
+				this.items.push(this.param.Sub_Page[1].Name);
+				await this.Detail1_UIstyleGetInfo(this.ClsID, this.param.Sub_Page[0].UI_Style.ID);
+				await this.Detail2_UIstyleGetInfo(this.ClsID, this.param.Sub_Page[1].UI_Style.ID);
+				console.log(this.param);
 			},
 			changeSwiper(evt) {
 				let index = evt.target.current || evt.detail.current;
@@ -368,13 +367,30 @@
 						if (!result.style_def.includes('"')) styledef = Base64.decode(result
 							.style_def);
 					}
-					$this.$data.head_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.head_styledef = result.style_def ? JSON.parse(styledef) : {};
 					// this.form = this.head_styledef.form.model;
-					// console.log($this.$data.head_styledef);
-					if ($this.$data.head_styledef.form?.items) {
-						$this.$data.head_styledef.form.items.forEach(async (ele, index) => {
+					// console.log($this.head_styledef);
+					if ($this.head_styledef.form?.items) {
+						$this.head_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'mast');
+							} else {
+								if (ele?.name === "Select") {
+									const selections = ele?.selections || []
+									//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+									let itemName = ele.value || "";
+									if (itemName) {
+										$this.head_styledef.form
+											.model[ele.fieldId] = itemName;
+									}
+									$this.head_styledef.form.items[index].dict = selections.map((a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
+
 							}
 							if ($this.focusFieldId == "") {
 								if (ele.name == 'Input' || ele.name == 'InputNumber') {
@@ -415,17 +431,34 @@
 						if (!result.style_def.includes('"')) styledef = Base64.decode(result
 							.style_def);
 					}
-					$this.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
-					$this.$data.detail1_styledef.SelBut_Checked = true;
-					// console.log($this.$data.detail1_styledef);
-					// $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
+					$this.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.detail1_styledef.SelBut_Checked = true;
+					// console.log($this.detail1_styledef);
+					// $this.detail1StyleDefList.push($this.detail1_styledef);
 					// var aa = JSON.stringify(this.detail1_styledef);
-					// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
-					// console.log($this.$data.detail1StyleDefList);
+					// $this.detail1StyleDefList.push(JSON.parse(aa));
+					// console.log($this.detail1StyleDefList);
 					if ($this.detail1_styledef.form?.items) {
 						$this.detail1_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'sub');
+							} else {
+								if (ele?.name === "Select") {
+									const selections = ele?.selections || []
+									//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+									let itemName = ele.value || "";
+									if (itemName) {
+										$this.detail1_styledef.form
+											.model[ele.fieldId] = itemName;
+									}
+									$this.detail1_styledef.form.items[index].dict = selections.map((a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
+
 							}
 						});
 					}
@@ -456,8 +489,8 @@
 						if (!result.style_def.includes('"')) styledef = Base64.decode(result
 							.style_def);
 					}
-					$this.$data.detail2_styledef = result.style_def ? JSON.parse(styledef) : {};
-					$this.$data.detail2_styledef.SelBut_Checked = true;
+					$this.detail2_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.detail2_styledef.SelBut_Checked = true;
 				} catch (ex) {
 					// console.log(ex);
 					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
@@ -482,7 +515,7 @@
 					var itemName = '';
 					(result.dict_item_list || []).forEach((item) => {
 						if (item.is_default == '1')
-							itemName =  item.name
+							itemName = item.name
 						list.push({
 							text: item.value ? item.value : item.name,
 							value: item.name,
@@ -510,7 +543,7 @@
 						var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
 						$this.detail1_styledef = [];
 						$this.detail1_styledef = detail1_styledef;
-						// console.log($this.$data.detail1_styledef);
+						// console.log($this.detail1_styledef);
 					}
 
 				} catch (ex) {
@@ -629,13 +662,13 @@
 					if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠� 						this.onChange(onChangeEvent);
 					}
-				
+
 				}
 			},
 			classAttr_extButton(item) {
 				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�-			
+
 				if (!onSuffixClickCallbackEvent.id) {
 					uni.showModal({
 						title: this.translateSys("tip"),
@@ -654,14 +687,14 @@
 					});
 					return;
 				}
-				this.$data.popupType = 'right'
+				this.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
-			
+
 				this.dataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
 					item);
 			},
-			
+
 			getDetailAttrList(list, selectButton) {
 				const detailAttrList = [];
 				list.forEach(style => {
@@ -757,7 +790,7 @@
 						var dataInfo = {
 							ed_type: 0,
 							start_transaction: true,
-							class_id: this.$data.head_styledef.form.clsId,
+							class_id: this.head_styledef.form.clsId,
 							class_name: '',
 							event_id: event.id,
 							event_name: '',
@@ -811,17 +844,17 @@
 								if (result.result_type == 0 && result.action) {
 									result.action.forEach(item => {
 										if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�-											$this.$data.param.Show_Welcom_Page = false;
+											$this.param.Show_Welcom_Page = false;
 											var value = item.value;
 											$this.viewAceionRow(value);
 										} else if (item.action_type ==
 											"set_subtable_page_content") { //宸茬爜鐩�-											$this.$data.param.Show_Welcom_Page = false;
+											$this.param.Show_Welcom_Page = false;
 											var value = item.value;
 											if (value.clear_confirm != false && value.clear ==
 												true &&
-												$this.$data.detail1StyleDefList.length > 0 &&
-												value.page_name == $this.$data.param.Sub_Page[0]
+												$this.detail1StyleDefList.length > 0 &&
+												value.page_name == $this.param.Sub_Page[0]
 												.Name
 											) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹� 												uni.showModal({
@@ -849,11 +882,11 @@
 													}
 												});
 											} else {
-												if (value.page_name == $this.$data.param.Sub_Page[
+												if (value.page_name == $this.param.Sub_Page[
 														0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-													$this.$data.detail1StyleDefList = [];
+													$this.detail1StyleDefList = [];
 												} else {
-													$this.$data.detail2StyleDefList = [];
+													$this.detail2StyleDefList = [];
 												}
 												$this.viewAceionContent(value);
 											}
@@ -896,7 +929,7 @@
 												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 												//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 												value.row.forEach(row => {
-													$this.$data.detail1StyleDefList
+													$this.detail1StyleDefList
 														.forEach((ele, index) => {
 															if (ele.form.objId == row
 																.id) {
@@ -913,12 +946,12 @@
 										} else if (item.action_type ==
 											"set_subtable_page_ext_data") {
 											var value = item.value;
-											if (value.page_name == $this.$data.param.Sub_Page[0]
+											if (value.page_name == $this.param.Sub_Page[0]
 												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 												$this.setData({
 													detail1ExtData: value.ext_data
 												})
-											} else if (value.page_name == $this.$data.param
+											} else if (value.page_name == $this.param
 												.Sub_Page[1].Name) {
 												$this.setData({
 													detail2ExtData: value.ext_data
@@ -926,13 +959,13 @@
 											}
 										} else if (item.action_type == "clear_subpage_rows") {
 											var value = item.value;
-											if (value.page_name == $this.$data.param.Sub_Page[0]
+											if (value.page_name == $this.param.Sub_Page[0]
 												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 												$this.setData({
 													detail1StyleDefList: [],
 													detail1ExtData: {}
 												})
-											} else if (value.page_name == $this.$data.param
+											} else if (value.page_name == $this.param
 												.Sub_Page[1].Name) {
 												$this.setData({
 													detail2StyleDefList: [],
@@ -958,7 +991,7 @@
 										} else if (item.action_type == "set_dlg_attr") {
 											// value = {"attr":"xxx", "value":"xxx"}
 											var data = item.value;
-											$this.$data.head_styledef.form.items.forEach(async (
+											$this.head_styledef.form.items.forEach(async (
 												ele, index) => {
 												data.forEach(async (ele2, index) => {
 													if (ele.fieldId == ele2
@@ -1042,6 +1075,9 @@
 					number1 = parseInt(value1)
 				if (value2)
 					number2 = parseInt(value2)
+				if (!operation) {
+					return value2;
+				}
 				if (operation == "+") {
 					return number1 + number2
 				} else if (operation == "-") {
@@ -1049,54 +1085,125 @@
 				} else if (operation == "*") {
 					return number1 * number2
 				} else if (operation == "/") {
-					if (number2)
-						return number1 / number2
-					else
-						return number1
-				} else return number2
+					if (number2) return number1 / number2;
+					else {
+						throw new Error(`${this.translate("illegal_dividend")}'${value2}'`);
+						return 0;
+					}
+				} else if (operation == "=") {
+					return value2;
+				} else {
+					throw new Error(`${this.translate("unrecognized_operator")}'${operation}'`);
+					return 0;
+				}
 			},
 
 			//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
 			viewActionSetRow(value) {
 				const $this = this
 				var detailStyleDefList = []
-				if (value.page_name == $this.$data.param.Sub_Page[1].Name) {
-					detailStyleDefList = $this.$data.detail2StyleDefList
-				} else if (value.page_name == $this.$data.param.Sub_Page[0].Name) {
-					detailStyleDefList = $this.$data.detail1StyleDefList
+				if (value.page_name == $this.param.Sub_Page[1].Name) {
+					detailStyleDefList = $this.detail2StyleDefList
+				} else if (value.page_name == $this.param.Sub_Page[0].Name) {
+					detailStyleDefList = $this.detail1StyleDefList
 				}
 				detailStyleDefList.forEach(ele => {
 					value.row.forEach((rowData) => {
-						if (ele.form.objId == rowData.id) {
-							rowData.attrs.forEach(attr => {
-								ele.form.items.forEach(ele2 => {
-									if (ele2.name != 'Layout') {
-										if (ele2.fieldId == attr.attr) {
-											ele2.value = $this.operationNumber(ele2.value,
-												attr.value, attr.operation)
-										}
-									} else if (ele2.name == 'Layout') {
-										ele2.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == attr.attr) {
-													col.value = $this
-														.operationNumber(col.value,
-															attr.value, attr
-															.operation)
-												}
+						if (rowData.id) {
+							if (ele.form.objId == rowData.id) {
+								rowData.attrs.forEach(attr => {
+									ele.form.items.forEach(ele2 => {
+										if (ele2.name != 'Layout') {
+											if (ele2.fieldId == attr.attr) {
+												ele2.value = $this.operationNumber(ele2
+													.value,
+													attr.value, attr.operation)
 											}
-										})
-									}
+										} else if (ele2.name == 'Layout') {
+											ele2.setting.colList.forEach(col => {
+												if (col) {
+													if (col.fieldId == attr.attr) {
+														col.value = $this
+															.operationNumber(col
+																.value,
+																attr.value, attr
+																.operation)
+													}
+												}
+											})
+										}
+									});
 								});
-							});
+							}
+
+						} else if (rowData.condition) {
+							const conditions = rowData.condition;
+							let bFindCondition = true;
+							for (let i in conditions) {
+								const condition = conditions[i];
+								let bFind = false;
+								for (let i2 in ele.form.items) {
+									const ele2 = ele.form.items[i2];
+									if (ele2.name != "Layout") {
+										if (ele2.fieldId == condition.attr) {
+											if (condition.value == ele2.value) {
+												bFind = true;
+											}
+											break;
+										}
+									} else {
+										const colList = ele2.setting.colList || [];
+										for (let i3 in colList) {
+											const col = colList[i3];
+											if (col.fieldId == condition.attr) {
+												if (condition.value == col.value) {
+													bFind = true;
+												}
+												break;
+											}
+										}
+										if (bFind) break;
+									}
+								}
+								if (!bFind) {
+									bFindCondition = false;
+									break;
+								}
+							}
+							if (bFindCondition) {
+								rowData.attrs.forEach(attr => {
+									ele.form.items.forEach(ele2 => {
+										if (ele2.name != 'Layout') {
+											if (ele2.fieldId == attr.attr) {
+												ele2.value = $this.operationNumber(ele2
+													.value,
+													attr.value, attr.operation)
+											}
+										} else if (ele2.name == 'Layout') {
+											ele2.setting.colList.forEach(col => {
+												if (col) {
+													if (col.fieldId == attr.attr) {
+														col.value = $this
+															.operationNumber(col
+																.value,
+																attr.value, attr
+																.operation)
+													}
+												}
+											})
+										}
+									});
+								});
+							}
 						}
+
 					})
 				});
-				if (value.page_name == $this.$data.param.Sub_Page[1].Name) {
+				if (value.page_name == $this.param.Sub_Page[1].Name) {
 					$this.setData({
 						detail2StyleDefList: detailStyleDefList
 					})
-				} else if (value.page_name == $this.$data.param.Sub_Page[0].Name) {
+				} else if (value.page_name == $this.param.Sub_Page[0].Name) {
 					$this.setData({
 						detail1StyleDefList: detailStyleDefList
 					})
@@ -1109,12 +1216,12 @@
 				if (JSON.stringify(data.row) == '{}') {
 					return;
 				}
-				var styleStr = JSON.stringify(this.$data.detail1_styledef);
+				var styleStr = JSON.stringify(this.detail1_styledef);
 				if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
-					styleStr = JSON.stringify(this.$data.detail2_styledef);
+					styleStr = JSON.stringify(this.detail2_styledef);
 				} else {
-					if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
-						styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷�+					if (data.page_name == this.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+						styleStr = JSON.stringify(this.detail2_styledef); //寰呭垎鎷� 					}
 				}
 				data.row.forEach(row => {
@@ -1142,19 +1249,19 @@
 						});
 
 						if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
-							this.$data.detail2StyleDefList.push(detailStyle);
-							// console.log(this.$data.detail2StyleDefList);
+							this.detail2StyleDefList.push(detailStyle);
+							// console.log(this.detail2StyleDefList);
 						} else {
-							if (data.page_name == this.$data.param.Sub_Page[1]
+							if (data.page_name == this.param.Sub_Page[1]
 								.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
-								this.$data.detail2StyleDefList.push(detailStyle);
-								// console.log(this.$data.detail2StyleDefList);
+								this.detail2StyleDefList.push(detailStyle);
+								// console.log(this.detail2StyleDefList);
 							} else {
-								this.$data.detail1StyleDefList.push(detailStyle);
+								this.detail1StyleDefList.push(detailStyle);
 								this.activelist.push({
 									active: false
 								});
-								// console.log(this.$data.detail1StyleDefList);
+								// console.log(this.detail1StyleDefList);
 							}
 						}
 					}
@@ -1171,9 +1278,9 @@
 				if (JSON.stringify(data.content) == '{}') {
 					return;
 				}
-				var styleStr = JSON.stringify($this.$data.detail2_styledef);
-				if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄爜鐩樹腑
-					styleStr = JSON.stringify($this.$data.detail1_styledef); //鐮佺洏涓�+				var styleStr = JSON.stringify($this.detail2_styledef);
+				if (data.page_name == $this.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄爜鐩樹腑
+					styleStr = JSON.stringify($this.detail1_styledef); //鐮佺洏涓� 				}
 				data.content.forEach(cont => {
 
@@ -1201,7 +1308,7 @@
 								}
 							});
 						});
-						if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+						if (data.page_name == $this.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 							//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩� 							if (data.clear == false) {
 								var isflag = true;
@@ -1235,7 +1342,7 @@
 							$this.activelist.push({
 								active: false
 							});
-							// console.log($this.$data.detail1StyleDefList);
+							// console.log($this.detail1StyleDefList);
 						} else {
 							if (data.clear == false) {
 								//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�@@ -1268,7 +1375,7 @@
 								$this.detail2StyleDefList.push(detailStyle); //宸插垎鎷� 							}
 
-							//console.log($this.$data.detail2StyleDefList);
+							//console.log($this.detail2StyleDefList);
 						}
 					}
 				});
@@ -1355,7 +1462,7 @@
 			async del(style, event) {
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				this.head_styledef.form.items.forEach(item => {
 					head_attr[item.fieldId] = item.value;
 				});
 				// console.log(head_attr);
@@ -1436,7 +1543,7 @@
 			async del2(style, event) {
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				this.head_styledef.form.items.forEach(item => {
 					head_attr[item.fieldId] = item.value;
 				});
 				// console.log(head_attr);
@@ -1522,7 +1629,7 @@
 					ele.active = false;
 				});
 				this.activelist[value].active = true;
-				// console.log(this.$data.activelist);
+				// console.log(this.activelist);
 			},
 			popupChange(e) {
 				console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show);
@@ -1531,23 +1638,23 @@
 				// console.log(e.target.dataset);
 				var index = e.target.dataset.index;
 				var ischeck = e.target.dataset.ischeck;
-				var data = this.$data.check_list.items;
-				// this.$data.check_list.items=[];
-				if (this.$data.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫�+				var data = this.check_list.items;
+				// this.check_list.items=[];
+				if (this.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫� 					for (var i in data) {
 						data[i].check = false;
 					}
 				}
 				data[index].check = ischeck ? false : true;
-				this.$data.check_list.items = data;
-			
+				this.check_list.items = data;
+
 			},
 			popup_cancel(e) { //寮规鍙栨秷
 				this.$refs.popup.close();
 			},
 			popup_sava(e) { //寮规纭畾
 				var $this = this;
-				var items = $this.$data.check_list.items;
+				var items = $this.check_list.items;
 				var data = [];
 				var name = "";
 				for (var i = 0; i < items.length; i++) {
@@ -1561,7 +1668,7 @@
 						});
 					}
 				}
-				if (!$this.$data.popupParam) {
+				if (!$this.popupParam) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: "popupParam涓虹┖锛�,
@@ -1579,7 +1686,7 @@
 					});
 					return;
 				}
-				var callback_eventid = $this.$data.popupParam.button_callback.trim();
+				var callback_eventid = $this.popupParam.button_callback.trim();
 				var info = {
 					eventid: callback_eventid,
 					edtype: "0",
@@ -1587,31 +1694,31 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: $this.$data.ClsID,
+					clsid: $this.ClsID,
 					objid: "",
-					attr: $this.$data.popupParam.req,
+					attr: $this.popupParam.req,
 					dataJson: data
 				}
-				$this.DataObjRunCustomEvent(info, $this.$data.popupParam.data_attr);
+				$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
 				this.$refs.popup.close();
 			},
-			
+
 			async DataObjRunCustomEvent(info, data_attr) {
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.ClsID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.ClsID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.ClsID, // button=bottom鏃�master鐨刢ls_id
+						cls_id: this.ClsID, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 					}
 				};
 				if (data_attr) {
 					enviroment.edit_dlg = {
 						type: 'small', //灏忕獥鍙�-						class_id: this.$data.ClsID, //褰撳墠鏁版嵁绫籭d
+						class_id: this.ClsID, //褰撳墠鏁版嵁绫籭d
 					}
 					if (data_attr) {
 						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1627,7 +1734,7 @@
 				}
 				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var input_param = Base64.encode(JSON.stringify(info.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				if (info.dataJson)
 					info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
@@ -1692,7 +1799,7 @@
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
 						});
-			
+
 						var actionlist = data.action;
 						if (actionlist) {
 							console.log(actionlist);
@@ -1704,7 +1811,7 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									result.forEach(async (attr, key) => {
-										$this.$data.head_styledef.form.items
+										$this.head_styledef.form.items
 											.forEach(
 												async (ele,
 													index) => {
@@ -1737,11 +1844,11 @@
 									});
 									var head_styledef = JSON.parse(JSON.stringify($this.$data
 										.head_styledef));
-									$this.$data.head_styledef = [];
-									$this.$data.head_styledef = head_styledef;
-									// console.log($this.$data.head_styledef);
+									$this.head_styledef = [];
+									$this.head_styledef = head_styledef;
+									// console.log($this.head_styledef);
 								} else if (action.action_type == 'set_global_attr') {
-									$this.$data.global_attr = action.value || [];
+									$this.global_attr = action.value || [];
 								} else {
 									uni.showModal({
 										title: this.translateSys("tip"),
@@ -1760,66 +1867,10 @@
 						}
 						console.log($this.head_styledef);
 						if (data.result) {
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.head_styledef.form.items
-									.length; c++) {
-									var attr = $this.$data.head_styledef.form.items[c];
-									//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-									if ($this.head_styledef.form.model[result[i].attr] ==
-										undefined) {
-										$this.head_styledef.form.model[result[i].attr] =
-											result[i]
-											.value;
-									}
-									//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-									if (attr.name != 'Layout') {
-										if (attr.fieldId == result[i].attr) {
-											attr.value = '';
-											attr.oldvalue = '';
-											attr.value = result[i].value;
-											attr.oldvalue = result[i].value;
-											$this.head_styledef.form.model[attr.fieldId] =
-												result[i]
-												.value;
-										}
-									} else if (attr.name == 'Layout') {
-										attr.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == result[i].attr) {
-													col.value = '';
-													col.oldvalue = '';
-													col.value = result[i].value;
-													col.oldvalue = result[i].value;
-													$this.head_styledef.form.model[col
-															.fieldId] =
-														result[i].value;
-												}
-											}
-										});
-									}
-								}
-			
-								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i]
-											.attr) {
-											$this.$data.refdatastore[j].value = result[i]
-												.value;
-										}
-									}
-								}
+							$this.setFormValues( data.result)
 							}
-						}
 					}
-			
+
 				}).catch(ex => {
 					// console.log(ex);
 					let exStr = JSON.stringify(ex)
@@ -1852,19 +1903,7 @@
 					attr: a,
 					value: obj_attr[a] || "",
 				}));
-				if ($this.refdatastore.length > 0) {
-					for (var i = 0; i < $this.refdatastore.length; i++) {
-						if (!req.filter(function(s) {
-								return $this.refdatastore[i].attr == s.name
-							}).length) {
-							req.push({
-								'attr': $this.refdatastore[i].attr,
-								'value': $this.refdatastore[i].value
-							});
-						}
-					}
-				}
-			
+				
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
 					type: 'small', //灏忕獥鍙�@@ -1884,7 +1923,7 @@
 						}))
 					)
 				);
-			
+
 				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
 				var dataInfo = {
 					ed_type: "0",
@@ -1943,7 +1982,7 @@
 							showCancel: false,
 							confirmText: $this.translateSys("cancel")
 						});
-			
+
 						if (data != "") {
 							var actions = data.action;
 							if (actions) {
@@ -1952,7 +1991,7 @@
 									console.log(action)
 									var val = action.value;
 									var enviroment = JSON.stringify(enviroment);
-			
+
 									if (action.action_type == 'open_panel') {
 										var d = dialog({
 											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
@@ -1994,7 +2033,7 @@
 														rclsid: '',
 														robjid: '',
 														userlogin: '',
-														clsid: $this.$data.param
+														clsid: $this.param
 															.DataCls
 															.id,
 														objid: "",
@@ -2022,7 +2061,7 @@
 										});
 										d.show();
 									} else if (action.action_type == 'open_common_dlg') {
-			
+
 										if (val.common_dlg_id == 'check_list') {
 											$this.setData({
 												check_list: val.config
@@ -2081,9 +2120,9 @@
 															attr] =
 														data[0].ID +
 														';' + data[0].Name;
-			
-													// $this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
-													// $this.$data.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
+
+													// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+													// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
 													var callback_eventid = param
 														.button_callback
 														.trim();
@@ -2102,7 +2141,7 @@
 															attr: param.req,
 															dataJson: [],
 														}
-			
+
 														$this.DataObjRunCustomEvent(
 															info);
 													}
@@ -2136,7 +2175,7 @@
 							});
 						}
 					}
-			
+
 				}).catch(ex => {
 					// console.log(ex);
 					let exStr = JSON.stringify(ex)
@@ -2151,22 +2190,22 @@
 					});
 				});
 			},
-			
-			
+
+
 			//纭畾
 			ok() {
 				this.Before_OK_Event = this.param.Sub_Page[0].Before_ok;
 				this.After_OK_Event = this.param.Sub_Page[0].After_ok;
 				// console.log(this.Before_OK_Event);
 				// console.log(this.After_OK_Event);
-				if (this.$data.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
-					this.sava(this.$data.Before_OK_Event);
-				else if (this.$data.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
-					this.sava(this.$data.After_OK_Event);
+				if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
+					this.sava(this.Before_OK_Event);
+				else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
+					this.sava(this.After_OK_Event);
 			},
 			sava(event) {
 				var $this = this;
-				// if (this.$data.detail1StyleDefList.length == 0) {
+				// if (this.detail1StyleDefList.length == 0) {
 				// 	uni.showModal({
 				// 		title: this.translateSys("tip"),
 				// 		content: this.translate(
@@ -2184,13 +2223,13 @@
 				this.okLoading = true
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				this.head_styledef.form.items.forEach(item => {
 					head_attr[item.fieldId] = item.value;
 				});
 				// console.log(head_attr);
 				//鑾峰彇姝e湪鐮佺洏灞炴�
 				var detailAttrList = [];
-				this.$data.detail1StyleDefList.forEach(style => {
+				this.detail1StyleDefList.forEach(style => {
 					var detail_attr = {};
 					style.form.items.forEach(item => {
 						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�@@ -2210,7 +2249,7 @@
 				});
 				// console.log(detailAttrList);
 				//鑾峰彇姝e湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
-				this.$data.detail1StyleDefList.forEach(style => {
+				this.detail1StyleDefList.forEach(style => {
 					style.form.attrs.forEach(attr => {
 						for (var key in detailAttrList) {
 							if (style.form.objId == detailAttrList[key]['id']) {
@@ -2274,14 +2313,14 @@
 				this.After_OK_Event = this.param.Sub_Page[1].After_ok;
 				// console.log(this.Before_OK_Event);
 				// console.log(this.After_OK_Event);
-				if (this.$data.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
-					this.sava2(this.$data.Before_OK_Event);
-				else if (this.$data.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
-					this.sava2(this.$data.After_OK_Event);
+				if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
+					this.sava2(this.Before_OK_Event);
+				else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
+					this.sava2(this.After_OK_Event);
 			},
 			sava2(event) {
 				var $this = this;
-				if (this.$data.detail2StyleDefList.length == 0) {
+				if (this.detail2StyleDefList.length == 0) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate(
@@ -2299,13 +2338,13 @@
 				this.ok2Loading = true
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				this.head_styledef.form.items.forEach(item => {
 					head_attr[item.fieldId] = item.value;
 				});
 				// console.log(head_attr);
 				//鑾峰彇姝e湪鐮佺洏灞炴�
 				var detailAttrList = [];
-				this.$data.detail2StyleDefList.forEach(style => {
+				this.detail2StyleDefList.forEach(style => {
 					var detail_attr = {};
 					style.form.items.forEach(item => {
 						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�@@ -2325,7 +2364,7 @@
 				});
 				// console.log(detailAttrList);
 				//鑾峰彇姝e湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
-				this.$data.detail2StyleDefList.forEach(style => {
+				this.detail2StyleDefList.forEach(style => {
 					style.form.attrs.forEach(attr => {
 						for (var key in detailAttrList) {
 							if (style.form.objId == detailAttrList[key]['id']) {
@@ -2393,7 +2432,7 @@
 				var dataInfo = {
 					ed_type: 0,
 					start_transaction: true,
-					class_id: this.$data.ClsID,
+					class_id: this.ClsID,
 					class_name: '',
 					event_id: event.ID,
 					event_name: '',
@@ -2453,19 +2492,19 @@
 										//鍔犺浇宸茬粡鐮佺洏鏁版嵁
 										$this.viewAceionRow(value, 'add');
 										//娓呯┖鏉$爜鍐呭
-										$this.$data.head_styledef.form.items.forEach((item,
+										$this.head_styledef.form.items.forEach((item,
 											index) => {
 											if (item.fieldId != "S_CNTR_CODE") {
 												item.value = '';
 												item.oldvalue = '';
-												$this.$data.head_styledef.form.model[item
+												$this.head_styledef.form.model[item
 													.fieldId] = '';
 											}
 										});
 										//娓呴櫎姝e湪鐮佺洏涓垚鍔熺殑鏁版嵁
-										// $this.$data.detail1StyleDefList.forEach((style,index)=>{
+										// $this.detail1StyleDefList.forEach((style,index)=>{
 										//   if(style.form.items[0].fieldId == json.attrs[0].attr && style.form.items[0].value == json.attrs[0].value){ 
-										// 	$this.$data.detail1StyleDefList.splice(index,1);
+										// 	$this.detail1StyleDefList.splice(index,1);
 										// 	return;
 										//   }
 										// });
@@ -2482,7 +2521,7 @@
 										// //鍒锋柊褰撳墠椤甸潰
 										// // location.reload();
 										// uni.redirectTo({
-										// 	url:'../modal/5600?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
+										// 	url:'../modal/5600?param='+JSON.stringify(this.param)+"&titlename="+this.title
 										// });
 										//  } else if(item.action_type == "prompt"){  //鎵撳紑绯荤粺鎻愮ず寮规
 										//    var value = '';
@@ -2493,12 +2532,12 @@
 										// uni.showModal({title:"绯荤粺鎻愮ず",content:value,showCancel:false,confirmText:"鍏抽棴"});
 									} else if (item.action_type ==
 										"set_subtable_page_content") { //宸茬爜鐩�-										$this.$data.param.Show_Welcom_Page = false;
+										$this.param.Show_Welcom_Page = false;
 										var value = item.value;
 										if (value.clear_confirm != false && value.clear ==
 											true &&
-											$this.$data.detail1StyleDefList.length > 0 &&
-											value.page_name == $this.$data.param.Sub_Page[0]
+											$this.detail1StyleDefList.length > 0 &&
+											value.page_name == $this.param.Sub_Page[0]
 											.Name
 										) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹� 											uni.showModal({
@@ -2526,11 +2565,11 @@
 												}
 											});
 										} else {
-											if (value.page_name == $this.$data.param.Sub_Page[
+											if (value.page_name == $this.param.Sub_Page[
 													0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-												$this.$data.detail1StyleDefList = [];
+												$this.detail1StyleDefList = [];
 											} else {
-												$this.$data.detail2StyleDefList = [];
+												$this.detail2StyleDefList = [];
 											}
 											$this.viewAceionContent(value);
 										}
@@ -2541,7 +2580,7 @@
 											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 											//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 											value.row.forEach(row => {
-												$this.$data.detail1StyleDefList.forEach((
+												$this.detail1StyleDefList.forEach((
 													ele, index) => {
 													if (ele.form.objId == row.id) {
 														$this.$data
@@ -2556,12 +2595,12 @@
 
 									} else if (item.action_type == "set_subtable_page_ext_data") {
 										var value = item.value;
-										if (value.page_name == $this.$data.param.Sub_Page[0]
+										if (value.page_name == $this.param.Sub_Page[0]
 											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 											$this.setData({
 												detail1ExtData: value.ext_data
 											})
-										} else if (value.page_name == $this.$data.param.Sub_Page[1]
+										} else if (value.page_name == $this.param.Sub_Page[1]
 											.Name) {
 											$this.setData({
 												detail2ExtData: value.ext_data
@@ -2569,13 +2608,13 @@
 										}
 									} else if (item.action_type == "clear_subpage_rows") {
 										var value = item.value;
-										if (value.page_name == $this.$data.param.Sub_Page[0]
+										if (value.page_name == $this.param.Sub_Page[0]
 											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 											$this.setData({
 												detail1StyleDefList: [],
 												detail1ExtData: {}
 											})
-										} else if (value.page_name == $this.$data.param.Sub_Page[1]
+										} else if (value.page_name == $this.param.Sub_Page[1]
 											.Name) {
 											$this.setData({
 												detail2StyleDefList: [],
@@ -2600,7 +2639,7 @@
 									} else if (item.action_type == "set_dlg_attr") {
 										// value = {"attr":"xxx", "value":"xxx"}
 										var data = item.value;
-										$this.$data.head_styledef.form.items.forEach(async (
+										$this.head_styledef.form.items.forEach(async (
 											ele, index) => {
 											data.forEach(async (ele2, index) => {
 												if (ele.fieldId == ele2
@@ -2638,16 +2677,16 @@
 									}
 								});
 							} else {
-								if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+								if ($this.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
 									if (type == '1') {
-										$this.sava($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+										$this.sava($this.After_OK_Event); //鎵ц纭畾鍚庝簨浠� 									} else {
-										$this.sava2($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+										$this.sava2($this.After_OK_Event); //鎵ц纭畾鍚庝簨浠� 									}
 								}
 							}
 						} else {
-							// $this.$data.detail2StyleDefList=[];
+							// $this.detail2StyleDefList=[];
 							if (result.info) {
 								uni.showModal({
 									title: this.translateSys("tip"),
@@ -3045,23 +3084,24 @@
 		.demo-uni-row .uni-input {
 			width: calc(100% - 120px);
 		}
+
 		.popup-header {
 			font-size: 42rpx;
 			font-weight: bold;
 			margin: 20rpx 20rpx 0px 20rpx;
 		}
-		
+
 		.view_popup_CheckList {
 			margin-bottom: 20rpx;
 		}
-		
+
 		.popup-footer {
 			float: right;
 			position: absolute;
 			bottom: 0;
 			right: 20rpx;
 		}
-		
+
 		button.btn_popup_add {
 			width: 180rpx;
 			margin-top: 50rpx;
@@ -3076,7 +3116,7 @@
 			/* float: left; */
 			display: inline-block;
 		}
-		
+
 		button.btn_popup_cancel {
 			width: 180rpx;
 			margin-top: 50rpx;
@@ -3090,7 +3130,7 @@
 			/* float: right; */
 			display: inline-block;
 		}
-		
+
 
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1