From d84283821bb08d81d887f20a7118caf25b8b2714 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期二, 27 八月 2024 18:29:10 +0800
Subject: [PATCH] 判断接口返回值是否是字符串，然后解析

---
 pages/modal/3018_2.vue    |  330 +++++-
 pages/modal/3200_view.vue |   34 
 pages/modal/5602.vue      |  372 ++++---
 pages/modal/5601.vue      |  428 +++++---
 pages/modal/3037_2.vue    |   80 +
 store/index.js            |  542 +++++++++++
 pages/modal/3200.vue      |  469 ++++++----
 manifest.json             |    4 
 pages/modal/5600.vue      |  420 +++++---
 9 files changed, 1,844 insertions(+), 835 deletions(-)

diff --git a/manifest.json b/manifest.json
index 1ed9c79..c89b7b5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "MoboxPDA",
     "appid" : "__UNI__56D451E",
     "description" : "",
-    "versionName" : "1.1.16",
-    "versionCode" : 1116,
+    "versionName" : "1.1.18",
+    "versionCode" : 1118,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 855ad61..380f3db 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -5,8 +5,8 @@
 			<uni-forms ref="baseForm" label-align="right">
 				<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
 					<!-- 鏅�甯冨眬 -->
-					<uni-forms-item class="head-form" v-if="item.name != 'Layout'&& item.show==true"
-						:label="item.label +'锛� " :label-width="item.labelWidth+'px'">
+					<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>
@@ -63,8 +63,8 @@
 					<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  && cols.show==true" :label="cols.label +'锛�"
-								:label-width="cols.labelWidth+'px'" >
+							<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"
@@ -130,7 +130,8 @@
 					</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="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>
@@ -198,7 +199,7 @@
 				receiver: null,
 				intentFilter: null,
 				content: '',
-				saving:false
+				saving: false
 			};
 		},
 		onNavigationBarButtonTap(e) {
@@ -236,13 +237,41 @@
 
 					}
 				})
-			} 
-			else if (e.index == 1) {
+			} else if (e.index == 1) {
 				//鍒锋柊
-				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.param) +
+				// 		"&titlename=" + this.title
+				// });
+				this.setData({
+					edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
+					edit_ok_event: "", //寮圭獥鐐瑰嚮OK 瑙﹀彂浜嬩欢ID
+					edit_select_compose_event: "", //閫夋嫨缁勬垚瀵硅薄鏃惰皟鐢�+					edit_compose_cls_id: "",
+					global_attr: [],
+					refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
+					scanCodeVal: "",
+					subClassAttrList: [],
+					subPanelList: [],
+					subClassGridStyle: [],
+					popupType: "center",
+					check_list: {},
+
+					focusFieldId: "",
+					focusOldFieldId: "",
+					head_styledef: {
+						form: {
+							items: []
+						}
+					},
+					after_ok: {},
+					activity: null,
+					receiver: null,
+					intentFilter: null,
+					content: '',
+					saving: false
+				})
+				this.loadData()
 			}
 		},
 		onLoad(options) {
@@ -321,25 +350,32 @@
 					class_id: class_id,
 					ui_style_id: style_id,
 				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (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);
-						}
-						const styledefHead = styledef ? JSON.parse(styledef) : {};
+				try {
+					var textProgress = `Head_UIStyleGetInfo start ${class_id}_${style_id}\n`
+					const ret = await this.getUIStyleInfo(dataInfo)
+					textProgress += `err_code:${ret.err_code}\n`
+					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);
+					}
+					textProgress += `styledef2:${styledef}\n`
+
+					const styledefHead = styledef ? JSON.parse(styledef) : {};
+					if (styledefHead?.form?.items) {
 						for (let i in styledefHead.form.items) {
 							const ele = styledefHead.form.items[i]
+							textProgress += `form.items${i}:${ele.name}\n`
 							if (ele.name != "Layout") {
+
 								ele.show = true
 								if (ele?.useDict) {
 									//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									textProgress += `Dict:${ele.bind.dict.name}\n`
 									await $this.DictGetInfo(ele.bind.dict,
 										styledefHead.form.model,
 										ele);
@@ -347,6 +383,7 @@
 								if ($this.focusFieldId == "") {
 									if (ele.name == 'Input' || ele.name ==
 										'InputNumber') {
+										textProgress += `focusFieldId=${ele.fieldId}\n`
 										$this.setData({
 											focusFieldId: ele.fieldId
 										})
@@ -355,11 +392,12 @@
 							} else {
 								for (let j in ele.setting.colList) {
 									const col = ele.setting.colList[j]
-
+									textProgress += `col${j}:${col?.name || ''}\n`
 									if (col) {
 										col.show = true
 										if (col?.useDict) {
 											//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+											textProgress += `Dict:${col.bind.dict.name}\n`
 											await $this.DictGetInfo(col.bind
 												.dict,
 												styledefHead.form
@@ -369,6 +407,7 @@
 											if (col.name == 'Input' || col
 												.name ==
 												'InputNumber') {
+												textProgress += `focusFieldId=${col.fieldId}\n`
 												$this.setData({
 													focusFieldId: col
 														.fieldId
@@ -379,44 +418,157 @@
 								}
 							}
 						}
-						$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") {
-									await $this.loadInitEvent(a.scrip_id);
-								} else if (a.event_id == 'after_ok') {
-									$this.after_ok = {
-										id: a.scrip_id,
-										name: a.scrip_name
-									};
-								}
-							});
-						}
 
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
+					}
+					textProgress += `head_styledef value\n`
+					$this.setData({
+						head_styledef: styledefHead
+					})
+					textProgress += `event:${this.head_styledef.event?.length || 0}\n`
+					if ($this.head_styledef.event) {
+						$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
+							if (a.event_id == "initial") {
+								await $this.loadInitEvent(a.scrip_id);
+							} else if (a.event_id == 'after_ok') {
+								$this.after_ok = {
+									id: a.scrip_id,
+									name: a.scrip_name
+								};
+							}
 						});
 					}
-				}).catch(ex => {
+					textProgress += `end`
+				} catch (ex) {
 					// console.log(ex);
+					console.log(textProgress);
+					console.log(JSON.stringify(ex), 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.1",
-						content: ex.errMsg,
+						content: tip + '\n' + textProgress,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
+				}
+
+				// this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
+				// 	// console.log("ret",ret);
+				// 	textProgress += `err_code:${ret.err_code}\n`
+				// 	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);
+				// 		}
+				// 		textProgress += `styledef2:${styledef}\n`
+
+				// 		const styledefHead = styledef ? JSON.parse(styledef) : {};
+				// 		for (let i in styledefHead.form.items) {
+				// 			const ele = styledefHead.form.items[i]
+				// 			textProgress += `form.items${i}:${ele.name}\n`
+				// 			if (ele.name != "Layout") {
+
+				// 				ele.show = true
+				// 				if (ele?.useDict) {
+				// 					//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+				// 					textProgress += `Dict:${ele.bind.dict.name}\n`
+				// 					await $this.DictGetInfo(ele.bind.dict,
+				// 						styledefHead.form.model,
+				// 						ele);
+				// 				}
+				// 				if ($this.focusFieldId == "") {
+				// 					if (ele.name == 'Input' || ele.name ==
+				// 						'InputNumber') {
+				// 						textProgress += `focusFieldId=${ele.fieldId}\n`
+				// 						$this.setData({
+				// 							focusFieldId: ele.fieldId
+				// 						})
+				// 					}
+				// 				}
+				// 			} else {
+				// 				for (let j in ele.setting.colList) {
+				// 					const col = ele.setting.colList[j]
+				// 					textProgress += `col${j}:${col?.name || ''}\n`
+				// 					if (col) {
+				// 						col.show = true
+				// 						if (col?.useDict) {
+				// 							//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+				// 							textProgress += `Dict:${col.bind.dict.name}\n`
+				// 							await $this.DictGetInfo(col.bind
+				// 								.dict,
+				// 								styledefHead.form
+				// 								.model, col);
+				// 						}
+				// 						if ($this.focusFieldId == "") {
+				// 							if (col.name == 'Input' || col
+				// 								.name ==
+				// 								'InputNumber') {
+				// 								textProgress += `focusFieldId=${col.fieldId}\n`
+				// 								$this.setData({
+				// 									focusFieldId: col
+				// 										.fieldId
+				// 								})
+				// 							}
+				// 						}
+				// 					}
+				// 				}
+				// 			}
+				// 		}
+				// 		textProgress += `head_styledef value\n`
+				// 		$this.setData({
+				// 			head_styledef: styledefHead
+				// 		})
+				// 		textProgress += `event:${this.head_styledef.event?.length || 0}\n`
+				// 		if ($this.head_styledef.event) {
+				// 			$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
+				// 				if (a.event_id == "initial") {
+				// 					await $this.loadInitEvent(a.scrip_id);
+				// 				} else if (a.event_id == 'after_ok') {
+				// 					$this.after_ok = {
+				// 						id: a.scrip_id,
+				// 						name: a.scrip_name
+				// 					};
+				// 				}
+				// 			});
+				// 		}
+				// 		textProgress += `end`
+				// 	} else {
+				// 		textProgress += `err_msg:${ret.err_msg}\n`
+				// 		uni.showModal({
+				// 			title: this.translateSys("error") + "1",
+				// 			content: tip + '\n' + textProgress,
+				// 			showCancel: false,
+				// 			confirmText: this.translateSys("cancel")
+				// 		});
+				// 	}
+				// }).catch(ex => {
+				// 	console.log(textProgress);
+				// 	console.log(JSON.stringify(ex), ex);
+				// 	let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
+				// 	uni.showModal({
+				// 		title: this.translateSys("error") + "1.1",
+				// 		content: tip + '\n' + textProgress,
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// 	// console.log(ex);
+				// 	// uni.showModal({
+				// 	// 	title: this.translateSys("error") + "1.1",
+				// 	// 	content: ex.errMsg,
+				// 	// 	showCancel: false,
+				// 	// 	confirmText: this.translateSys("cancel")
+				// 	// });
+				// });
 
 			},
 			async DictGetInfo(dict, formModel, formItem) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�-
 				var $this = this;
 				var dataInfo = {
 					dict_id: dict.id,
@@ -464,7 +616,24 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etDictInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
@@ -494,12 +663,29 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
 								reject({
-									"errMsg": ret.err_msg
+									"errMsg": ret.err_msg || ret.errMsg
 								});
 							}
 						},
@@ -508,11 +694,11 @@
 							reject(err);
 						}
 					})
