From b1f20a79e8c5635e0f8aeea42df1d5804fd6dc1f Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 17 六月 2024 18:01:29 +0800
Subject: [PATCH] delete event

---
 pages/modal/5600.vue | 2605 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1,396 insertions(+), 1,209 deletions(-)

diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 2374e45..50001b7 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -468,353 +468,319 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
-	export default {
-		modules: {
-			Base64,
-		},
-		data() {
-			return {
-				title: '鐮佺洏',
-				ClsID: 'CG_Detail',
-				param: {},
-				focusFieldId: "",
-				head_styledef: {
-					form: {
-						items: []
+import Base64 from '../../components/js-base64/base64.js'
+export default {
+	modules: {
+		Base64,
+	},
+	data() {
+		return {
+			title: '鐮佺洏',
+			ClsID: 'CG_Detail',
+			param: {},
+			focusFieldId: "",
+			head_styledef: {
+				form: {
+					items: []
+				}
+			},
+			detail1_styledef: {},
+			detail1StyleDefList: [],
+			detail2_styledef: {},
+			detail2StyleDefList: [], //鍒嗛〉鏁版嵁
+			detail1ExtData: {},
+			detail2ExtData: {}, //鍒嗛〉鎵╁睍鏁版嵁
+			// 鍒嗘鍣ㄦ暟鎹�+			current: 0,
+			Before_OK_Event: {},
+			After_OK_Event: {},
+			Before_Del_Event: {},
+			After_Del_Event: {},
+			items: [],
+			active_id: '',
+			activelist: [],
+		};
+	},
+	onLoad(options) {
+		// console.log(options);
+		uni.setNavigationBarTitle({
+			title: options.titlename
+		}); //璁剧疆椤堕儴鏍囬 
+		this.$data.title = options.titlename;
+		this.$data.param = JSON.parse(options.param);
+		// console.log(this.$data.param);
+		//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�+		this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
+
+		//鍔犺浇鍒濆鐣岄潰
+		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);
+		}
+		//鍔犺浇Tab椤电
+		this.$data.items.push(this.$data.param.Sub_Page[0].Name);
+		this.$data.items.push(this.$data.param.Sub_Page[1].Name);
+		this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
+		this.Detail2_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[1].UI_Style.ID);
+
+		console.log(this.$data.param);
+	},
+		//椤甸潰鍒濆鍖栬幏鍙栫劍鐐�+	methods: {
+		setData: function(obj) {
+			let that = this;
+			let keys = [];
+			let val, data;
+
+			Object.keys(obj).forEach(function(key) {
+				keys = key.split(".");
+				val = obj[key];
+				data = that.$data;
+				keys.forEach(function(key2, index) {
+					if (index + 1 == keys.length) {
+						that.$set(data, key2, val);
+					} else {
+						if (!data[key2]) {
+							that.$set(data, key2, {});
+						}
 					}
-				},
-				detail1_styledef: {},
-				detail1StyleDefList: [],
-				detail2_styledef: {},
-				detail2StyleDefList: [], //鍒嗛〉鏁版嵁
-				detail1ExtData: {},
-				detail2ExtData: {}, //鍒嗛〉鎵╁睍鏁版嵁
-				// 鍒嗘鍣ㄦ暟鎹�-				current: 0,
-				Before_OK_Event: {},
-				After_OK_Event: {},
-				items: [],
-				active_id: '',
-				activelist: [],
+					data = data[key2];
+				});
+			});
+		},
+		async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�+			var $this = this;
+			var dataInfo = {
+				class_id: class_id,
+				ui_style_id: style_id,
 			};
-		},
-		onLoad(options) {
-			// console.log(options);
-			uni.setNavigationBarTitle({
-				title: options.titlename
-			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.title = options.titlename;
-			this.$data.param = JSON.parse(options.param);
-			// console.log(this.$data.param);
-			//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�-			this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
-
-			//鍔犺浇鍒濆鐣岄潰
-			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);
-			}
-			//鍔犺浇Tab椤电
-			this.$data.items.push(this.$data.param.Sub_Page[0].Name);
-			this.$data.items.push(this.$data.param.Sub_Page[1].Name);
-			this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
-			this.Detail2_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[1].UI_Style.ID);
-
-			console.log(this.$data.param);
-		},
-			//椤甸潰鍒濆鍖栬幏鍙栫劍鐐�-		methods: {
-			setData: function(obj) {
-				let that = this;
-				let keys = [];
-				let val, data;
-
-				Object.keys(obj).forEach(function(key) {
-					keys = key.split(".");
-					val = obj[key];
-					data = that.$data;
-					keys.forEach(function(key2, index) {
-						if (index + 1 == keys.length) {
-							that.$set(data, key2, val);
-						} else {
-							if (!data[key2]) {
-								that.$set(data, key2, {});
-							}
+			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
+				// console.log(ret);
+				if (ret.err_code == 0) {
+					var styledef = "";
+					if (ret.result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = ret.result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
+							.style_def);
+					}
+					$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
+					// this.form = this.head_styledef.form.model;
+					// console.log($this.$data.head_styledef);
+					$this.$data.head_styledef.form.items.forEach(async (ele, index) => {
+						if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+							await this.DictGetInfo(ele.bind.dict, index, 'mast');
 						}
-						data = data[key2];
-					});
-				});
-			},
-			async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					class_id: class_id,
-					ui_style_id: style_id,
-				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
-						// this.form = this.head_styledef.form.model;
-						// console.log($this.$data.head_styledef);
-						$this.$data.head_styledef.form.items.forEach(async (ele, index) => {
-							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-								await this.DictGetInfo(ele.bind.dict, index, 'mast');
-							}
-							if($this.focusFieldId == "")
+						if($this.focusFieldId == "")
+						{
+							if(ele.name=='Input' || ele.name=='InputNumber')
 							{
-								if(ele.name=='Input' || ele.name=='InputNumber')
-								{
-								    $this.setData({focusFieldId:ele.fieldId})
-								}
+								$this.setData({focusFieldId:ele.fieldId})
 							}
-						
-						});
-					} else {
-						uni.showModal({
-							title: "閿欒1",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
-					}
-				}).catch(ex => {
-					// console.log(ex);
+						}
+					
+					});
+				} else {
 					uni.showModal({
-						title: "閿欒1.1",
-						content: ex.errMsg,
+						title: "閿欒1",
+						content: ret.err_msg,
 						showCancel: false,
 						confirmText: "鍙栨秷"
 					});
+				}
+			}).catch(ex => {
+				// console.log(ex);
+				uni.showModal({
+					title: "閿欒1.1",
+					content: ex.errMsg,
+					showCancel: false,
+					confirmText: "鍙栨秷"
 				});
+			});
 
-			},
-			async Detail1_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					class_id: class_id,
-					ui_style_id: style_id,
-				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						$this.$data.detail1_styledef = ret.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);
-						// var aa = JSON.stringify(this.detail1_styledef);
-						// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
-						// console.log($this.$data.detail1StyleDefList);
-						$this.detail1_styledef.form.items.forEach(async (ele, index) => {
-							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-								await this.DictGetInfo(ele.bind.dict, index, 'sub');
-							}
-						});
-					} else {
-						uni.showModal({
-							title: "閿欒2",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
+		},
+		async Detail1_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�+			var $this = this;
+			var dataInfo = {
+				class_id: class_id,
+				ui_style_id: style_id,
+			};
+			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
+				// console.log(ret);
+				if (ret.err_code == 0) {
+					var styledef = "";
+					if (ret.result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = ret.result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
+							.style_def);
 					}
-				}).catch(ex => {
-					// console.log(ex);
+					$this.$data.detail1_styledef = ret.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);
+					// var aa = JSON.stringify(this.detail1_styledef);
+					// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
+					// console.log($this.$data.detail1StyleDefList);
+					$this.detail1_styledef.form.items.forEach(async (ele, index) => {
+						if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+							await this.DictGetInfo(ele.bind.dict, index, 'sub');
+						}
+					});
+				} else {
 					uni.showModal({
-						title: "閿欒2.1",
-						content: ex.errMsg,
+						title: "閿欒2",
+						content: ret.err_msg,
 						showCancel: false,
 						confirmText: "鍙栨秷"
 					});
+				}
+			}).catch(ex => {
+				// console.log(ex);
+				uni.showModal({
+					title: "閿欒2.1",
+					content: ex.errMsg,
+					showCancel: false,
+					confirmText: "鍙栨秷"
 				});
+			});
 
-			},
-			async Detail2_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					class_id: class_id,
-					ui_style_id: style_id,
-				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						$this.$data.detail2_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
-						$this.$data.detail2_styledef.SelBut_Checked = true;
-						// console.log($this.$data.detail2_styledef);
-
-					} else {
-						uni.showModal({
-							title: "閿欒3",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
+		},
+		async Detail2_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�+			var $this = this;
+			var dataInfo = {
+				class_id: class_id,
+				ui_style_id: style_id,
+			};
+			this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
+				// console.log(ret);
+				if (ret.err_code == 0) {
+					var styledef = "";
+					if (ret.result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = ret.result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
+							.style_def);
 					}
-				}).catch(ex => {
-					// console.log(ex);
-					uni.showModal({
-						title: "閿欒3.1",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: "鍙栨秷"
-					});
-				});
+					$this.$data.detail2_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
+					$this.$data.detail2_styledef.SelBut_Checked = true;
+					// console.log($this.$data.detail2_styledef);
 
