From de0f1b7995ee559f19e27ea07da0091d4ae189d5 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 04 十一月 2024 16:39:37 +0800
Subject: [PATCH] 3018

---
 pages/modal/3018_2.vue |  886 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 471 insertions(+), 415 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 234bec1..230a47d 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -8,16 +8,13 @@
 					<uni-forms-item v-if="item.name != 'Layout'&& item.show==true" :label="item.label +'锛� "
 						:label-width="item.labelWidth+'px'">
 						<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> -->
-						<span class="form-item-span" v-if="item.disabled"
-							:style="'width: calc(100% - '+item.labelWidth+'px);'">{{item.value}}</span>
 						<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-						<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+						<uni-data-select id="dv_select" v-if="item.name=='Select'"
 							:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
 							:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
 							@change="onchange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
 						<!-- 鏂囨湰妗�鏁板瓧妗�-->
-						<view class="input-wrapper"
-							v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
+						<view class="input-wrapper" v-if="(item.name=='Input' || item.name=='InputNumber')">
 							<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
 								@change="classAttr_extButton(item)">&#xe568;</text>
 							<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -25,12 +22,12 @@
 								v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder"
 								:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
 								:focus="focusFieldId == item.fieldId" @focus="ontap(item)" @click="onClick(item)"
-								@blur="onevent(item)" />
+								@blur="onevent(item)" :maxlength="-1" />
 							<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
 								@click="classAttr_extButton(item)">&#xe568;</text>
 						</view>
 						<!-- 澶氳鏂囨湰 -->
-						<view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
+						<view class="input-wrapper" v-if="item.name=='Textarea' ">
 							<textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
 								:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
 								@blur="onModelValue(item)" @click="onClick(item)" :data-index="index"
@@ -60,8 +57,7 @@
 							:class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value"
 							@change="onModelValue(item)" />
 						<!-- 鏃ユ湡鏃堕棿 -->
-						<view class="input-wrapper"
-							v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
+						<view class="input-wrapper" v-if="(item.name=='TimePicker' || item.name=='DatePicker')">
 							<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
 								:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
 								<view class="picker">{{item.value}}</view>
@@ -74,10 +70,7 @@
 							:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
 							<uni-forms-item 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"
-									v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
+								<view class="input-wrapper" v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
 									<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
 										@change="onchange(cols)">&#xe568;</text>
 									<input class="uni-input" :class="cols.disabled?'input-disabled':''"
@@ -85,17 +78,17 @@
 										v-model="cols.value" :disabled="cols.disabled" :placeholder="cols.placeholder"
 										:style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix || cols.setting.suffix?'87%':'96%'}"
 										:focus="focusFieldId == cols.fieldId" @focus="ontap(cols)"
-										@click="onClick(cols)" @blur="onevent(cols)" />
+										@click="onClick(cols)" @blur="onevent(cols)" :maxlength="-1" />
 									<text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]"
 										@click="onchange(cols)">&#xe568;</text>
 								</view>
 								<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
-								<uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled"
+								<uni-data-select id="dv_select" v-if="cols.name=='Select' "
 									:class="cols.disabled?'input-disabled':''" v-model="cols.value"
 									:localdata="cols.dict" @change="onchange(cols)" :disabled="cols.disabled"
 									:clear="false"></uni-data-select>
 								<!-- 澶氳鏂囨湰 -->
-								<view class="input-wrapper" v-if="cols.name=='Textarea' && !cols.disabled">
+								<view class="input-wrapper" v-if="cols.name=='Textarea' ">
 									<textarea class="uni-input" :value="cols.value"
 										:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
 										:focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)"
@@ -148,9 +141,10 @@
 					</a>
 				</view>
 			</view>
-			<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>
+			<button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0 && btnName != ''"
+				:class="saving?'btn_disabled':''" :disabled="saving">{{btnName}}</button>
+			<button type="default" @tap="cancel"
+				:class="(dropdownBtns.length> 0 || btnName != '')?'btn_cancel':'btn_cancel2'">{{translateSys('cancel')}}</button>
 
 		</view>
 		<!-- 鏅�寮圭獥 top bottom center left right -->