-			
+
 				})
-			
+
 			},
-			
+
 			async loadInitEvent(eventid) {
 				var $this = this;
 				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
@@ -773,7 +959,7 @@
 
 
 			ontap(item) { //鎵爜鍔熻兘
-					// console.log("ontap",item);
+				// console.log("ontap",item);
 				// 鎵撳紑钃濈墮閫傞厤鍣� 				// uni.openBluetoothAdapter({
 				//   success: function() {
@@ -922,7 +1108,7 @@
 				this.focusFieldId = item.fieldId
 			},
 			onevent(item) {
-					// console.log("onevent",item);
+				// console.log("onevent",item);
 				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
@@ -955,7 +1141,7 @@
 			},
 			onchange(item) {
 				// console.log("onchange",item);
-				if (item.oldvalue != item.value&& item.value.trim() != "") {
+				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -2218,20 +2404,20 @@
 			width: 98%;
 		}
 
-		.v-headStyle .head-form {
+		.uni-forms-item {
 			// border: 0.5px solid red;
 			margin-bottom: 11rpx;
 		}
 
-		.v-headStyle .form-item-span {
-			// border: 0.5px solid red;
-			padding: 7rpx 0;
-			color: #2d8cf0;
-			white-space: normal;
-			word-break: break-all;
-			display: inline-block;
-			// width: calc(100% - 100px);
-		}
+		// .v-headStyle .form-item-span {
+		// 	// border: 0.5px solid red;
+		// 	padding: 7rpx 0;
+		// 	color: #2d8cf0;
+		// 	white-space: normal;
+		// 	word-break: break-all;
+		// 	display: inline-block;
+		// 	// width: calc(100% - 100px);
+		// }
 
 		.input-wrapper {
 			border: 1px solid #d5d5d5;
@@ -2314,10 +2500,12 @@
 				float: left;
 				display: inline-block;
 			}
+
 			.btn_disabled {
 				background-color: #ddd;
 				color: #888;
 			}
+
 			.btn_cancel {
 				width: 45%;
 				margin: 0 10rpx;
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index e6f824c..ad6c857 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -323,6 +323,7 @@
 				//浼犲叆鍙傛暟鍊� 				if (paramValue) {
 					const attrs = paramValue.attrs || [];
+
 					(this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
 						if (ele.name != "Layout") {
 							attrs.forEach(async (ele2, index2) => {
@@ -366,13 +367,14 @@
 						}
 						$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
 						// console.log($this.$data.head_styledef);
-						$this.head_styledef.form.items.forEach(async (ele, index) => {
-							ele.show = true;
-							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-								await this.DictGetInfo(ele.bind.dict, index, 'mast');
-							}
-						});
-
+						if ($this.head_styledef.form?.items) {
+							$this.head_styledef.form.items.forEach(async (ele, index) => {
+								ele.show = true;
+								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									await this.DictGetInfo(ele.bind.dict, index, 'mast');
+								}
+							});
+						}
 						if ($this.head_styledef.event?.length > 0) {
 							$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
 								if (a.event_id == "initial") {
@@ -418,11 +420,13 @@
 						}
 						$this.$data.detail1_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
 						$this.$data.detail1_styledef.SelBut_Checked = true;
-						$this.detail1_styledef.form.items.forEach(async (ele, index) => {
-							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-								await this.DictGetInfo(ele.bind.dict, index, 'sub');
-							}
-						});
+						if ($this.detail1_styledef.form?.items) {
+							$this.detail1_styledef.form.items.forEach(async (ele, index) => {
+								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									await this.DictGetInfo(ele.bind.dict, index, 'sub');
+								}
+							});
+						}
 						if ($this.detail1_styledef.event?.length > 0) {
 							$detail1_styledefforEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
 								if (a.event_id == "initial") {
@@ -513,7 +517,32 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etDictInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
+							if (ret.err_code == 0) {
+								resolve(ret);
+							} else {
+								reject({
+									"errMsg": ret.err_msg
+								});
+							}
+
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
@@ -531,7 +560,7 @@
 				})
 
 			},
-getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+			getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮� 				const loginInfo = this.$store.getters.loginid
 				const dataSApi = this.$store.getters.getDataSApi
 				return new Promise((resolve, reject) => {
@@ -543,12 +572,29 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
 								reject({
-									"errMsg": ret.err_msg
+									"errMsg": ret.err_msg || ret.errMsg
 								});
 							}
 						},
@@ -1978,7 +2024,7 @@
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
-							this.saving =false
+							this.saving = false
 							return false
 						} else {
 							var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index d794f70..71ac1bf 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -22,164 +22,172 @@
 				</view>
 			</view>
 
-			<scroll-view :scroll-top="scrollTop" :scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower"
-				@scroll="scroll">
-				<view class="view-content" id="tabpanel">
-					<view class="dv-panel dv-panel-bkcolor" v-for="(style,ii) in detail1StyleDefList"
-						@click="onPanelClick(ii)" :id="'panel'+style.form.htmlobjId"
-						:class="activelist[ii].active==true?'bk-active':''">
-						<div class="dv-panel-button" v-if="param.ListPage.CheckBox==true">
-							<checkbox-group>
-								<label>
-									<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
-								</label>
-							</checkbox-group>
-						</div>
-						<!-- HTML椤甸潰绫诲瀷鏄剧ず -->
-						<div class="dv-listHtml-Panel" v-if="ListHtml_Panel" v-html="ListHtml_Panel[ii]" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
-				  param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
-				  param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
-
-						</div>
-						<div class="dv-panel-input" v-if="!ListHtml_Panel" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
-				  param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
-				  param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
-							<div v-for="(item,index) in style.form.items">
-								<!-- 鏅�甯冨眬 -->
-								<view v-if="item.name!='Layout'">
-									<text class="txt_title"
-										:style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
-									<span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
-									<!-- 鏂囨湰妗�鏁板瓧妗�-->
-									<view class="dv_input"
-										v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
-										<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
-											@change="onChange(item)">&#xe568;</text>
-										<input class="uni-input" :class="item.disabled?'input-disabled':''"
-											:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
-											v-model="item.value" :disabled="item.disabled"
-											:placeholder="item.placeholder"
-											:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
-											:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
-										<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
-											@click="onChange(item)">&#xe568;</text>
-									</view>
-									<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-									<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
-										: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=='Textarea' && !item.disabled">
-										<textarea class="uni-input" :value="item.value"
-											:class="item.disabled?'input-disabled':''" :placeholder="item.placeholder"
-											@blur="onModelValue(item)" style="height:60px;" :style="{'width':'96%'}"
-											:disabled="item.disabled"></textarea>
-									</view>
-									<!-- 澶嶉�妗�-->
-									<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
-										:class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
-										:data-ischeck="item.value" :disabled="item.disabled"
-										:style="{'margin-left':'10rpx'}">
-										<label>
-											<checkbox :value="item.value" :checked="item.value" />
-											<text>{{item.label}}</text>
-										</label>
-									</checkbox-group>
-									<!-- Switch寮�叧 -->
-									<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
-										:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
-										:style="{'margin-left':'10rpx'}" />
-									<!-- 鏃ユ湡鏃堕棿 -->
-									<view class="input-wrapper"
-										v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
-										<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>
-										</picker>
-									</view>
-								</view>
-								<!-- 鏍呮牸甯冨眬 -->
-								<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">
-										<view v-if="cols!=null">
-											<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="dv_input"
-												v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
-												<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':''"
-													:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
-													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="focusMateria" @focus="ontap(cols)" @blur="onevent(cols)" />
-												<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"
-												: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">
-												<textarea class="uni-input" :value="cols.value"
-													:class="cols.disabled?'input-disabled':''"
-													:placeholder="cols.placeholder" @blur="onModelValue(cols)"
-													style="height:60px;" :style="{'width':'96%'}"
-													:disabled="cols.disabled"></textarea>
-											</view>
-											<!-- 澶嶉�妗�-->
-											<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
-												:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
-												@change="onModelValue(cols)" :data-ischeck="cols.value"
-												:style="{'margin-left':'10rpx'}">
-												<label>
-													<checkbox :value="cols.value" :checked="cols.value" />
-													<text>{{cols.label}}</text>
-												</label>
-											</checkbox-group>
-											<!-- Switch寮�叧 -->
-											<switch v-if="cols.name=='Switch'"
-												:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
-												v-model="cols.value" @change="onModelValue(cols)"
-												:style="{'margin-left':'10rpx'}" />
-											<!-- 鏃ユ湡鏃堕棿 -->
-											<view class="input-wrapper"
-												v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled">
-												<picker mode="date" class="date_iput"
-													:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
-													:value="cols.value" @change="onModelValue(cols)">
-													<view class="picker">{{cols.value}}</view>
-												</picker>
-											</view>
-
-										</view>
-									</uni-col>
-								</uni-row>
+			<view class="v-scroll-view">
+				<scroll-view :scroll-top="scrollTop" :scroll-y="true" class="scroll-y" @scrolltolower="scrolltolower"
+					@scroll="scroll">
+					<view class="view-content" id="tabpanel">
+						<view class="dv-panel dv-panel-bkcolor" v-for="(style,ii) in detail1StyleDefList" :key="ii"
+							@click="onPanelClick(ii)" :id="'panel'+style.form.htmlobjId"
+							:class="activeItem == style?'bk-active':''">
+							<div class="dv-panel-button" v-if="param.ListPage.CheckBox==true">
+								<checkbox-group>
+									<label>
+										<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
+									</label>
+								</checkbox-group>
 							</div>
-						</div>
-						<div class="dv-panel-button" v-if="param.ListPage.Click_View==true">
-							<a @click="onViewPageClick(style)"><i class="mobox-normal-right-arrow" /></a>
-						</div>
-						<div class="dv-panel-buticon" v-if="param.ListPage.ListItem_Button">
-							<view class="btn-padding" v-for="(btn,key) in param.ListPage.ListItem_Button">
-								<a @click="onBtnClick(btn,style)" :title="btn.ShowName" v-if="btn.Style=='img'">
-									<i :class="btn.Img" />
-								</a>
-								<button type="default" @click="onBtnClick(btn,style)" class="btn-padding"
-									v-else-if="btn.Style=='text'">{{btn.ShowName}}</button>
-							</view>
-						</div>
+							<!-- HTML椤甸潰绫诲瀷鏄剧ず -->
+							<div class="dv-listHtml-Panel" v-if="ListHtml_Panel" v-html="ListHtml_Panel[ii]" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
+				  param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
+				  param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
+
+							</div>
+							<div class="dv-panel-input" v-if="!ListHtml_Panel" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
+				  param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
+				  param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
+								<div v-for="(item,index) in style.form.items">
+									<!-- 鏅�甯冨眬 -->
+									<view v-if="item.name!='Layout'">
+										<text class="txt_title"
+											:style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
+										<span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
+										<!-- 鏂囨湰妗�鏁板瓧妗�-->
+										<view class="dv_input"
+											v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
+											<text v-if="item.setting.prefix" class="uni-icon"
+												:class="[item.setting.prefix]" @change="onChange(item)">&#xe568;</text>
+											<input class="uni-input" :class="item.disabled?'input-disabled':''"
+												:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
+												v-model="item.value" :disabled="item.disabled"
+												:placeholder="item.placeholder"
+												:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
+												:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
+											<text v-if="item.setting.suffix" class="uni-icon"
+												:class="[item.setting.suffix]" @click="onChange(item)">&#xe568;</text>
+										</view>
+										<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
+										<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+											: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=='Textarea' && !item.disabled">
+											<textarea class="uni-input" :value="item.value"
+												:class="item.disabled?'input-disabled':''"
+												:placeholder="item.placeholder" @blur="onModelValue(item)"
+												style="height:60px;" :style="{'width':'96%'}"
+												:disabled="item.disabled"></textarea>
+										</view>
+										<!-- 澶嶉�妗�-->
+										<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
+											:class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
+											:data-ischeck="item.value" :disabled="item.disabled"
+											:style="{'margin-left':'10rpx'}">
+											<label>
+												<checkbox :value="item.value" :checked="item.value" />
+												<text>{{item.label}}</text>
+											</label>
+										</checkbox-group>
+										<!-- Switch寮�叧 -->
+										<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
+											:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
+											:style="{'margin-left':'10rpx'}" />
+										<!-- 鏃ユ湡鏃堕棿 -->
+										<view class="input-wrapper"
+											v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
+											<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>
+											</picker>
+										</view>
+									</view>
+									<!-- 鏍呮牸甯冨眬 -->
+									<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">
+											<view v-if="cols!=null">
+												<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="dv_input"
+													v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
+													<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':''"
+														:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
+														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="focusMateria" @focus="ontap(cols)"
+														@blur="onevent(cols)" />
+													<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"
+													: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">
+													<textarea class="uni-input" :value="cols.value"
+														:class="cols.disabled?'input-disabled':''"
+														:placeholder="cols.placeholder" @blur="onModelValue(cols)"
+														style="height:60px;" :style="{'width':'96%'}"
+														:disabled="cols.disabled"></textarea>
+												</view>
+												<!-- 澶嶉�妗�-->
+												<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
+													:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
+													@change="onModelValue(cols)" :data-ischeck="cols.value"
+													:style="{'margin-left':'10rpx'}">
+													<label>
+														<checkbox :value="cols.value" :checked="cols.value" />
+														<text>{{cols.label}}</text>
+													</label>
+												</checkbox-group>
+												<!-- Switch寮�叧 -->
+												<switch v-if="cols.name=='Switch'"
+													:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
+													v-model="cols.value" @change="onModelValue(cols)"
+													:style="{'margin-left':'10rpx'}" />
+												<!-- 鏃ユ湡鏃堕棿 -->
+												<view class="input-wrapper"
+													v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled">
+													<picker mode="date" class="date_iput"
+														:class="cols.disabled?'input-disabled':''"
+														:disabled="item.disabled" :value="cols.value"
+														@change="onModelValue(cols)">
+														<view class="picker">{{cols.value}}</view>
+													</picker>
+												</view>
+
+											</view>
+										</uni-col>
+									</uni-row>
+								</div>
+							</div>
+							<div class="dv-panel-button" v-if="param.ListPage.Click_View==true">
+								<a @click="onViewPageClick(style)"><i class="mobox-normal-right-arrow" /></a>
+							</div>
+							<div class="dv-panel-buticon" v-if="param.ListPage.ListItem_Button">
+								<view class="btn-padding" v-for="(btn,key) in param.ListPage.ListItem_Button">
+									<a @click="onBtnClick(btn,style)" :title="btn.ShowName" v-if="btn.Style=='img'">
+										<i :class="btn.Img" />
+									</a>
+									<button type="default" @click="onBtnClick(btn,style)" class="btn-padding"
+										v-else-if="btn.Style=='text'">{{btn.ShowName}}</button>
+								</view>
+							</div>
+						</view>
 					</view>
-				</view>
-			</scroll-view>
+				</scroll-view>
+			</view>
 		</view>
 
 		<view class="view-floor">
@@ -238,11 +246,10 @@
 				},
 				detail1_styledef: {},
 				detail1StyleDefList: [],
-				detail2_styledef: {},
-				detail2StyleDefList: [],
 				items: [],
 				active_id: '',
-				activelist: [],
+				//activelist: [],
+				activeItem: {},
 				where: '',
 				wheres: '',
 				orderby: '',
@@ -283,8 +290,6 @@
 			};
 			this.detail1_styledef = {};
 			this.detail1StyleDefList = [];
-			this.detail2_styledef = {};
-			this.detail2StyleDefList = [];
 			this.ListHtml_Panel = "";
 			this.ListPageHtml_Show = {
 				name: "",
@@ -295,7 +300,8 @@
 			};
 			this.items = [];
 			this.active_id = '';
-			this.activelist = [];
+			this.activeItem = {};
+			//this.activelist = [];
 
 			if (this.param.ListPage.ListItem_UIDef?.ui_type == "HTML椤甸潰") {
 				// HTML椤甸潰
@@ -445,12 +451,15 @@
 						$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.head_styledef.form.items.forEach(async (ele, index) => {
-							console.log(ele.useDict);
-							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-								await this.DictGetInfo(ele.bind.dict, index, 'mast');
-							}
-						});
+						if ($this.head_styledef.form?.items) {
+							$this.head_styledef.form.items.forEach(async (ele, index) => {
+								console.log(ele.useDict);
+								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									await this.DictGetInfo(ele.bind.dict, index, 'mast');
+								}
+							});
+
+						}
 
 					} else {
 						uni.showModal({
@@ -611,7 +620,32 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etDictInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
+							if (ret.err_code == 0) {
+								resolve(ret);
+							} else {
+								reject({
+									"errMsg": ret.err_msg
+								});
+							}
+
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
@@ -629,7 +663,7 @@
 				})
 
 			},
-getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+			getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮� 				const loginInfo = this.$store.getters.loginid
 				const dataSApi = this.$store.getters.getDataSApi
 				return new Promise((resolve, reject) => {
@@ -641,12 +675,29 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
 								reject({
-									"errMsg": ret.err_msg
+									"errMsg": ret.err_msg || ret.errMsg
 								});
 							}
 						},
@@ -722,7 +773,6 @@
 
 										});
 									} else {
-										// this.detail2StyleDefList=[];
 										if (result.info) {
 											uni.showModal({
 												title: this.translateSys("tip"),
@@ -801,6 +851,7 @@
 								if (ret.result.page_count > 1) $this.query_id = ret.result.query_id;
 								// console.log($this.ListPageHtml_Show.event);
 								if ($this.ListPageHtml_Show.event.id) {
+									const detail1StyleDefList = $this.detail1StyleDefList
 									ret.result.obj_list.forEach((obj) => {
 										var info = {
 											id: obj.id,
@@ -817,12 +868,17 @@
 											.replace('{', '').replace('}', '') : 'null';
 										detailStyle.form.objId = obj.id;
 										detailStyle.form.attrs = obj.attr_list;
-										$this.detail1StyleDefList.push(detailStyle);
-										$this.activelist.push({
-											active: false
-										});
+										detail1StyleDefList.push(detailStyle);
+										// $this.activelist.push({
+										// 	active: false
+										// });
 									});
 									// console.log(this.detail1StyleDefList);
+
+									$this.setData({
+										detail1StyleDefList: detail1StyleDefList
+									})
+
 									var jsonlist = [];
 									$this.detail1StyleDefList.forEach(attr => {
 										jsonlist.push({
@@ -848,6 +904,7 @@
 									});
 								} else {
 									// $this.detail1StyleDefList=[];
+									const detail1StyleDefList = []
 									ret.result.obj_list.forEach((obj) => {
 										var styleStr = JSON.stringify($this.detail1_styledef);
 										var detailStyle = JSON.parse(styleStr);
@@ -878,12 +935,15 @@
 											.replace('{', '').replace('}', '') : 'null';
 										detailStyle.form.objId = obj.id;
 										detailStyle.form.attrs = obj.attr_list;
-										$this.detail1StyleDefList.push(detailStyle);
-										$this.activelist.push({
-											active: false
-										});
+										detail1StyleDefList.push(detailStyle);
+										// $this.activelist.push({
+										// 	active: false
+										// });
 										//list.push(info);
 									});
+									$this.setData({
+										detail1StyleDefList: detail1StyleDefList
+									})
 								}
 
 								// 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�@@ -1176,8 +1236,7 @@
 
 					if (!this.ListPageHtml_Show.event.id) {
 						//鍒ゆ柇娌℃湁HTML椤甸潰浜嬩欢
-						// console.log(this.detail2_styledef);
-						this.detail2_styledef.form.items.forEach(async (ele, index) => {
+						this.head_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.name != "Layout") {
 								if (!obj_attr[ele.fieldId]) {
 									obj_attr[ele.fieldId] = ele.value;
@@ -1568,7 +1627,6 @@
 											}
 										});
 									} else {
-										// this.detail2StyleDefList=[];
 										if (result.info) {
 											uni.showModal({
 												title: this.translateSys("tip"),
@@ -1615,10 +1673,13 @@
 			//鐐逛腑琛ㄥ崟
 			onPanelClick(value) { //鐐瑰嚮闈㈡澘楂樹寒鏄剧ず
 				// console.log(value);
-				this.activelist.forEach(ele => {
-					ele.active = false;
-				});
-				this.activelist[value].active = true;
+				this.setData({
+					activeItem: this.detail1StyleDefList[value]
+				})
+				// this.activelist.forEach(ele => {
+				// 	ele.active = false;
+				// });
+				// this.activelist[value].active = true;
 			},
 
 			//浜嬩欢澶勭悊
@@ -1721,7 +1782,6 @@
 										}
 									});
 								} else {
-									// this.detail2StyleDefList=[];
 									if (result.info) {
 										uni.showModal({
 											title: this.translateSys("tip"),
@@ -1981,8 +2041,13 @@
 		},
 	};
 </script>
-<style lang="scss">
+<style lang="less">
 	.uni-page-modal-3200 {
+		display: flex;
+		flex-direction: column;
+		height: calc(100vh - 30rpx);
+		padding: 15rpx 0;
+
 		.v-headStyle:first-child {
 			margin-top: 15rpx;
 		}
@@ -2050,13 +2115,21 @@
 		}
 
 		.v-content {
-			height: 945rpx;
-			overflow: hide;
+			flex: 1;
+			display: flex;
+			width: 100%;
+			flex-direction: column;
+			min-height: 100px;
+			overflow: hidden;
 			/* border:0.1px solid red; */
 		}
 
 		.view-content {
+			width: 100%;
+			display: flex;
 			margin-top: 10rpx;
+			flex-direction: column;
+
 		}
 
 		.dv-panel-bkcolor {
@@ -2169,7 +2242,8 @@
 		}
 
 		.view-floor {
-			padding: 0 20rpx;
+			width: calc(100% - 20rpx);
+			padding: 10rpx;
 			/* border:1px solid red; */
 		}
 
@@ -2279,7 +2353,14 @@
 			border-radius: 10rpx;
 		}
 
-		.scroll-Y {
+		.v-scroll-view {
+			flex: 1;
+			overflow: hidden;
+			width: 98%;
+		}
+
+		.scroll-y {
+			width: 100%;
 			height: 100%;
 		}
 
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index 5b6b485..224ea62 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -267,24 +267,26 @@
 						$this.$data.detail2_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
 						$this.$data.detail2_styledef.SelBut_Checked = false;
 						// console.log($this.$data.detail2_styledef);
-						$this.styleDef.form.attrs.forEach((attr) => {
-							// info[attr.name]=attr.value;
-							$this.detail2_styledef.form.items.forEach(async (ele, index) => {
-								if (ele.name != 'Layout') {
-									if (ele.fieldId == attr.name) {
-										ele.value = attr.value;
-									}
-								} else if (ele.name == 'Layout') {
-									ele.setting.colList.forEach(async (col, key) => {
-										if (col) {
-											if (col.fieldId == attr.name) {
-												col.value = attr.value;
-											}
+						if ($this.detail2_styledef.form?.items) {
+							$this.styleDef.form.attrs.forEach((attr) => {
+								// info[attr.name]=attr.value;
+								$this.detail2_styledef.form.items.forEach(async (ele, index) => {
+									if (ele.name != 'Layout') {
+										if (ele.fieldId == attr.name) {
+											ele.value = attr.value;
 										}
-									});
-								}
+									} else if (ele.name == 'Layout') {
+										ele.setting.colList.forEach(async (col, key) => {
+											if (col) {
+												if (col.fieldId == attr.name) {
+													col.value = attr.value;
+												}
+											}
+										});
+									}
+								});
 							});
-						});
+						}
 						setTimeout(function() {
 							var detail2_styledef = JSON.parse(JSON.stringify($this.detail2_styledef));
 							$this.detail2_styledef = [];
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index df1fcee..0f9b763 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -11,7 +11,8 @@
 				<uni-data-picker class="dv_select" v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
 					v-model="item.value" :localdata="item.dict" @change="onEnterChange(item)" :readonly="item.disabled"
 					:clear-icon="false" :popup-title="item.label"></uni-data-picker>
-				<view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
+				<view class="input-wrapper" :style="{'width':`calc(96% - ${item.labelWidth}px)`}"
+					v-if="item.name=='Input' || item.name=='InputNumber'">
 					<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
 						@click="onEnterChange(item)">&#xe568;</text>
 					<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -336,19 +337,21 @@
 						$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 (ele.name == 'Input' || ele.name == 'InputNumber') {
-									$this.setData({
-										focusFieldId: ele.fieldId
-									})
+						if ($this.$data.head_styledef.form?.items) {
+							$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 (ele.name == 'Input' || ele.name == 'InputNumber') {
+										$this.setData({
+											focusFieldId: ele.fieldId
+										})
+									}
+								}
 
-						});
+							});
+						}
 					} else {
 						uni.showModal({
 							title: this.translateSys("error") + "1",
@@ -359,9 +362,10 @@
 					}
 				}).catch(ex => {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "1.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -392,11 +396,13 @@
 						// 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');
-							}
-						});
+						if ($this.detail1_styledef.form?.items) {
+							$this.detail1_styledef.form.items.forEach(async (ele, index) => {
+								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									await this.DictGetInfo(ele.bind.dict, index, 'sub');
+								}
+							});
+						}
 					} else {
 						uni.showModal({
 							title: this.translateSys("error") + "2",
@@ -407,9 +413,10 @@
 					}
 				}).catch(ex => {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "2.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -447,9 +454,10 @@
 					}
 				}).catch(ex => {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "3.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -525,7 +533,32 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+								if (typeof ret == 'string') {
+									try {
+										try {
+											try {
+												ret = JSON.parse(ret.replace(/\\"/g, '"'));
+											} catch (ex) {
+												ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+											}
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+												'<br>').replace(/[\t]/g, '    '));
+										}
+									} catch (ex) {
+										console.log(ret)
+										return reject('灏唃etDictInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+									}
+								}
+								if (ret.err_code == 0) {
+									resolve(ret);
+								} else {
+									reject({
+										"errMsg": ret.err_msg
+									});
+								}
+							
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
@@ -555,12 +588,29 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
 								reject({
-									"errMsg": ret.err_msg
+									"errMsg": ret.err_msg || ret.errMsg
 								});
 							}
 						},
@@ -819,7 +869,7 @@
 							input_param: input_param,
 						};
 						this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
-							// console.log(ret);
+							console.log(ret);
 							if (ret.err_code == 0) {
 								var result = ret.result;
 								if (result.ret != 0) {
@@ -1042,6 +1092,7 @@
 												});
 											}
 										});
+										console.log("end")
 									} else {
 										// this.detail2StyleDefList=[];
 										if (result.info) {
@@ -1065,9 +1116,10 @@
 							}
 						}).catch(ex => {
 							// console.log(ex);
+							let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 							uni.showModal({
 								title: this.translateSys("error") + "4.1",
-								content: ex.errMsg,
+								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
@@ -1160,48 +1212,53 @@
 				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 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;
-									}
-								});
-							}
-						});
-					});
+				}
+				data.row.forEach(row => {
 
-					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鏄惁鏄凡鍒嗘嫞
+					var detailStyle = JSON.parse(styleStr);
+					if (detailStyle.form) {
+						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 {
-							this.$data.detail1StyleDefList.push(detailStyle);
-							this.activelist.push({
-								active: false
-							});
-							// console.log(this.$data.detail1StyleDefList);
+							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);
+							}
 						}
 					}
 				});
