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/5601.vue |  722 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 484 insertions(+), 238 deletions(-)

diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 8684971..50ace94 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -24,7 +24,7 @@
 				<!-- 鏍呮牸甯冨眬 -->
 				<uni-row v-else :gutter="item.setting.gutter">
 					<uni-col
-						:span=" item.setting.spanList && item.setting.spanList[key - 1]? item.setting.spanList[key - 1] : 24 / item.setting.col"
+						:span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
 						v-for="(col,key) in item.setting.colList">
 						<uni-forms-item :label="col.label +'锛�" :label-width="col.labelWidth+'px'">
 							<uni-data-picker v-if="col.name=='Select'" :class="col.disabled?'input-disabled':''"
@@ -84,7 +84,7 @@
 												<!-- 鏍呮牸甯冨眬 -->
 												<uni-row class="demo-uni-row" v-else :gutter="item.setting.gutter">
 													<uni-col
-														:span=" item.setting.spanList && item.setting.spanList[key - 1]? item.setting.spanList[key - 1] : 24 / item.setting.col"
+														:span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
 														v-for="(cols,key) in item.setting.colList">
 														<view v-if="cols!=null">
 															<text class="txt_title"
@@ -116,8 +116,9 @@
 							<view class="view-bottom" v-if="pageData.OK_Button==true">
 								<button type="default" @tap="cancel"
 									class="btn_cancel">{{translateSys('cancel')}}</button>
-								<button type="primary" @tap="ok(pageData)"
-									class="btn_add">{{translateSys('ok')}}</button>
+								<button type="primary" @tap="ok(pageData)" class="btn_add"
+									:class="pageData.okLoading?'btn_disabled':''"
+									:disabled="pageData.okLoading? true:false">{{translateSys('ok')}}</button>
 							</view>
 						</view>
 					</swiper-item>
@@ -260,8 +261,9 @@
 				//鍔犺浇Tab椤电
 				const pageList = this.param.Sub_Page || []
 				for (let i in pageList) {
-					page.DefList = [];
+
 					const page = pageList[i]
+					page.DefList = [];
 					page.StyleDef = await this.Detail_UIstyleGetInfo(
 						this.ClsID,
 						page.UI_Style.ID
@@ -294,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") {
@@ -353,52 +354,121 @@
 								}
 							}
 						}
-						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) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				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);
-						}
+				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 detailstyledef = ret.result.style_def ? JSON.parse(
-							styledef) : {};
-						detailstyledef.SelBut_Checked = true;
-						for (let index in styledefHead.form.items) {
-							const ele = styledefHead.form.items[index]
+					const detailstyledef = ret.result.style_def ? JSON.parse(
+						styledef) : {};
+					detailstyledef.SelBut_Checked = true;
+					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鏄惁浣跨敤瀛楀吀
@@ -418,27 +488,78 @@
 								}
 							}
 						}
-						console.log("Detail_UIstyleGetInfo", detailstyledef);
-						return detailstyledef
-					} else {
-						return {}
-						uni.showModal({
-							title: this.translateSys("error") + "2",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+
 					}
-				}).catch(ex => {
+					console.log("Detail_UIstyleGetInfo", detailstyledef);
+					return detailstyledef
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
-						title: this.translateSys("error") + "2.1",
+						title: this.translateSys("error") + "2",
 						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 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 (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,
+				// 							detailstyledef.form
+				// 							.model, col);
+				// 					}
+				// 				}
+				// 			}
+				// 		}
+				// 		console.log("Detail_UIstyleGetInfo", detailstyledef);
+				// 		return detailstyledef
+				// 	} else {
+				// 		return {}
+				// 		uni.showModal({
+				// 			title: this.translateSys("error") + "2",
+				// 			content: ret.err_msg,
+				// 			showCancel: false,
+				// 			confirmText: this.translateSys("cancel")
+				// 		});
+				// 	}
+				// }).catch(ex => {
+				// 	// console.log(ex);
+				// 	uni.showModal({
+				// 		title: this.translateSys("error") + "2.1",
+				// 		content: ex.errMsg,
+				// 		showCancel: false,
+				// 		confirmText: this.translateSys("cancel")
+				// 	});
+				// 	return {}
+				// });
 
 			},
 
@@ -481,7 +602,7 @@
 				}
 
 			},
-			getDictInfo(info) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�+			getDictInfo(info) { //Mobox3寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛� 				const loginInfo = this.$store.getters.loginid
 				const mobxoSApi = this.$store.getters.getMobxoSApi
 				return new Promise((resolve, reject) => {
@@ -510,6 +631,53 @@
 				})
 
 			},