@@ -201,6 +195,7 @@
 		data() {
 			return {
 				title: this.translateSys('add2'),
+				btnName: "",
 				param: {},
 				edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
 				edit_ok_event: "", //寮圭獥鐐瑰嚮OK 瑙﹀彂浜嬩欢ID
@@ -244,7 +239,7 @@
 										$this.onScanValue(ele, res.result)
 										break;
 									}
-								} else if (ele.name == "Layot") {
+								} else if (ele.name == "Layout") {
 									let curIndex = (ele.setting.colList || []).findIndex((col, index2,
 										arr) => {
 										return (col.name == 'Input' || col.name == 'InputNumber' || col
@@ -303,6 +298,7 @@
 			this.$data.param = JSON.parse(options.param);
 			this.$data.title = this.$data.param.Add_BtnName ? this.$data.param.Add_BtnName : options
 				.titlename; //璁剧疆鎸夐挳鏂囧瓧
+			this.$data.btnName = this.$data.param.Add_BtnName || ""
 			this.loadData(options.paramValue)
 		},
 		computed: {
@@ -472,10 +468,10 @@
 					var itemName = '';
 					(res.dict_item_list || []).forEach((item) => {
 						if (item.is_default == '1')
-							itemName = item.name;
+							itemName = item.name
 						list.push({
-							text: item.name,
-							value: item.id,
+							text: item.value ? item.value : item.name,
+							value: item.name,
 						});
 					});
 					//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
@@ -486,12 +482,19 @@
 					formItem.dict = list;
 				} catch (ex) {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+
 					uni.showModal({
 						title: this.translateSys("error") + "1.3",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
+
+
 				}
 			},
 
@@ -549,160 +552,32 @@
 								var action = actionlist[i];
 								if (action.action_type == 'set_dlg_attr') {
 									var result = action.value;
-									for (var i = 0; i < result.length; i++) {
-										if (result[i].choice_list) {
-											for (var c = 0; c < $this.head_styledef.form.items
-												.length; c++) {
-												var attr = $this.head_styledef.form.items[c];
-												if (attr.name != 'Layout') {
-													if (attr.fieldId == result[i].attr) {
-														var dictItemList = [];
-														for (var d in result[i].choice_list) {
-															var val = result[i].choice_list[d];
-															dictItemList.push({
-																"CN_S_NAME": val,
-																"CN_S_VALUE": val,
-																"text": val,
-																"value": val
-															});
-														}
-														attr.dict = dictItemList;
-													}
-												} else if (attr.name == 'Layout') {
-													attr.setting.colList.forEach(col => {
-														if (col) {
-															if (col.fieldId == result[
-																	i]
-																.attr) {
-																var dictItemList = [];
-																for (var d in result[i]
-																		.choice_list) {
-																	var val = result[i]
-																		.choice_list[
-																			d];
-																	dictItemList.push({
-																		"CN_S_NAME": val,
-																		"CN_S_VALUE": val,
-																		"text": val,
-																		"value": val
-																	});
-																}
-																col.dict =
-																	dictItemList;
-															}
-														}
-													});
-												}
-
-											}
-										}
-										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] ==
-												undefined) {
-												$this.head_styledef.form.model[result[i]
-														.attr] =
-													result[i]
-													.value;
-											}
-											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-											if (attr.name != 'Layout') {
-												if (attr.fieldId == result[i].attr) {
-													attr.value = '';
-													attr.oldvalue = '';
-													attr.value = result[i].value;
-													attr.oldvalue = result[i].value;
-													$this.head_styledef.form.model[attr
-															.fieldId] =
-														result[
-															i].value;
-												}
-											} else if (attr.name == 'Layout') {
-												attr.setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == result[i]
-															.attr) {
-															col.value = '';
-															col.oldvalue = '';
-															col.value = result[i]
-																.value;
-															col.oldvalue = result[i]
-																.value;
-															$this.head_styledef.form
-																.model[
-																	col
-																	.fieldId] = result[
-																	i]
-																.value;
-														}
-													}
-												});
-											}
-										}
-										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
-												return result[i].attr == s.attr
-											}).length) {
-											length = 1;
-											$this.$data.refdatastore.push(result[i]);
-										}
-										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore
-												.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[
-														i]
-													.attr) {
-													$this.$data.refdatastore[j].value = result[
-															i]
-														.value;
-												}
-											}
-										}
-									}
-								} else if (data.action[i].action_type == 'set_dlg_attr_show') {
+									$this.setFormValues(result)
+								} 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;
-														}
-													} 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));
-									$this.$data.head_styledef = [];
-									$this.$data.head_styledef = head_styledef;
+									$this.hideFormItems(result)
 									// console.log($this.$data.head_styledef);