-			},
-			async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�-				this.data = [];
-				var $this = this;
-				var dataInfo = {
-					dict_id: dict.id,
-					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,
-							});
-						});
-
-						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 {
-							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);
-						}
-
-					} else {
-						uni.showModal({
-							title: "閿欒3.1",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
-					}
-				}).catch(ex => {
-					// console.log(ex);
+				} else {
 					uni.showModal({
 						title: "閿欒3",
-						content: ex.errMsg,
+						content: ret.err_msg,
 						showCancel: false,
 						confirmText: "鍙栨秷"
 					});
+				}
+			}).catch(ex => {
+				// console.log(ex);
+				uni.showModal({
+					title: "閿欒3.1",
+					content: ex.errMsg,
+					showCancel: false,
+					confirmText: "鍙栨秷"
 				});
-			},
+			});
 
-			ontap(index,item) { //鎵爜鍔熻兘
-				// var $ele = e;
-				//console.log(e.target)
-				getApp().onScan((result) => {
-					console.log(result.decodedata);
-					item.value = result.decodedata;
-					// uni.hideKeyboard();
-					var $this = this;
+		},
+		async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�+			this.data = [];
+			var $this = this;
+			var dataInfo = {
+				dict_id: dict.id,
+				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,
+						});
+					});
 
-					// if(item.value=='B61DF51DD50645CEB9D152DD77D2466A'){
-					// 	this.active_id = 'B61DF51DD50645CEB9D152DD77D2466A';
-					// 	// var target = uni.createSelectorQuery().select('#B61DF51DD50645CEB9D152DD77D2466A');
-					// 	uni.createSelectorQuery()
-					// 	    .select("#tabpanel")//瀵瑰簲澶栧眰鑺傜偣
-					// 	    .boundingClientRect((container) => {
-					// 	        uni.createSelectorQuery()
-					// 	        .select("#B61DF51DD50645CEB9D152DD77D2466A")//鐩爣鑺傜偣
-					// 	        .boundingClientRect((target) => {
-					// 	            uni.pageScrollTo({
-					// 	            scrollTop: target.top - container.top,//婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�-					// 	            });
-					// 	        })
-					// 	        .exec();
-					// 	    })
-					// 	    .exec();
-					// }
-					console.log(item);
-					if (item.oldvalue != item.value) {
-						item.oldvalue = item.value;
-						var attr = item.fieldId;
-						this.head_styledef.form.model[attr] = item.value;
-						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-						var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�-						var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�-						var isflag = false;
-
-						if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�-							$this.onChange(onChangeEvent);
+					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;
 						}
-						if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�-						 //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂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);
-				
+						$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 {
+						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;
 						}
-						// if(onSuffixClickCallbackEvent.id){   //鍚庡浘鏍囩偣鍑讳簨浠�-						//   this.onSuffixClick(onSuffixClickCallbackEvent);
-						// }
-						// if(onSuffixClickEvent.id){   //鍚庡浘鏍囩偣鍑诲洖璋�-						//   this.onSuffixClickCallback(onSuffixClickEvent);
-						// }
+						$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);
 					}
