~jt/MES-PDA.git

			@@ -254,7 +254,7 @@
			</div>

			</view>
			<button type="default" @tap="cancel" class="btn_cancel">取消</button>
			<button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>
			<button type="default" @tap="sava" class="btn_add">{{title}}</button>
			<!-- 普通弹窗 top bottom center left right -->
			<view>
			@@ -274,8 +274,9 @@
			</view>
			</view>
			<view class="popup-footer">
			<button type="default" @tap="popup_sava" class="btn_popup_add">确定</button>
			<button type="default" @tap="popup_cancel" class="btn_popup_cancel">取消</button>
			<button type="default" @tap="popup_sava" class="btn_popup_add">{{translateSys('ok')}}</button>
			<button type="default" @tap="popup_cancel"
			class="btn_popup_cancel">{{translateSys('cancel')}}</button>
			</view>
			</view>
			</uni-popup>
			@@ -306,7 +307,7 @@
			},
			data() {
			return {
			title: '新增',
			title: this.translateSys('add2'),
			param: {},
			type: '',
			classAttrList: [],
			@@ -350,74 +351,110 @@
			console.log(param);
			if (!param.EditDlgMode) {
			uni.showModal({
			title: "提示",
			content: "该功能点未配置编辑窗口，请重新配置！",
			title: this.translateSys('tip'),
			content: this.translate('function_not_edit_dlg'),
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			uni.navigateBack({
			delta: 1, //返回层数，2则上上页
			});
			return;
			}
			if (!param.Edit_dlg.Name) {
			uni.showModal({
			title: "提示",
			content: "该功能点未配置窗口样式，请重新配置！",
			title: this.translateSys('tip')
			",
			content: this.translate('function_not_edit_dlg'),
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			uni.navigateBack({
			delta: 1, //返回层数，2则上上页
			});
			return;
			}
			this.$data.param = param;
			var edit_dlg = {
			Model: param.EditDlgMode,
			Name: param.Edit_dlg.Name
			}
			var dataInfo = {
			class_id: 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 => {
			// console.log(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: "错误1",
			content: success.err_msg,
			showCancel: false,
			confirmText: "取消"
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: "错误1.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: "取消"
			});
			});
			this.loadData()

			},

			methods: {
			setData: function(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() {
			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;
			@@ -434,19 +471,19 @@

			} else {
			uni.showModal({
			title: "错误1.2",
			title: this.translateSys('error') + " 1.2",
			content: success.err_msg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: "错误1.3",
			title: this.translateSys('error') + " 1.3",
			content: ex.errMsg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			});
			},
			@@ -476,19 +513,19 @@
			$this.viewParam();
			} else {
			uni.showModal({
			title: "错误1.4",
			title: this.translateSys('error') + " 1.4",
			content: success.err_msg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			}).catch(ex => {
			console.log(ex);
			uni.showModal({
			title: "错误1.5",
			title: this.translateSys('error') + " 1.5",
			content: ex.errMsg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			});
			}
			@@ -565,7 +602,8 @@
			DispName: attr.disp_name,
			LuaAttr: attr.lua_attr,
			Desc: attr.desc,
			ActionDef: attr.action_def ? Base64.decode(attr.action_def) : '',
			ActionDef: attr.action_def ? Base64.decode(attr
			.action_def) : '',
			Multilingual: attr.multilingual,
			RefCondition: attr.ref_condition,
			GroupName: data.group,
			@@ -619,7 +657,8 @@
			if (ca.select == true)
			ca.Value = []; //ca.dictitem[0].CN_S_NAME;
			else
			ca.Value = '请选择'; //ca.dictitem[0].CN_S_NAME;
			ca.Value = this.translateSys(
			"select"); //ca.dictitem[0].CN_S_NAME;
			var dictitemlist = [];
			for (var d = 0; d < ca.dictitem.length; d++) {
			ca.dictitem[d].label = ca.dictitem[d].CN_S_NAME;
			@@ -629,22 +668,25 @@
			ca.Value = ca.dictitem[d].CN_S_NAME;
			}
			}
			if(utils.classUtils.attrTypeIsDate(ca.Type)){
			if (utils.classUtils.attrTypeIsDateTime(ca.Type)) {
			var nowDate = new Date();
			var date = {
			year: nowDate.getFullYear(),
			month: nowDate.getMonth() + 1,
			day: nowDate.getDate()
			}
			ca.Value = date.year + '-' + (date.month >= 10 ? date.month : '0' + date
			.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day);
			ca.Value = date.year + '-' + (date.month >= 10 ? date.month :
			'0' +
			date
			.month) + '-' + (date.day >= 10 ? date.day : '0' + date
			.day);
			}
			if (utils.classUtils.attrTypeIsObjRefMulti(ca.Type)) {
			ca.RelClsList = ca.RelCls;
			ca.Value = '请';
			ca.Value = this.translateSys('please');
			}
			if(utils.classUtils.attrTypeIsRegion(ca.Type))
			ca.Value = '请选择';
			if (utils.classUtils.attrTypeIsRegion(ca.Type))
			ca.Value = this.translateSys("select");
			if (utils.classUtils.attrTypeIsBool(ca.Type))
			ca.Value = false;

			@@ -725,10 +767,10 @@

			} else {
			uni.showModal({
			title: "提示",
			content: "未找到可显示的的属性",
			title: this.translateSys('tip'),
			content: this.translate('no_find_attr_diaplay'),
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			},
			@@ -756,27 +798,29 @@
			// }
			// $this.$data.popupParam= popupParam;
			// return;
			var before_click_button = $this.$data.classAttrList[index].Attr[iindex].before_click_button;
			var before_click_button = $this.$data.classAttrList[index].Attr[iindex]
			.before_click_button;
			var button_callback = $this.$data.classAttrList[index].Attr[iindex].button_callback;
			if (!before_click_button) {
			uni.showModal({
			title: "提示",
			content: "before_click_button-event_id为空！",
			title: this.translateSys('tip'),
			content: this.translate("icon_click_event_empty"),
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return;
			}
			if (!button_callback) {
			uni.showModal({
			title: "提示",
			content: "button_callback-event_id为空！",
			title: this.translateSys('tip'),
			content: this.translate("icon_click_event_empty"),
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return;
			}
			this.DataObjRunCustomEvent_Return(before_click_button, data_attr, button_callback, index, iindex);
			this.DataObjRunCustomEvent_Return(before_click_button, data_attr, button_callback, index,
			iindex);
			},
			popupChange(e) {
			console.log('当前模式：' + e.type + ',状态：' + e.show);
			@@ -817,14 +861,16 @@
			}
			if (!$this.$data.popupParam) {
			uni.showModal({
			title: "提示",
			title: this.translateSys('tip'),
			content: "popupParam为空！",
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return;
			}
			$this.$data.classAttrList[$this.$data.popupParam.index].Attr[$this.$data.popupParam.iindex].Value = name;
			$this.$data.classAttrList[$this.$data.popupParam.index].Attr[$this.$data.popupParam.iindex]
			.Value =
			name;
			console.log(data);
			var callback_eventid = $this.$data.popupParam.button_callback.trim();
			var info = {
			@@ -857,7 +903,9 @@
			//console.log(e.target)
			getApp().onScan((result) => {
			console.log(result);
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']]
			.Value =
			result.decodedata;
			uni.hideKeyboard();
			this.onevent($ele, result.decodedata);
			@@ -869,20 +917,29 @@
			},
			ondateTime(e) {
			//console.log(e.target)
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e.target
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			.Value = e
			.target
			.value;
			},
			onchange(e) {
			// console.log(e.target);
			var value = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].dictitem[e
			.target.value];
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
			var value = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']]
			.dictitem[e
			.target.value];
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']];
			// console.log(data_attr);
			if (value.Name != data_attr.Value) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = value
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			.Value =
			value
			.Name;
			// console.log(this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target
			.dataset[
			'iindex']]
			.action;
			if (eventid) {
			// self.event_no_sub = 1;
			@@ -893,7 +950,7 @@
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			req.push(this.formatAttr(ar))


			}
			}
			var info = {
			@@ -955,7 +1012,7 @@
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (utils.classUtils.attrTypeIsDict(ar.Type))
			if (utils.classUtils.attrTypeIsDict(ar.Type))
			req.push({
			attr: ar.Name,
			value: itemvalue.Name
			@@ -985,12 +1042,16 @@
			},
			onevent(e, decodedata) {
			// console.log(e.target);
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
			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) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			.Value =
			decodedata ? decodedata : e.target.value;
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target
			.dataset[
			'iindex']]
			.action;
			if (eventid) {
			// self.event_no_sub = 1;
			@@ -1023,11 +1084,16 @@
			oncheck(e) {
			// console.log(e.target);
			var ischecked = e.target.dataset.ischeck ? false : true;
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
			var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset[
			'iindex']];
			// console.log(data_attr);
			if (ischecked != data_attr.Value) {
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = ischecked;
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			.Value =
			ischecked;
			var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target
			.dataset[
			'iindex']]
			.action;
			if (eventid) {
			// self.event_no_sub = 1;
			@@ -1065,8 +1131,10 @@
			addresschange(e) {
			// console.log(e.target);
			console.log(e.data.join(';'))
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e.data.join(
			';');
			this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
			.Value = e.data
			.join(
			';');
			},
			classAttr_AddPer(index, iindex) {
			var param = {
			@@ -1080,11 +1148,15 @@
			AddPer(data, param) {
			// console.log(param);
			console.log(data);
			$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
			$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[0].Login + ';' +
			$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[
			0].Name;
			$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[
			0]
			.Login + ';' +
			data[0].Name;

			var eventid = $this.$data.classAttrList[param.index].Attr[param.iindex].action;
			var eventid = $this.$data.classAttrList[param.index].Attr[param.iindex]
			.action;
			if (eventid) {
			eventid = eventid.trim();
			if (eventid) {
			@@ -1112,10 +1184,10 @@
			classAttr_AddRef(e) {
			console.log(e.target);
			uni.showModal({
			title: "提示",
			content: "此功能还未实现！",
			title: this.translateSys('tip'),
			content: this.translateSys('unrealized'),
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			// var value=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.target.value];
			// this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
			@@ -1132,11 +1204,15 @@
			AddPer(data, param) {
			// console.log(param);
			// console.log(data);
			$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
			$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[0].ID + ';' +
			$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 eventid = $this.$data.classAttrList[param.index].Attr[param.iindex].action;
			var eventid = $this.$data.classAttrList[param.index].Attr[param.iindex]
			.action;
			if (eventid) {
			eventid = eventid.trim();
			if (eventid) {
			@@ -1170,7 +1246,7 @@
			},
			add() {
			uni.showLoading({
			title: "加载中...",
			title: this.translateSys("loading")
			mask: true
			});
			var req = [];
			@@ -1179,8 +1255,10 @@
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.Value == this.translateSys("select") \|\| ar.Value == '——' + this
			.translateSys(
			"select") + '——') ar.Value = '';
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select == true) { //判断下拉是否多选
			var valStr = "";
			for (var v in ar.Value) {
			@@ -1197,25 +1275,27 @@
			name: ar.Name,
			value: ar.Value
			});
			} else
			{
			} else {
			const node = this.formatAttr(ar)
			req.push({
			name: node.attr,
			value: node.value
			});
			}



			if (ar.notempty == true && !ar.Value) {
			// if(ar.NotEmpty=='1'){
			uni.hideLoading();
			// uni.showToast({title:ar.DispName+'不能为空！',icon:"success",duration:3000});
			uni.showModal({
			title: "提示",
			content: ar.DispName + '不能为空！',
			title: this.translateSys('tip'),
			content: this.translateSys('quotation_mark_left') + ar.DispName +
			this
			.translateSys('quotation_mark_right') + this.translate(
			"cannot_empty"),
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return;
			}
			@@ -1225,7 +1305,7 @@
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid,
			}
			@@ -1270,19 +1350,27 @@
			if (action.ret == '0') {
			if (action.ret != 0) {
			uni.showModal({
			title: "提示",
			content: '执行脚本失败，' + action.result,
			title: this.translateSys('tip'),
			content: this.translate('execute_script_failed') +
			this
			.translateSys('comma') + this.translate(
			'result') +
			this
			.translateSys('colon') + action.result,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return;
			}
			if (action.info) {
			uni.showModal({
			title: "提示",
			content: '执行脚本失败，' + action.info,
			title: this.translateSys('tip'),
			content: this.translate('execute_script_failed') +
			this
			.translateSys('comma') +
			this.translateSys('colon') + action.info,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return;
			}
			@@ -1298,32 +1386,33 @@
			}
			} else
			uni.showToast({
			title: "创建成功！",
			title: this.translate('create_success'),
			icon: "success",
			duration: 3000
			});
			//刷新
			uni.redirectTo({
			url: '../modal/3018?param=' + JSON.stringify(this.$data.param) +
			url: '../modal/3018?param=' + JSON.stringify(this.$data
			.param) +
			"&titlename=" + this.$data.title
			});
			// this.cancel();
			} else {
			uni.showModal({
			title: "错误",
			title: this.translateSys('error') + " ",
			content: success.err_msg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			}).catch(ex => {
			console.log(ex);
			uni.hideLoading();
			uni.showModal({
			title: "提示",
			title: this.translateSys('tip'),
			content: ex.errMsg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			});
			},
			@@ -1336,7 +1425,7 @@
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			@@ -1384,29 +1473,34 @@
			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
			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: '提示',
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			else uni.showModal({
			title: '提示',
			content: tip + ',提示:' + data.ret,
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
			'<br/>') : '';
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			.info
			.join(
			'<br/>') : '';
			if (tip) uni.showModal({
			title: '提示',
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});

			if (data.action) {
			@@ -1420,15 +1514,23 @@
			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
			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];
			var ca = this.$data.classAttrList[a]
			.Attr[l];
			if (value[i].attr == ca.Name) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			if (utils.classUtils
			.attrTypeIsDict(ca
			.Type)) {
			var dictItemList = [];
			for (var d in value[i].choice_list) {
			var list_val = value[i].choice_list[d];
			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,
			@@ -1447,16 +1549,22 @@
			}

			var length = 0;
			if (!this.$data.refdatastore.filter(function(s) {
			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;
			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;
			}
			}
			}
			@@ -1465,10 +1573,15 @@
			}
			if (action_type == 'open_select_userdlg') {
			uni.showModal({
			title: "错误2.2",
			content: "open_select_userdlg这个action_type还未处理！",
			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: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			// else if (action_type == 'tip_dlg') {
			@@ -1480,19 +1593,19 @@
			}
			} else {
			uni.showModal({
			title: "错误2",
			title: this.translateSys('error') + " 2",
			content: success.err_msg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: "错误2.1",
			title: this.translateSys('error') + " 2.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			});
			},
			@@ -1502,7 +1615,7 @@
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			@@ -1567,29 +1680,34 @@
			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
			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: '提示',
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			else uni.showModal({
			title: '提示',
			content: tip + ',提示:' + data.ret,
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
			'<br/>') : '';
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			.info
			.join(
			'<br/>') : '';
			if (tip) uni.showModal({
			title: '提示',
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});

			var actionlist = data.action;
			@@ -1601,14 +1719,19 @@
			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++) {
			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)) {
			if (utils.classUtils.attrTypeIsDict(
			attr[j]
			.Type)) {
			var dictItemList = [];
			for (var d in result[i].choice_list) {
			var val = result[i].choice_list[d];
			for (var d in result[i]
			.choice_list) {
			var val = result[i]
			.choice_list[d];
			dictItemList.push({
			"CN_S_NAME": val,
			"Name": val,
			@@ -1623,10 +1746,12 @@
			}
			}
			}
			for (var c = 0; c < $this.$data.classAttrList.length; c++) {
			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);
			console.log(attr[j].Name + '==' + result[i]
			.attr);
			if (attr[j].Name == result[i].attr) {
			attr[j].Value = result[i].value;
			}
			@@ -1640,9 +1765,14 @@
			$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 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;
			}
			}
			}
			@@ -1674,8 +1804,10 @@
			}
			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 ($this.$data.refdatastore[j].attr == result[i]
			.attr) {
			$this.$data.refdatastore[j].value = result[i]
			.value;
			}
			}
			}
			@@ -1684,19 +1816,19 @@
			}
			} else {
			uni.showModal({
			title: "错误3",
			title: this.translateSys('error') + " 3",
			content: success.err_msg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: "错误3.1",
			title: this.translateSys('error') + " 3.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			});
			},
			@@ -1705,7 +1837,7 @@
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid, // button=bottom时 master的cls_id

			@@ -1718,7 +1850,9 @@
			var attr = attrlist[i].Attr;
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';
			if (ar.Value == this.translateSys("select") \|\| ar.Value == '——' + this
			.translateSys(
			"select") + '——') ar.Value = '';
			req.push(this.formatAttr(ar));
			}
			}
			@@ -1785,29 +1919,34 @@
			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
			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: '提示',
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			else uni.showModal({
			title: '提示',
			content: tip + ',提示:' + data.ret,
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
			'<br/>') : '';
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			.info
			.join(
			'<br/>') : '';
			if (tip) uni.showModal({
			title: '提示',
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});

			var result = data.result;
			@@ -1833,19 +1972,19 @@
			}
			} else {
			uni.showModal({
			title: "错误4",
			title: this.translateSys('error') + " 4",
			content: success.err_msg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: "错误4.1",
			title: this.translateSys('error') + " 4.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			});
			},
			@@ -1854,7 +1993,7 @@
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.clsid, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: '新增',
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.clsid, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			@@ -1936,29 +2075,34 @@
			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
			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: '提示',
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			else uni.showModal({
			title: '提示',
			content: tip + ',提示:' + data.ret,
			title: this.translateSys('tip'),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
			'<br/>') : '';
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			.info
			.join(
			'<br/>') : '';
			if (tip) uni.showModal({
			title: '提示',
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});

			if (data != "") {
			@@ -1973,8 +2117,14 @@
			if (action.action_type == 'open_panel') {
			var d = dialog({
			title: '<i class="ace-icon fa fa-info-circle"></i> ' +
			'提示',
			content: action.action_type + '此action尚未处理！'
			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') {
			@@ -1989,13 +2139,16 @@
			data_attr: data_attr
			}
			uni.navigateTo({
			url: '../selpsn/index?mulit=false&param=' + JSON.stringify(
			param),
			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
			var callback_eventid = param
			.button_callback
			.trim();
			var info = {
			eventid: callback_eventid,
			@@ -2004,28 +2157,38 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: $this.$data.param.clsid,
			clsid: $this.$data.param
			.clsid,
			objid: "",
			attr: param.req,
			inputparameter: data,
			dataJson: [],
			}
			$this.DataObjRunCustomEvent(info, param.data_attr);
			$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> ' +
			'提示',
			content: action.action_type + '此action尚未处理！'
			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') //判断是否是侧滑
			if (val.config.appear_style ==
			'sideslip') //判断是否是侧滑
			$this.$data.popupType = 'right';
			else
			$this.$data.popupType = 'center'
			@@ -2040,7 +2203,8 @@
			}
			$this.$data.popupParam = popupParam;
			}
			} else if (action.action_type == 'open_project_query_dlg') {
			} else if (action.action_type ==
			'open_project_query_dlg') {
			//console.log(action.value.select_range);
			//console.log(action.value.mulit_select);
			var priRel = '-1';
			@@ -2050,7 +2214,8 @@
			priRel = '1';
			else if (action.value.select_range == '我创建的')
			priRel = '2';
			else if (action.value.select_range == '我参与的' \|\| action.value
			else if (action.value.select_range == '我参与的' \|\| action
			.value
			.select_range == '我参加的')
			priRel = '3';
			else if (action.value.select_range == '我关注的')
			@@ -2066,16 +2231,25 @@
			req: req
			}
			uni.navigateTo({
			url: '../selPrj/index?relation=' + priRel + '&param=' +
			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]
			$this.$data.classAttrList[param
			.index]
			.Attr[param
			.iindex].Value = data[0]
			.Name;
			var callback_eventid = param.button_callback
			$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 = {
			@@ -2085,13 +2259,15 @@
			rclsid: "",
			robjid: "",
			userlogin: "",
			clsid: $this.$data.param.clsid,
			clsid: $this.$data
			.param.clsid,
			objid: "",
			attr: param.req,
			dataJson: [],
			}

			$this.DataObjRunCustomEvent(info);
			$this.DataObjRunCustomEvent(
			info);
			}
			}
			}
			@@ -2099,8 +2275,14 @@
			} else {
			var d = dialog({
			title: '<i class="ace-icon fa fa-info-circle"></i> ' +
			'提示',
			content: action.action_type + '此action尚未处理！'
			this.translateSys('tip'),
			content: this.translateSys(
			"quotation_mark_left") +
			action
			.action_type + this.translateSys(
			"quotation_mark_right") + this
			.translate(
			"tip_action_unprocessed")
			});
			d.show();
			}
			@@ -2108,35 +2290,35 @@
			}
			} else {
			uni.showModal({
			title: "提示5.2",
			content: '调用 before_click_button 脚本返回空，event_id' + eventid,
			title: this.translateSys('tip') + "5.2",
			content: this.translate("execute_script_return_empty"),
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			}
			} else {
			uni.showModal({
			title: "错误5",
			title: this.translateSys('error') + " 5",
			content: success.err_msg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			}
			}).catch(ex => {
			// console.log(ex);
			uni.showModal({
			title: "提示5.1",
			title: this.translateSys('tip') + "5.1",
			content: ex.errMsg,
			showCancel: false,
			confirmText: "取消"
			confirmText: this.translateSys('cancel')
			});
			});
			},

			formatAttr(attr) {
			if (utils.classUtils.attrTypeIsObjRefMulti(attr.Type)) //if(ar.Type=='引用对象(多个)')
			if (attr.Value == '请') ar.Value = '';
			if (attr.Value == this.translateSys('please')) ar.Value = '';
			if (utils.classUtils.attrTypeIsUser(attr.Type) \|\| utils.classUtils.attrTypeIsProject(attr
			.Type)) //if(ar.Type=='引用人员' \|\| ar.Type=='引用项目')
			return {
			@@ -2154,6 +2336,14 @@
			value: attr.Value ? attr.Value : ''
			};
			},
			translate(t) {
			if (typeof this.$t == "function") return this.$t(`page.${t}`)
			else return t;
			},
			translateSys(t) {
			if (typeof this.$t == "function") return this.$t(`sys.${t}`)
			else return t;
			},
			}
			}
			</script>