+								} else if (action.action_type ==
+									"set_dlg_current_edit_attr"
+								) {
+									if ($this
+										.focusOldFieldId ==
+										action.value) {
+										$this.setData({
+											focusFieldId: ""
+										})
+									} else {
+										$this.setData({
+											focusFieldId: $this
+												.focusOldFieldId
+										})
+									}
+									$this.$nextTick(() => {
+										$this.setData({
+											focusFieldId: action
+												.value
+										})
+									});
 								} else {
 									uni.showModal({
 										title: this.translateSys("tip"),
@@ -969,16 +844,15 @@
 					});
 					return;
 				}
-
-				var fieldId = $this.$data.popupParam.item.fieldId;
-				$this.head_styledef.form.model[attr] = name;
-				for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
-					var attr = $this.$data.head_styledef.form.items[c];
-					if (attr.fieldId == fieldId) {
-						attr.value = name;
-					}
+				if (data.length == 0) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content: this.translate("tip_no_select_data"),
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return;
 				}
-				console.log(data);
 				var callback_eventid = $this.$data.popupParam.button_callback.trim();
 				var info = {
 					eventid: callback_eventid,
@@ -1039,7 +913,7 @@
 					info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
 				var dataInfo = {
@@ -1107,160 +981,34 @@
 								var action = actionlist[i];
 								if (action.action_type == 'set_dlg_attr') {
 									var result = action.value;
-									for (var i = 0; i < result.length; i++) {
-										if (result[i].choice_list) {
-											for (var c = 0; c < $this.head_styledef.form.items
-												.length; c++) {
-												var attr = $this.head_styledef.form.items[c];
-												if (attr.name != 'Layout') {
-													if (attr.fieldId == result[i].attr) {
-														var dictItemList = [];
-														for (var d in result[i].choice_list) {
-															var val = result[i].choice_list[d];
-															dictItemList.push({
-																"CN_S_NAME": val,
-																"CN_S_VALUE": val,
-																"text": val,
-																"value": val
-															});
-														}
-														attr.dict = dictItemList;
-													}
-												} else if (attr.name == 'Layout') {
-													attr.setting.colList.forEach(col => {
-														if (col) {
-															if (col.fieldId == result[
-																	i]
-																.attr) {
-																var dictItemList = [];
-																for (var d in result[i]
-																		.choice_list) {
-																	var val = result[i]
-																		.choice_list[
-																			d];
-																	dictItemList.push({
-																		"CN_S_NAME": val,
-																		"CN_S_VALUE": val,
-																		"text": val,
-																		"value": val
-																	});
-																}
-																col.dict =
-																	dictItemList;
-															}
-														}
-													});
-												}
-
-											}
-										}
-										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] ==
-												undefined) {
-												$this.head_styledef.form.model[result[i]
-														.attr] =
-													result[i]
-													.value;
-											}
-											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-											if (attr.name != 'Layout') {
-												if (attr.fieldId == result[i].attr) {
-													attr.value = '';
-													attr.oldvalue = '';
-													attr.value = result[i].value;
-													attr.oldvalue = result[i].value;
-													$this.head_styledef.form.model[attr
-															.fieldId] =
-														result[i]
-														.value;
-												}
-											} else if (attr.name == 'Layout') {
-												attr.setting.colList.forEach(col => {
-													if (col) {
-														if (col.fieldId == result[i]
-															.attr) {
-															col.value = '';
-															col.oldvalue = '';
-															col.value = result[i]
-																.value;
-															col.oldvalue = result[i]
-																.value;
-															$this.head_styledef.form
-																.model[col
-																	.fieldId] = result[
-																	i].value;
-														}
-													}
-												});
-											}
-										}
-										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
-												return result[i].attr == s.attr
-											}).length) {
-											length = 1;
-											$this.$data.refdatastore.push(result[i]);
-										}
-										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore
-												.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[
-														i]
-													.attr) {
-													$this.$data.refdatastore[j].value = result[
-															i]
-														.value;
-												}
-											}
-										}
-									}
+									$this.setFormValues(result)
 								} 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;