@@ -1217,94 +1274,105 @@
 				if (JSON.stringify(data.content) == '{}') {
 					return;
 				}
+				var styleStr = JSON.stringify($this.$data.detail2_styledef);
+				if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄爜鐩樹腑
+					styleStr = JSON.stringify($this.$data.detail1_styledef); //鐮佺洏涓�+				}
 				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 (detailStyle.form) {
+						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); //寰呭垎鎷� 							}
-						});
-					});
-					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;
-								}
+							$this.activelist.push({
+								active: false
 							});
-							if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+							// console.log($this.$data.detail1StyleDefList);
 						} 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;
-													}
-												});
-											}
+							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); //宸插垎鎷�+										isflag = false;
+									}
+								});
+								if (isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+							} else {
+								$this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+							}
+
+							//console.log($this.$data.detail2StyleDefList);
 						}
-						// console.log($this.$data.detail2StyleDefList);
 					}
 				});
 
@@ -1383,9 +1451,10 @@
 								}
 							}).catch(ex => {
 								// console.log(ex);
+								let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 								uni.showModal({
 									title: this.translateSys("error") + "5.1",
-									content: ex.errMsg,
+									content: tip,
 									showCancel: false,
 									confirmText: this.translateSys("cancel")
 								});
@@ -1582,21 +1651,21 @@
 			},
 			sava(event) {
 				var $this = this;
-				if (this.$data.detail1StyleDefList.length == 0) {
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate(
-								"tip_no_data_first") +
-							this.translateSys(
-								"quotation_mark_left") + this.param.Sub_Page[0].Name + this.translateSys(
-								"quotation_mark_right") +
-							this.translate(
-								"tip_no_data_last"),
-						showCancel: false,
-						confirmText: this.translateSys("cancel")
-					});
-					return false;
-				}
+				// if (this.$data.detail1StyleDefList.length == 0) {
+				// 	uni.showModal({
+				// 		title: this.translateSys("tip"),
+				// 		content: this.translate(
+				// 				"tip_no_data_first") +
+				// 			this.translateSys(
+				// 				"quotation_mark_left") + this.param.Sub_Page[0].Name + this.translateSys(
+				// 				"quotation_mark_right") +
+				// 			this.translate(
+				// 				"tip_no_data_last"),
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// 	return false;
+				// }
 				this.okLoading = true
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
@@ -1663,16 +1732,16 @@
 					});
 				});
 				const list = []
