From 9201045a62b97c63e0cda7a63bc383b4074b2ee0 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期三, 16 四月 2025 16:22:12 +0800
Subject: [PATCH] d

---
 pages/modal/small-wnd/index.vue | 1179 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 568 insertions(+), 611 deletions(-)

diff --git a/pages/modal/small-wnd/index.vue b/pages/modal/small-wnd/index.vue
index 3d67208..4fdd1ee 100644
--- a/pages/modal/small-wnd/index.vue
+++ b/pages/modal/small-wnd/index.vue
@@ -287,9 +287,22 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from  '@/js/Base64.js';
 	import pickerAddress from '../../js/pickerAddress/pickerAddress.vue'
 	import utils from "@/js/utils.js"
+	import {
+		dictGetInfo,
+		dictItemGetInfo
+	} from "@/api/mobox.js"
+	import {
+		getUIStyleInfo,
+		classAttrGetList,
+		runCustomEvent,
+		dataObjCreate,
+		dataObjDel
+	} from "@/api/data.js"
 	export default {
 		name: "PageModalSmallWnd",
 		modules: {
@@ -301,7 +314,7 @@
 		onBackPress(e) {
 			// console.log("鐩戝惉杩斿洖鎸夐挳浜嬩欢",e);
 			if (this.type) {
-				var eventChannel = this.$scope.eventChannel;
+				const eventChannel = this.getOpenerEventChannel();
 				// const eventChannel = this.getOpenerEventChannel();
 				eventChannel.emit(this.type, "");
 			}
@@ -375,6 +388,28 @@
 			this.loadData()
 		},
 		methods: {
+			setData(obj) {
+				let that = this;
+				let keys = [];
+				let val, data;
+
+				Object.keys(obj).forEach(function(key) {
+					keys = key.split(".");
+					val = obj[key];
+					data = that.$data;
+					keys.forEach(function(key2, index) {
+						if (index + 1 == keys.length) {
+							that.$set(data, key2, val);
+						} else {
+							if (!data[key2]) {
+								that.$set(data, key2, {});
+							}
+						}
+						data = data[key2];
+					});
+				});
+			},
+
 			async loadData() {
 
 
@@ -386,126 +421,93 @@
 				await this.loadAttrList();
 			},
 			async loadAttrList() {
-				var dataInfo = {
-					class_id: this.param.clsId,
-					class_name: this.param.clsName,
-					group_name: ''
-				};
-				var $this = this;
 
-				// console.log($this.$store.getters.getclassAttrList);
-				$this.$store.state.thisareaFuncID = this.param.clsId;
-				//鑾峰彇
-				if ($this.$store.getters.getclassAttrList) {
-					$this.$data.attrList = $this.$store.getters.getclassAttrList;
-				} else {
-					$this.$store.dispatch('classAttrGetList', dataInfo).then(success => {
-						// console.log(success);
-						if (success.err_code == 0) {
-							$this.$data.attrList = success.result;
-						}
-					}).catch(ex => {
-						uni.showModal({
-							title: this.translateSys('error') + " 1.1",
-							content: ex.errMsg,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						})
-					})
+				try {
+					var dataInfo = {
+						class_id: this.param.clsId,
+						class_name: this.param.clsName,
+						group_name: ''
+					};
+					this.$data.attrList == await classAttrGetList(dataInfo) || []
+
+				} catch (ex) {
+					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
+					uni.showModal({
+						title: this.translateSys("error") + "1.1",
+						content: tip,
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
 				}
 			},
 			async DictItemGetList(attr, name) { //Mobox3寰楀埌瀛楀吀椤瑰垪琛�-				this.data = [];
-				var $this = this;
-				var dataInfo = {
-					dict_id: undefined,
-					dict_name: name
-				};
-				this.$store.dispatch('DictItemGetList', dataInfo).then(async (success) => {
-					// console.log(success);
-					if (success.err_code == 0) {
 
-						let dicList = success.result?.dict_item_list || [];
-						$this.dictList[attr.attr] = dicList;
+				try {
+					this.data = [];
+					var dataInfo = {
+						dict_id: undefined,
+						dict_name: name
+					};
+					const result = await dictItemGetInfo(dataInfo)
+					let dicList = result?.dict_item_list || [];
+					this.dictList[attr.attr] = dicList;
 
-						let dictName = "";
-						if (dicList?.length > 0) {
-							let defaultValue = dicList
-								.find(
-									(d) => d.is_default ==
-									1
-								)?.name;
-							if (defaultValue) dictName =
-								defaultValue;
-							else dictName = dicList[0]
-								.name;
+					let dictName = "";
+					if (dicList?.length > 0) {
+						let defaultValue = dicList
+							.find(
+								(d) => d.is_default ==
+								1
+							)?.name;
+						if (defaultValue) dictName =
+							defaultValue;
+						else dictName = dicList[0]
+							.name;
 
-						}
-						this.form[attr.attr] = dictName;
-					} else {
-						uni.showModal({
-							title: this.translateSys('error') + " 1.2",
-							content: success.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys('cancel')
-						});
 					}
-				}).catch(ex => {
-					// console.log(ex);
+					this.form[attr.attr] = dictName;
+
+				} catch (ex) {
 					uni.showModal({
 						title: this.translateSys('error') + " 1.3",
 						content: ex.errMsg,
 						showCancel: false,
 						confirmText: this.translateSys('cancel')
 					});
-				});
+					return []
+				}
+
+
 			},
 			async loadStyleDef() {
-				var $this = this;
+				try {
+					var $this = this;
 
-				var gridstyleInfo = {};
-				if (param.editDlg.id) {
-					gridstyleInfo = {
-						class_id: $this.param.clsId,
-						ui_style_id: this.param.editDlg.id,
-					};
-				} else {
-					gridstyleInfo = {
-						class_id: $this.param.clsId,
-						ui_style_type: 2,
-						ui_style_name: $this.param.editDlg.name
-					};
-				}
-				$this.$store.state.thisareaFuncID = this.param.clsId;
-				$this.$store.state.thisEditName = $this.$data.param.editDlg.name
-				// console.log($this.$store.getters.getclassGridStyleInfo);
-				//鑾峰彇
-				if ($this.$store.getters.getclassGridStyleInfo) {
-					$this.$data.style_def = $this.$store.getters.getclassGridStyleInfo;
-				} 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);
-							$this.$data.style_def = JSON.parse(styledef);
-						} 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')
-						});
+					var gridstyleInfo = {};
+					if (param.editDlg.id) {
+						gridstyleInfo = {
+							class_id: this.param.clsId,
+							ui_style_id: this.param.editDlg.id,
+						};
+					} else {
+						gridstyleInfo = {
+							class_id: $this.param.clsId,
+							ui_style_type: 2,
+							ui_style_name: this.param.editDlg.name
+						};
+					}
+					const result = await getUIStyleInfo(gridstyleInfo)
+					var styledef = Base64.decode(result?.style_def);
+					this.$data.style_def = JSON.parse(styledef);
+				} catch (ex) {
+					uni.showModal({
+						title: this.translateSys('error') + " 1.5,
+						content: ex.errMsg,
+						showCancel: false,
+						confirmText: this.translateSys('cancel')
 					});
+					return []
 				}
 			},
 
@@ -1060,7 +1062,7 @@
 			},
 			cancel(e) {
 				if (this.type) {
-					var eventChannel = this.$scope.eventChannel;
+					const eventChannel = this.getOpenerEventChannel();
 					// const eventChannel = this.getOpenerEventChannel();
 					eventChannel.emit(this.type, "");
 				}
@@ -1094,7 +1096,7 @@
 				// console.log(e.target);
 				var value = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
 					.dictitem[e
-						.target.value];
+						.detail.value];
 				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
 					'iindex']];
 				// console.log(data_attr);