-														}
-													} 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));
-									$this.$data.head_styledef = [];
-									$this.$data.head_styledef = head_styledef;
+									$this.hideFormItems(result)
 									// console.log($this.$data.head_styledef);
 								} else if (action.action_type == 'set_global_attr') {
 									$this.$data.global_attr = action.value || [];
+								} else if (action.action_type ==
+									"set_dlg_current_edit_attr"
+								) {
+									if ($this
+										.focusOldFieldId ==
+										action.value) {
+										$this.setData({
+											focusFieldId: ""
+										})
+									} else {
+										$this.setData({
+											focusFieldId: $this
+												.focusOldFieldId
+										})
+									}
+									$this.$nextTick(() => {
+										$this.setData({
+											focusFieldId: action
+												.value
+										})
+									});
 								} else {
 									uni.showModal({
 										title: this.translateSys("tip"),
@@ -1370,7 +1118,7 @@
 					}
 				};
 				var obj_attr = $this.head_styledef.form.model;
-				 console.log(obj_attr);
+				console.log(obj_attr);
 				var req = Object.keys(obj_attr).map((a) => ({
 					attr: a,
 					value: obj_attr[a] || "",
@@ -1387,7 +1135,7 @@
 						}
 					}
 				}
-			
+
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
 					type: 'small', //灏忕獥鍙�@@ -1396,8 +1144,8 @@
 				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
-				req.forEach(item => {
-					obj_attr[item.attr] = item.value;
+				req.forEach(item2 => {
+					obj_attr[item2.attr] = item2.value;
 				});
 				let input_param = Base64.encode(
 					JSON.stringify(
@@ -1426,7 +1174,7 @@
 					compose_info: '',
 					ext_info: extinfo,
 					global_attr: global_attr,
-					input_param:input_param,
+					input_param: input_param,
 				};
 				console.log(dataInfo);
 				// return;
@@ -1545,13 +1293,19 @@
 										});
 										d.show();
 									} else if (action.action_type == 'open_common_dlg') {
-		
+
 										if (val.common_dlg_id == 'check_list') {
-											$this.setData({check_list:val.config})
+											$this.setData({
+												check_list: val.config
+											})
 											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-												$this.setData({popupType:"right"})
+												$this.setData({
+													popupType: "right"
+												})
 											else
-											$this.setData({popupType:"center"})
+												$this.setData({
+													popupType: "center"
+												})
 											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 											$this.$refs.popup.open($this.popupType);
 											var popupParam = {
@@ -1560,7 +1314,9 @@
 												req: req,
 												data_attr: data_attr
 											}
-											$this.setData({popupParam:popupParam})
+											$this.setData({
+												popupParam: popupParam
+											})
 										}
 									} else if (action.action_type == 'open_project_query_dlg') {
 										//console.log(action.value.select_range);
@@ -1677,6 +1433,7 @@
 
 			},
 			add() {
+				const $this = this
 				uni.showLoading({
 					title: this.translateSys("loading"),
 					mask: true
@@ -1722,81 +1479,280 @@
 				};
 				console.log(dataInfo);
 				// return
-				dataObjCreate(dataInfo).then(result => {
+				dataObjCreate(dataInfo).then(res => {
 					uni.hideLoading();
-					if (result.action) {
-						var action = JSON.parse(result.action);
-						console.log(action);
-						if (action.ret == '0') {
-							if (action.ret != 0) {
-								uni.showModal({
-									title: this.translateSys("tip"),
-									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;
+					let data = res.lua_result
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
 							}
-							if (action.info) {
-								uni.showModal({
-									title: this.translateSys("tip"),
-									content: this.translate('execute_script_failed') +
-										this
-										.translateSys('comma') +
-										this.translateSys('colon') + action.info,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
-								return;
-							}
-							if (action.result_type == '0') {
-								uni.showToast({
-									title: action.result,
-									icon: "success",
-									duration: 3000
-								});
-							}
+							uni.showModal({
+								title: this.translateSys("tip"),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys("cancel")
+							});
+						} else uni.showModal({
+							title: this.translateSys("tip"),
+							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
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys("cancel")
+						});
+						else {
 
-							// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+							uni.showToast({
+								title: this.translate('create_success'),
+								icon: "success",
+								duration: 3000
+							});
 						}
-					} else
-						uni.showToast({
-							title: this.translate('create_success'),
-							icon: "success",
-							duration: 3000
-						});
-					if (!this.$data.param.After_Btn_Not_Refresh) {
-						//鍒锋柊
-						uni.redirectTo({
-							url: '../modal/3018_2?param=' + JSON.stringify(this.$data
-									.param) +
-								"&titlename=" + this.$data.title
-						});
-					}
 
+
+						if (!this.$data.param.After_Btn_Not_Refresh) {
+							//鍒锋柊
+							uni.redirectTo({
+								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+										.param) +
+									"&titlename=" + this.$data.title
+							});
+						} else {
+							var actionlist = data.action;
+							if (actionlist) {
+								console.log(actionlist);
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										$this.setFormValues(action.value)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.hideFormItems(result)
+									} else if (action.action_type ==
+										"set_dlg_current_edit_attr"
+									) {
+										if ($this
+											.focusOldFieldId ==
+											action.value) {
+											$this.setData({
+												focusFieldId: ""
+											})
+										} else {
+											$this.setData({
+												focusFieldId: $this
+													.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: action
+													.value
+											})
+										});
+									}
+								}
+							}
+
+						}
+					}
 					// this.class_attr_init();
 
 					this.saving = false
 				}).catch(ex => {
-					console.log(ex);
 					this.saving = false
+
 					uni.hideLoading();
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("tip"),
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
 				});
 			},
+			setFormValues(data) {
+				const $this = this
+				for (var i = 0; i < data.length; i++) {
+					if (data[i].choice_list) {
+						for (var c = 0; c < $this.head_styledef.form.items
+							.length; c++) {
+							var attr = $this.head_styledef.form.items[c];
+							if (attr.name != 'Layout') {
+								if (attr.fieldId == data[i].attr) {
+									var dictItemList = [];
+									for (var d in data[i].choice_list) {
+										var val = data[i].choice_list[d];
+										dictItemList.push({
+											"CN_S_NAME": val,
+											"CN_S_VALUE": val,
+											"text": val,
+											"value": val
+										});
+									}
+									attr.dict = dictItemList;
+								}
+							} else if (attr.name == 'Layout') {
+								attr.setting.colList.forEach(col => {
+									if (col) {
+										if (col.fieldId == data[
+												i]
+											.attr) {
+											var dictItemList = [];
+											for (var d in data[i]
+													.choice_list) {
+												var val = data[i]
+													.choice_list[
+														d];
+												dictItemList.push({
+													"CN_S_NAME": val,
+													"CN_S_VALUE": val,
+													"text": val,
+													"value": val
+												});
+											}
+											col.dict =
+												dictItemList;
+										}
+									}
+								});
+							}
+
+						}
+					}
+					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+'=='+data[i].attr);
+						//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+						if ($this.head_styledef.form.model[data[i]
+								.attr] ==
+							undefined) {
+							$this.head_styledef.form.model[data[i]
+									.attr] =
+								data[i]
+								.value;
+						}
+						//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+						if (attr.name != 'Layout') {
+							if (attr.fieldId == data[i].attr) {
+								attr.value = '';
+								attr.oldvalue = '';
+								attr.value = data[i].value;
+								attr.oldvalue = data[i].value;
+								$this.head_styledef.form.model[attr
+										.fieldId] =
+									data[
+										i].value;
+							}
+						} else if (attr.name == 'Layout') {
+							attr.setting.colList.forEach(col => {
+								if (col) {
+									if (col.fieldId == data[i]
+										.attr) {
+										col.value = '';
+										col.oldvalue = '';
+										col.value = data[i]
+											.value;
+										col.oldvalue = data[i]
+											.value;
+										$this.head_styledef.form
+											.model[
+												col
+												.fieldId] = data[
+												i]
+											.value;
+									}
+								}
+							});
+						}
+					}
+					var length = 0;
+					if (!$this.$data.refdatastore.filter(function(s) {
+							return data[i].attr == s.attr
+						}).length) {
+						length = 1;
+						$this.$data.refdatastore.push(data[i]);
+					}
+					if (length == 0) {
+						for (var j = 0; j < $this.$data.refdatastore
+							.length; j++) {
+							if ($this.$data.refdatastore[j].attr == data[
+									i]
+								.attr) {
+								$this.$data.refdatastore[j].value = data[
+										i]
+									.value;
+							}
+						}
+					}
+				}
+
+			},
+			hideFormItems(data) {
+				const $this = this
+				data.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 =
+															attr
+															.show;
+													}
+												}
+											});
+								}
+							});
+				});
+				var head_styledef = JSON.parse(JSON.stringify($this.$data
+					.head_styledef));
+				$this.$data.head_styledef = [];
+				$this.$data.head_styledef = head_styledef;
+			},
 			afterOK() {
 				this.saving = true
+				const $this = this
 				var obj_attr = this.head_styledef.form.model;
 				// console.log(obj_attr);
 				var input_param = {
@@ -1822,7 +1778,7 @@
 					user_login: '',
 					data_json: '',
 					compose_info: '',
-					input_param: '',
+					input_param: Base64.encode(JSON.stringify(input_param)),
 				};
 				console.log(dataInfo);
 				// return;
@@ -1864,18 +1820,63 @@
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
 						});
