From 41e6159cfa12416155adcd6747e48fab28ffc534 Mon Sep 17 00:00:00 2001
From: cyy <cuiqian2004@163.com>
Date: 星期一, 26 八月 2024 22:45:17 +0800
Subject: [PATCH] test

---
 pages/modal/3018_2.vue |  558 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 356 insertions(+), 202 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 34ff757..855ad61 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -60,11 +60,11 @@
 						</view>
 					</uni-forms-item>
 					<!-- 鏍呮牸甯冨眬 -->
-					<uni-row class="demo-uni-row" v-if="item.name=='Layout' && item.show==true">
+					<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
 						<uni-col v-for="(cols,key) in item.setting.colList"
 							:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
-							<uni-forms-item class="head-form" v-if="cols!=null" :label="cols.label +'锛�"
-								:label-width="cols.labelWidth+'px'">
+							<uni-forms-item class="head-form" v-if="cols!=null  && cols.show==true" :label="cols.label +'锛�"
+								:label-width="cols.labelWidth+'px'" >
 								<!-- <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text> -->
 								<span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
 								<view class="input-wrapper"
@@ -130,7 +130,7 @@
 					</a>
 				</view>
 			</view>
-			<button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0">{{title}}</button>
+			<button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0" :class="saving?'btn_disabled':''" :disabled="saving">{{title}}</button>
 			<button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>
 
 		</view>
@@ -197,7 +197,8 @@
 				activity: null,
 				receiver: null,
 				intentFilter: null,
-				content: ''
+				content: '',
+				saving:false
 			};
 		},
 		onNavigationBarButtonTap(e) {
@@ -235,7 +236,8 @@
 
 					}
 				})
-			} else if (e.index == 1) {
+			} 
+			else if (e.index == 1) {
 				//鍒锋柊
 				uni.redirectTo({
 					url: '../modal/3018_2?param=' + JSON.stringify(this.$data.param) +
@@ -311,7 +313,6 @@
 					})
 				}
 
-				console.log(this.$data.param);
 
 			},
 			async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�@@ -320,7 +321,7 @@
 					class_id: class_id,
 					ui_style_id: style_id,
 				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
+				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
 					// console.log(ret);
 					if (ret.err_code == 0) {
 						var styledef = "";
@@ -333,12 +334,13 @@
 								.style_def);
 						}
 						const styledefHead = styledef ? JSON.parse(styledef) : {};