-				if (jsonlist.length == 0) {
-					//this.okLoading = false
-					uni.showModal({
-						title: this.translateSys("tip"),
-						content: this.translate("tip_no_select_data"),
-						showCancel: false,
-						confirmText: this.translateSys("cancel")
-					});
-					return;
-				}
+				// if (jsonlist.length == 0) {
+				// 	//this.okLoading = false
+				// 	uni.showModal({
+				// 		title: this.translateSys("tip"),
+				// 		content: this.translate("tip_no_select_data"),
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// 	return;
+				// }
 				list.push({
 					page_name: $this.param.Sub_Page[0].Name,
 					item_list: jsonlist,
@@ -2008,7 +2077,9 @@
 					else if (type == "2")
 						this.ok2Loading = false
 				}).catch(ex => {
-					var tip = typeof ex == "string" ? ex : ex.errMsg;
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
+
+					// var tip = typeof ex == "string" ? ex : ex.errMsg;
 					if (type == "1")
 						this.okLoading = false
 					else if (type == "2")
@@ -2058,6 +2129,7 @@
 
 		.v-headStyle {
 			width: 100%;
+			margin-bottom: 11rpx;
 		}
 
 		.view-content {
@@ -2103,22 +2175,24 @@
 		}
 
 		.v-headStyle .txt_title {
-			font-size: 34rpx;
+			font-size: 14px;
 			text-align: right;
 			display: inline-block;
-			vertical-align: 12px;
+			// align-items: center;
+			color: #606266;
+			padding: 0 5px 0 0;
+			vertical-align: 10px;
 		}
 
 		.v-headStyle input {
 			display: inline-block;
 			width: 85%;
-			height: 52rpx;
-			line-height: 34rpx;
+			line-height: 14px;
 			background: #FFF;
 			border-radius: 0 !important;
 			color: #2d8cf0;
-			padding: 10rpx 8rpx 12rpx;
-			font-size: 34rpx;
+			padding: 12rpx 8rpx;
+			font-size: 14px;
 			font-family: inherit;
 			box-shadow: none !important;
 			transition-duration: 0.1s;
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 503c7dc..50ace94 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -296,25 +296,24 @@
 				}
 			},
 			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(async (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);
-						}
-						const styledefHead = styledef ? JSON.parse(styledef) : {};
-
+				try {
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					const ret = await this.getUIStyleInfo(dataInfo)
+					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);
+					}
+					const styledefHead = styledef ? JSON.parse(styledef) : {};
+					if (styledefHead?.form?.items) {
 						for (let i in styledefHead.form.items) {
 							const ele = styledefHead.form.items[i]
 							if (ele.name != "Layout") {
@@ -355,26 +354,95 @@
 								}
 							}
 						}