@@ -1210,9 +1212,9 @@
 				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
 					'iindex']];
 				// console.log(decodedata);
-				if (e.target.value != data_attr.Value) {
+				if (e.detail.value != data_attr.Value) {
 					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
-						decodedata ? decodedata : e.target.value;
+						decodedata ? decodedata : e.detail.value;
 					var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
 							'iindex']]
 						.action;
@@ -1346,7 +1348,7 @@
 					showCancel: false,
 					confirmText: this.translateSys('cancel')
 				});
-				// var value=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.target.value];
+				// var value=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.detail.value];
 				// this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
 			},
 			classAttr_AddPrj(index, iindex) {
@@ -1487,64 +1489,54 @@
 				};
 				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: '鎵ц鑴氭湰澶辫触锛� + action.result,
-										showCancel: false,
-										confirmText: this.translateSys('cancel')
-									});
-									return;
-								}
-								if (action.info) {
-									uni.showModal({
-										title: this.translateSys('tip') + "",
-										content: '鎵ц鑴氭湰澶辫触锛� + 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: '鎵ц鑴氭湰澶辫触锛� + action.result,
+									showCancel: false,
+									confirmText: this.translateSys('cancel')
+								});
+								return;
 							}
-						} else
-							uni.showToast({
-								title: "鍒涘缓鎴愬姛锛�,
-								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: '鎵ц鑴氭湰澶辫触锛� + 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: "鍒涘缓鎴愬姛锛�,
+							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();
@@ -1608,122 +1600,113 @@
 				};
 				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 + ',鎻愮ず:' + 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 + ',鎻愮ず:' + 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 == value[i]
-																.attr) {
-																this.$data.refdatastore[j].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 == value[i]
+															.attr) {
+															this.$data.refdatastore[j].value = value[i]
+																.value;
 														}
 													}
 												}
 											}
 										}