-						
-						styledefHead.form.items.forEach(async (ele) => {
+						for (let i in styledefHead.form.items) {
+							const ele = styledefHead.form.items[i]
 							if (ele.name != "Layout") {
+								ele.show = true
 								if (ele?.useDict) {
 									//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-									await this.DictGetInfo(ele.bind.dict,
+									await $this.DictGetInfo(ele.bind.dict,
 										styledefHead.form.model,
 										ele);
 								}
@@ -351,30 +353,36 @@
 									}
 								}
 							} else {
-								ele.setting.colList.forEach(async (col) => {
-									if (col?.useDict) {
-										//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-										await this.DictGetInfo(col.bind
-											.dict,
-											styledefHead.form
-											.model, col);
-									}
-									if ($this.focusFieldId == "") {
-										if (col.name == 'Input' || col
-											.name ==
-											'InputNumber') {
-											$this.setData({
-												focusFieldId: col
-													.fieldId
-											})
+								for (let j in ele.setting.colList) {
+									const col = ele.setting.colList[j]
+
+									if (col) {
+										col.show = true
+										if (col?.useDict) {
+											//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+											await $this.DictGetInfo(col.bind
+												.dict,
+												styledefHead.form
+												.model, col);
+										}
+										if ($this.focusFieldId == "") {
+											if (col.name == 'Input' || col
+												.name ==
+												'InputNumber') {
+												$this.setData({
+													focusFieldId: col
+														.fieldId
+												})
+											}
 										}
 									}
-								});
+								}
 							}
-						});
-						this.setData({
+						}
+						$this.setData({
 							head_styledef: styledefHead
 						})
+						console.log("head_styledef",this.head_styledef)
 						if ($this.head_styledef.event?.length > 0) {
 							$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
 								if (a.event_id == "initial") {
@@ -408,46 +416,34 @@
 
 			},
 			async DictGetInfo(dict, formModel, formItem) { //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,
-							});
+				try {
+					const res = await this.getDictInfo(dataInfo)
+					var list = [];
+					var itemName = '';
+					res.result.dict_item_list.forEach((item) => {
+						if (item.is_default == '1')
+							itemName = item.name;
+						list.push({
+							text: item.value,
+							value: item.name,
 						});
-						//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
-						if (itemName) {
-							formItem.value = itemName;
-							formModel[formItem.fieldId] = itemName;
-						}
-						formItem.dict = list;
-							// $this.head_styledef.form.items[index].dictitem=success.result;
-							// this.$store.commit("classAttrList", $this.$data.classAttrList);
-						
-
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1.2",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+					});
+					//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+					if (itemName) {
+						formItem.value = itemName;
+						formModel[formItem.fieldId] = itemName;
 					}
-				}).catch(ex => {
+					formItem.dict = list;
+
+					// $this.head_styledef.form.items[index].dictitem=success.result;
+					// this.$store.commit("classAttrList", $this.$data.classAttrList);
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
 						title: this.translateSys("error") + "1.3",
@@ -455,8 +451,68 @@
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
+				}
 			},
+			getDictInfo(info) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�+				const loginInfo = this.$store.getters.loginid
+				const mobxoSApi = this.$store.getters.getMobxoSApi
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
+						data: info,
+						method: 'POST',
+						dataType: "json",
+						success: (_res) => {
+							// console.log(_res);
+							const ret = _res.data
+							if (ret.err_code == 0) {
+								resolve(ret);
+							} else {
+								reject({
+									"errMsg": ret.err_msg
+								});
+							}
+						},
+						fail: (err) => {
+							// console.log(err);
+							reject(err);
+						}
+					})
+
+				})
+
+			},
+			getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+				const loginInfo = this.$store.getters.loginid
+				const dataSApi = this.$store.getters.getDataSApi
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+							.session_id,
+						data: info,
+						method: 'POST',
+						dataType: "json",
+						success: (_res) => {
+							// console.log(_res);
+							const ret = _res.data
+							if (ret.err_code == 0) {
+								resolve(ret);
+							} else {
+								reject({
+									"errMsg": ret.err_msg
+								});
+							}
+						},
+						fail: (err) => {
+							// console.log(err);
+							reject(err);
+						}
+					})
+			
+				})
+			
+			},
+			
 			async loadInitEvent(eventid) {
 				var $this = this;
 				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
@@ -489,13 +545,15 @@
 								});
 							} else uni.showModal({
 								title: this.translateSys("tip"),
-								content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
+								content: tip + ',' + this.translateSys('tip') + ':' + data
+									.ret,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
 							return false
 						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info
+							var tip = data.info ? typeof data.info == 'string' ? data.info : data
+								.info
 								.join(
 									'<br/>') : '';
 							if (tip) uni.showModal({
@@ -534,13 +592,15 @@
 													} else if (attr.name == 'Layout') {
 														attr.setting.colList.forEach(col => {
 															if (col) {
-																if (col.fieldId == result[i]
+																if (col.fieldId == result[
+																		i]
 																	.attr) {
 																	var dictItemList = [];
 																	for (var d in result[i]
 																			.choice_list) {
 																		var val = result[i]
-																			.choice_list[d];
+																			.choice_list[
+																				d];
 																		dictItemList.push({
 																			"CN_S_NAME": val,
 																			"CN_S_VALUE": val,
@@ -548,7 +608,8 @@
 																			"value": val
 																		});
 																	}
-																	col.dict = dictItemList;
+																	col.dict =
+																		dictItemList;
 																}
 															}
 														});
@@ -556,14 +617,17 @@
 
 												}
 											}
-											for (var c = 0; c < $this.$data.head_styledef.form.items
+											for (var c = 0; c < $this.$data.head_styledef.form
+												.items
 												.length; c++) {
 												var attr = $this.$data.head_styledef.form.items[c];
 												// console.log(attr[j].Name+'=='+result[i].attr);
 												//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-												if ($this.head_styledef.form.model[result[i].attr] ==
+												if ($this.head_styledef.form.model[result[i]
+														.attr] ==
 													undefined) {
-													$this.head_styledef.form.model[result[i].attr] =
+													$this.head_styledef.form.model[result[i]
+															.attr] =
 														result[i]
 														.value;
 												}
@@ -574,7 +638,8 @@
 														attr.oldvalue = '';
 														attr.value = result[i].value;
 														attr.oldvalue = result[i].value;
-														$this.head_styledef.form.model[attr.fieldId] =
+														$this.head_styledef.form.model[attr
+																.fieldId] =
 															result[
 																i].value;
 													}
@@ -585,11 +650,15 @@
 																.attr) {
 																col.value = '';
 																col.oldvalue = '';
-																col.value = result[i].value;
-																col.oldvalue = result[i].value;
-																$this.head_styledef.form.model[
+																col.value = result[i]
+																	.value;
+																col.oldvalue = result[i]
+																	.value;
+																$this.head_styledef.form
+																	.model[
 																		col
-																		.fieldId] = result[i]
+																		.fieldId] = result[
+																		i]
 																	.value;
 															}
 														}
@@ -606,9 +675,11 @@
 											if (length == 0) {
 												for (var j = 0; j < $this.$data.refdatastore
 													.length; j++) {
-													if ($this.$data.refdatastore[j].attr == result[i]
+													if ($this.$data.refdatastore[j].attr == result[
+															i]
 														.attr) {
-														$this.$data.refdatastore[j].value = result[i]
+														$this.$data.refdatastore[j].value = result[
+																i]
 															.value;
 													}
 												}
@@ -617,34 +688,36 @@
 									} else if (data.action[i].action_type == 'set_dlg_attr_show') {
 										var result = action.value;
 										result.forEach(async (attr, key) => {
-											$this.$data.head_styledef.form.items.forEach(
-												async (
-													ele, index) => {
-													//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-													if (ele.name != 'Layout') {
-														if (ele.fieldId == attr
-															.attr) {
-															ele.show = attr.show;
-														}
-													} else if (ele.name ==
-														'Layout') {
-														ele.setting.colList
-															.forEach(
-																col => {
-																	if (col) {
-																		if (col
-																			.fieldId ==
-																			attr
-																			.attr
-																		) {
-																			col.show =
+											$this.$data.head_styledef.form.items
+												.forEach(
+													async (
+														ele, index) => {
+														//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+														if (ele.name != 'Layout') {
+															if (ele.fieldId == attr
+																.attr) {
+																ele.show = attr
+																	.show;
+															}
+														} else if (ele.name ==
+															'Layout') {
+															ele.setting.colList
+																.forEach(
+																	col => {
+																		if (col) {
+																			if (col
+																				.fieldId ==
 																				attr
-																				.show;
+																				.attr
+																			) {
+																				col.show =
+																					attr
+																					.show;
+																			}
 																		}
-																	}
-																});
-													}
-												});
+																	});
+														}
+													});
 										});
 										var head_styledef = JSON.parse(JSON.stringify($this.$data
 											.head_styledef));
@@ -657,7 +730,8 @@
 											content: this.translate(
 													'execute_init_event_failed') +
 												this.translateSys("full_stop") +
-												this.translate('reason') + this.translateSys(
+												this.translate('reason') + this
+												.translateSys(
 													"colon") +
 												this.translateSys("quotation_mark_left") +
 												action
@@ -676,7 +750,8 @@
 							title: this.translateSys("error") + "3",
 							content: this.translate('execute_init_event_failed') +
 								this.translateSys("full_stop") +
-								this.translate('reason') + this.translateSys("colon") + success
+								this.translate('reason') + this.translateSys("colon") +
+								success
 								.err_msg,
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
@@ -688,7 +763,8 @@
 						title: this.translateSys("error") + "3.1",
 						content: this.translate('execute_init_event_failed') +
 							this.translateSys("full_stop") +
-							this.translate('reason') + this.translateSys("colon") + ex.errMsg,
+							this.translate('reason') + this.translateSys("colon") + ex
+							.errMsg,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -697,6 +773,7 @@
 
 
 			ontap(item) { //鎵爜鍔熻兘
+					// console.log("ontap",item);
 				// 鎵撳紑钃濈墮閫傞厤鍣� 				// uni.openBluetoothAdapter({
 				//   success: function() {
@@ -744,13 +821,13 @@
 			},
 			onScanValue(item, value) {
 				const $this = this;
-				console.log("onScanValue", item);
+				//console.log("onScanValue", item);
 				if (item.oldvalue != value) {
 					item.oldvalue = value;
 					item.value = value;
-					var attr = value
+					var attr = item.fieldId;
 					$this.head_styledef.form.model[attr] = value;
-					if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�+					/*if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌� 						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
 						var findd = false
 						const items = $this.head_styledef.form.items || []
@@ -758,7 +835,8 @@
 							const ele = items[i]
 
 							if (ele.name != "Layout") {
-								if (ele.name == 'Input' || ele.name == 'InputNumber' || ele.name == 'Textarea') {
+								if (ele.name == 'Input' || ele.name == 'InputNumber' || ele.name ==
+									'Textarea') {
 									if (attr == ele.fieldId) {
 										findd = true
 									} else {
@@ -775,7 +853,8 @@
 							} else {
 								if (findd) {
 									let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-										return (col.name == 'Input' || col.name == 'InputNumber' || col.name ==
+										return (col.name == 'Input' || col.name == 'InputNumber' ||
+											col.name ==
 											'Textarea');
 									})
 									if (curIndex > -1) {
@@ -792,7 +871,8 @@
 									})
 									if (curIndex > -1) {
 										findd = true
-										let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
+										let curIndex2 = ele.setting.colList.findIndex((col, index2,
+											arr) => {
 											return (col.name == 'Input' || col.name ==
 													'InputNumber' || col.name == 'Textarea') &&
 												index2 >
@@ -811,7 +891,7 @@
 							}
 						}
 					}
-
+					*/
 					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠� 					if (eventid) {
 						var obj_attr = this.head_styledef.form.model;
@@ -838,12 +918,12 @@
 				}
 			},
 			onClick(item) {
+				// console.log("onClick",item);
 				this.focusFieldId = item.fieldId
 			},
 			onevent(item) {
-				// console.log(e.target);
-				console.log(item);
-				if (item.oldvalue != item.value) {
+					// console.log("onevent",item);
+				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -874,8 +954,8 @@
 
 			},
 			onchange(item) {
-				console.log(item);
-				if (item.oldvalue != item.value) {
+				// console.log("onchange",item);
+				if (item.oldvalue != item.value&& item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -935,7 +1015,8 @@
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open($this.popupType);
 
-				this.DataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id, item);
+				this.DataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
+					item);
 			},
 			popupChange(e) {
 				console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show);
@@ -1082,7 +1163,8 @@
 					if (success.err_code == 0) {
 						var data = success.result;
 						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info :
+							var tip = data.err_info ? typeof data.err_info == 'string' ? data
+								.err_info :
 								data
 								.err_info.join('<br/>') : '';
 							if (data.ret == 801) {
@@ -1098,13 +1180,15 @@
 								});
 							} else uni.showModal({
 								title: this.translateSys("tip"),
-								content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
+								content: tip + ',' + this.translateSys('tip') + ':' + data
+									.ret,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
 							return false
 						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info
+							var tip = data.info ? typeof data.info == 'string' ? data.info : data
+								.info
 								.join(
 									'<br/>') : '';
 							if (tip) uni.showModal({
@@ -1143,13 +1227,15 @@
 													} else if (attr.name == 'Layout') {
 														attr.setting.colList.forEach(col => {
 															if (col) {
-																if (col.fieldId == result[i]
+																if (col.fieldId == result[
+																		i]
 																	.attr) {
 																	var dictItemList = [];
 																	for (var d in result[i]
 																			.choice_list) {
 																		var val = result[i]
-																			.choice_list[d];
+																			.choice_list[
+																				d];
 																		dictItemList.push({
 																			"CN_S_NAME": val,
 																			"CN_S_VALUE": val,
@@ -1157,7 +1243,8 @@
 																			"value": val
 																		});
 																	}
-																	col.dict = dictItemList;
+																	col.dict =
+																		dictItemList;
 																}
 															}
 														});
@@ -1165,14 +1252,17 @@
 
 												}
 											}
-											for (var c = 0; c < $this.$data.head_styledef.form.items
+											for (var c = 0; c < $this.$data.head_styledef.form
+												.items
 												.length; c++) {
 												var attr = $this.$data.head_styledef.form.items[c];
 												// console.log(attr[j].Name+'=='+result[i].attr);
 												//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-												if ($this.head_styledef.form.model[result[i].attr] ==
+												if ($this.head_styledef.form.model[result[i]
+														.attr] ==
 													undefined) {
-													$this.head_styledef.form.model[result[i].attr] =
+													$this.head_styledef.form.model[result[i]
+															.attr] =
 														result[i]
 														.value;
 												}
@@ -1183,20 +1273,26 @@
 														attr.oldvalue = '';
 														attr.value = result[i].value;
 														attr.oldvalue = result[i].value;
-														$this.head_styledef.form.model[attr.fieldId] =
+														$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) {
+															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;
+																col.value = result[i]
+																	.value;
+																col.oldvalue = result[i]
+																	.value;
+																$this.head_styledef.form
+																	.model[col
+																		.fieldId] = result[
+																		i].value;
 															}
 														}
 													});
@@ -1210,10 +1306,13 @@
 												$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]
+												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]
+														$this.$data.refdatastore[j].value = result[
+																i]
 															.value;
 													}
 												}
@@ -1222,30 +1321,36 @@
 									} else if (action.action_type == 'set_dlg_attr_show') {
 										var result = action.value;
 										result.forEach(async (attr, key) => {
-											$this.$data.head_styledef.form.items.forEach(
-												async (ele,
-													index) => {
-													//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-													if (ele.name != 'Layout') {
-														if (ele.fieldId == attr.attr) {
-															ele.show = attr.show;
+											$this.$data.head_styledef.form.items
+												.forEach(
+													async (ele,
+														index) => {
+														//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+														if (ele.name != 'Layout') {
+															if (ele.fieldId == attr
+																.attr) {
+																ele.show = attr
+																	.show;
+															}
+														} else if (ele.name ==
+															'Layout') {
+															ele.setting.colList
+																.forEach(
+																	col => {
+																		if (col) {
+																			if (col
+																				.fieldId ==
+																				attr
+																				.attr
+																			) {
+																				col.show =
+																					attr
+																					.show;
+																			}
+																		}
+																	});
 														}
-													} else if (ele.name == 'Layout') {
-														ele.setting.colList.forEach(
-															col => {
-																if (col) {
-																	if (col
-																		.fieldId ==
-																		attr
-																		.attr) {
-																		col.show =
-																			attr
-																			.show;
-																	}
-																}
-															});
-													}
-												});
+													});
 										});
 										var head_styledef = JSON.parse(JSON.stringify($this.$data
 											.head_styledef));
@@ -1257,10 +1362,12 @@
 									} else {
 										uni.showModal({
 											title: this.translateSys("tip"),
-											content: this.translateSys("quotation_mark_left") +
+											content: this.translateSys(
+													"quotation_mark_left") +
 												action
 												.action_type + this.translateSys(
-													"quotation_mark_right") + this.translate(
+													"quotation_mark_right") + this
+												.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
 											confirmText: this.translateSys("cancel")
@@ -1276,11 +1383,14 @@
 							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++) {
+									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]
+										if ($this.head_styledef.form.model[result[i].attr] ==
+											undefined) {
+											$this.head_styledef.form.model[result[i].attr] =
+												result[i]
 												.value;
 										}
 										//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�@@ -1290,7 +1400,8 @@
 												attr.oldvalue = '';
 												attr.value = result[i].value;
 												attr.oldvalue = result[i].value;
-												$this.head_styledef.form.model[attr.fieldId] = result[i]
+												$this.head_styledef.form.model[attr.fieldId] =
+													result[i]
 													.value;
 											}
 										} else if (attr.name == 'Layout') {
@@ -1319,8 +1430,10 @@
 									}
 									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;
