From ec63534e04c68e067dcb0380e56f2e5312de24a3 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 27 九月 2024 17:18:41 +0800
Subject: [PATCH] 字典取值判断附加值还是名称

---
 pages/modal/3018.vue | 2026 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 990 insertions(+), 1,036 deletions(-)

diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index ef69bae..da25daf 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="uni-page-modal-3018">
 		<view class="v-area" v-for="(classattr,index) in classAttrList">
 			<div class="class_attr_title" style="display: none;">
 				<div class="title_line"></div>
@@ -254,8 +254,11 @@
 			</div>
 
 		</view>
-		<button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>
-		<button type="default" @tap="sava" class="btn_add">{{title}}</button>
+
+		<view class="v-bottom"><button type="default" @tap="cancel"
+				class="btn_cancel">{{translateSys('cancel')}}</button>
+			<button type="default" @tap="sava" class="btn_add">{{title}}</button>
+		</view>
 		<!-- 鏅�寮圭獥 top bottom center left right -->
 		<view>
 			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
@@ -290,6 +293,21 @@
 	import Base64 from '../../components/js-base64/base64.js'
 	import pickerAddress from '../../js/pickerAddress/pickerAddress.vue'
 	import utils from "@/js/utils.js"
+	import {
+		appGetInfo,
+		dictGetInfo,
+		dictItemGetInfo
+	} from "@/api/mobox.js"
+	import {
+		getUIStyleInfo,
+		runCustomEvent,
+		dataObjCreate
+	} from "@/api/data.js"
+	import {
+		classAttrList,
+	} from "@/api/index.js"
+
+
 	export default {
 		modules: {
 			Base64,
@@ -338,8 +356,11 @@
 				popupParam: {},
 			}
 		},