-						this.setData({
-							head_styledef: styledefHead
-						})
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+
 					}
-				}).catch(ex => {
+					this.setData({
+						head_styledef: styledefHead
+					})
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
-						title: this.translateSys("error") + "1.1",
+						title: this.translateSys("error") + "1",
 						content: ex.errMsg,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
-				});
+					return {}
+				}
+				// this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (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);
+				// 		}
+				// 		const styledefHead = styledef ? JSON.parse(styledef) : {};
+
+				// 		for (let i in styledefHead.form.items) {
+				// 			const ele = styledefHead.form.items[i]
+				// 			if (ele.name != "Layout") {
+				// 				if (ele?.useDict) {
+				// 					//鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+				// 					await this.DictGetInfo(ele.bind.dict,
+				// 						styledefHead.form.model,
+				// 						ele);
+				// 				}
+				// 				if ($this.focusFieldId == "") {
+				// 					if (ele.name == 'Input' || ele.name ==
+				// 						'InputNumber') {
+				// 						$this.setData({
+				// 							focusFieldId: ele.fieldId
+				// 						})
+				// 					}
+				// 				}
+				// 			} else {
+				// 				for (let j in ele.setting.colList) {
+				// 					const col = ele.setting.colList[j]
+				// 					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({
+				// 			head_styledef: styledefHead
+				// 		})
+				// 	} else {
+				// 		uni.showModal({
+				// 			title: this.translateSys("error") + "1",
+				// 			content: ret.err_msg,
+				// 			showCancel: false,
+				// 			confirmText: this.translateSys("cancel")
+				// 		});
+				// 	}
+				// }).catch(ex => {
+				// 	// console.log(ex);
+				// 	uni.showModal({
+				// 		title: this.translateSys("error") + "1.1",
+				// 		content: ex.errMsg,
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// });
 
 			},
 			async Detail_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�@@ -398,26 +466,29 @@
 					const detailstyledef = ret.result.style_def ? JSON.parse(
 						styledef) : {};
 					detailstyledef.SelBut_Checked = true;
-					for (let index in detailstyledef.form.items) {
-						const ele = detailstyledef.form.items[index]
+					if (detailstyledef?.form?.items) {
+						for (let index in detailstyledef.form.items) {
+							const ele = detailstyledef.form.items[index]
 
-						if (ele.name != "Layout") {
-							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
-								await this.DictGetInfo(ele.bind.dict,
-									detailstyledef.form
-									.model, ele);
-							}
-						} else {
-							for (let j in ele.setting.colList) {
-								const col = ele.setting.colList[j]
-								if (col?.useDict == true) {
-									await this.DictGetInfo(col
-										.bind.dict,
+							if (ele.name != "Layout") {
+								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									await this.DictGetInfo(ele.bind.dict,
 										detailstyledef.form
-										.model, col);
+										.model, ele);
+								}
+							} else {
+								for (let j in ele.setting.colList) {
+									const col = ele.setting.colList[j]
+									if (col?.useDict == true) {
+										await this.DictGetInfo(col
+											.bind.dict,
+											detailstyledef.form
+											.model, col);
+									}
 								}
 							}
 						}
+
 					}
 					console.log("Detail_UIstyleGetInfo", detailstyledef);
 					return detailstyledef
@@ -572,12 +643,29 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
 								reject({
-									"errMsg": ret.err_msg
+									"errMsg": ret.err_msg || ret.errMsg
 								});
 							}
 						},
@@ -1278,9 +1366,10 @@
 							}
 						}).catch(ex => {
 							// console.log(ex);
+							let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 							uni.showModal({
 								title: this.translateSys("error") + "4.1",
-								content: ex.errMsg,
+								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
@@ -1398,40 +1487,43 @@
 				});
 				if (!pageData)
 					return
-				data.row.forEach(row => {
-					var styleStr = JSON.stringify(pageData.StyleDef);
+				var styleStr = JSON.stringify(pageData.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;
-										}
-									});
-							}
+				var detailStyle = JSON.parse(styleStr);
+				if (detailStyle.form) {
+					data.row.forEach(row => {
+						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;
+											}
+										});
+								}
+							});
 						});
+
+						pageData.DefList.push(detailStyle);
+
 					});
-
-					pageData.DefList.push(detailStyle);
-
-				});
+				}
 			},
 			//鍔犺浇宸茬爜鐩樺唴瀹� 			viewAceionContent(data) {
@@ -1441,96 +1533,97 @@
 				});
 				if (!pageData)
 					return
-				console.log("viewAceionContent", pageData)
 				pageData.ExtData = data.ext_data || {}
 
 				if (JSON.stringify(data.content) == '{}') {
 					return;
 				}