-										if (action_type == 'open_select_userdlg') {
-											uni.showModal({
-												title: this.translateSys('error') + " 2.2",
-												content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
-												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: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
+											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({
@@ -1800,140 +1783,131 @@
 				};
 				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 + ',鎻愮ず:' + 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 + ',鎻愮ず:' + 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++) {
+													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;
 														}
 													}
 												}
 											}
-											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;
-													}
+										}
+										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;
 												}
 											}
 										}
-									} else if (data.action[i].action_type == 'set_global_attr') {
-										$this.$data.global_attr = data.action[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({
@@ -2024,67 +1998,58 @@
 				};
 				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 + ',鎻愮ず:' + 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 + ',鎻愮ず:' + 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({
@@ -2177,208 +2142,200 @@
 				};
 				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 + ',鎻愮ず:' + 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 != "") {
-								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.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 + ',鎻愮ず:' + 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 (action.action_type == 'open_panel') {
-											var d = dialog({
-												title: '<i class="ace-icon fa fa-info-circle"></i> ' +
-													this.translateSys('tip'),
-												content: action.action_type + '姝ction灏氭湭澶勭悊锛�
-											});
-											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 (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: action.action_type + '姝ction灏氭湭澶勭悊锛�
+										});
+										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: action.action_type + '姝ction灏氭湭澶勭悊锛�
+										});
+										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: '',
+															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: action.action_type + '姝ction灏氭湭澶勭悊锛�
-											});
-											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: action.action_type + '姝ction灏氭湭澶勭悊锛�
-											});
-											d.show();
-										}
+										});
+									} else {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												this.translateSys('tip'),
+											content: action.action_type + '姝ction灏氭湭澶勭悊锛�
+										});
+										d.show();
 									}
 								}
-							} else {
-								uni.showModal({
-									title: this.translateSys('tip') + "5.2",
-									content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,
-									showCancel: false,
-									confirmText: this.translateSys('cancel')
-								});
 							}
+						} else {
+							uni.showModal({
+								title: this.translateSys('tip') + "5.2",
+								content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,
+								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({

--
Gitblit v1.9.1