+		mounted() {
+			console.log("3018 mounted");
+		},
 		onLoad(options) {
-			// console.log(options);
+			console.log("3018", options);
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
@@ -363,8 +384,7 @@
 			}
 			if (!param.Edit_dlg.Name) {
 				uni.showModal({
-					title: this.translateSys('tip')
-					",
+					title: this.translateSys('tip'),
 					content: this.translate('function_not_edit_dlg'),
 					showCancel: false,
 					confirmText: this.translateSys('cancel')
@@ -402,82 +422,56 @@
 				});
 			},
 			async loadData() {
-				const param = this.param
-				var edit_dlg = {
-					Model: param.EditDlgMode,
-					Name: param.Edit_dlg.Name
-				}
-				var dataInfo = {
-					class_id: this.param.clsid,
-					class_name: '',
-					group_name: ''
-				};
-				var $this = this;
-				$this.$store.state.thisareaFuncID = param.clsid;
-				// console.log($this.$store.getters.getclassAttrList);
-				//鑾峰彇
-				if ($this.$store.getters.getclassAttrList) {
-					$this.$data.classAttrList = $this.$store.getters.getclassAttrList;
-					$this.classGridStyleInfo();
-				} else {
-					$this.$store.dispatch('classAttrGetList', dataInfo)
-						.then((success) => {
-							if (success.err_code == 0) {
-								$this.$data.classAttrList = success.result;
-								success.result.forEach(async (group, index) => {
-									group.attr_list.forEach(async (attr, key) => {
-										if (utils.classUtils.attrTypeIsDict(attr.type)) {
-											await $this.DictItemGetList(attr, key,
-												index);
-										}
-									});
-								});
-								setTimeout(function() {
-									$this.classGridStyleInfo();
-								}, 500);
-							} else {
-								uni.showModal({
-									title: this.translateSys('error') + " 1",
-									content: success.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')
-							});
-						});
-				}
-				console.log(this.$data.param);
-			},
-			async DictItemGetList(attr, key, index) { //Mobox3寰楀埌瀛楀吀椤瑰垪琛�-				this.data = [];
-				var $this = this;
-				var dataInfo = {
-					dict_id: attr.dict_id,
-					dict_name: attr.dict_name
-				};
-				// console.log(dataInfo);
-				this.$store.dispatch('DictItemGetList', dataInfo).then(async (success) => {
-					// console.log(success);
-					if (success.err_code == 0) {
-						$this.$data.classAttrList[index].attr_list[key].dictitem = success.result;
-						this.$store.commit("classAttrList", $this.$data.classAttrList);
-
-					} else {
-						uni.showModal({
-							title: this.translateSys('error') + " 1.2",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
+				try {
+					const param = this.param
+					var edit_dlg = {
+						Model: param.EditDlgMode,
+						Name: param.Edit_dlg.Name
 					}
-				}).catch(ex => {
+					var dataInfo = {
+						class_id: this.param.clsid,
+						class_name: '',
+						group_name: ''
+					};
+					var $this = this;
+					const result = await classAttrList(dataInfo) || []
+					for (let index in result) {
+						const group = result[index]
+						for (let key in group.attr_list) {
+							const attr = group.attr_list[key]
+							if (utils.classUtils.attrTypeIsDict(attr.type)) {
+								attr.dictitem = await $this.DictItemGetList(attr);
+							}
+						}
+					}
+					$this.$data.classAttrList = result;
+					await $this.classGridStyleInfo();
+				} catch (ex) {
+					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+					uni.showModal({
+						title: this.translateSys('error') + " 1",
+						content: tip,
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+				}
+			},
+			async DictItemGetList(attr) { //Mobox3寰楀埌瀛楀吀椤瑰垪琛�+				try {
+					this.data = [];
+					var $this = this;
+					var dataInfo = {
+						dict_id: attr.dict_id,
+						dict_name: attr.dict_name
+					};
+					const res = await dictItemGetInfo(dataInfo)
+					return res?.dict_item_list || []
+
+				} catch (ex) {
 					// console.log(ex);
 					uni.showModal({
 						title: this.translateSys('error') + " 1.3",
@@ -485,48 +479,32 @@
 						showCancel: false,
 						confirmText: this.translateSys('cancel')
 					});
-				});
+					return []
+				}
 			},
 			async classGridStyleInfo() {
-				var $this = this;
-				var gridstyleInfo = {
-					class_id: $this.$data.param.clsid,
-					ui_style_type: 2,
-					ui_style_name: $this.$data.param.Edit_dlg.Name
-				};
-				$this.$store.state.thisEditName = $this.$data.param.Edit_dlg.Name
-				// console.log($this.$store.getters.getclassGridStyleInfo);
-				//鑾峰彇
-				if ($this.$store.getters.getclassGridStyleInfo) {
-					$this.$data.classGridStyle = $this.$store.getters.getclassGridStyleInfo;
-					$this.viewParam();
-				} else {
-					// console.log(gridstyleInfo);
-					$this.$store.dispatch('UIStyleGetInfo', gridstyleInfo).then(async (success) => {
-						// console.log(success);
-						if (success.err_code == 0) {
-							var styledef = Base64.decode(success.result.style_def);
-							success.result.style_def = JSON.parse(styledef);
-							$this.$data.classGridStyle = success.result;
-							// console.log($this.$data.classGridStyle);
 
-							$this.viewParam();
-						} else {
-							uni.showModal({
-								title: this.translateSys('error') + " 1.4",
-								content: success.err_msg,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-						}
-					}).catch(ex => {
-						console.log(ex);
-						uni.showModal({
-							title: this.translateSys('error') + " 1.5",
-							content: ex.errMsg,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
+				try {
+					var $this = this;
+					var gridstyleInfo = {
+						class_id: $this.$data.param.clsid,
+						ui_style_type: 2,
+						ui_style_name: $this.$data.param.Edit_dlg.Name
+					};
+
+					const result = await getUIStyleInfo(dataInfo)
+					var styledef = Base64.decode(result.style_def);
+					result.style_def = JSON.parse(styledef);
+					$this.$data.classGridStyle = result
+					$this.viewParam();
+
+				} catch (ex) {
+					// console.log(ex);
+					uni.showModal({
+						title: this.translateSys('error') + " 1.4",
+						content: ex.errMsg,
+						showCancel: false,
+						confirmText: this.translateSys('cancel')
 					});
 				}
 			},
@@ -723,7 +701,7 @@
 									var ar = attr[j];
 									req.push({
 										attr: ar.attr,
-										val: ar.value ? ar.value : ''
+										value: ar.value ? ar.value : ''
 									});
 								}
 							}
@@ -950,7 +928,6 @@
 							for (var j = 0; j < attr.length; j++) {
 								var ar = attr[j];
 								req.push(this.formatAttr(ar))
-
 							}
 						}
 						var info = {
@@ -1246,7 +1223,7 @@
 			},
 			add() {
 				uni.showLoading({
-					title: this.translateSys("loading")
+					title: this.translateSys("loading"),
 					mask: true
 				});
 				var req = [];
@@ -1338,73 +1315,63 @@
 				};
 				console.log(dataInfo);
 				// return
-				this.$store.dispatch('createDataObj', dataInfo).then(success => {
-					console.log(success);
+				DataObjCreate(dataInfo).then((result) => {
+					console.log(result);
 					uni.hideLoading();
-					if (success.err_code == 0) {
-						var result = success.result;
-						// if(result.result_type == 0){}
-						if (success.result.action) {
-							var action = JSON.parse(success.result.action);
-							console.log(action);
-							if (action.ret == '0') {
-								if (action.ret != 0) {
-									uni.showModal({
-										title: this.translateSys('tip'),
-										content: this.translate('execute_script_failed') +
-											this
-											.translateSys('comma') + this.translate(
-												'result') +
-											this
-											.translateSys('colon') + action.result,
-										showCancel: false,
-										confirmText: this.translateSys('cancel')
-									});
-									return;
-								}
-								if (action.info) {
-									uni.showModal({
-										title: this.translateSys('tip'),
-										content: this.translate('execute_script_failed') +
-											this
-											.translateSys('comma') +
-											this.translateSys('colon') + action.info,
-										showCancel: false,
-										confirmText: this.translateSys('cancel')
-									});
-									return;
-								}
-								if (action.result_type == '0') {
-									uni.showToast({
-										title: action.result,
-										icon: "success",
-										duration: 3000
-									});
-								}
-
-								// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+					if (result.action) {
+						var action = JSON.parse(result.action);
+						console.log(action);
+						if (action.ret == '0') {
+							if (action.ret != 0) {
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: this.translate('execute_script_failed') +
+										this
+										.translateSys('comma') + this.translate(
+											'result') +
+										this
+										.translateSys('colon') + action.result,
+									showCancel: false,
+									confirmText: this.translateSys('cancel')
+								});
+								return;
 							}
-						} else
-							uni.showToast({
-								title: this.translate('create_success'),
-								icon: "success",
-								duration: 3000
-							});
-						//鍒锋柊
-						uni.redirectTo({
-							url: '../modal/3018?param=' + JSON.stringify(this.$data
-									.param) +
-								"&titlename=" + this.$data.title
+							if (action.info) {
+								uni.showModal({
+									title: this.translateSys('tip'),
+									content: this.translate('execute_script_failed') +
+										this
+										.translateSys('comma') +
+										this.translateSys('colon') + action.info,
+									showCancel: false,
+									confirmText: this.translateSys('cancel')
+								});
+								return;
+							}
+							if (action.result_type == '0') {
+								uni.showToast({
+									title: action.result,
+									icon: "success",
+									duration: 3000
+								});
+							}
+
+							// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+						}
+					} else
+						uni.showToast({
+							title: this.translate('create_success'),
+							icon: "success",
+							duration: 3000
 						});
-						// this.cancel();
-					} else {
-						uni.showModal({
-							title: this.translateSys('error') + " ",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
-					}
+					//鍒锋柊
+					uni.redirectTo({
+						url: '../modal/3018?param=' + JSON.stringify(this.$data
+								.param) +
+							"&titlename=" + this.$data.title
+					});
+					// this.cancel();
+
 				}).catch(ex => {
 					console.log(ex);
 					uni.hideLoading();
@@ -1438,7 +1405,7 @@
 				param.enviroment = Base64.encode(JSON.stringify(param.enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				// console.log(obj_attr);
 				// var dataInfo = {
@@ -1468,137 +1435,127 @@
 				};
 				console.log(dataInfo);
 				// return;
-				this.$store.dispatch('runCustomEvent', dataInfo).then(success => {
-					console.log(success);
-					if (success.err_code == 0) {
-						var data = success.result;
-						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data
-								.err_info :
-								data
-								.err_info.join('<br/>') : '';
-							if (data.ret == 801) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							else uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip + ',' + this.translateSys('tip') + ':' + data
-									.ret,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							return false
-						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data
-								.info
-								.join(
-									'<br/>') : '';
-							if (tip) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
+				runCustomEvent(dataInfo).then(data => {
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
+						else uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip + ',' + this.translateSys('tip') + ':' + data
+								.ret,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
 
-							if (data.action) {
-								var actionlist = data.action;
-								if (actionlist) {
-									for (var j = 0; j < actionlist.length; j++) {
-										var action = actionlist[j];
-										var action_type = action.action_type;
-										var value = action.value;
-										if (action_type == 'set_dlg_attr') {
-											if (value) {
-												console.log(value);
-												for (var i = 0; i < value.length; i++) {
-													for (var a = 0; a < this.$data.classAttrList
-														.length; a++) {
-														for (var l = 0; l < this.$data
-															.classAttrList[a]
-															.Attr
-															.length; l++) {
-															var ca = this.$data.classAttrList[a]
-																.Attr[l];
-															if (value[i].attr == ca.Name) {
-																if (utils.classUtils
-																	.attrTypeIsDict(ca
-																		.Type)) {
-																	var dictItemList = [];
-																	for (var d in value[i]
-																			.choice_list) {
-																		var list_val = value[i]
-																			.choice_list[d];
-																		dictItemList.push({
-																			"CN_S_NAME": list_val,
-																			"Name": list_val,
-																			"label": list_val,
-																			"value": list_val
-																		});
+						if (data.action) {
+							var actionlist = data.action;
+							if (actionlist) {
+								for (var j = 0; j < actionlist.length; j++) {
+									var action = actionlist[j];
+									var action_type = action.action_type;
+									var value = action.value;
+									if (action_type == 'set_dlg_attr') {
+										if (value) {
+											console.log(value);
+											for (var i = 0; i < value.length; i++) {
+												for (var a = 0; a < this.$data.classAttrList
+													.length; a++) {
+													for (var l = 0; l < this.$data
+														.classAttrList[a]
+														.Attr
+														.length; l++) {
+														var ca = this.$data.classAttrList[a]
+															.Attr[l];
+														if (value[i].attr == ca.Name) {
+															if (utils.classUtils
+																.attrTypeIsDict(ca
+																	.Type)) {
+																var dictItemList = [];
+																for (var d in value[i]
+																		.choice_list) {
+																	var list_val = value[i]
+																		.choice_list[d];
+																	dictItemList.push({
+																		"CN_S_NAME": list_val,
+																		"Name": list_val,
+																		"label": list_val,
+																		"value": list_val
+																	});
 
-																	}
-																	ca.dictitem = dictItemList;
-																	// attr[j].dictitem = val[i].choice_list;
-																} else {
-																	ca.Value = value[i].value;
 																}
+																ca.dictitem = dictItemList;
+																// attr[j].dictitem = val[i].choice_list;
+															} else {
+																ca.Value = value[i].value;
 															}
 														}
 													}
+												}
 
-													var length = 0;
-													if (!this.$data.refdatastore.filter(function(
-															s) {
-															return value[i].attr == s.attr
-														}).length) {
-														length = 1;
-														this.$data.refdatastore.push(value[i]);
-													}
-													if (length == 0) {
-														for (var j = 0; j < this.$data.refdatastore
-															.length; j++) {
-															if (this.$data.refdatastore[j].attr ==
+												var length = 0;
+												if (!this.$data.refdatastore.filter(function(
+														s) {
+														return value[i].attr == s.attr
+													}).length) {
+													length = 1;
+													this.$data.refdatastore.push(value[i]);
+												}
+												if (length == 0) {
+													for (var j = 0; j < this.$data.refdatastore
+														.length; j++) {
+														if (this.$data.refdatastore[j].attr ==
+															value[i]
+															.attr) {
+															this.$data.refdatastore[j].value =
 																value[i]
-																.attr) {
-																this.$data.refdatastore[j].value =
-																	value[i]
-																	.value;
-															}
+																.value;
 														}
 													}
 												}
 											}
 										}
-										if (action_type == 'open_select_userdlg') {
-											uni.showModal({
-												title: this.translateSys('error') + " 2.2",
-												content: this.translateSys(
-														"quotation_mark_left") +
-													action_type + this.translateSys(
-														"quotation_mark_right") + this
-													.translate(
-														"tip_action_unprocessed"),
-												showCancel: false,
-												confirmText: this.translateSys('cancel')
-											});
-										}
-										// else if (action_type == 'tip_dlg') {
-
-										// }
 									}
+									if (action_type == 'open_select_userdlg') {
+										uni.showModal({
+											title: this.translateSys('error') + " 2.2",
+											content: this.translateSys(
+													"quotation_mark_left") +
+												action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate(
+													"tip_action_unprocessed"),
+											showCancel: false,
+											confirmText: this.translateSys('cancel')
+										});
+									}
+									// else if (action_type == 'tip_dlg') {
+
+									// }
 								}
 							}
 						}
-					} else {
-						uni.showModal({
-							title: this.translateSys('error') + " 2",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -1651,7 +1608,7 @@
 					info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
 				var dataInfo = {
@@ -1675,153 +1632,144 @@
 				};
 				console.log(dataInfo);
 				// return;
-				this.$store.dispatch('runCustomEvent', dataInfo).then(success => {
-					console.log(success);
-					if (success.err_code == 0) {
-						var data = success.result;
-						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data
-								.err_info :
-								data
-								.err_info.join('<br/>') : '';
-							if (data.ret == 801) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							else uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip + ',' + this.translateSys('tip') + ':' + data
-									.ret,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							return false
-						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data
-								.info
-								.join(
-									'<br/>') : '';
-							if (tip) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
+				runCustomEvent(dataInfo).then(data => {
+					console.log(data);
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
+						else uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip + ',' + this.translateSys('tip') + ':' + data
+								.ret,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
 
-							var actionlist = data.action;
-							if (actionlist) {
-								console.log(actionlist);
-								for (var i = 0; i < actionlist.length; i++) {
-									var action = actionlist[i];
-									if (action.action_type == 'set_dlg_attr') {
-										var result = action.value;
-										for (var i = 0; i < result.length; i++) {
-											if (result[i].choice_list) {
-												for (var c = 0; c < $this.$data.classAttrList
-													.length; c++) {
-													var attr = $this.$data.classAttrList[c].Attr;
-													for (var j = 0; j < attr.length; j++) {
-														if (attr[j].Name == result[i].attr) {
-															if (utils.classUtils.attrTypeIsDict(
-																	attr[j]
-																	.Type)) {
-																var dictItemList = [];
-																for (var d in result[i]
-																		.choice_list) {
-																	var val = result[i]
-																		.choice_list[d];
-																	dictItemList.push({
-																		"CN_S_NAME": val,
-																		"Name": val,
-																		"label": val,
-																		"value": val
-																	});
-																}
-																attr[j].dictitem = dictItemList;
-																// attr[j].dictitem = result[i].choice_list;
-															}
-														}
-													}
-												}
-											}
+						var actionlist = data.action;
+						if (actionlist) {
+							console.log(actionlist);
+							for (var i = 0; i < actionlist.length; i++) {
+								var action = actionlist[i];
+								if (action.action_type == 'set_dlg_attr') {
+									var result = action.value;
+									for (var i = 0; i < result.length; i++) {
+										if (result[i].choice_list) {
 											for (var c = 0; c < $this.$data.classAttrList
 												.length; c++) {
 												var attr = $this.$data.classAttrList[c].Attr;
 												for (var j = 0; j < attr.length; j++) {
-													console.log(attr[j].Name + '==' + result[i]
-														.attr);
 													if (attr[j].Name == result[i].attr) {
-														attr[j].Value = result[i].value;
-													}
-												}
-											}
-											var length = 0;
-											if (!$this.$data.refdatastore.filter(function(s) {
-													return result[i].attr == s.attr
-												}).length) {
-												length = 1;
-												$this.$data.refdatastore.push(result[i]);
-											}
-											if (length == 0) {
-												for (var j = 0; j < $this.$data.refdatastore
-													.length; j++) {
-													if ($this.$data.refdatastore[j].attr == result[
-															i]
-														.attr) {
-														$this.$data.refdatastore[j].value = result[
-																i]
-															.value;
+														if (utils.classUtils.attrTypeIsDict(
+																attr[j]
+																.Type)) {
+															var dictItemList = [];
+															for (var d in result[i]
+																	.choice_list) {
+																var val = result[i]
+																	.choice_list[d];
+																dictItemList.push({
+																	"CN_S_NAME": val,
+																	"Name": val,
+																	"label": val,
+																	"value": val
+																});
+															}
+															attr[j].dictitem = dictItemList;
+															// attr[j].dictitem = result[i].choice_list;
+														}
 													}
 												}
 											}
 										}
-									} else if (data.action[i].action_type == 'set_global_attr') {
-										$this.$data.global_attr = data.action[i].value || [];
+										for (var c = 0; c < $this.$data.classAttrList
+											.length; c++) {
+											var attr = $this.$data.classAttrList[c].Attr;
+											for (var j = 0; j < attr.length; j++) {
+												console.log(attr[j].Name + '==' + result[i]
+													.attr);
+												if (attr[j].Name == result[i].attr) {
+													attr[j].Value = result[i].value;
+												}
+											}
+										}
+										var length = 0;
+										if (!$this.$data.refdatastore.filter(function(s) {
+												return result[i].attr == s.attr
+											}).length) {
+											length = 1;
+											$this.$data.refdatastore.push(result[i]);
+										}
+										if (length == 0) {
+											for (var j = 0; j < $this.$data.refdatastore
+												.length; j++) {
+												if ($this.$data.refdatastore[j].attr == result[
+														i]
+													.attr) {
+													$this.$data.refdatastore[j].value = result[
+															i]
+														.value;
+												}
+											}
+										}
 									}
+								} else if (data.action[i].action_type == 'set_global_attr') {
+									$this.$data.global_attr = data.action[i].value || [];
 								}
 							}
+						}
 
-							if (data.result) {
-								var result = data.result;
-								for (var i = 0; i < result.length; i++) {
-									for (var c = 0; c < $this.$data.classAttrList.length; c++) {
-										var attr = $this.$data.classAttrList[c].Attr;
-										for (var j = 0; j < attr.length; j++) {
-											if (attr[j].Name == result[i].attr) {
-												attr[j].Value = result[i].value;
-											}
+						if (data.result) {
+							var result = data.result;
+							for (var i = 0; i < result.length; i++) {
+								for (var c = 0; c < $this.$data.classAttrList.length; c++) {
+									var attr = $this.$data.classAttrList[c].Attr;
+									for (var j = 0; j < attr.length; j++) {
+										if (attr[j].Name == result[i].attr) {
+											attr[j].Value = result[i].value;
 										}
 									}
+								}
 
-									var length = 0;
-									if (!$this.$data.refdatastore.filter(function(s) {
-											return result[i].attr == s.attr
-										}).length) {
-										length = 1;
-										$this.$data.refdatastore.push(result[i]);
-									}
-									if (length == 0) {
-										for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-											if ($this.$data.refdatastore[j].attr == result[i]
-												.attr) {
-												$this.$data.refdatastore[j].value = result[i]
-													.value;
-											}
+								var length = 0;
+								if (!$this.$data.refdatastore.filter(function(s) {
+										return result[i].attr == s.attr
+									}).length) {
+									length = 1;
+									$this.$data.refdatastore.push(result[i]);
+								}
+								if (length == 0) {
+									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
+										if ($this.$data.refdatastore[j].attr == result[i]
+											.attr) {
+											$this.$data.refdatastore[j].value = result[i]
+												.value;
 										}
 									}
 								}
 							}
 						}
-					} else {
-						uni.showModal({
-							title: this.translateSys('error') + " 3",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -1890,7 +1838,7 @@
 				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				info.attr.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
 				var dataInfo = {
@@ -1914,70 +1862,61 @@
 				};
 				console.log(dataInfo);
 				// return;
-				this.$store.dispatch('runCustomEvent', dataInfo).then(success => {
-					console.log(success);
-					if (success.err_code == 0) {
-						var data = success.result;
-						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data
-								.err_info :
-								data
-								.err_info.join('<br/>') : '';
-							if (data.ret == 801) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							else uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip + ',' + this.translateSys('tip') + ':' + data
-									.ret,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							return false
-						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data
-								.info
-								.join(
-									'<br/>') : '';
-							if (tip) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
-								var length = 0;
-								if (!this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < this.$data.refdatastore.length; j++) {
-										if (this.$data.refdatastore[j].attr == result[i].attr) {
-											this.$data.refdatastore[j].value = result[i].value;
-										}
-									}
-								}
-							}
-
-							this.add();
-						}
-					} else {
-						uni.showModal({
-							title: this.translateSys('error') + " 4",
-							content: success.err_msg,
+				runCustomEvent(dataInfo).then(data => {
+					console.log(data);
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
 							showCancel: false,
 							confirmText: this.translateSys('cancel')
 						});
+						else uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip + ',' + this.translateSys('tip') + ':' + data
+								.ret,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
+
+						var result = data.result;
+						for (var i = 0; i < result.length; i++) {
+							// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
+							var length = 0;
+							if (!this.$data.refdatastore.filter(function(s) {
+									return result[i].attr == s.attr
+								}).length) {
+								length = 1;
+								this.$data.refdatastore.push(result[i]);
+							}
+							if (length == 0) {
+								for (var j = 0; j < this.$data.refdatastore.length; j++) {
+									if (this.$data.refdatastore[j].attr == result[i].attr) {
+										this.$data.refdatastore[j].value = result[i].value;
+									}
+								}
+							}
+						}
+
+						this.add();
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -2046,7 +1985,7 @@
 				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				req.forEach(item => {
-					obj_attr[item.attr] = item.val;
+					obj_attr[item.attr] = item.value;
 				});
 				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
 				var dataInfo = {
@@ -2070,241 +2009,232 @@
 				};
 				console.log(dataInfo);
 				// return;
-				this.$store.dispatch('runCustomEvent', dataInfo).then(success => {
-					console.log(success);
-					if (success.err_code == 0) {
-						var data = success.result;
-						if (data.ret != 0) {
-							var tip = data.err_info ? typeof data.err_info == 'string' ? data
-								.err_info :
-								data
-								.err_info.join('<br/>') : '';
-							if (data.ret == 801) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							else uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip + ',' + this.translateSys('tip') + ':' + data
-									.ret,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
-							return false
-						} else {
-							var tip = data.info ? typeof data.info == 'string' ? data.info : data
-								.info
-								.join(
-									'<br/>') : '';
-							if (tip) uni.showModal({
-								title: this.translateSys('tip'),
-								content: tip,
-								showCancel: false,
-								confirmText: this.translateSys('cancel')
-							});
+				runCustomEvent(dataInfo).then(data => {
+					console.log(data);
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
+						else uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip + ',' + this.translateSys('tip') + ':' + data
+								.ret,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys('tip'),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('cancel')
+						});
 
-							if (data != "") {
-								var actions = data.action;
-								console.log(actions);
-								if (actions) {
-									for (var i = 0; i < actions.length; i++) {
-										var action = actions[i];
-										var val = action.value;
-										var enviroment = JSON.stringify(enviroment);
+						if (data != "") {
+							var actions = data.action;
+							console.log(actions);
+							if (actions) {
+								for (var i = 0; i < actions.length; i++) {
+									var action = actions[i];
+									var val = action.value;
+									var enviroment = JSON.stringify(enviroment);
 
-										if (action.action_type == 'open_panel') {
-											var d = dialog({
-												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-													this.translateSys('tip'),
-												content: this.translateSys(
-														"quotation_mark_left") +
-													action
-													.action_type + this.translateSys(
-														"quotation_mark_right") + this
-													.translate(
-														"tip_action_unprocessed")
-											});
-											d.show();
-										} else if (action.action_type == 'open_select_userdlg') {
-											var style = val.style;
-											// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
-											var $this = this;
-											var param = {
+									if (action.action_type == 'open_panel') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												this.translateSys('tip'),
+											content: this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_select_userdlg') {
+										var style = val.style;
+										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
+										var $this = this;
+										var param = {
+											index: index,
+											iindex: iindex,
+											button_callback: button_callback,
+											req: req,
+											data_attr: data_attr
+										}
+										uni.navigateTo({
+											url: '../selpsn/index?mulit=false&param=' +
+												JSON
+												.stringify(
+													param),
+											events: {
+												AddPer(data, param) {
+													// console.log(param);
+													console.log(data);
+													var callback_eventid = param
+														.button_callback
+														.trim();
+													var info = {
+														eventid: callback_eventid,
+														edtype: "0",
+														projectid: '',
+														rclsid: '',
+														robjid: '',
+														userlogin: '',
+														clsid: $this.$data.param
+															.clsid,
+														objid: "",
+														attr: param.req,
+														inputparameter: data,
+														dataJson: [],
+													}
+													$this.DataObjRunCustomEvent(info,
+														param
+														.data_attr);
+												}
+											}
+										});
+									} else if (action.action_type == 'open_data_query_dlg') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												this.translateSys('tip'),
+											content: this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_common_dlg') {
+										var $this = this;
+										if (val.common_dlg_id == 'check_list') {
+											$this.$data.check_list = val.config;
+											if (val.config.appear_style ==
+												'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+												$this.$data.popupType = 'right';
+											else
+												$this.$data.popupType = 'center'
+											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+											$this.$refs.popup.open($this.$data.popupType);
+											var popupParam = {
 												index: index,
 												iindex: iindex,
 												button_callback: button_callback,
 												req: req,
 												data_attr: data_attr
 											}
-											uni.navigateTo({
-												url: '../selpsn/index?mulit=false&param=' +
-													JSON
-													.stringify(
-														param),
-												events: {
-													AddPer(data, param) {
-														// console.log(param);
-														console.log(data);
-														var callback_eventid = param
-															.button_callback
-															.trim();
+											$this.$data.popupParam = popupParam;
+										}
+									} else if (action.action_type ==
+										'open_project_query_dlg') {
+										//console.log(action.value.select_range);
+										//console.log(action.value.mulit_select);
+										var priRel = '-1';
+										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+											priRel = '0';
+										else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
+											priRel = '1';
+										else if (action.value.select_range == '鎴戝垱寤虹殑')
+											priRel = '2';
+										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+											.value
+											.select_range == '鎴戝弬鍔犵殑')
+											priRel = '3';
+										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+											priRel = '4';
+										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+											priRel = '5';
+
+										var $this = this;
+										var param_ = {
+											index: index,
+											iindex: iindex,
+											button_callback: button_callback,
+											req: req
+										}
+										uni.navigateTo({
+											url: '../selPrj/index?relation=' + priRel +
+												'&param=' +
+												JSON.stringify(param_),
+											events: {
+												AddPer(data, param) {
+													$this.$data.classAttrList[param
+															.index]
+														.Attr[param
+															.iindex].Value = data[0]
+														.Name;
+													$this.$data.classAttrList[param
+															.index]
+														.Attr[param
+															.iindex].ValID = data[0]
+														.ID + ';' +
+														data[0]
+														.Name;
+													var callback_eventid = param
+														.button_callback
+														.trim();
+													if (callback_eventid) {
 														var info = {
 															eventid: callback_eventid,
-															edtype: "0",
-															projectid: '',
-															rclsid: '',
-															robjid: '',
-															userlogin: '',
-															clsid: $this.$data.param
-																.clsid,
+															edtype: "2",
+															projectid: data[0].ID,
+															rclsid: "",
+															robjid: "",
+															userlogin: "",
+															clsid: $this.$data
+																.param.clsid,
 															objid: "",
 															attr: param.req,
-															inputparameter: data,
 															dataJson: [],
 														}
-														$this.DataObjRunCustomEvent(info,
-															param
-															.data_attr);
+
+														$this.DataObjRunCustomEvent(
+															info);
 													}
 												}
-											});
-										} else if (action.action_type == 'open_data_query_dlg') {
-											var d = dialog({
-												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-													this.translateSys('tip'),
-												content: this.translateSys(
-														"quotation_mark_left") +
-													action
-													.action_type + this.translateSys(
-														"quotation_mark_right") + this
-													.translate(
-														"tip_action_unprocessed")
-											});
-											d.show();
-										} else if (action.action_type == 'open_common_dlg') {
-											var $this = this;
-											if (val.common_dlg_id == 'check_list') {
-												$this.$data.check_list = val.config;
-												if (val.config.appear_style ==
-													'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-													$this.$data.popupType = 'right';
-												else
-													$this.$data.popupType = 'center'
-												// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-												$this.$refs.popup.open($this.$data.popupType);
-												var popupParam = {
-													index: index,
-													iindex: iindex,
-													button_callback: button_callback,
-													req: req,
-													data_attr: data_attr
-												}
-												$this.$data.popupParam = popupParam;
 											}
-										} else if (action.action_type ==
-											'open_project_query_dlg') {
-											//console.log(action.value.select_range);
-											//console.log(action.value.mulit_select);
-											var priRel = '-1';
-											if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
-												priRel = '0';
-											else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
-												priRel = '1';
-											else if (action.value.select_range == '鎴戝垱寤虹殑')
-												priRel = '2';
-											else if (action.value.select_range == '鎴戝弬涓庣殑' || action
-												.value
-												.select_range == '鎴戝弬鍔犵殑')
-												priRel = '3';
-											else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
-												priRel = '4';
-											else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
-												priRel = '5';
-
-											var $this = this;
-											var param_ = {
-												index: index,
-												iindex: iindex,
-												button_callback: button_callback,
-												req: req
-											}
-											uni.navigateTo({
-												url: '../selPrj/index?relation=' + priRel +
-													'&param=' +
-													JSON.stringify(param_),
-												events: {
-													AddPer(data, param) {
-														$this.$data.classAttrList[param
-																.index]
-															.Attr[param
-																.iindex].Value = data[0]
-															.Name;
-														$this.$data.classAttrList[param
-																.index]
-															.Attr[param
-																.iindex].ValID = data[0]
-															.ID + ';' +
-															data[0]
-															.Name;
-														var callback_eventid = param
-															.button_callback
-															.trim();
-														if (callback_eventid) {
-															var info = {
-																eventid: callback_eventid,
-																edtype: "2",
-																projectid: data[0].ID,
-																rclsid: "",
-																robjid: "",
-																userlogin: "",
-																clsid: $this.$data
-																	.param.clsid,
-																objid: "",
-																attr: param.req,
-																dataJson: [],
-															}
-
-															$this.DataObjRunCustomEvent(
-																info);
-														}
-													}
-												}
-											});
-										} else {
-											var d = dialog({
-												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-													this.translateSys('tip'),
-												content: this.translateSys(
-														"quotation_mark_left") +
-													action
-													.action_type + this.translateSys(
-														"quotation_mark_right") + this
-													.translate(
-														"tip_action_unprocessed")
-											});
-											d.show();
-										}
+										});
+									} else {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												this.translateSys('tip'),
+											content: this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + this.translateSys(
+													"quotation_mark_right") + this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
 									}
 								}
-							} else {
-								uni.showModal({
-									title: this.translateSys('tip') + "5.2",
-									content: this.translate("execute_script_return_empty"),
-									showCancel: false,
-									confirmText: this.translateSys('cancel')
-								});
 							}
+						} else {
+							uni.showModal({
+								title: this.translateSys('tip') + "5.2",
+								content: this.translate("execute_script_return_empty"),
+								showCancel: false,
+								confirmText: this.translateSys('cancel')
+							});
 						}
-					} else {
-						uni.showModal({
-							title: this.translateSys('error') + " 5",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -2348,251 +2278,6 @@
 	}
 </script>
 <style>
-	.class_attr_title {
-		font-size: 44rpx;
-		padding-bottom: 22rpx;
-		position: relative;
-	}
-
-	.class_attr_title .title_line {
-		border-bottom: 2rpx solid #aaa;
-		position: relative;
-		bottom: -50rpx;
-		width: calc(100% - 290rpx);
-		margin-left: 100px;
-	}
-
-	.class_attr_title .title_icon {
-		border-radius: 50%;
-		width: 100rpx;
-		line-height: 64rpx;
-		display: inline-block;
-		vertical-align: middle;
-		padding-top: 10rpx;
-		padding-left: 20rpx;
-		text-align: center;
-		color: #fff;
-	}
-
-	.class_attr_title i {
-		color: #2c6aa0 !important;
-	}
-
-	.class_attr_title .title_icon i {
-		font-size: 80rpx;
-	}
-
-	.class_attr_title .title {
-		padding-right: 22rpx;
-		display: inline-block;
-		background-color: #fff;
-		position: relative;
-		bottom: -8rpx;
-	}
-
-	.class_attr_title .arrow {
-		position: absolute;
-		top: 6rpx;
-		right: 30rpx;
-		font-size: 60rpx;
-	}
-
-	input::-webkit-input-placeholder {
-		font-size: 12rpx;
-	}
-
-	textarea {
-		width: 98%;
-		border: 1px solid #d5d5d5;
-		padding: 10rpx 8rpx 12rpx;
-		background: #FFF;
-		border-radius: 0 !important;
-		font-size: 34rpx;
-		font-family: inherit;
-		box-shadow: none !important;
-		transition-duration: 0.1s;
-		color: #046db3;
-		margin-top: 4px;
-	}
-
-	input {
-		border: 1px solid #d5d5d5;
-		width: 98%;
-		height: 52rpx;
-		background: #FFF;
-		border-radius: 0 !important;
-		color: #046db3;
-		padding: 10rpx 8rpx 12rpx;
-		font-size: 34rpx;
-		font-family: inherit;
-		box-shadow: none !important;
-		transition-duration: 0.1s;
-		margin-top: 4rpx;
-	}
-
-	.select {
-		width: 20px;
-		position: absolute;
-		opacity: 0;
-	}
-
-	.class_attr_body .form-group {
-		margin: 20rpx 30rpx;
-		/* margin-left: -12px;
-	    margin-right: -12px; */
-	}
-
-	.form-group>label[class*="col-"] {
-		margin-bottom: 8rpx;
-		font-size: 32rpx;
-	}
-
-	.form-group label {
-		vertical-align: middle;
-		line-height: 60rpx;
-	}
-
-	.no-padding-right {
-		padding-right: 0 !important;
-	}
-
-	.col-xs-12 {
-		width: 100%;
-	}
-
-	.tx_title {
-		font-size: 32rpx;
-	}
-
-	.tx_title2 {
-		font-size: 32rpx;
-		text-align: right;
-		display: inline-block;
-		vertical-align: -2px;
-	}
-
-	.text-right {
-		margin-right: 20rpx;
-		margin-top: -6rpx;
-		display: inline-block;
-		float: right;
-		font-size: 48rpx;
-	}
-
-	.text-right a,
-	.text-right2 a {
-		color: #337ab7;
-	}
-
-	.text-right2 {
-		margin: 0;
-		vertical-align: -4px;
-		margin-left: 9px;
-		float: none;
-		font-size: 48rpx;
-		display: inline-block;
-	}
-
-	.section_iput {
-		border: 1px solid #d5d5d5;
-		width: 98%;
-		height: 62rpx;
-		background: #FFF;
-		border-radius: 0 !important;
-		color: #046db3;
-		padding: 10rpx 8rpx 10rpx;
-		font-size: 34rpx;
-		font-family: inherit;
-		box-shadow: none !important;
-		transition-duration: 0.1s;
-	}
-
-	.date_iput {
-		border: 1px solid #d5d5d5;
-		/* width: 98%; */
-		height: 62rpx;
-		background: #FFF;
-		border-radius: 0 !important;
-		color: #046db3;
-		padding: 10rpx 8rpx 4rpx;
-		font-size: 34rpx;
-		font-family: inherit;
-		box-shadow: none !important;
-		transition-duration: 0.1s;
-	}
-
-	button.btn_add {
-		width: 49.5%;
-		margin-top: 50rpx;
-		padding: 20rpx;
-		line-height: 1.5;
-		background: #27A6E1;
-		border: none;
-		color: #fff;
-		font-size: 38rpx;
-		font-weight: bold;
-		float: right;
-		display: inline-block;
-	}
-
-	button.btn_cancel {
-		width: 49.5%;
-		margin-top: 50rpx;
-		padding: 20rpx;
-		line-height: 1.5;
-		background: #27A6E1;
-		border: none;
-		color: #fff;
-		font-size: 38rpx;
-		font-weight: bold;
-		float: left;
-		display: inline-block;
-	}
-
-	.i_tishi {
-		color: red;
-		vertical-align: sub;
-		font-style: initial;
-		margin-left: 20rpx;
-		font-size: 17px;
-	}
-
-	.attr_field {
-		display: inline-block;
-		vertical-align: middle;
-		margin-left: 8px;
-		/* width: 71%; */
-	}
-
-	.input_vallist {
-		max-height: 350rpx;
-		overflow-y: auto;
-		display: none;
-	}
-
-	.input_vallist ul {
-		/* border: 1px solid red; */
-		padding: 0 20rpx;
-	}
-
-	.input_vallist ul li {
-		list-style: none;
-		padding: 20rpx;
-		border-bottom: 1px solid #ccc;
-	}
-
-	.input_vallist ul li a {
-		float: right;
-	}
-
-	.input_vallist ul li a i {
-		font-size: 45rpx;
-	}
-
-	.view-popup {
-		position: relative;
-	}
-
 	.popup-content {
 		@include flex;
 		align-items: center;
@@ -2603,104 +2288,373 @@
 		/* border: 1px solid red; */
 	}
 
-	.popup-cont {
-		overflow-y: auto;
-		/* border: 1px solid red; */
-	}
-
 	.popup-height {
 		@include height;
 		/* width: 200px; */
 	}
-
-	.popup-header {
-		font-size: 42rpx;
-		font-weight: bold;
-		margin: 20rpx 20rpx 0px 20rpx;
-	}
-
-	.view_popup_CheckList {
-		margin-bottom: 20rpx;
-	}
-
-	.popup-footer {
-		float: right;
-		position: absolute;
-		bottom: 0;
-		right: 20rpx;
-	}
-
-	button.btn_popup_add {
-		width: 180rpx;
-		margin-top: 50rpx;
-		margin-right: 20rpx;
-		padding: 15rpx;
-		line-height: 1.5;
-		background: #27A6E1;
-		border: none;
-		color: #fff;
-		font-size: 38rpx;
-		font-weight: bold;
-		/* float: left; */
-		display: inline-block;
-	}
-
-	button.btn_popup_cancel {
-		width: 180rpx;
-		margin-top: 50rpx;
-		padding: 15rpx;
-		line-height: 1.5;
-		background: #27A6E1;
-		border: none;
-		color: #fff;
-		font-size: 38rpx;
-		font-weight: bold;
-		/* float: right; */
-		display: inline-block;
-	}
 </style>
-<style>
-	.touch-item {
-		background-color: #F8F9FC;
-		display: flex;
-		justify-content: space-between;
-		width: 100%;
-		overflow: hidden
-	}
 
-	.itemcontent {
+<style lang="scss">
+	.uni-page-modal-3018 {
 		display: flex;
-		flex-direction: column;
-		padding: 5px 10px;
-		border-bottom: 1px solid #eeeeee;
-		margin-right: 0;
-		margin-left: -100px;
-		width: 100%;
-		-webkit-transition: all 0.4s;
-		transition: all 0.4s;
-		-webkit-transform: translateX(100px);
-		transform: translateX(100px);
-		position: relative;
-	}
+		height: calc(100vh - 30rpx);
+		width: 720rpx;
+		flex-direction: column !important;
+		padding: 15rpx;
 
-	.itembtn {
-		width: 100px;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		background-color: #119bf8;
-		color: white;
-		position: relative;
-		-webkit-transform: translateX(100px);
-		transform: translateX(100px);
-		-webkit-transition: all 0.4s;
-		transition: all 0.4s;
-	}
+		.v-area {
+			width: 100%;
+			flex-direction: column !important;
+		}
 
-	.touch-move-active .itemcontent,
-	.touch-move-active .itembtn {
-		-webkit-transform: translateX(0);
-		transform: translateX(0);
+		.v-bottom {
+			display: block;
+			width: calc(100% - 30rpx);
+			padding: 10rpx 15rpx 20rpx 15rpx;
+		}
+
+		.class_attr_title {
+			font-size: 44rpx;
+			padding-bottom: 22rpx;
+			position: relative;
+		}
+
+		.class_attr_title .title_line {
+			border-bottom: 2rpx solid #aaa;
+			position: relative;
+			bottom: -50rpx;
+			width: calc(100% - 290rpx);
+			margin-left: 100px;
+		}
+
+		.class_attr_title .title_icon {
+			border-radius: 50%;
+			width: 100rpx;
+			line-height: 64rpx;
+			display: inline-block;
+			vertical-align: middle;
+			padding-top: 10rpx;
+			padding-left: 20rpx;
+			text-align: center;
+			color: #fff;
+		}
+
+		.class_attr_title i {
+			color: #2c6aa0 !important;
+		}
+
+		.class_attr_title .title_icon i {
+			font-size: 80rpx;
+		}
+
+		.class_attr_title .title {
+			padding-right: 22rpx;
+			display: inline-block;
+			background-color: #fff;
+			position: relative;
+			bottom: -8rpx;
+		}
+
+		.class_attr_title .arrow {
+			position: absolute;
+			top: 6rpx;
+			right: 30rpx;
+			font-size: 60rpx;
+		}
+
+		input::-webkit-input-placeholder {
+			font-size: 12rpx;
+		}
+
+		textarea {
+			width: 98%;
+			border: 1px solid #d5d5d5;
+			padding: 10rpx 8rpx 12rpx;
+			background: #FFF;
+			border-radius: 0 !important;
+			font-size: 34rpx;
+			font-family: inherit;
+			box-shadow: none !important;
+			transition-duration: 0.1s;
+			color: #046db3;
+			margin-top: 4px;
+		}
+
+		input {
+			border: 1px solid #d5d5d5;
+			width: 98%;
+			height: 52rpx;
+			background: #FFF;
+			border-radius: 0 !important;
+			color: #046db3;
+			padding: 10rpx 8rpx 12rpx;
+			font-size: 34rpx;
+			font-family: inherit;
+			box-shadow: none !important;
+			transition-duration: 0.1s;
+			margin-top: 4rpx;
+		}
+
+		.select {
+			width: 20px;
+			position: absolute;
+			opacity: 0;
+		}
+
+		.class_attr_body .form-group {
+			margin: 20rpx 30rpx;
+			/* margin-left: -12px;
+	    margin-right: -12px; */
+		}
+
+		.form-group>label[class*="col-"] {
+			margin-bottom: 8rpx;
+			font-size: 32rpx;
+		}
+
+		.form-group label {
+			vertical-align: middle;
+			line-height: 60rpx;
+		}
+
+		.no-padding-right {
+			padding-right: 0 !important;
+		}
+
+		.col-xs-12 {
+			width: 100%;
+		}
+
+		.tx_title {
+			font-size: 32rpx;
+		}
+
+		.tx_title2 {
+			font-size: 32rpx;
+			text-align: right;
+			display: inline-block;
+			vertical-align: -2px;
+		}
+
+		.text-right {
+			margin-right: 20rpx;
+			margin-top: -6rpx;
+			display: inline-block;
+			float: right;
+			font-size: 48rpx;
+		}
+
+		.text-right a,
+		.text-right2 a {
+			color: #337ab7;
+		}
+
+		.text-right2 {
+			margin: 0;
+			vertical-align: -4px;
+			margin-left: 9px;
+			float: none;
+			font-size: 48rpx;
+			display: inline-block;
+		}
+
+		.section_iput {
+			border: 1px solid #d5d5d5;
+			width: 98%;
+			height: 62rpx;
+			background: #FFF;
+			border-radius: 0 !important;
+			color: #046db3;
+			padding: 10rpx 8rpx 10rpx;
+			font-size: 34rpx;
+			font-family: inherit;
+			box-shadow: none !important;
+			transition-duration: 0.1s;
+		}
+
+		.date_iput {
+			border: 1px solid #d5d5d5;
+			/* width: 98%; */
+			height: 62rpx;
+			background: #FFF;
+			border-radius: 0 !important;
+			color: #046db3;
+			padding: 10rpx 8rpx 4rpx;
+			font-size: 34rpx;
+			font-family: inherit;
+			box-shadow: none !important;
+			transition-duration: 0.1s;
+		}
+
+		button.btn_add {
+			width: 49.5%;
+			margin-top: 50rpx;
+			padding: 20rpx;
+			line-height: 1.5;
+			background: #27A6E1;
+			border: none;
+			color: #fff;
+			font-size: 38rpx;
+			font-weight: bold;
+			float: right;
+			display: inline-block;
+		}
+
+		button.btn_cancel {
+			width: 49.5%;
+			margin-top: 50rpx;
+			padding: 20rpx;
+			line-height: 1.5;
+			background: #27A6E1;
+			border: none;
+			color: #fff;
+			font-size: 38rpx;
+			font-weight: bold;
+			float: left;
+			display: inline-block;
+		}
+
+		.i_tishi {
+			color: red;
+			vertical-align: sub;
+			font-style: initial;
+			margin-left: 20rpx;
+			font-size: 17px;
+		}
+
+		.attr_field {
+			display: inline-block;
+			vertical-align: middle;
+			margin-left: 8px;
+			/* width: 71%; */
+		}
+
+		.input_vallist {
+			max-height: 350rpx;
+			overflow-y: auto;
+			display: none;
+		}
+
+		.input_vallist ul {
+			/* border: 1px solid red; */
+			padding: 0 20rpx;
+		}
+
+		.input_vallist ul li {
+			list-style: none;
+			padding: 20rpx;
+			border-bottom: 1px solid #ccc;
+		}
+
+		.input_vallist ul li a {
+			float: right;
+		}
+
+		.input_vallist ul li a i {
+			font-size: 45rpx;
+		}
+
+		.view-popup {
+			position: relative;
+		}
+
+
+		.popup-cont {
+			overflow-y: auto;
+			/* border: 1px solid red; */
+		}
+
+
+
+		.popup-header {
+			font-size: 42rpx;
+			font-weight: bold;
+			margin: 20rpx 20rpx 0px 20rpx;
+		}
+
+		.view_popup_CheckList {
+			margin-bottom: 20rpx;
+		}
+
+		.popup-footer {
+			float: right;
+			position: absolute;
+			bottom: 0;
+			right: 20rpx;
+		}
+
+		button.btn_popup_add {
+			width: 180rpx;
+			margin-top: 50rpx;
+			margin-right: 20rpx;
+			padding: 15rpx;
+			line-height: 1.5;
+			background: #27A6E1;
+			border: none;
+			color: #fff;
+			font-size: 38rpx;
+			font-weight: bold;
+			/* float: left; */
+			display: inline-block;
+		}
+
+		button.btn_popup_cancel {
+			width: 180rpx;
+			margin-top: 50rpx;
+			padding: 15rpx;
+			line-height: 1.5;
+			background: #27A6E1;
+			border: none;
+			color: #fff;
+			font-size: 38rpx;
+			font-weight: bold;
+			/* float: right; */
+			display: inline-block;
+		}
+
+
+		.touch-item {
+			background-color: #F8F9FC;
+			display: flex;
+			justify-content: space-between;
+			width: 100%;
+			overflow: hidden
+		}
+
+		.itemcontent {
+			display: flex;
+			flex-direction: column;
+			padding: 5px 10px;
+			border-bottom: 1px solid #eeeeee;
+			margin-right: 0;
+			margin-left: -100px;
+			width: 100%;
+			-webkit-transition: all 0.4s;
+			transition: all 0.4s;
+			-webkit-transform: translateX(100px);
+			transform: translateX(100px);
+			position: relative;
+		}
+
+		.itembtn {
+			width: 100px;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			background-color: #119bf8;
+			color: white;
+			position: relative;
+			-webkit-transform: translateX(100px);
+			transform: translateX(100px);
+			-webkit-transition: all 0.4s;
+			transition: all 0.4s;
+		}
+
+		.touch-move-active .itemcontent,
+		.touch-move-active .itembtn {
+			-webkit-transform: translateX(0);
+			transform: translateX(0);
+		}
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1