-				data.content.forEach(cont => {
-					var styleStr = JSON.stringify(pageData.StyleDef);
-					console.log("viewAceionContent2", pageData)
-					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;
-										}
-									});
-							}
-						});
-					});
-					//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�-					if (data.clear == false) {
-						var isflag = true;
-						pageData.DefList.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;
-															}
-														});
+				var styleStr = JSON.stringify(pageData.StyleDef);
+				var detailStyle = JSON.parse(styleStr);
+				if (detailStyle.form) {
+					data.content.forEach(cont => {
+						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;
 											}
 										});
-								});
-								isflag = false;
-							}
+								}
+							});
 						});
-						if (isflag) pageData.DefList.push(detailStyle); //寰呭垎鎷�-					} else {
-						pageData.DefList.push(detailStyle); //寰呭垎鎷�-					}
-					$this.activelist.push({
-						active: false
+						//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+						if (data.clear == false) {
+							var isflag = true;
+							pageData.DefList.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) pageData.DefList.push(detailStyle); //寰呭垎鎷�+						} else {
+							pageData.DefList.push(detailStyle); //寰呭垎鎷�+						}
+						$this.activelist.push({
+							active: false
+						});
 					});
-
-				});
+				}
 
 			},
 			onClickItem(e) { //閫夋嫨椤电
@@ -2059,7 +2152,7 @@
 					pageParam.okLoading = false
 				}).catch(ex => {
 					pageParam.okLoading = false
-					var tip = typeof ex == "string" ? ex : ex.errMsg;
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
 						content: this.translate(
@@ -2108,8 +2201,8 @@
 		.v-head-style {
 			width: 98%;
 
-			.uni-form-item {
-				margin-bottom: 15rpx;
+			.uni-forms-item {
+				margin-bottom: 11rpx;
 			}
 
 			.input-wrapper {
@@ -2121,6 +2214,7 @@
 				.uni-input {
 					flex: 1;
 					padding: 12rpx 8rpx;
+					color: #2d8cf0;
 					// height: 40rpx;
 					// line-height: 40rpx;
 				}
@@ -2186,10 +2280,6 @@
 			position: relative;
 			border: 0 solid #000;
 			box-sizing: border-box;
-		}
-
-		.uni-input {
-			/* border: none; */
 		}
 
 		.uni-icon {
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 622cfaa..5f3b6f3 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -17,7 +17,8 @@
 					v-model="item.value" :localdata="item.dict" @change="onEnterChange(item)" :readonly="item.disabled"
 					:clear-icon="false" :popup-title="item.label"></uni-data-picker>
 
-				<view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
+				<view class="input-wrapper" :style="{'width':`calc(96% - ${item.labelWidth}px)`}"
+					v-if="item.name=='Input' || item.name=='InputNumber'">
 					<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
 						@click="onEnterChange(item)">&#xe568;</text>
 					<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -343,18 +344,21 @@
 						$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.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 (ele.name == 'Input' || ele.name == 'InputNumber') {
-									$this.setData({
-										focusFieldId: ele.fieldId
-									})
+						if ($this.head_styledef.form?.items) {
+							$this.head_styledef.form.items.forEach(async (ele, index) => {
+								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									await this.DictGetInfo(ele.bind.dict, index, 'mast');
 								}
-							}
-						});
+								if ($this.focusFieldId == "") {
+									if (ele.name == 'Input' || ele.name == 'InputNumber') {
+										$this.setData({
+											focusFieldId: ele.fieldId
+										})
+									}
+								}
+							});
+
+						}
 					} else {
 						uni.showModal({
 							title: this.translateSys("error") + "1",
@@ -365,9 +369,10 @@
 					}
 				}).catch(ex => {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "1.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -398,11 +403,13 @@
 						// 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');
-							}
-						});
+						if ($this.detail1_styledef.form?.items) {
+							$this.detail1_styledef.form.items.forEach(async (ele, index) => {
+								if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+									await this.DictGetInfo(ele.bind.dict, index, 'sub');
+								}
+							});
+						}
 					} else {
 						uni.showModal({
 							title: this.translateSys("error") + "2",
@@ -413,9 +420,10 @@
 					}
 				}).catch(ex => {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "2.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -453,9 +461,10 @@
 					}
 				}).catch(ex => {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "3.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
@@ -531,7 +540,32 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etDictInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
+							if (ret.err_code == 0) {
+								resolve(ret);
+							} else {
+								reject({
+									"errMsg": ret.err_msg
+								});
+							}
+
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
@@ -549,7 +583,7 @@
 				})
 
 			},
-getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+			getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮� 				const loginInfo = this.$store.getters.loginid
 				const dataSApi = this.$store.getters.getDataSApi
 				return new Promise((resolve, reject) => {
@@ -561,12 +595,29 @@
 						dataType: "json",
 						success: (_res) => {
 							// console.log(_res);
-							const ret = _res.data
+							var ret = _res.data
+							if (typeof ret == 'string') {
+								try {
+									try {
+										try {
+											ret = JSON.parse(ret.replace(/\\"/g, '"'));
+										} catch (ex) {
+											ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+										}
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\"/g, "'").replace(/[\r\n]/g,
+											'<br>').replace(/[\t]/g, '    '));
+									}
+								} catch (ex) {
+									console.log(ret)
+									return reject('灏唃etUIStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+								}
+							}
 							if (ret.err_code == 0) {
 								resolve(ret);
 							} else {
 								reject({
-									"errMsg": ret.err_msg
+									"errMsg": ret.err_msg || ret.errMsg
 								});
 							}
 						},
@@ -1056,9 +1107,10 @@
 							}
 						}).catch(ex => {
 							// console.log(ex);
+							let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 							uni.showModal({
 								title: this.translateSys("error") + "4.1",
-								content: ex.errMsg,
+								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys("cancel")
 							});
@@ -1151,48 +1203,53 @@
 				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 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;
-									}
-								});
-							}
-						});
-					});
+				}
+				data.row.forEach(row => {
 
-					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鏄惁鏄凡鍒嗘嫞
+					var detailStyle = JSON.parse(styleStr);
+					if (detailStyle.form) {
+						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 {
-							this.$data.detail1StyleDefList.push(detailStyle);
-							this.activelist.push({
-								active: false
-							});
-							// console.log(this.$data.detail1StyleDefList);
+							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);
+							}
 						}
 					}
 				});
@@ -1209,95 +1266,103 @@
 				if (JSON.stringify(data.content) == '{}') {
 					return;
 				}
+				var styleStr = JSON.stringify($this.$data.detail2_styledef); //宸插垎鎷�+				if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+					styleStr = JSON.stringify($this.$data.detail1_styledef); //寰呭垎鎷�+				}
 				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 (detailStyle.form) {
+						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); //寰呭垎鎷� 							}
-						});
-					});
-
-					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;
-								}
+							$this.activelist.push({
+								active: false
 							});
-							if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+							// console.log($this.$data.detail1StyleDefList);
 						} 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;
-													}
-												});
-											}
+							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); //宸插垎鎷�+										isflag = false;
+									}
+								});
+								if (isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+							} else {
+								$this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+							}
+							// console.log($this.$data.detail2StyleDefList);
 						}
-						// console.log($this.$data.detail2StyleDefList);
 					}
 				});
 			},