-				})
-			},
-			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
-				// console.log(item);
+
+				} else {
+					uni.showModal({
+						title: "閿欒3.1",
+						content: success.err_msg,
+						showCancel: false,
+						confirmText: "鍙栨秷"
+					});
+				}
+			}).catch(ex => {
+				// console.log(ex);
+				uni.showModal({
+					title: "閿欒3",
+					content: ex.errMsg,
+					showCancel: false,
+					confirmText: "鍙栨秷"
+				});
+			});
+		},
+
+		ontap(index,item) { //鎵爜鍔熻兘
+			// var $ele = e;
+			//console.log(e.target)
+			getApp().onScan((result) => {
+				console.log(result.decodedata);
+				item.value = result.decodedata;
+				// uni.hideKeyboard();
+				var $this = this;
+
+				// if(item.value=='B61DF51DD50645CEB9D152DD77D2466A'){
+				// 	this.active_id = 'B61DF51DD50645CEB9D152DD77D2466A';
+				// 	// var target = uni.createSelectorQuery().select('#B61DF51DD50645CEB9D152DD77D2466A');
+				// 	uni.createSelectorQuery()
+				// 	    .select("#tabpanel")//瀵瑰簲澶栧眰鑺傜偣
+				// 	    .boundingClientRect((container) => {
+				// 	        uni.createSelectorQuery()
+				// 	        .select("#B61DF51DD50645CEB9D152DD77D2466A")//鐩爣鑺傜偣
+				// 	        .boundingClientRect((target) => {
+				// 	            uni.pageScrollTo({
+				// 	            scrollTop: target.top - container.top,//婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�+				// 	            });
+				// 	        })
+				// 	        .exec();
+				// 	    })
+				// 	    .exec();
+				// }
+				console.log(item);
 				if (item.oldvalue != item.value) {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
@@ -825,7 +791,20 @@
 					var isflag = false;
 
 					if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�-						this.onChange(onChangeEvent);
+						$this.onChange(onChangeEvent);
+					}
+					if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�+					 //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂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);
@@ -834,887 +813,246 @@
 					//   this.onSuffixClickCallback(onSuffixClickEvent);
 					// }
 				}
-			},
-			getDetailAttrList(list, selectButton) {
-				const detailAttrList = [];
-				list.forEach(style => {
-					var detail_attr = {};
-					style.form.items.forEach(item => {
-						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-							item.setting.colList.forEach(cols => {
-								if (cols != null) detail_attr[cols.fieldId] = cols.value;
-							});
-						} else
-							detail_attr[item.fieldId] = item.value;
-					});
+			})
+		},
+		onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
+			// console.log(item);
+			if (item.oldvalue != item.value) {
+				item.oldvalue = item.value;
+				var attr = item.fieldId;
+				this.head_styledef.form.model[attr] = item.value;
+				var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�+				var isflag = false;
 
-					detail_attr['id'] = style.form.objId;
-					if (selectButton == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
-						if (style.SelBut_Checked == true)
-							detailAttrList.push(detail_attr);
+				if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+					this.onChange(onChangeEvent);
+				}
+				// if(onSuffixClickCallbackEvent.id){   //鍚庡浘鏍囩偣鍑讳簨浠�+				//   this.onSuffixClick(onSuffixClickCallbackEvent);
+				// }
+				// if(onSuffixClickEvent.id){   //鍚庡浘鏍囩偣鍑诲洖璋�+				//   this.onSuffixClickCallback(onSuffixClickEvent);
+				// }
+			}
+		},
+		getDetailAttrList(list, selectButton) {
+			const detailAttrList = [];
+			list.forEach(style => {
+				var detail_attr = {};
+				style.form.items.forEach(item => {
+					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+						item.setting.colList.forEach(cols => {
+							if (cols != null) detail_attr[cols.fieldId] = cols.value;
+						});
 					} else
-						detailAttrList.push(detail_attr);
+						detail_attr[item.fieldId] = item.value;
 				});
-				// console.log(detailAttrList);
-				//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
-				list.forEach(style => {
-					style.form.attrs.forEach(attr => {
-						for (var key in detailAttrList) {
-							if (style.form.objId == detailAttrList[key]['id']) {
-								var keys = Object.keys(detailAttrList[key]);
-								var isflag = true;
-								keys.forEach((ele) => {
-									if (ele == attr.attr) isflag = false;
-								});
-								if (isflag) {
-									detailAttrList[attr.attr] = attr.value;
-								}
+
+				detail_attr['id'] = style.form.objId;
+				if (selectButton == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+					if (style.SelBut_Checked == true)
+						detailAttrList.push(detail_attr);
+				} else
+					detailAttrList.push(detail_attr);
+			});
+			// console.log(detailAttrList);
+			//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
+			list.forEach(style => {
+				style.form.attrs.forEach(attr => {
+					for (var key in detailAttrList) {
+						if (style.form.objId == detailAttrList[key]['id']) {
+							var keys = Object.keys(detailAttrList[key]);
+							var isflag = true;
+							keys.forEach((ele) => {
+								if (ele == attr.attr) isflag = false;
+							});
+							if (isflag) {
+								detailAttrList[attr.attr] = attr.value;
 							}
 						}
-					});
+					}
 				});
+			});
 
-				const jsonlist = [];
-				detailAttrList.forEach(attr => {
-					jsonlist.push({
-						id: attr["id"]|| "",
-						attrs: Object.keys(attr).map((a) => ({
-							attr: a,
-							value: attr[a] || "",
-						})).filter((a)=>{return a.attr != "id"})
-					});
+			const jsonlist = [];
+			detailAttrList.forEach(attr => {
+				jsonlist.push({
+					id: attr["id"]|| "",
+					attrs: Object.keys(attr).map((a) => ({
+						attr: a,
+						value: attr[a] || "",
+					})).filter((a)=>{return a.attr != "id"})
 				});
-				return jsonlist;
-			},
-			// 鍐呭鍙樺寲鍚庝簨浠�-			async onChange(event) {
-				try {
-					if (event.id) {
+			});
+			return jsonlist;
+		},
+		// 鍐呭鍙樺寲鍚庝簨浠�+		async onChange(event) {
+			try {
+				if (event.id) {
 
-						//鑾峰彇琛ㄥご灞炴�
-						var head_attr = {};
-						this.head_styledef.form.items.forEach(item => {
-							head_attr[item.fieldId] = item.value;
-						});
-						var obj_attr = this.head_styledef.form.model;
-						// console.log(obj_attr);
-						var input_param = Base64.encode(
-							JSON.stringify(
-								Object.keys(head_attr).map((a) => ({
-									attr: a,
-									value: head_attr[a] || "",
-								}))
-							)
-						);
-						var $this = this;
-						const jsonList = []
-						const itemlist1= $this.getDetailAttrList($this.detail1StyleDefList,$this.param.Sub_Page[0].Select_Button)
-						const itemlist2= $this.getDetailAttrList($this.detail2StyleDefList,$this.param.Sub_Page[1].Select_Button)
-						
-						jsonList.push({page_name:$this.param.Sub_Page[0].Name,item_list:itemlist1,ext_data:$this.detail1ExtData})
-						jsonList.push({page_name:$this.param.Sub_Page[1].Name,item_list:itemlist2,ext_data:$this.detail2ExtData})
-						const data_json = Base64.encode(
-							JSON.stringify(jsonList)
-						);
-						var dataInfo = {
-							ed_type: 0,
-							start_transaction: true,
-							class_id: this.$data.head_styledef.form.clsId,
-							class_name: '',
-							event_id: event.id,
-							event_name: '',
-							data_obj_id: '',
-							obj_attr: obj_attr,
-							prj_id: '',
-							ref_cls_id: '',
-							rel_obj_id: '',
-							user_login: '',
-							data_json: data_json,
-							compose_info: '',
-							ext_info: '',
-							global_attr: '',
-							input_param: input_param,
-						};
-						this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
-							// console.log(ret);
-							if (ret.err_code == 0) {
-								var result = ret.result;
-								if (result.ret != 0) {
-									var tip = result.err_info ? typeof result.err_info == 'string' ? result
-										.err_info : result.err_info.join('<br/>') : '';
-									if (result.ret == 801) uni.showModal({
-										title: '鎻愮ず',
-										content: tip,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-									else uni.showModal({
-										title: '鎻愮ず',
-										content: tip + ',鎻愮ず:' + result.ret,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-									return false;
-								} else {
-									var tip = result.info ? typeof result.info == 'string' ? result.info :
-										result.info.join('<br/>') : '';
-									if (tip) uni.showModal({
-										title: '鎻愮ず',
-										content: tip,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-
-									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;
-												var value = item.value;
-												$this.viewAceionRow(value);
-											} else if (item.action_type ==
-												"set_subtable_page_content") { //宸茬爜鐩�-												$this.$data.param.Show_Welcom_Page = false;
-												var value = item.value;
-												if (value.clear == true && $this.$data
-													.detail1StyleDefList.length > 0 && value
-													.page_name == $this.$data.param.Sub_Page[0].Name
-													) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�-													uni.showModal({
-														title: '鎻愮ず',
-														content: '绯荤粺妫�祴鍒版湁姝ｅ湪鐮佺洏涓殑璐у搧锛岀户缁搷浣滀細娓呯┖锛屾槸鍚︾户缁紵',
-														success: function(res) {
-															if (res.confirm) {
-																$this.$data
-																	.detail1StyleDefList = [];
-																$this.viewAceionContent(
-																	value);
-															} else if (res.cancel) {
-																$this.$data
-																	.detail1StyleDefList = [];
-																$this.viewAceionContent(
-																	value);
-															}
-														}
-													});
-												} else {
-													if (value.page_name == $this.$data.param.Sub_Page[
-															0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-														$this.$data.detail1StyleDefList = [];
-													} else {
-														$this.$data.detail2StyleDefList = [];
-													}
-													$this.viewAceionContent(value);
-												}
-											} else if (item.action_type ==
-												"select_subtable_page_row") {
-												// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
-												var value = item.value;
-												$this.detail1StyleDefList.forEach(ele => {
-													$this.activelist[index].active = false;
-													if (ele.form.objId == value.row.id) {
-														ele.SelBut_Checked = true;
-														$this.active_id = ele.form.htmlobjId;
-														//鑷姩婊氬姩鍒版寚瀹氬厓绱�-														uni.createSelectorQuery()
-															.select("#tabpanel") //瀵瑰簲澶栧眰鑺傜偣
-															.boundingClientRect((
-															container) => {
-																uni.createSelectorQuery()
-																	.select("#tabpanel" +
-																		ele.form.htmlobjId
-																		) //鐩爣鑺傜偣
-																	.boundingClientRect((
-																		target) => {
-																		uni.pageScrollTo({
-																			scrollTop: target
-																				.top -
-																				container
-																				.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�-																		});
-																	})
-																	.exec();
-															})
-															.exec();
-													}
-												});
-											} else if (item.action_type == "set_subtable_page_row") { 
-												$this.viewActionSetRow( item.value)
-												
-											} else if (item.action_type == "set_subtable_page_ext_data") {
-												var value = item.value;
-												if (value.page_name == $this.$data.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].Name) {
-													$this.setData({detail2ExtData:value.ext_data})
-												}
-											}
-											else if (item.action_type == "clear_subpage_rows") {
-												var value = item.value;
-												if (value.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-													$this.setData({detail1StyleDefList:[],detail1ExtData:{}})
-												} 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"}
-												var data = item.value;
-												$this.$data.head_styledef.form.items.forEach(async (
-													ele, index) => {
-													data.forEach(async (ele2, index) => {
-														if (ele.fieldId == ele2
-															.attr) {
-															ele.value = ele2
-																.value;
-														}
-													});
-												});
-											}
-										});
-									} else {
-										// this.detail2StyleDefList=[];
-										if (result.info) {
-											uni.showModal({
-												title: "閿欒4.3",
-												content: result.info,
-												showCancel: false,
-												confirmText: "鍙栨秷"
-											});
-										}
-									}
-								}
-
+					//鑾峰彇琛ㄥご灞炴�
+					var head_attr = {};
+					this.head_styledef.form.items.forEach(item => {
+						head_attr[item.fieldId] = item.value;
+					});
+					var obj_attr = this.head_styledef.form.model;
+					// console.log(obj_attr);
+					var input_param = Base64.encode(
+						JSON.stringify(
+							Object.keys(head_attr).map((a) => ({
+								attr: a,
+								value: head_attr[a] || "",
+							}))
+						)
+					);
+					var $this = this;
+					const jsonList = []
+					const itemlist1= $this.getDetailAttrList($this.detail1StyleDefList,$this.param.Sub_Page[0].Select_Button)
+					const itemlist2= $this.getDetailAttrList($this.detail2StyleDefList,$this.param.Sub_Page[1].Select_Button)
+					
+					jsonList.push({page_name:$this.param.Sub_Page[0].Name,item_list:itemlist1,ext_data:$this.detail1ExtData})
+					jsonList.push({page_name:$this.param.Sub_Page[1].Name,item_list:itemlist2,ext_data:$this.detail2ExtData})
+					const data_json = Base64.encode(
+						JSON.stringify(jsonList)
+					);
+					var dataInfo = {
+						ed_type: 0,
+						start_transaction: true,
+						class_id: this.$data.head_styledef.form.clsId,
+						class_name: '',
+						event_id: event.id,
+						event_name: '',
+						data_obj_id: '',
+						obj_attr: obj_attr,
+						prj_id: '',
+						ref_cls_id: '',
+						rel_obj_id: '',
+						user_login: '',
+						data_json: data_json,
+						compose_info: '',
+						ext_info: '',
+						global_attr: '',
+						input_param: input_param,
+					};
+					this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
+						// console.log(ret);
+						if (ret.err_code == 0) {
+							var result = ret.result;
+							if (result.ret != 0) {
+								var tip = result.err_info ? typeof result.err_info == 'string' ? result
+									.err_info : result.err_info.join('<br/>') : '';
+								if (result.ret == 801) uni.showModal({
+									title: '鎻愮ず',
+									content: tip,
+									showCancel: false,
+									confirmText: "鍙栨秷"
+								});
+								else uni.showModal({
+									title: '鎻愮ず',
+									content: tip + ',鎻愮ず:' + result.ret,
+									showCancel: false,
+									confirmText: "鍙栨秷"
+								});
+								return false;
 							} else {
-								uni.showModal({
-									title: "閿欒4",
-									content: ret.err_msg,
+								var tip = result.info ? typeof result.info == 'string' ? result.info :
+									result.info.join('<br/>') : '';
+								if (tip) uni.showModal({
+									title: '鎻愮ず',
+									content: tip,
 									showCancel: false,
 									confirmText: "鍙栨秷"
 								});
-							}
-						}).catch(ex => {
-							// console.log(ex);
-							uni.showModal({
-								title: "閿欒4.1",
-								content: ex.errMsg,
-								showCancel: false,
-								confirmText: "鍙栨秷"
-							});
-						});
-					}
-				} catch (ex) {
-					var tip = typeof ex == "string" ? ex : ex.message;
-					uni.showModal({
-						title: "閿欒4.2",
-						content: "鎵ц鈥滃唴瀹瑰彉鍖栧悗鈥濅簨浠跺け璐ワ細" + tip,
-						showCancel: false,
-						confirmText: "鍙栨秷"
-					});
 
-				}
-			},
-			operationNumber(value1, value2,operation){
-				var number1 = 0
-				var number2 =0
-				if(value1)
-					number1 =  parseInt(value1)
-				if(value2)	
-					number2 =  parseInt(value2)
-				if(operation == "+")
-				{
-					return number1 + number2
-				}
-				else if(operation == "-")
-				{
-					return number1 - number2
-				}
-				else if(operation == "*")
-				{
-					return number1 * number2
-				}
-				else if(operation == "/")
-				{
-					if(number2)
-						return number1 / number2
-					else
-						return number1 
-				}
-				else return number2 
-			},
-			
-			//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
-			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
-				}
-				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(value.page_name == $this.$data.param.Sub_Page[1].Name)
-				{
-					$this.setData({detail2StyleDefList:detailStyleDefList})
-				}
-				else if(value.page_name == $this.$data.param.Sub_Page[0].Name)
-				{
-					 $this.setData({detail1StyleDefList:detailStyleDefList})
-				}
-				
-			},
-			//鍔犺浇姝ｅ湪鐮佺洏鍐呭
-			viewAceionRow(data, type) {
-				// console.log(data);
-				if (JSON.stringify(data.row) == '{}') {
-					return;
-				}
-				data.row.forEach(row => {
-					var styleStr = JSON.stringify(this.$data.detail1_styledef);
-					if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
-						styleStr = JSON.stringify(this.$data.detail2_styledef);
-					} else {
-						if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
-							styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷�-						}
-					}
-					var detailStyle = JSON.parse(styleStr);
-					detailStyle.form.objId = row.id;
-					detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace('}',
-						'') : 'null';
-					detailStyle.form.attrs = row.attrs;
-					row.attrs.forEach(attr => {
-						detailStyle.form.items.forEach(ele => {
-							if (ele.name != 'Layout') {
-								if (ele.fieldId == attr.attr) ele.value = attr.value;
-							} else if (ele.name == 'Layout') {
-								ele.setting.colList.forEach(col => {
-									if (col) {
-										if (col.fieldId == attr.attr) col.value = attr
-											.value;
-									}
-								});
-							}
-						});
-					});
-
-					if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
-						this.$data.detail2StyleDefList.push(detailStyle);
-						// console.log(this.$data.detail2StyleDefList);
-					} else {
-						if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
-							this.$data.detail2StyleDefList.push(detailStyle);
-							// console.log(this.$data.detail2StyleDefList);
-						} else {
-							this.$data.detail1StyleDefList.push(detailStyle);
-							this.activelist.push({
-								active: false
-							});
-							// console.log(this.$data.detail1StyleDefList);
-						}
-					}
-				});
-			},
-			//鍔犺浇宸茬爜鐩樺唴瀹�-			viewAceionContent(data) {
-				var $this = this;
-				if (data.page_name == $this.$data.param.Sub_Page[0].Name) {
-					$this.detail1ExtData = data.ext_data ||{}
-				}
-				else if (data.page_name == $this.$data.param.Sub_Page[1].Name) {
-					$this.detail2ExtData = data.ext_data||{}
-				} 
-				if (JSON.stringify(data.content) == '{}') {
-					return;
-				}
-				data.content.forEach(cont => {
-					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 detailStyle = JSON.parse(styleStr);
-					detailStyle.SelBut_Checked = data.checkbox ?? true;
-					detailStyle.form.objId = cont.id;
-					detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '').replace('{', '').replace('}',
-						'') : 'null';
-					detailStyle.form.attrs = cont.attrs;
-					cont.attrs.forEach(attr => {
-						detailStyle.form.items.forEach(ele => {
-							if (ele.name != 'Layout') {
-								if (ele.fieldId == attr.attr) ele.value = attr.value;
-							} else if (ele.name == 'Layout') {
-								ele.setting.colList.forEach(col => {
-									if (col) {
-										if (col.fieldId == attr.attr) col.value = attr
-											.value;
-									}
-								});
-							}
-						});
-					});
-					if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-						//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�-						if (data.clear == false) {
-							var isflag = true;
-							$this.detail1StyleDefList.forEach((style, index) => {
-								if (style.form.objId == detailStyle.form.objId) {
-									cont.attrs.forEach(attr => {
-										style.form.items.forEach(ele => {
-											if (ele.name != 'Layout') {
-												if (ele.fieldId == attr.attr) ele.value =
-													attr.value;
-											} else if (ele.name == 'Layout') {
-												ele.setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == attr
-															.attr) col.value = attr
-															.value;
-													}
-												});
-											}
-										});
-									});
-									isflag = false;
-								}
-							});
-							if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�-						} else {
-							$this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�-						}
-						$this.activelist.push({
-							active: false
-						});
-						// console.log($this.$data.detail1StyleDefList);
-					} else {
-						if (data.clear == false) {
-							//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�-							var isflag = true;
-							$this.detail2StyleDefList.forEach((style, index) => {
-								if (style.form.objId == detailStyle.form.objId) {
-									cont.attrs.forEach(attr => {
-										style.form.items.forEach(ele => {
-											if (ele.name != 'Layout') {
-												if (ele.fieldId == attr.attr) ele.value =
-													attr.value;
-											} else if (ele.name == 'Layout') {
-												ele.setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == attr
-															.attr) col.value = attr
-															.value;
-													}
-												});
-											}
-										});
-									});
-									isflag = false;
-								}
-							});
-							if (isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�-						} else {
-							$this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�-						}
-						// console.log($this.$data.detail2StyleDefList);
-					}
-				});
-			
-			
-
-			},
-			onClickItem(e) { //閫夋嫨椤电
-				// console.log(e);
-				this.current = e.currentIndex
-			},
-			onDetail1EnterChange(item) { //鐮佺洏涓牱寮忓洖杞︿簨浠�-				console.log(item);
-			},
-			delItem(index) { //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�-				this.detail1StyleDefList.splice(index, 1);
-			},
-			delDataObj(style, index) { //鍒犻櫎宸茬爜鐩樻暟
-				// console.log(style);
-				var $this = this;
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭畾鍒犻櫎璇ュ凡鐮佺洏鏁版嵁锛�,
-					success: function(res) {
-						if (res.confirm) {
-							var objID = style.form.objId;
-							if (!style.form.objId.includes('{')) objID = '{' + style.form.objId + '}';
-
-							var dataInfo = {
-								class_id: style.form.clsId,
-								class_name: '',
-								obj_id: objID
-							};
-							// console.log(dataInfo);
-							$this.$store.dispatch('dataObjDel', dataInfo).then(ret => {
-								// console.log(ret);
-								if (ret.err_code == 0) {
-									$this.detail2StyleDefList.splice(index, 1);
-									uni.showModal({
-										title: "鎻愮ず",
-										content: "鍒犻櫎鎴愬姛锛�,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-
-								} else {
-									uni.showModal({
-										title: "閿欒5",
-										content: ret.err_msg,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-								}
-							}).catch(ex => {
-								// console.log(ex);
-								uni.showModal({
-									title: "閿欒5.1",
-									content: ex.errMsg,
-									showCancel: false,
-									confirmText: "鍙栨秷"
-								});
-							});
-						} else if (res.cancel) {
-
-						}
-					}
-				});
-
-			},
-			onPanelClick(value) {
-				// console.log(value);
-				this.active_id = '';
-				this.activelist.forEach(ele => {
-					ele.active = false;
-				});
-				this.activelist[value].active = true;
-				// console.log(this.$data.activelist);
-			},
-			//纭畾
-			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);
-			},
-			sava(event) {
-				var $this = this;
-				if (this.$data.detail1StyleDefList.length == 0) {
-					uni.showModal({
-						title: "鎻愮ず",
-						content: "娌℃湁姝ｅ湪鐮佺洏鐨勬暟鎹紒",
-						showCancel: false,
-						confirmText: "鍙栨秷"
-					});
-					return false;
-				}
-				//鑾峰彇琛ㄥご灞炴�
-				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
-					head_attr[item.fieldId] = item.value;
-				});
-				// console.log(head_attr);
-				//鑾峰彇姝ｅ湪鐮佺洏灞炴�
-				var detailAttrList = [];
-				this.$data.detail1StyleDefList.forEach(style => {
-					var detail_attr = {};
-					style.form.items.forEach(item => {
-						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-							item.setting.colList.forEach(cols => {
-								if (cols != null) detail_attr[cols.fieldId] = cols.value;
-							});
-						} else
-							detail_attr[item.fieldId] = item.value;
-					});
-
-					detail_attr['id'] = style.form.objId;
-					if ($this.param.Sub_Page[0].Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
-						if (style.SelBut_Checked == true)
-							detailAttrList.push(detail_attr);
-					} else
-						detailAttrList.push(detail_attr);
-				});
-				// console.log(detailAttrList);
-				//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
-				this.$data.detail1StyleDefList.forEach(style => {
-					style.form.attrs.forEach(attr => {
-						for (var key in detailAttrList) {
-							if (style.form.objId == detailAttrList[key]['id']) {
-								var keys = Object.keys(detailAttrList[key]);
-								var isflag = true;
-								keys.forEach((ele) => {
-									if (ele == attr.attr) isflag = false;
-								});
-								if (isflag) {
-									detailAttrList[attr.attr] = attr.value;
-								}
-							}
-						}
-					});
-				});
-				// console.log(detailAttrList);
-				//    return;
-				var input_param = Base64.encode(
-					JSON.stringify(
-						Object.keys(head_attr).map((a) => ({
-							attr: a,
-							value: head_attr[a] || "",
-						}))
-					)
-				);
-				var jsonlist = [];
-				detailAttrList.forEach(attr => {
-					jsonlist.push({
-						id: '',
-						attrs: Object.keys(attr).map((a) => ({
-							attr: a,
-							value: attr[a] || "",
-						}))
-					});
-				});
-				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)=>{
-				// 	await $this.runCustomEvent(event,input_param,json,'1');
-				// });
-			},
-			ok2() {
-				this.Before_OK_Event = this.param.Sub_Page[1].Before_ok;
-				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);
-			},
-			sava2(event) {
-				var $this = this;
-				if (this.$data.detail2StyleDefList.length == 0) {
-					uni.showModal({
-						title: "鎻愮ず",
-						content: "娌℃湁宸茬爜鐩樼殑鏁版嵁锛�,
-						showCancel: false,
-						confirmText: "鍙栨秷"
-					});
-					return false;
-				}
-				//鑾峰彇琛ㄥご灞炴�
-				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
-					head_attr[item.fieldId] = item.value;
-				});
-				// console.log(head_attr);
-				//鑾峰彇姝ｅ湪鐮佺洏灞炴�
-				var detailAttrList = [];
-				this.$data.detail2StyleDefList.forEach(style => {
-					var detail_attr = {};
-					style.form.items.forEach(item => {
-						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-							item.setting.colList.forEach(cols => {
-								if (cols != null) detail_attr[cols.fieldId] = cols.value;
-							});
-						} else
-							detail_attr[item.fieldId] = item.value;
-					});
-
-					detail_attr['id'] = style.form.objId;
-					if ($this.param.Sub_Page[1].Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
-						if (style.SelBut_Checked == true)
-							detailAttrList.push(detail_attr);
-					} else
-						detailAttrList.push(detail_attr);
-				});
-				// console.log(detailAttrList);
-				//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
-				this.$data.detail2StyleDefList.forEach(style => {
-					style.form.attrs.forEach(attr => {
-						for (var key in detailAttrList) {
-							if (style.form.objId == detailAttrList[key]['id']) {
-								var keys = Object.keys(detailAttrList[key]);
-								var isflag = true;
-								keys.forEach((ele) => {
-									if (ele == attr.attr) isflag = false;
-								});
-								if (isflag) {
-									detailAttrList[attr.attr] = attr.value;
-								}
-							}
-						}
-					});
-				});
-				// console.log(detailAttrList);
-				//    return;
-				var input_param = Base64.encode(
-					JSON.stringify(
-						Object.keys(head_attr).map((a) => ({
-							attr: a,
-							value: head_attr[a] || "",
-						}))
-					)
-				);
-				var jsonlist = [];
-				detailAttrList.forEach(attr => {
-					jsonlist.push({
-						id: '',
-						attrs: Object.keys(attr).map((a) => ({
-							attr: a,
-							value: attr[a] || "",
-						}))
-					});
-				});
-				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, list, '2');
-				// jsonlist.forEach(async (json,key)=>{
-				// 	await $this.runCustomEvent(event,input_param,json,'2');
-				// });
-			},
-			//鎵ц纭畾鑴氭湰
-			async runCustomEvent(event, input_param, json, type) {
-				var $this = this;
-				var data_json = Base64.encode(
-					JSON.stringify(json)
-				);
-				var dataInfo = {
-					ed_type: 0,
-					start_transaction: true,
-					class_id: this.$data.ClsID,
-					class_name: '',
-					event_id: event.ID,
-					event_name: '',
-					data_obj_id: '',
-					obj_attr: '',
-					prj_id: '',
-					ref_cls_id: '',
-					rel_obj_id: '',
-					user_login: '',
-					data_json: data_json,
-					compose_info: '',
-					ext_info: '',
-					global_attr: '',
-					input_param: input_param,
-				};
-				// console.log(dataInfo);
-				this.$store.dispatch('runCustomEvent', dataInfo).then(res => {
-					console.log(res);
-					if (res.err_code == 0) {
-						var result = res.result;
-						if (result.ret != 0) {
-							var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
-								result.err_info.join('<br/>') : '';
-							if (result.ret == 801) uni.showModal({
-								title: '鎻愮ず',
-								content: tip,
-								showCancel: false,
-								confirmText: "鍙栨秷"
-							});
-							else uni.showModal({
-								title: '鎻愮ず',
-								content: tip + ',鎻愮ず:' + result.ret,
-								showCancel: false,
-								confirmText: "鍙栨秷"
-							});
-							return false;
-						} else {
-							var tip = result.info ? typeof result.info == 'string' ? result.info : result.info
-								.join('<br/>') : '';
-							if (tip) uni.showModal({
-								title: '鎻愮ず',
-								content: tip,
-								showCancel: false,
-								confirmText: "鍙栨秷"
-							});
-
-							if (result.result_type == 0) {
-								if (result.action) {
+								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;
 											var value = item.value;
-											//鍔犺浇宸茬粡鐮佺洏鏁版嵁
-											$this.viewAceionRow(value, 'add');
-											//娓呯┖鏉＄爜鍐呭
-											$this.$data.head_styledef.form.items.forEach((item,
-												index) => {
-													if (item.fieldId != "S_CNTR_CODE") {
-														item.value = '';
-														item.oldvalue = '';
-														$this.$data.head_styledef.form.model[item
-															.fieldId] = '';
+											$this.viewAceionRow(value);
+										} else if (item.action_type ==
+											"set_subtable_page_content") { //宸茬爜鐩�+											$this.$data.param.Show_Welcom_Page = false;
+											var value = item.value;
+											if (value.clear == true && $this.$data
+												.detail1StyleDefList.length > 0 && value
+												.page_name == $this.$data.param.Sub_Page[0].Name
+												) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�+												uni.showModal({
+													title: '鎻愮ず',
+													content: '绯荤粺妫�祴鍒版湁姝ｅ湪鐮佺洏涓殑璐у搧锛岀户缁搷浣滀細娓呯┖锛屾槸鍚︾户缁紵',
+													success: function(res) {
+														if (res.confirm) {
+															$this.$data
+																.detail1StyleDefList = [];
+															$this.viewAceionContent(
+																value);
+														} else if (res.cancel) {
+															$this.$data
+																.detail1StyleDefList = [];
+															$this.viewAceionContent(
+																value);
+														}
 													}
 												});
-											//娓呴櫎姝ｅ湪鐮佺洏涓垚鍔熺殑鏁版嵁
-											// $this.$data.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);
-											// 	return;
-											//   }
-											// });
-											// this.detail2StyleDefList=[];
-											uni.showModal({
-												title: "鎻愮ず",
-												content: "鐮佺洏鎴愬姛",
-												showCancel: false,
-												confirmText: "鍙栨秷"
+											} else {
+												if (value.page_name == $this.$data.param.Sub_Page[
+														0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+													$this.$data.detail1StyleDefList = [];
+												} else {
+													$this.$data.detail2StyleDefList = [];
+												}
+												$this.viewAceionContent(value);
+											}
+										} else if (item.action_type ==
+											"select_subtable_page_row") {
+											// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
+											var value = item.value;
+											$this.detail1StyleDefList.forEach(ele => {
+												$this.activelist[index].active = false;
+												if (ele.form.objId == value.row.id) {
+													ele.SelBut_Checked = true;
+													$this.active_id = ele.form.htmlobjId;
+													//鑷姩婊氬姩鍒版寚瀹氬厓绱�+													uni.createSelectorQuery()
+														.select("#tabpanel") //瀵瑰簲澶栧眰鑺傜偣
+														.boundingClientRect((
+														container) => {
+															uni.createSelectorQuery()
+																.select("#tabpanel" +
+																	ele.form.htmlobjId
+																	) //鐩爣鑺傜偣
+																.boundingClientRect((
+																	target) => {
+																	uni.pageScrollTo({
+																		scrollTop: target
+																			.top -
+																			container
+																			.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�+																	});
+																})
+																.exec();
+														})
+														.exec();
+												}
 											});
-											//  } else if(item.action_type == "refresh"){  //鍒锋柊
-											//    var value = item.value;
-											// //鍒锋柊褰撳墠椤甸潰
-											// // location.reload();
-											// uni.redirectTo({
-											// 	url:'../modal/5600?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
-											// });
-											//  } else if(item.action_type == "prompt"){  //鎵撳紑绯荤粺鎻愮ず寮规
-											//    var value = '';
-											// item.value.forEach(ele=>{
-											// 	if(value) value+='\n';
-											// 	value+=ele;
-											// });
-											// uni.showModal({title:"绯荤粺鎻愮ず",content:value,showCancel:false,confirmText:"鍏抽棴"});
-										}
-										else if (item.action_type == "set_subtable_page_row") {
+										}  else if(item.action_type == "remove_subtable_page_row"){  //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+											var value = item.value;
+											if(value.page_name == $this.param.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+												//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+												value.row.forEach(row=>{
+													$this.$data.detail1StyleDefList.forEach((ele,index)=>{
+														if(ele.form.objId == row.id){
+														  $this.$data.detail1StyleDefList.splice(index,1); 
+														}
+													});
+												});
+											}
+										} 
+										else if (item.action_type == "set_subtable_page_row") { 
 											$this.viewActionSetRow( item.value)
 											
 										} else if (item.action_type == "set_subtable_page_ext_data") {
@@ -1738,52 +1076,901 @@
 												$this.setData({focusFieldId: ""})
 											$this.setData({focusFieldId:item.value})
 										}
+										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 (
+												ele, index) => {
+												data.forEach(async (ele2, index) => {
+													if (ele.fieldId == ele2
+														.attr) {
+														ele.value = ele2
+															.value;
+													}
+												});
+											});
+										}
 									});
 								} else {
-									if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
-										if (type == '1') {
-											$this.sava($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�-										} else {
-											$this.sava2($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�-										}
+									// this.detail2StyleDefList=[];
+									if (result.info) {
+										uni.showModal({
+											title: "閿欒4.3",
+											content: result.info,
+											showCancel: false,
+											confirmText: "鍙栨秷"
+										});
 									}
 								}
-							} else {
-								// $this.$data.detail2StyleDefList=[];
-								if (result.info) {
-									uni.showModal({
-										title: "鎻愮ず",
-										content: result.info,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-								}
 							}
+
+						} else {
+							uni.showModal({
+								title: "閿欒4",
+								content: ret.err_msg,
+								showCancel: false,
+								confirmText: "鍙栨秷"
+							});
 						}
-					} else {
+					}).catch(ex => {
+						// console.log(ex);
 						uni.showModal({
-							title: "閿欒8",
-							content: res.err_msg,
+							title: "閿欒4.1",
+							content: ex.errMsg,
 							showCancel: false,
 							confirmText: "鍙栨秷"
 						});
+					});
+				}
+			} catch (ex) {
+				var tip = typeof ex == "string" ? ex : ex.message;
+				uni.showModal({
+					title: "閿欒4.2",
+					content: "鎵ц鈥滃唴瀹瑰彉鍖栧悗鈥濅簨浠跺け璐ワ細" + tip,
+					showCancel: false,
+					confirmText: "鍙栨秷"
+				});
+
+			}
+		},
+		operationNumber(value1, value2,operation){
+			var number1 = 0
+			var number2 =0
+			if(value1)
+				number1 =  parseInt(value1)
+			if(value2)	
+				number2 =  parseInt(value2)
+			if(operation == "+")
+			{
+				return number1 + number2
+			}
+			else if(operation == "-")
+			{
+				return number1 - number2
+			}
+			else if(operation == "*")
+			{
+				return number1 * number2
+			}
+			else if(operation == "/")
+			{
+				if(number2)
+					return number1 / number2
+				else
+					return number1 
+			}
+			else return number2 
+		},
+		
+		//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
+		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
+			}
+			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)
+									  }
+									}
+								  })
+								}
+							});
+						});
 					}