+						if (!this.$data.param.After_Btn_Not_Refresh) {
+							//鍒锋柊
+							uni.redirectTo({
+								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+										.param) +
+									"&titlename=" + this.$data.title
+							});
+						} else {
+							var actionlist = data.action;
+							if (actionlist) {
+								console.log(actionlist);
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										$this.setFormValues(action.value)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.hideFormItems(result)
+									} else if (action.action_type ==
+										"set_dlg_current_edit_attr"
+									) {
+										if ($this
+											.focusOldFieldId ==
+											action.value) {
+											$this.setData({
+												focusFieldId: ""
+											})
+										} else {
+											$this.setData({
+												focusFieldId: $this
+													.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: action
+													.value
+											})
+										});
+									}
 
-						var result = data.result;
-
+								}
+							}
+						}
 					}
 
 					this.saving = false
 				}).catch(ex => {
 					// console.log(ex);
 					this.saving = false
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys('tip') + "7.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -1925,6 +1926,7 @@
 				}
 			},
 			onTriggerEvent(btn, enviroment) {
+				const $this = this
 				var obj_attr = this.head_styledef.form.model;
 				// console.log(obj_attr);
 				var input_param = {
@@ -1990,16 +1992,61 @@
 							showCancel: false,
 							confirmText: this.translateSys("cancel")
 						});