+											if ($this.$data.refdatastore[j].attr == result[i]
+												.attr) {
+												$this.$data.refdatastore[j].value = result[i]
+													.value;
 											}
 										}
 									}
@@ -1418,7 +1531,8 @@
 					if (success.err_code == 0) {
 						var data = success.result;
 						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info :
+							var tip = data.err_info ? typeof data.err_info == 'string' ? data
+								.err_info :
 								data
 								.err_info.join('<br/>') : '';
 							if (data.ret == 801) {
@@ -1434,13 +1548,15 @@
 								});
 							} else uni.showModal({
 								title: this.translateSys("tip"),
-								content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
+								content: tip + ',' + this.translateSys('tip') + ':' + data
+									.ret,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
 							return false
 						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info
+							var tip = data.info ? typeof data.info == 'string' ? data.info : data
+								.info
 								.join(
 									'<br/>') : '';
 							if (tip) uni.showModal({
@@ -1463,10 +1579,12 @@
 											var d = dialog({
 												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
 													this.translateSys("tip"),
-												content: this.translateSys("quotation_mark_left") +
+												content: this.translateSys(
+														"quotation_mark_left") +
 													action
 													.action_type + this.translateSys(
-														"quotation_mark_right") + this.translate(
+														"quotation_mark_right") + this
+													.translate(
 														"tip_action_unprocessed")
 											});
 											d.show();
@@ -1481,7 +1599,8 @@
 												data_attr: data_attr
 											}
 											uni.navigateTo({
-												url: '../selpsn/index?mulit=false&param=' + JSON
+												url: '../selpsn/index?mulit=false&param=' +
+													JSON
 													.stringify(
 														param),
 												events: {
@@ -1498,14 +1617,16 @@
 															rclsid: '',
 															robjid: '',
 															userlogin: '',
-															clsid: $this.$data.param.DataCls
+															clsid: $this.$data.param
+																.DataCls
 																.id,
 															objid: "",
 															attr: param.req,
 															inputparameter: data,
 															dataJson: [],
 														}
-														$this.DataObjRunCustomEvent(info, param
+														$this.DataObjRunCustomEvent(info,
+															param
 															.data_attr);
 													}
 												}
@@ -1514,10 +1635,12 @@
 											var d = dialog({
 												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
 													this.translateSys("tip"),
-												content: this.translateSys("quotation_mark_left") +
+												content: this.translateSys(
+														"quotation_mark_left") +
 													action
 													.action_type + this.translateSys(
-														"quotation_mark_right") + this.translate(
+														"quotation_mark_right") + this
+													.translate(
 														"tip_action_unprocessed")
 											});
 											d.show();
@@ -1525,7 +1648,8 @@
 											var $this = this;
 											if (val.common_dlg_id == 'check_list') {
 												$this.$data.check_list = val.config;
-												if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+												if (val.config.appear_style ==
+													'sideslip') //鍒ゆ柇鏄惁鏄晶婊� 													$this.$data.popupType = 'right';
 												else
 													$this.$data.popupType = 'center'
@@ -1539,7 +1663,8 @@
 												}
 												$this.$data.popupParam = popupParam;
 											}
-										} else if (action.action_type == 'open_project_query_dlg') {
+										} else if (action.action_type ==
+											'open_project_query_dlg') {
 											//console.log(action.value.select_range);
 											//console.log(action.value.mulit_select);
 											var priRel = '-1';
@@ -1549,7 +1674,8 @@
 												priRel = '1';
 											else if (action.value.select_range == '鎴戝垱寤虹殑')
 												priRel = '2';
-											else if (action.value.select_range == '鎴戝弬涓庣殑' || action.value
+											else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+												.value
 												.select_range == '鎴戝弬鍔犵殑')
 												priRel = '3';
 											else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
@@ -1570,7 +1696,8 @@
 												events: {
 													AddPer(data, param) {
 														var attr = param.item.fieldId;
-														$this.head_styledef.form.model[attr] =
+														$this.head_styledef.form.model[
+																attr] =
 															data[0].ID +
 															';' + data[0].Name;
 
@@ -1587,14 +1714,16 @@
 																rclsid: "",
 																robjid: "",
 																userlogin: "",
-																clsid: $this.$data.param
+																clsid: $this.$data
+																	.param
 																	.DataCls.id,
 																objid: "",
 																attr: param.req,
 																dataJson: [],
 															}
 
-															$this.DataObjRunCustomEvent(info);
+															$this.DataObjRunCustomEvent(
+																info);
 														}
 													}
 												}
@@ -1602,9 +1731,11 @@
 										} else {
 											uni.showModal({
 												title: this.translateSys("tip"),
-												content: this.translateSys("quotation_mark_left") +
+												content: this.translateSys(
+														"quotation_mark_left") +
 													action.action_type + this.translateSys(
-														"quotation_mark_right") + this.translate(
+														"quotation_mark_right") + this
+													.translate(
 														"tip_action_unprocessed"),
 												showCancel: false,
 												confirmText: this.translateSys("cancel")
@@ -1657,7 +1788,8 @@
 					title: this.translateSys("loading"),
 					mask: true
 				});
-				var obj_attr = this.head_styledef.form.model;
+				this.saving = true
+				var obj_attr = this.head_styledef.form.model || [];
 				console.log(obj_attr);
 				// var req = Object.keys(obj_attr).map((a) => ({
 				// 	name: a,
@@ -1710,19 +1842,23 @@
 								if (action.ret != 0) {
 									uni.showModal({
 										title: this.translateSys("tip"),
-										content: this.translate('execute_script_failed') + this
-											.translateSys('comma') + this.translate('result') +
+										content: this.translate('execute_script_failed') +
+											this
+											.translateSys('comma') + this.translate(
+												'result') +
 											this
 											.translateSys('colon') + action.result,
 										showCancel: false,
 										confirmText: this.translateSys("cancel")
 									});
+									this.saving = false
 									return;
 								}
 								if (action.info) {
 									uni.showModal({
 										title: this.translateSys("tip"),
-										content: this.translate('execute_script_failed') + this
+										content: this.translate('execute_script_failed') +
+											this
 											.translateSys('comma') +
 											this.translateSys('colon') + action.info,
 										showCancel: false,
@@ -1749,7 +1885,8 @@
 						if (!this.$data.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this.$data.param) +
+								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+										.param) +
 									"&titlename=" + this.$data.title
 							});
 						}