-				}).catch(ex => {
-					var tip = typeof ex == "string" ? ex : ex.errMsg;
+				})	
+			});
+			if(value.page_name == $this.$data.param.Sub_Page[1].Name)
+			{
+				$this.setData({detail2StyleDefList:detailStyleDefList})
+			}
+			else if(value.page_name == $this.$data.param.Sub_Page[0].Name)
+			{
+				 $this.setData({detail1StyleDefList:detailStyleDefList})
+			}
+			
+		},
+		//鍔犺浇姝ｅ湪鐮佺洏鍐呭
+		viewAceionRow(data, type) {
+			// console.log(data);
+			if (JSON.stringify(data.row) == '{}') {
+				return;
+			}
+			data.row.forEach(row => {
+				var styleStr = JSON.stringify(this.$data.detail1_styledef);
+				if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
+					styleStr = JSON.stringify(this.$data.detail2_styledef);
+				} else {
+					if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+						styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷�+					}
+				}
+				var detailStyle = JSON.parse(styleStr);
+				detailStyle.form.objId = row.id;
+				detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace('}',
+					'') : 'null';
+				detailStyle.form.attrs = row.attrs;
+				row.attrs.forEach(attr => {
+					detailStyle.form.items.forEach(ele => {
+						if (ele.name != 'Layout') {
+							if (ele.fieldId == attr.attr) ele.value = attr.value;
+						} else if (ele.name == 'Layout') {
+							ele.setting.colList.forEach(col => {
+								if (col) {
+									if (col.fieldId == attr.attr) col.value = attr
+										.value;
+								}
+							});
+						}
+					});
+				});
+
+				if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
+					this.$data.detail2StyleDefList.push(detailStyle);
+					// console.log(this.$data.detail2StyleDefList);
+				} else {
+					if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+						this.$data.detail2StyleDefList.push(detailStyle);
+						// console.log(this.$data.detail2StyleDefList);
+					} else {
+						this.$data.detail1StyleDefList.push(detailStyle);
+						this.activelist.push({
+							active: false
+						});
+						// console.log(this.$data.detail1StyleDefList);
+					}
+				}
+			});
+		},
+		//鍔犺浇宸茬爜鐩樺唴瀹�+		viewAceionContent(data) {
+			var $this = this;
+			if (data.page_name == $this.param.Sub_Page[0].Name) {
+				$this.detail1ExtData = data.ext_data ||{}
+			}
+			else if (data.page_name == $this.param.Sub_Page[1].Name) {
+				$this.detail2ExtData = data.ext_data||{}
+			} 
+			if (JSON.stringify(data.content) == '{}') {
+				return;
+			}
+			data.content.forEach(cont => {
+				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 detailStyle = JSON.parse(styleStr);
+				detailStyle.SelBut_Checked = data.checkbox ?? true;
+				detailStyle.form.objId = cont.id;
+				detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g, '').replace('{', '').replace('}',
+					'') : 'null';
+				detailStyle.form.attrs = cont.attrs;
+				cont.attrs.forEach(attr => {
+					detailStyle.form.items.forEach(ele => {
+						if (ele.name != 'Layout') {
+							if (ele.fieldId == attr.attr) ele.value = attr.value;
+						} else if (ele.name == 'Layout') {
+							ele.setting.colList.forEach(col => {
+								if (col) {
+									if (col.fieldId == attr.attr) col.value = attr
+										.value;
+								}
+							});
+						}
+					});
+				});
+				if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+					//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+					if (data.clear == false) {
+						var isflag = true;
+						$this.detail1StyleDefList.forEach((style, index) => {
+							if (style.form.objId == detailStyle.form.objId) {
+								cont.attrs.forEach(attr => {
+									style.form.items.forEach(ele => {
+										if (ele.name != 'Layout') {
+											if (ele.fieldId == attr.attr) ele.value =
+												attr.value;
+										} else if (ele.name == 'Layout') {
+											ele.setting.colList.forEach(col => {
+												if (col) {
+													if (col.fieldId == attr
+														.attr) col.value = attr
+														.value;
+												}
+											});
+										}
+									});
+								});
+								isflag = false;
+							}
+						});
+						if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+					} else {
+						$this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+					}
+					$this.activelist.push({
+						active: false
+					});
+					// console.log($this.$data.detail1StyleDefList);
+				} else {
+					if (data.clear == false) {
+						//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+						var isflag = true;
+						$this.detail2StyleDefList.forEach((style, index) => {
+							if (style.form.objId == detailStyle.form.objId) {
+								cont.attrs.forEach(attr => {
+									style.form.items.forEach(ele => {
+										if (ele.name != 'Layout') {
+											if (ele.fieldId == attr.attr) ele.value =
+												attr.value;
+										} else if (ele.name == 'Layout') {
+											ele.setting.colList.forEach(col => {
+												if (col) {
+													if (col.fieldId == attr
+														.attr) col.value = attr
+														.value;
+												}
+											});
+										}
+									});
+								});
+								isflag = false;
+							}
+						});
+						if (isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+					} else {
+						$this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+					}
+					// console.log($this.$data.detail2StyleDefList);
+				}
+			});
+		
+		
+
+		},
+		onClickItem(e) { //閫夋嫨椤电
+			// console.log(e);
+			this.current = e.currentIndex
+		},
+		onDetail1EnterChange(item) { //鐮佺洏涓牱寮忓洖杞︿簨浠�+			console.log(item);
+		},
+		delItem(index) { //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�+		
+		   //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�+		  this.Before_Del_Event = this.param.Sub_Page[0].Before_Delete;
+		  this.After_Del_Event = this.param.Sub_Page[0].After_Delete;
+		  const style = this.detail1StyleDefList[index];
+		  //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�+		  this.detail1StyleDefList.splice(index, 1);
+		  if (this.Before_Del_Event?.ID)
+			//鏄惁鏈夊垹闄ゅ墠浜嬩欢
+			this.del(style, this.Before_Del_Event);
+		  else if (this.After_Del_Event?.ID)
+			//鏄惁鏈夊垹闄ゅ悗浜嬩欢
+			this.del(style, this.After_Del_Event);
+		},
+		delDataObj(style, index) { //鍒犻櫎宸茬爜鐩樻暟
+			// console.log(style);
+			
+			$this.Before_Del_Event = $this.param.Sub_Page[0].Before_Delete;
+			$this.After_Del_Event = $this.param.Sub_Page[0].After_Delete;
+			
+			var $this = this;
+			uni.showModal({
+				title: '鎻愮ず',
+				content: '纭畾鍒犻櫎璇ュ凡鐮佺洏鏁版嵁锛�,
+				success: function(res) {
+					if (res.confirm) {
+						var objID = style.form.objId;
+						if (!style.form.objId.includes('{')) objID = '{' + style.form.objId + '}';
+
+						var dataInfo = {
+							class_id: style.form.clsId,
+							class_name: '',
+							obj_id: objID
+						};
+						// console.log(dataInfo);
+						$this.$store.dispatch('dataObjDel', dataInfo).then(ret => {
+							// console.log(ret);
+							if (ret.err_code == 0) {
+							const style = $this.detail2StyleDefList[index];
+							$this.detail2StyleDefList.splice(index, 1); 
+							if ($this.Before_Del_Event?.ID)
+							//鏄惁鏈夊垹闄ゅ墠浜嬩欢
+								$this.del2(style, $this.Before_Del_Event);
+							else if ($this.After_Del_Event?.ID)
+							//鏄惁鏈夊垹闄ゅ悗浜嬩欢
+								$this.del2(style, $this.After_Del_Event);
+								uni.showModal({
+									title: "鎻愮ず",
+									content: "鍒犻櫎鎴愬姛锛�,
+									showCancel: false,
+									confirmText: "鍙栨秷"
+								});
+								
+
+							} else {
+								uni.showModal({
+									title: "閿欒5",
+									content: ret.err_msg,
+									showCancel: false,
+									confirmText: "鍙栨秷"
+								});
+							}
+						}).catch(ex => {
+							// console.log(ex);
+							uni.showModal({
+								title: "閿欒5.1",
+								content: ex.errMsg,
+								showCancel: false,
+								confirmText: "鍙栨秷"
+							});
+						});
+					} else if (res.cancel) {
+
+					}
+				}
+			});
+
+		},
+		async del(style, event) {
+	  //鑾峰彇琛ㄥご灞炴�
+			var head_attr = {};
+			this.$data.head_styledef.form.items.forEach(item => {
+			  head_attr[item.fieldId] = item.value;
+			});
+			// console.log(head_attr);
+			//鑾峰彇姝ｅ湪鍒嗘嫞灞炴�
+		  var detailAttrList = [];
+		  var detail_attr={};
+		  style.form.items.forEach(item => {
+			if(item.name == "Layout"){  //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+			  item.setting.colList.forEach(cols => {
+				if(cols!=null) detail_attr[cols.fieldId] = cols.value;
+			  });
+			}else
+			  detail_attr[item.fieldId] = item.value;
+		  });
+		  
+		 detail_attr['id'] = style.form.objId;
+		  if($this.param.Sub_Page[0].Select_Button==true){ //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+			if(style.SelBut_Checked==true) 
+			  detailAttrList.push(detail_attr);
+		  } else 
+			detailAttrList.push(detail_attr);
+
+			// console.log(detailAttrList);
+			//鑾峰彇姝ｅ湪鍒嗘嫞閲屾病鏈夋樉绀虹殑瀛楁
+		  style.form.attrs.forEach(attr => {
+			for(var key in detailAttrList){
+			  if(style.form.objId == detailAttrList[key]['id']){
+				var keys = Object.keys(detailAttrList[key]);
+				var isflag = true;
+				keys.forEach((ele) => {
+					if(ele == attr.attr) isflag = false;
+				});
+				if(isflag) {
+					detailAttrList[attr.attr] = attr.value;
+				}
+			  }
+			}
+		  });
+			var input_param = Base64.encode(
+				JSON.stringify(
+				  Object.keys(head_attr).map((a) => ({
+					attr: a,
+					value: head_attr[a] || "",
+				  }))
+				)
+			);
+			 var jsonlist=[];
+			detailAttrList.forEach(attr=>{
+				jsonlist.push({
+				  id:attr["id"]|| "",
+				  attrs: Object.keys(attr).map((a) => ({
+					attr: a,
+					value: attr[a] || "",
+				  })).filter((a)=>{return a.attr != "id"})
+				});
+			});
+			// console.log(jsonlist);
+			const list = []
+			list.push({page_name:$this.param.Sub_Page[0].Name,item_list:jsonlist,ext_data:$this.detail1ExtData})
+			$this.runCustomEvent(event,input_param,list,'1');
+		},
+		
+		async del2(style, event) {
+			 //鑾峰彇琛ㄥご灞炴�
+			var head_attr = {};
+			this.$data.head_styledef.form.items.forEach(item => {
+			  head_attr[item.fieldId] = item.value;
+			});
+			// console.log(head_attr);
+			//鑾峰彇宸插垎鎷ｅ睘鎬�+			var detailAttrList = [];
+			var detail_attr={};
+			style.form.items.forEach(item => {
+			if(item.name == "Layout"){  //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+				item.setting.colList.forEach(cols => {
+				if(cols!=null) detail_attr[cols.fieldId] = cols.value;
+			  });
+			}else
+				detail_attr[item.fieldId] = item.value;
+			});
+			  
+			detail_attr['id'] = style.form.objId;
+			if($this.param.Sub_Page[1].Select_Button==true){ //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+				if(style.SelBut_Checked==true) 
+					detailAttrList.push(detail_attr);
+			} else 
+				detailAttrList.push(detail_attr);
+			//鑾峰彇宸插垎鎷ｉ噷娌℃湁鏄剧ず鐨勫瓧娈�+			style.form.attrs.forEach(attr => {
+				for(var key in detailAttrList){
+					if(style.form.objId == detailAttrList[key]['id']){
+					var keys = Object.keys(detailAttrList[key]);
+					var isflag = true;
+					keys.forEach((ele) => {
+					  if(ele == attr.attr) isflag = false;
+					});
+					if(isflag) {
+					  detailAttrList[attr.attr] = attr.value;
+					}
+				  }
+				} 
+			});
+			// console.log(detailAttrList);
+	 //    return;
+			var input_param = Base64.encode(
+				JSON.stringify(
+				  Object.keys(head_attr).map((a) => ({
+					attr: a,
+					value: head_attr[a] || "",
+				  }))
+				)
+			);
+			var jsonlist=[];
+			detailAttrList.forEach(attr=>{
+				jsonlist.push({
+				  id:attr["id"]|| "",
+				  attrs: Object.keys(attr).map((a) => ({
+					attr: a,
+					value: attr[a] || "",
+				  })).filter((a)=>{return a.attr != "id"})
+				});
+			});
+			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,list,'2');
+		},
+
+		onPanelClick(value) {
+			// console.log(value);
+			this.active_id = '';
+			this.activelist.forEach(ele => {
+				ele.active = false;
+			});
+			this.activelist[value].active = true;
+			// console.log(this.$data.activelist);
+		},
+		//纭畾
+		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);
+		},
+		sava(event) {
+			var $this = this;
+			if (this.$data.detail1StyleDefList.length == 0) {
+				uni.showModal({
+					title: "鎻愮ず",
+					content: "娌℃湁姝ｅ湪鐮佺洏鐨勬暟鎹紒",
+					showCancel: false,
+					confirmText: "鍙栨秷"
+				});
+				return false;
+			}
+			//鑾峰彇琛ㄥご灞炴�
+			var head_attr = {};
+			this.$data.head_styledef.form.items.forEach(item => {
+				head_attr[item.fieldId] = item.value;
+			});
+			// console.log(head_attr);
+			//鑾峰彇姝ｅ湪鐮佺洏灞炴�
+			var detailAttrList = [];
+			this.$data.detail1StyleDefList.forEach(style => {
+				var detail_attr = {};
+				style.form.items.forEach(item => {
+					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+						item.setting.colList.forEach(cols => {
+							if (cols != null) detail_attr[cols.fieldId] = cols.value;
+						});
+					} else
+						detail_attr[item.fieldId] = item.value;
+				});
+
+				detail_attr['id'] = style.form.objId;
+				if ($this.param.Sub_Page[0].Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+					if (style.SelBut_Checked == true)
+						detailAttrList.push(detail_attr);
+				} else
+					detailAttrList.push(detail_attr);
+			});
+			// console.log(detailAttrList);
+			//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
+			this.$data.detail1StyleDefList.forEach(style => {
+				style.form.attrs.forEach(attr => {
+					for (var key in detailAttrList) {
+						if (style.form.objId == detailAttrList[key]['id']) {
+							var keys = Object.keys(detailAttrList[key]);
+							var isflag = true;
+							keys.forEach((ele) => {
+								if (ele == attr.attr) isflag = false;
+							});
+							if (isflag) {
+								detailAttrList[attr.attr] = attr.value;
+							}
+						}
+					}
+				});
+			});
+			// console.log(detailAttrList);
+			//    return;
+			var input_param = Base64.encode(
+				JSON.stringify(
+					Object.keys(head_attr).map((a) => ({
+						attr: a,
+						value: head_attr[a] || "",
+					}))
+				)
+			);
+			var jsonlist = [];
+			detailAttrList.forEach(attr => {
+				jsonlist.push({
+					 id:attr["id"]|| "",
+					attrs: Object.keys(attr).map((a) => ({
+						attr: a,
+						value: attr[a] || "",
+					}))
+				});
+			});
+			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, list, '1');
+			// jsonlist.forEach(async (json,key)=>{
+			// 	await $this.runCustomEvent(event,input_param,json,'1');
+			// });
+		},
+		ok2() {
+			this.Before_OK_Event = this.param.Sub_Page[1].Before_ok;
+			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);
+		},
+		sava2(event) {
+			var $this = this;
+			if (this.$data.detail2StyleDefList.length == 0) {
+				uni.showModal({
+					title: "鎻愮ず",
+					content: "娌℃湁宸茬爜鐩樼殑鏁版嵁锛�,
+					showCancel: false,
+					confirmText: "鍙栨秷"
+				});
+				return false;
+			}
+			//鑾峰彇琛ㄥご灞炴�
+			var head_attr = {};
+			this.$data.head_styledef.form.items.forEach(item => {
+				head_attr[item.fieldId] = item.value;
+			});
+			// console.log(head_attr);
+			//鑾峰彇姝ｅ湪鐮佺洏灞炴�
+			var detailAttrList = [];
+			this.$data.detail2StyleDefList.forEach(style => {
+				var detail_attr = {};
+				style.form.items.forEach(item => {
+					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+						item.setting.colList.forEach(cols => {
+							if (cols != null) detail_attr[cols.fieldId] = cols.value;
+						});
+					} else
+						detail_attr[item.fieldId] = item.value;
+				});
+
+				detail_attr['id'] = style.form.objId;
+				if ($this.param.Sub_Page[1].Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+					if (style.SelBut_Checked == true)
+						detailAttrList.push(detail_attr);
+				} else
+					detailAttrList.push(detail_attr);
+			});
+			// console.log(detailAttrList);
+			//鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
+			this.$data.detail2StyleDefList.forEach(style => {
+				style.form.attrs.forEach(attr => {
+					for (var key in detailAttrList) {
+						if (style.form.objId == detailAttrList[key]['id']) {
+							var keys = Object.keys(detailAttrList[key]);
+							var isflag = true;
+							keys.forEach((ele) => {
+								if (ele == attr.attr) isflag = false;
+							});
+							if (isflag) {
+								detailAttrList[attr.attr] = attr.value;
+							}
+						}
+					}
+				});
+			});
+			// console.log(detailAttrList);
+			//    return;
+			var input_param = Base64.encode(
+				JSON.stringify(
+					Object.keys(head_attr).map((a) => ({
+						attr: a,
+						value: head_attr[a] || "",
+					}))
+				)
+			);
+			var jsonlist = [];
+			detailAttrList.forEach(attr => {
+				jsonlist.push({
+					 id:attr["id"]|| "",
+					attrs: Object.keys(attr).map((a) => ({
+						attr: a,
+						value: attr[a] || "",
+					}))
+				});
+			});
+			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, list, '2');
+			// jsonlist.forEach(async (json,key)=>{
+			// 	await $this.runCustomEvent(event,input_param,json,'2');
+			// });
+		},
+		//鎵ц纭畾鑴氭湰
+		async runCustomEvent(event, input_param, json, type) {
+			var $this = this;
+			var data_json = Base64.encode(
+				JSON.stringify(json)
+			);
+			var dataInfo = {
+				ed_type: 0,
+				start_transaction: true,
+				class_id: this.$data.ClsID,
+				class_name: '',
+				event_id: event.ID,
+				event_name: '',
+				data_obj_id: '',
+				obj_attr: '',
+				prj_id: '',
+				ref_cls_id: '',
+				rel_obj_id: '',
+				user_login: '',
+				data_json: data_json,
+				compose_info: '',
+				ext_info: '',
+				global_attr: '',
+				input_param: input_param,
+			};
+			
+			// console.log(dataInfo);
+			this.$store.dispatch('runCustomEvent', dataInfo).then(res => {
+				console.log(res);
+				if (res.err_code == 0) {
+					var result = res.result;
+					if (result.ret != 0) {
+						var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info :
+							result.err_info.join('<br/>') : '';
+						if (result.ret == 801) uni.showModal({
+							title: '鎻愮ず',
+							content: tip,
+							showCancel: false,
+							confirmText: "鍙栨秷"
+						});
+						else uni.showModal({
+							title: '鎻愮ず',
+							content: tip + ',鎻愮ず:' + result.ret,
+							showCancel: false,
+							confirmText: "鍙栨秷"
+						});
+						return false;
+					} else {
+						var tip = result.info ? typeof result.info == 'string' ? result.info : result.info
+							.join('<br/>') : '';
+						if (tip) uni.showModal({
+							title: '鎻愮ず',
+							content: tip,
+							showCancel: false,
+							confirmText: "鍙栨秷"
+						});
+						if (result.result_type == 0) {
+							if (result.action) {
+							//	uni.showModal({title:"鎻愮ず",content:JSON.stringify(result.action),showCancel:false,confirmText:"鍙栨秷"});
+								
+								result.action.forEach(item => {
+									if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+										var value = item.value;
+										//鍔犺浇宸茬粡鐮佺洏鏁版嵁
+										$this.viewAceionRow(value, 'add');
+										//娓呯┖鏉＄爜鍐呭
+										$this.$data.head_styledef.form.items.forEach((item,
+											index) => {
+												if (item.fieldId != "S_CNTR_CODE") {
+													item.value = '';
+													item.oldvalue = '';
+													$this.$data.head_styledef.form.model[item
+														.fieldId] = '';
+												}
+											});
+										//娓呴櫎姝ｅ湪鐮佺洏涓垚鍔熺殑鏁版嵁
+										// $this.$data.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);
+										// 	return;
+										//   }
+										// });
+										// this.detail2StyleDefList=[];
+										uni.showModal({
+											title: "鎻愮ず",
+											content: "鐮佺洏鎴愬姛",
+											showCancel: false,
+											confirmText: "鍙栨秷"
+										});
+										//  } else if(item.action_type == "refresh"){  //鍒锋柊
+										//    var value = item.value;
+										// //鍒锋柊褰撳墠椤甸潰
+										// // location.reload();
+										// uni.redirectTo({
+										// 	url:'../modal/5600?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
+										// });
+										//  } else if(item.action_type == "prompt"){  //鎵撳紑绯荤粺鎻愮ず寮规
+										//    var value = '';
+										// item.value.forEach(ele=>{
+										// 	if(value) value+='\n';
+										// 	value+=ele;
+										// });
+										// uni.showModal({title:"绯荤粺鎻愮ず",content:value,showCancel:false,confirmText:"鍏抽棴"});
+									}
+									else if(item.action_type == "remove_subtable_page_row"){  //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+										var value = item.value;
+										if(value.page_name == $this.param.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+											//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+											value.row.forEach(row=>{
+												$this.$data.detail1StyleDefList.forEach((ele,index)=>{
+													if(ele.form.objId == row.id){
+													  $this.$data.detail1StyleDefList.splice(index,1); 
+													}
+												});
+											});
+										}
+									} 
+																			
+									else if (item.action_type == "set_subtable_page_row") {
+										$this.viewActionSetRow( item.value)
+										
+									} else if (item.action_type == "set_subtable_page_ext_data") {
+										var value = item.value;
+										if (value.page_name == $this.$data.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].Name) {
+											$this.setData({detail2ExtData:value.ext_data})
+										}
+									}
+									else if (item.action_type == "clear_subpage_rows") {
+										var value = item.value;
+										if (value.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+											$this.setData({detail1StyleDefList:[],detail1ExtData:{}})
+										} 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 ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+									if (type == '1') {
+										$this.sava($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+									} else {
+										$this.sava2($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+									}
+								}
+							}
+						} else {
+							// $this.$data.detail2StyleDefList=[];
+							if (result.info) {
+								uni.showModal({
+									title: "鎻愮ず",
+									content: result.info,
+									showCancel: false,
+									confirmText: "鍙栨秷"
+								});
+							}
+						}
+					}
+				} else {
 					uni.showModal({
-						title: "閿欒8.1",
-						content: "鎵ц鈥滅‘瀹氬悗鈥濅簨浠跺け璐ワ細" + tip,
+						title: "閿欒8",
+						content: res.err_msg,
 						showCancel: false,
 						confirmText: "鍙栨秷"
 					});
+				}
+			}).catch(ex => {
+				var tip = typeof ex == "string" ? ex : ex.errMsg;
+				uni.showModal({
+					title: "閿欒8.1",
+					content: "鎵ц鈥滅‘瀹氬悗鈥濅簨浠跺け璐ワ細" + tip,
+					showCancel: false,
+					confirmText: "鍙栨秷"
 				});
-			},
-
-			cancel(e) { //鍙栨秷
-				uni.navigateBack({
-					delta: 1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
-				});
-			},
+			});
 		},
-	};
+
+		cancel(e) { //鍙栨秷
+			uni.navigateBack({
+				delta: 1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+			});
+		},
+	},
+};
 </script>
\ No newline at end of file

--
Gitblit v1.9.1