+						if (!this.$data.param.After_Btn_Not_Refresh) {
+							//鍒锋柊
+							uni.redirectTo({
+								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+										.param) +
+									"&titlename=" + this.$data.title
+							});
+						} else {
+							var actionlist = data.action;
+							if (actionlist) {
+								console.log(actionlist);
+								for (var i = 0; i < actionlist.length; i++) {
+									var action = actionlist[i];
+									if (action.action_type == 'set_dlg_attr') {
+										$this.setFormValues(action.value)
+									} else if (action.action_type == 'set_dlg_attr_show') {
+										var result = action.value;
+										$this.hideFormItems(result)
+									} else if (action.action_type ==
+										"set_dlg_current_edit_attr"
+									) {
+										if ($this
+											.focusOldFieldId ==
+											action.value) {
+											$this.setData({
+												focusFieldId: ""
+											})
+										} else {
+											$this.setData({
+												focusFieldId: $this
+													.focusOldFieldId
+											})
+										}
+										$this.$nextTick(() => {
+											$this.setData({
+												focusFieldId: action
+													.value
+											})
+										});
+									}
 
-						var result = data.result;
-
+								}
+							}
+						}
 					}
 
 				}).catch(ex => {
 					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys('tip') + "7.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -2018,7 +2065,6 @@
 				const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg
 					.Name +
 					"&type=addDataObj"
-				console.log("showAddSmallDialog", url);
 				var $this = this;
 				uni.navigateTo({
 					url: url,
@@ -2027,13 +2073,12 @@
 						addDataObj: function(resData) {
 							console.log(resData);
 							//鍒锋柊
-							if (!this.$data.param.After_Btn_Not_Refresh) {
-								uni.redirectTo({
-									url: '../modal/3018_2?param=' + JSON.stringify(this
-											.$data.param) +
-										"&titlename=" + this.$data.title
-								});
-							}
+							uni.redirectTo({
+								url: '../modal/3018_2?param=' + JSON.stringify(this
+										.$data.param) +
+									"&titlename=" + this.$data.title
+							});
+
 						},
 					}
 				});
@@ -2194,6 +2239,17 @@
 				display: inline-block;
 			}
 
+			.btn_cancel2 {
+				width: 90%;
+				margin: 0 10rpx;
+				background: #fff;
+				border: none;
+				color: #000;
+				font-size: 38rpx;
+				float: right;
+				display: inline-block;
+			}
+
 			.uni-padding-wrap {
 				margin: 2rpx 0 0 10rpx;
 				background-color: #98DAEA;

--
Gitblit v1.9.1