@@ -1763,8 +1900,10 @@
 							confirmText: this.translateSys("cancel")
 						});
 					}
+					this.saving = false
 				}).catch(ex => {
 					console.log(ex);
+					this.saving = false
 					uni.hideLoading();
 					uni.showModal({
 						title: this.translateSys("tip"),
@@ -1775,6 +1914,7 @@
 				});
 			},
 			afterOK() {
+				this.saving = true
 				var obj_attr = this.head_styledef.form.model;
 				// console.log(obj_attr);
 				var input_param = {
@@ -1809,7 +1949,8 @@
 					if (success.err_code == 0) {
 						var data = success.result;
 						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info :
+							var tip = data.err_info ? typeof data.err_info == 'string' ? data
+								.err_info :
 								data
 								.err_info.join('<br/>') : '';
 							if (data.ret == 801) {
@@ -1825,13 +1966,16 @@
 								});
 							} else uni.showModal({
 								title: this.translateSys("tip"),
-								content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
+								content: tip + ',' + this.translateSys('tip') + ':' + data
+									.ret,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
+							this.saving = false
 							return false
 						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info
+							var tip = data.info ? typeof data.info == 'string' ? data.info : data
+								.info
 								.join(
 									'<br/>') : '';
 							if (tip) uni.showModal({
@@ -1852,8 +1996,10 @@
 							confirmText: this.translateSys("cancel")
 						});
 					}
+					this.saving = false
 				}).catch(ex => {
 					// console.log(ex);
+					this.saving = false
 					uni.showModal({
 						title: this.translateSys('tip') + "7.1",
 						content: ex.errMsg,
@@ -1940,7 +2086,8 @@
 					if (success.err_code == 0) {
 						var data = success.result;
 						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info :
+							var tip = data.err_info ? typeof data.err_info == 'string' ? data
+								.err_info :
 								data
 								.err_info.join('<br/>') : '';
 							if (data.ret == 801) {
@@ -1956,13 +2103,15 @@
 								});
 							} else uni.showModal({
 								title: this.translateSys("tip"),
-								content: tip + ',' + this.translateSys('tip') + ':' + data.ret,
+								content: tip + ',' + this.translateSys('tip') + ':' + data
+									.ret,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
 							return false
 						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info
+							var tip = data.info ? typeof data.info == 'string' ? data.info : data
+								.info
 								.join(
 									'<br/>') : '';
 							if (tip) uni.showModal({
@@ -2003,7 +2152,8 @@
 					cls_name: btn.Cls_Name,
 					Edit_dlg: btn.Edit_dlg
 				};
-				const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg.Name +
+				const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg
+					.Name +
 					"&type=addDataObj"
 				console.log("showAddSmallDialog", url);
 				var $this = this;
@@ -2016,7 +2166,8 @@
 							//鍒锋柊
 							if (!this.$data.param.After_Btn_Not_Refresh) {
 								uni.redirectTo({
-									url: '../modal/3018_2?param=' + JSON.stringify(this.$data.param) +
+									url: '../modal/3018_2?param=' + JSON.stringify(this
+											.$data.param) +
 										"&titlename=" + this.$data.title
 								});
 							}
@@ -2163,7 +2314,10 @@
 				float: left;
 				display: inline-block;
 			}
-
+			.btn_disabled {
+				background-color: #ddd;
+				color: #888;
+			}
 			.btn_cancel {
 				width: 45%;
 				margin: 0 10rpx;

--
Gitblit v1.9.1