+			getUIStyleInfo(info) { //Mobox3鏁版嵁绫荤晫闈㈡牱寮�+				const loginInfo = this.$store.getters.loginid
+				const dataSApi = this.$store.getters.getDataSApi
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: dataSApi + 'api/class/uistyle/GetInfo?sessionid=' + loginInfo.result
+							.session_id,
+						data: info,
+						method: 'POST',
+						dataType: "json",
+						success: (_res) => {
+							// console.log(_res);
+							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 || ret.errMsg
+								});
+							}
+						},
+						fail: (err) => {
+							// console.log(err);
+							reject(err);
+						}
+					})
+
+				})
+
+			},
 
 			onClick(item) {
 				this.focusFieldId = item.fieldId
@@ -522,7 +690,7 @@
 					console.log(result.decodedata);
 					item.value = result.decodedata;
 					var $this = this;
-					if (item.oldvalue != item.value) {
+					if (item.oldvalue != item.value && item.value.trim() != "") {
 						item.oldvalue = item.value;
 						var attr = item.fieldId;
 						this.head_styledef.form.model[attr] = item.value;
@@ -610,7 +778,7 @@
 
 			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
 				console.log(item);
-				if (item.oldvalue != item.value) {
+				if (item.oldvalue != item.value && item.value.trim() != "") {
 					item.oldvalue = item.value;
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
@@ -628,47 +796,48 @@
 			},
 			getDetailAttrList(pageData) {
 				const detailAttrList = [];
-				pageData.DefList.forEach(style => {
-					var detail_attr = {};
-					style.form.items.forEach(item => {
-						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-							item.setting.colList.forEach(cols => {
-								if (cols != null) detail_attr[cols
-									.fieldId] = cols.value;
-							});
-						} else
-							detail_attr[item.fieldId] = item.value;
-					});
-
-					detail_attr['id'] = style.form.objId;
-					if (pageData.Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
-						if (style.SelBut_Checked == true)
-							detailAttrList.push(detail_attr);
-					} else
-						detailAttrList.push(detail_attr);
-				});
-				// console.log(detailAttrList);
-				//鑾峰彇姝e湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
-				pageData.DefList.forEach(style => {
-					style.form.attrs.forEach(attr => {
-						for (var key in detailAttrList) {
-							if (style.form.objId == detailAttrList[key][
-									'id'
-								]) {
-								var keys = Object.keys(detailAttrList[key]);
-								var isflag = true;
-								keys.forEach((ele) => {
-									if (ele == attr.attr) isflag =
-										false;
+				if (pageData.DefList) {
+					pageData.DefList.forEach(style => {
+						var detail_attr = {};
+						style.form.items.forEach(item => {
+							if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+								item.setting.colList.forEach(cols => {
+									if (cols != null) detail_attr[cols
+										.fieldId] = cols.value;
 								});
-								if (isflag) {
-									detailAttrList[attr.attr] = attr.value;
+							} else
+								detail_attr[item.fieldId] = item.value;
+						});
+
+						detail_attr['id'] = style.form.objId;
+						if (pageData.Select_Button == true) { //鍒ゆ柇閫夋嫨鎸夐挳鏄惁涓簍rue
+							if (style.SelBut_Checked == true)
+								detailAttrList.push(detail_attr);
+						} else
+							detailAttrList.push(detail_attr);
+					});
+					// console.log(detailAttrList);
+					//鑾峰彇姝e湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
+					pageData.DefList.forEach(style => {
+						style.form.attrs.forEach(attr => {
+							for (var key in detailAttrList) {
+								if (style.form.objId == detailAttrList[key][
+										'id'
+									]) {
+									var keys = Object.keys(detailAttrList[key]);
+									var isflag = true;
+									keys.forEach((ele) => {
+										if (ele == attr.attr) isflag =
+											false;
+									});
+									if (isflag) {
+										detailAttrList[attr.attr] = attr.value;
+									}
 								}
 							}
-						}
+						});
 					});
-				});
-
+				}
 				const jsonlist = [];
 				detailAttrList.forEach(attr => {
 					jsonlist.push({
@@ -711,6 +880,7 @@
 						var $this = this;
 						const jsonList = []
 						this.pageDetail.forEach((page) => {
+
 							jsonList.push({
 								page_name: page.Name,
 								item_list: $this.getDetailAttrList(page
@@ -718,6 +888,7 @@
 									.Select_Button),
 								ext_data: page.ExtData || {}
 							})
+
 						})
 						const data_json = Base64.encode(
 							JSON.stringify(jsonList)
@@ -742,7 +913,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) {
@@ -789,6 +960,7 @@
 
 									if (result.result_type == 0 && result.action) {
 										result.action.forEach(item => {
+
 											if (item.action_type ==
 												"insert_subtable_page_row"
 											) { //鐮佺洏涓�@@ -834,7 +1006,7 @@
 															.page_name +
 															this
 															.translateSys(
-																"sys.quotation_mark_right"
+																"quotation_mark_right"
 															) +
 															this
 															.translate(
@@ -1069,6 +1241,35 @@
 																			ele2
 																			.attr
 																		) {
+																			if (ele.name ==
+																				'Select' &&
+																				ele2
+																				.choice_list
+																			) {
+																				const
+																					dictItemList = [];
+																				const
+																					choiceList =
+																					ele2
+																					.choice_list ||
+																					[];
+																				for (let d in
+																						choiceList) {
+																					const
+																						val =
+																						choiceList[
+																							d
+																						];
+																					dictItemList
+																						.push({
+																							text: val,
+																							value: val
+																						});
+																				}
+																				ele.dict =
+																					dictItemList;
+																			}
+
 																			ele.value =
 																				ele2
 																				.value;
@@ -1092,6 +1293,38 @@
 																							ele2
 																							.attr
 																						) {
+																							if (col
+																								.name ==
+																								'Select' &&
+																								ele2
+																								.choice_list
+																							) {
+																								const
+																									dictItemList = [];
+																								const
+																									choiceList =
+																									ele2
+																									.choice_list ||
+																									[];
+																								for (
+																									let d in
+																										choiceList
+																								) {
+																									const
+																										val =
+																										choiceList[
+																											d
+																										];
+																									dictItemList
+																										.push({
+																											text: val,
+																											value: val
+																										});
+																								}
+																								col.dict =
+																									dictItemList;
+																							}
+
 																							col.value =
 																								ele2
 																								.value;
@@ -1133,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")
 							});
@@ -1249,143 +1483,147 @@
 					return;
 				}
 				const pageData = this.pageDetail.find((page) => {
-					return value.page_name == page.Name;
+					return data.page_name == page.Name;
 				});
 				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) {
 				var $this = this;
 				const pageData = $this.pageDetail.find((page) => {
-					return value.page_name == page.Name;
+					return data.page_name == page.Name;
 				});
 				if (!pageData)
 					return
-
 				pageData.ExtData = data.ext_data || {}
 
 				if (JSON.stringify(data.content) == '{}') {
 					return;
 				}
-				data.content.forEach(cont => {
-					var styleStr = JSON.stringify(pageData.StyleDef);
+				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;
 
-					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;
-															}
-														});
+						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) { //閫夋嫨椤电
@@ -1525,19 +1763,20 @@
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate(
-								"page.tip_no_data_first") +
+								"tip_no_data_first") +
 							this.translateSys(
 								"quotation_mark_left") + pageData.Name + this
 							.translateSys(
-								"sys.quotation_mark_right") +
+								"quotation_mark_right") +
 							this.translate(
-								"page.tip_no_data_last"),
+								"tip_no_data_last"),
 						showCancel: false,
 						confirmText: this.translateSys("cancel")
 					});
 					return false;
 				}
 				//鑾峰彇琛ㄥご灞炴�
+				pageData.okLoading = true
 				var head_attr = {};
 				this.$data.head_styledef.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�@@ -1618,6 +1857,7 @@
 					});
 				});
 				if (jsonlist.length == 0) {
+					pageData.okLoading = false
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
@@ -1909,8 +2149,10 @@
 								"cancel")
 						});
 					}
+					pageParam.okLoading = false
 				}).catch(ex => {
-					var tip = typeof ex == "string" ? ex : ex.errMsg;
+					pageParam.okLoading = false
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
 						content: this.translate(
@@ -1959,8 +2201,8 @@
 		.v-head-style {
 			width: 98%;
 
-			.uni-form-item {
-				margin-bottom: 15rpx;
+			.uni-forms-item {
+				margin-bottom: 11rpx;
 			}
 
 			.input-wrapper {
@@ -1972,6 +2214,7 @@
 				.uni-input {
 					flex: 1;
 					padding: 12rpx 8rpx;
+					color: #2d8cf0;
 					// height: 40rpx;
 					// line-height: 40rpx;
 				}
@@ -2037,10 +2280,6 @@
 			position: relative;
 			border: 0 solid #000;
 			box-sizing: border-box;
-		}
-
-		.uni-input {
-			/* border: none; */
 		}
 
 		.uni-icon {
@@ -2143,9 +2382,16 @@
 						font-size: 38rpx;
 						font-weight: bold;
 						float: right;
+						color: #fff;
 						display: inline-block;
 					}
 
+					.btn_disabled {
+						background-color: #ddd;
+						color: #888;
+					}
+
+
 				}
 			}
 

--
Gitblit v1.9.1