@@ -1369,9 +1434,10 @@
 								}
 							}).catch(ex => {
 								// console.log(ex);
+								let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 								uni.showModal({
 									title: this.translateSys("error") + "5.1",
-									content: ex.errMsg,
+									content: tip,
 									showCancel: false,
 									confirmText: this.translateSys("cancel")
 								});
@@ -2052,7 +2118,8 @@
 						this.okLoading = false
 					else if (type == "2")
 						this.ok2Loading = false
-					var tip = typeof ex == "string" ? ex : ex.errMsg;
+
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
 						content: this.translate("execute_after_ok_event_failed") + this.translateSys(
@@ -2097,6 +2164,7 @@
 
 		.v-headStyle {
 			width: 100%;
+			margin-bottom: 11rpx;
 		}
 
 		.view-content {
@@ -2145,24 +2213,24 @@
 		}
 
 		.v-headStyle .txt_title {
-			font-size: 34rpx;
+			font-size: 14px;
 			text-align: right;
 			display: inline-block;
-			vertical-align: 12px;
+			// align-items: center;
+			color: #606266;
+			padding: 0 5px 0 0;
+			vertical-align: 10px;
 		}
 
 		.v-headStyle input {
 			display: inline-block;
-			/* border: 1px solid #d5d5d5; */
-			/* width: 65%; */
 			width: 85%;
-			height: 52rpx;
-			line-height: 34rpx;
+			line-height: 14px;
 			background: #FFF;
 			border-radius: 0 !important;
 			color: #2d8cf0;
-			padding: 10rpx 8rpx 12rpx;
-			font-size: 34rpx;
+			padding: 12rpx 8rpx;
+			font-size: 14px;
 			font-family: inherit;
 			box-shadow: none !important;
 			transition-duration: 0.1s;
diff --git a/store/index.js b/store/index.js
index 2f25b50..1ccde98 100644
--- a/store/index.js
+++ b/store/index.js
@@ -297,7 +297,7 @@
 						mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
 						dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
 						mongodbSvr = ser[0] + "//" + ser[2].split(':')[0] + ":" + mongodbsport +
-						"/";
+							"/";
 					}
 					commit("setOrgSApi", orgSApi);
 					commit("setMobxoSApi", mobxoSApi);
@@ -363,7 +363,7 @@
 					url = state.OIMoboxSAPI + 'api/app/area/GetList?sessionid=' + state
 						.loginProvider.loginid.result.session_id;
 					univerifyInfo = {
-						app_type: univerifyInfo.app_type||"MES",
+						app_type: univerifyInfo.app_type || "MES",
 					};
 					header = {};
 				}
@@ -387,7 +387,29 @@
 						// 	})
 						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
 						// }
-						const ret = res.data;
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哸reaFunc銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.code == '00000' || ret.err_code == 0) {
 							commit("areaFunc", ret);
 							resolve(ret);
@@ -419,7 +441,29 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏咷etFuncTree銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.err_code == 0) {
 							// commit("areaFunc",ret);
 							resolve(ret);
@@ -467,7 +511,29 @@
 						// 	})
 						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
 						// }
-						const ret = res.data
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哻lassAttrList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.code == '00000') {
 							commit("classAttrList", ret);
 							resolve(ret);
@@ -509,7 +575,29 @@
 					},
 					success: (res) => {
 						console.log(res);
-						const ret = res.data
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哻lassGridStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.code == '00000') {
 							// var data ={};
 							// Vue.set(data,univerifyInfo.name,ret);
@@ -560,7 +648,29 @@
 						// 	})
 						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
 						// }
-						const ret = res.data
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏唖ubClassAttrList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.code == '00000') {
 							commit("subClassAttrList", ret);
 							resolve(ret);
@@ -609,7 +719,29 @@
 						// 	})
 						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
 						// }
-						const ret = res.data
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏唖ubClassGridStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.code == '00000') {
 							// var data ={};
 							// Vue.set(data,univerifyInfo.name,ret);
@@ -653,7 +785,29 @@
 					},
 					success: (res) => {
 						// console.log(res);
-						const ret = res.data
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哾icValueInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.code == '00000') {
 							state.thisDictName = univerifyInfo.dic_name
 							commit("dicValueInfo", ret);
@@ -695,7 +849,29 @@
 					},
 					success: (res) => {
 						// console.log(res);
-						const ret = res.data
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏咲ataObjRunCustomEventInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.code == '00000') {
 							commit("DataObjRunCustomEventInfo", ret);
 							resolve(ret);
@@ -740,14 +916,32 @@
 					header: header,
 					success: (res) => {
 						// console.log(res);
-						try {
-							res = JSON.parse(res.data);
-						} catch (e) {
-							res = res.data;
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏唓uerySelpsn銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
 						}
-						if (res.code == '00000' || res.err_code == 0) {
-							commit("querySelpsn", res);
-							resolve(res);
+
+
+						if (ret.code == '00000' || ret.err_code == 0) {
+							commit("querySelpsn", ret);
+							resolve(ret);
 						} else {
 							reject({
 								"errMsg": ret.msg || ret.err_msg
@@ -793,7 +987,28 @@
 					header: header,
 					success: (res) => {
 						console.log(res);
-						const ret = res.data;
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哖rojectGetAnalysisList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
 						if (ret.code == '00000') {
 							commit("ProjectGetAnalysisList", ret);
 							resolve(ret);
@@ -840,7 +1055,28 @@
 						// 	})
 						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
 						// }
-						const ret = res.data;
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哸ddclassattr銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
 						if (ret.code == '00000') {
 							commit("addclassattr", ret);
 							resolve(ret);
@@ -874,7 +1110,28 @@
 					},
 					success: (res) => {
 						console.log(res);
-						const ret = res.data;
+						var ret = res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏咲elObj銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
 						if (ret.code == '00000') {
 							commit("DelObj", ret);
 							resolve(ret);
@@ -909,7 +1166,28 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哻lassAttrGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
 						if (ret.err_code == 0) {
 							commit("classAttrList", ret);
 							resolve(ret);
@@ -942,7 +1220,29 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏唖ubClassAttrGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.err_code == 0) {
 							commit("subClassAttrList", ret);
 							resolve(ret);
@@ -975,7 +1275,29 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏咲ictItemGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.err_code == 0) {
 							resolve(ret);
 						} else {
@@ -1007,7 +1329,29 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏咲ictGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.err_code == 0) {
 							resolve(ret);
 						} else {
@@ -1040,7 +1384,29 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哻reateDataObj銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
+
+
 						if (ret.err_code == 0) {
 							resolve(ret);
 						} else {
@@ -1073,18 +1439,37 @@
 					dataType: "json",
 					success: (_res) => {
 						console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哢IStyleGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
 						if (ret.err_code == 0) {
-							// commit("areaFunc",ret);
 							resolve(ret);
 						} else {
 							reject({
-								"errMsg": ret.err_msg
+								"errMsg": ret.err_msg || ret.errMsg
 							});
 						}
 					},
 					fail: (err) => {
-						// console.log(err);
+						console.log("fail", err);
 						reject(err);
 					}
 				})
@@ -1106,13 +1491,32 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏唕unCustomEvent銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
 						if (ret.err_code == 0) {
-							// commit("areaFunc",ret);
 							resolve(ret);
 						} else {
 							reject({
-								"errMsg": ret.err_msg
+								"errMsg": ret.err_msg || ret.errMsg
 							});
 						}
 					},
@@ -1139,13 +1543,31 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哾ataObjDel銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+							}
+						}
 						if (ret.err_code == 0) {
-							// commit("areaFunc",ret);
 							resolve(ret);
 						} else {
 							reject({
-								"errMsg": ret.err_msg
+								"errMsg": ret.err_msg || ret.errMsg
 							});
 						}
 					},
@@ -1172,13 +1594,32 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哾ataObjQuery銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
 						if (ret.err_code == 0) {
-							// commit("areaFunc",ret);
 							resolve(ret);
 						} else {
 							reject({
-								"errMsg": ret.err_msg
+								"errMsg": ret.err_msg || ret.errMsg
 							});
 						}
 					},
@@ -1205,13 +1646,32 @@
 					dataType: "json",
 					success: (_res) => {
 						// console.log(_res);
-						const ret = _res.data
+						var ret = _res.data
+						if (typeof ret == 'string') {
+							try {
+								try {
+									try {
+										ret = JSON.parse(ret.replace(/\\"/g, '"'));
+									} catch (ex) {
+										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+									}
+								} catch (ex) {
+									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+										/[\r\n]/g,
+										'<br>').replace(/[\t]/g, '    '));
+								}
+							} catch (ex) {
+								console.log(ret)
+								return reject(
+									'灏哸ppGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+								)
+							}
+						}
 						if (ret.err_code == 0) {
-							// commit("areaFunc",ret);
 							resolve(ret);
 						} else {
 							reject({
-								"errMsg": ret.err_msg
+								"errMsg": ret.err_msg || ret.errMsg
 							});
 						}
 					},

--
Gitblit v1.9.1