~jt/MES-PDA.git

			@@ -1,142 +1,17 @@
			<template>
			<view class="uni-page-modal-3018-2">
			<view class="uni-page-modal-3018-2" :class="largeMode?'large-mode':''">
			<view class="view-content">
			<!-- 表头样式 -->
			<uni-forms ref="baseForm" label-align="right">
			<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
			<!-- 普通布局 -->
			<uni-forms-item v-if="item.name != 'Layout'&& item.show==true"
			:label="item.label ? item.label +'：':'' " :label-width="item.labelWidth+'px'">
			<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}：</text> -->
			<!-- 下拉框-单选 item.useDict?item.dict:item.selections-->
			<uni-data-select id="dv_select" v-if="item.name=='Select'"
			:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
			:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
			@change="onChange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
			<!-- 文本框/数字框 -->
			<view class="input-wrapper" v-if="(item.name=='Input' \|\| item.name=='InputNumber')">
			<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
			@click="classAttr_extButton(item)"></text>
			<input class="uni-input" :class="item.disabled?'input-disabled':''"
			:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
			v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder"
			:style="{'padding-left':item.setting.prefix?0 : '8rpx','right':item.setting.suffix?0 : '8rpx'}"
			:focus="focusFieldId == item.fieldId" @focus="ontap(item)" @click="onClick(item)"
			@keyup.enter="onModelValue(item)" @blur="onModelValue(item)" :maxlength="-1" />
			<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
			@click="classAttr_extButton(item)"></text>
			</view>
			<!-- 多行文本 -->
			<view class="input-wrapper" v-if="item.name=='Textarea' ">
			<textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
			:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
			@blur="onModelValue(item)" @click="onClick(item)" :data-index="index"
			style="height:60px;" :style="{'width':'96%'}" :disabled="item.disabled"></textarea>
			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
			@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
			@on-click-suffix="classAttr_extButton"></OIForm>

			</view>
			<!-- 复选框 -->
			<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
			:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
			@change="onCheckBoxValue" :data-attr="item.fieldId">
			<label v-for="(item2) in item.selections" :key="item2.value">
			<checkbox :value="item2.value" :checked="item.value.includes(item2.value)" />
			<text>{{item2.label}}</text>
			</label>
			</checkbox-group>
			<!-- 单选框 -->
			<radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
			:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
			@change="onRadioBoxValue" :data-attr="item.fieldId">
			<label v-for="(item2) in item.selections" :key="item2.value">
			<radio :value="item2.value" :checked="item2.value === item.value" />
			<text>{{item2.label}}</text>
			</label>
			</radio-group>
			<!-- Switch开关 -->
			<switch class="input-switch" v-if="item.name=='Switch'"
			:class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value"
			@change="onModelValue(item)" />
			<!-- 日期时间 -->
			<view class="input-wrapper" v-if="(item.name=='TimePicker' \|\| item.name=='DatePicker')">
			<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
			<view class="picker">{{item.value}}</view>
			</picker>
			</view>
			</uni-forms-item>
			<!-- 栅格布局 -->
			<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
			<uni-col v-for="(cols,key) in item.setting.colList"
			:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
			<uni-forms-item v-if="cols!=null && cols.show==true"
			:label="cols.label? cols.label +'：':''" :label-width="cols.labelWidth+'px'">
			<view class="input-wrapper" v-if="(cols.name=='Input' \|\| cols.name=='InputNumber') ">
			<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
			@click="classAttr_extButton(cols)"></text>
			<input class="uni-input" :class="cols.disabled?'input-disabled':''"
			:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
			v-model="cols.value" :disabled="cols.disabled" :placeholder="cols.placeholder"
			:style="{'padding-left':cols.setting.prefix?0 : '8px','right':cols.setting.suffix?0 : '8px'}"
			:focus="focusFieldId == cols.fieldId" @focus="ontap(cols)"
			@click="onClick(cols)" @blur="onevent(cols)" :maxlength="-1" />
			<text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]"
			@click="classAttr_extButton(cols)"></text>
			</view>
			<!-- 下拉框-单选 cols.useDict?cols.dict:cols.selections-->
			<uni-data-select id="dv_select" v-if="cols.name=='Select' "
			:class="cols.disabled?'input-disabled':''" v-model="cols.value"
			:localdata="cols.dict" @change="onChange(cols)" :disabled="cols.disabled"
			:clear="false"></uni-data-select>
			<!-- 多行文本 -->
			<view class="input-wrapper" v-if="cols.name=='Textarea' ">
			<textarea class="uni-input" :value="cols.value"
			:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
			:focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)"
			@click="onClick(cols)" style="height:60px;" :style="{'width':'96%'}"
			:disabled="cols.disabled"></textarea>
			</view>
			<!-- 复选框 -->
			<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
			:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
			@change="onCheckBoxValue" :data-attr="cols.fieldId">
			<label v-for="(cols2) in cols.selections" :key="cols2.value">
			<checkbox :value="cols2.value" :checked="cols.value.includes(cols2.value)" />
			<text>{{cols2.label}}</text>
			</label>
			</checkbox-group>
			<!-- 单选框 -->
			<radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
			:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
			@change="onRadioBoxValue" :data-attr="cols.fieldId">
			<label v-for="(cols2) in cols.selections" :key="cols2.value">
			<radio :value="cols2.value" :checked="cols2.value === cols.value" />
			<text>{{cols2.label}}</text>
			</label>
			</radio-group>
			<!-- Switch开关 -->
			<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
			:disabled="cols.disabled" v-model="cols.value" @change="onModelValue(cols)"
			:style="{'margin-left':'10rpx'}" />
			<!-- 日期时间 -->
			<view class="input-wrapper"
			v-if="(cols.name=='TimePicker' \|\| cols.name=='DatePicker') && !cols.disabled">
			<picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''"
			:disabled="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
			<view class="picker">{{cols.value}}</view>
			</picker>
			</view>

			</uni-forms-item>
			</uni-col>
			</uni-row>
			</view>
			</uni-forms>
			</view>
			<view class="view-bottom">
			<view class="uni-padding-wrap" v-if="dropdownBtns.length>0">
			<view class="uni-btn-v">
			<a @tap="clickDropdownBtns">
			<Icon class="mobox-normal-more" />
			<text class="mobox-normal-more" />
			</a>
			</view>
			</view>
			@@ -152,7 +27,8 @@
			<view class="popup-header">{{check_list.title}}</view>
			<view class="popup-content" :class="{ 'popup-height': popupType === 'left' \|\| popupType === 'right' }"
			:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
			<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
			<view class="popup-cont"
			:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
			<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
			<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
			:data-index="index" :style="{'margin-left': '10rpx'}">
			@@ -175,8 +51,12 @@
			</template>

			<script>
			import Base64 from '../../components/js-base64/base64.js'
			import {
			Base64
			} from '@/js/Base64.js';
			import utils from "@/js/utils.js"
			import dayjs from "dayjs";
			import OIForm from '@/components/oi-form/index.vue'
			import {
			appGetInfo,
			dictGetInfo
			@@ -186,13 +66,16 @@
			runCustomEvent,
			dataObjCreate
			} from "@/api/data.js"
			import buttonClickMixin from '@/mixins/button-click.js';

			export default {
			modules: {
			Base64,
			mixins: [buttonClickMixin],
			components: {
			OIForm,
			},
			data() {
			return {
			largeMode: getApp().globalData.largeMode \|\| false,
			title: this.translateSys('add2'),
			btnName: "",
			param: {},
			@@ -201,7 +84,6 @@
			edit_select_compose_event: "", //选择组成对象时调用
			edit_compose_cls_id: "",
			global_attr: [],
			refdatastore: [], //引用数据存储区// {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
			scanCodeVal: "",
			popupType: "center",
			check_list: {},
			@@ -268,7 +150,6 @@
			edit_select_compose_event: "", //选择组成对象时调用
			edit_compose_cls_id: "",
			global_attr: [],
			refdatastore: [], //引用数据存储区// {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
			scanCodeVal: "",
			popupType: "center",
			check_list: {},
			@@ -294,10 +175,10 @@
			uni.setNavigationBarTitle({
			title: options.titlename
			}); //设置顶部标题
			this.$data.param = JSON.parse(options.param);
			this.$data.title = this.$data.param.Add_BtnName ? this.$data.param.Add_BtnName : options
			this.param = JSON.parse(options.param);
			this.title = this.param.Add_BtnName ? this.param.Add_BtnName : options
			.titlename; //设置按钮文字
			this.$data.btnName = this.$data.param.Add_BtnName \|\| ""
			this.btnName = this.param.Add_BtnName \|\| ""
			this.loadData(options.paramValue)
			},
			computed: {
			@@ -337,7 +218,7 @@
			//传入参数值
			if (paramValue) {
			const attrs = paramValue.attrs \|\| [];
			(this.$data.head_styledef?.form?.items \|\| []).forEach(async (ele, index) => {
			(this.head_styledef?.form?.items \|\| []).forEach(async (ele, index) => {
			if (ele.name != "Layout") {
			attrs.forEach(async (ele2, index2) => {
			if (ele.fieldId == ele2.name) {
			@@ -393,18 +274,15 @@
			//有默认值，显示默认值
			let itemName = ele.value \|\| "";
			if (itemName) {
			styledefHead.form
			.model[ele.fieldId] = itemName;
			styledefHead.form.model[ele.fieldId] = itemName;
			}
			ele.dict = selections.map((a) => {
			ele.selections = selections.map((a) => {
			return {
			value: a.value,
			text: a.label
			}
			})

			}

			}
			if ($this.focusFieldId == "") {
			if (ele.name == 'Input' \|\| ele.name ==
			@@ -434,16 +312,13 @@
			styledefHead.form
			.model[col.fieldId] = itemName;
			}
			col.dict = selections.map((a) => {
			col.selections = selections.map((a) => {
			return {
			value: a.value,
			text: a.label
			}
			})


			}

			}
			if ($this.focusFieldId == "") {
			if (col.name == 'Input' \|\| col
			@@ -458,6 +333,25 @@
			}
			}
			}
			}
			const app = getApp()
			if (app.globalData.bindClasses) {
			styledefHead.form.items.push({
			name: "Input",
			label: this.translate("classes"),
			labelWidth: 100,
			disabled: true,
			value: app.globalData.classes,
			setting: {
			width: 100,
			height: 50,
			},
			bind: {
			attr: "",
			},
			fieldId: "S_CLASSES",
			})
			styledefHead.form.model["S_CLASSES"] = app.globalData.classes
			}

			}
			@@ -487,7 +381,7 @@
			title: this.translateSys("error") + "1.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},
			@@ -527,7 +421,7 @@
			title: this.translateSys("error") + "1.3",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});


			@@ -559,26 +453,24 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			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: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});

			var actionlist = data.action;
			@@ -592,13 +484,11 @@
			} else if (action.action_type == 'set_dlg_attr_show') {
			var result = action.value;
			$this.hideFormItems(result)
			// console.log($this.$data.head_styledef);
			// console.log($this.head_styledef);
			} else if (action.action_type ==
			"set_dlg_current_edit_attr"
			) {
			if ($this
			.focusOldFieldId ==
			action.value) {
			if ($this.focusOldFieldId == action.value) {
			$this.setData({
			focusFieldId: ""
			})
			@@ -629,7 +519,7 @@
			"quotation_mark_right") + this
			.translate('tip_action_unprocessed'),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			}
			@@ -647,67 +537,33 @@
			this.translateSys("full_stop") +
			this.translate('reason') + this.translateSys("colon") + tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			},


			ontap(item) { //扫码功能
			// console.log("ontap",item);
			// 打开蓝牙适配器
			// uni.openBluetoothAdapter({
			// success: function() {
			// // 开始搜索蓝牙设备
			// uni.startBluetoothDevicesDiscovery({
			// success: function() {
			// // 监听找到新设备的事件
			// uni.onBluetoothDeviceFound(function(devices) {
			// // 这里可以过滤出RFID芯片，连接并读取数据
			// console.log(devices[0].deviceId);
			// })
			// }
			// })
			// }
			// });
			// 监听NFC功能是否可用
			// uni.getNFCAdapterState({
			// success: function(res) {
			// console.log(res);
			// if (res.errCode === 0) {
			// // NFC功能可用，开始监听
			// uni.onNFCStart((res) => {
			// if (res.errCode === 0) {
			// // 开始NFC标签检测
			// uni.makeNFCReaderStart({
			// success: function() {
			// // 监听NFC标签
			// uni.onNFCTagDiscovered(function(res) {
			// console.log(res);
			// // 这里可以处理NFC标签数据
			// })
			// }
			// })
			// }
			// })
			// }
			// }
			// })

			this.focusOldFieldId = item.fieldId
			getApp().onScan((result) => {
			console.log(result);
			// uni.hideKeyboard();
			this.onScanValue(item, result.decodedata)
			this.onScanValue(item, result)
			})
			},
			onScanValue(item, value) {
			const $this = this;
			//console.log("onScanValue", item);
			if (item.oldvalue != value) {
			item.oldvalue = value;
			item.value = value;
			item.value = value
			let newVal = item.value
			if (typeof item.value == "string") {
			newVal = item.value.trim()
			}
			if (newVal) {
			item.oldvalue = newVal;
			var attr = item.fieldId;
			$this.head_styledef.form.model[attr] = value;
			$this.head_styledef.form.model[attr] = newVal;
			var eventid = item.bind.onChangeEvent.id; //内容变化后事件
			if (eventid) {
			var obj_attr = this.head_styledef.form.model;
			@@ -724,70 +580,67 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.DataCls.id,
			clsid: this.param.DataCls.id,
			objid: "",
			attr: req,
			dataJson: [],
			}
			this.DataObjRunCustomEvent(info, '');
			}
			if (item.value) { //第一个输入框不为空
			//初始化，下个输入框focus属性
			var findd = false
			for (let i in $this.head_styledef.form.items) {
			const ele = $this.head_styledef.form.items[i]
			//初始化，下个输入框focus属性
			var findd = false
			for (let i in $this.head_styledef.form.items) {
			const ele = $this.head_styledef.form.items[i]

			if (ele.name != "Layout") {
			if (ele.name == 'Input' \|\| ele.name == 'InputNumber') {
			if (attr == ele.fieldId) {
			findd = true
			} else {
			if (findd) {
			$this.setData({
			focusFieldId: ele.fieldId
			})
			break
			}

			}

			}
			} else {
			if (findd) {
			let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
			return (col.name == 'Input' \|\| col.name == 'InputNumber');
			})
			if (curIndex > -1) {
			if (ele.name != "Layout") {
			if (ele.name == 'Input' \|\| ele.name == 'InputNumber') {
			if (attr == ele.fieldId) {
			findd = true
			} else {
			if (findd) {
			$this.setData({
			focusFieldId: ele.setting.colList[curIndex]
			.fieldId
			focusFieldId: ele.fieldId
			})
			break
			}

			} else {
			let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
			return attr == col.fieldId;
			})
			if (curIndex > -1) {
			findd = true
			let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
			return (col.name == 'Input' \|\| col.name ==
			'InputNumber') &&
			index2 >
			curIndex;
			})
			if (curIndex2 > -1) {
			$this.setData({
			focusFieldId: ele.setting.colList[curIndex]
			.fieldId
			})
			break
			}
			}
			}

			}
			} else {
			if (findd) {
			let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
			return (col.name == 'Input' \|\| col.name == 'InputNumber');
			})
			if (curIndex > -1) {
			$this.setData({
			focusFieldId: ele.setting.colList[curIndex]
			.fieldId
			})
			break
			}

			} else {
			let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
			return attr == col.fieldId;
			})
			if (curIndex > -1) {
			findd = true
			let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
			return (col.name == 'Input' \|\| col.name ==
			'InputNumber') &&
			index2 >
			curIndex;
			})
			if (curIndex2 > -1) {
			$this.setData({
			focusFieldId: ele.setting.colList[curIndex].fieldId
			})
			break
			}
			}
			}

			}
			}

			@@ -797,95 +650,58 @@
			// console.log("onClick",item);
			this.focusFieldId = item.fieldId
			},
			onevent(item) {
			// console.log("onevent",item);
			if (item.oldvalue != item.value && item.value.trim() != "") {
			item.oldvalue = item.value;
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			//子数据类扫码区事件脚本
			var eventid = item.bind.onChangeEvent.id; //内容变化后事件
			if (eventid) {
			var obj_attr = this.head_styledef.form.model;
			// console.log(obj_attr);
			var req = Object.keys(obj_attr).map((a) => ({
			attr: a,
			value: obj_attr[a] \|\| "",
			}));
			var info = {
			eventid: eventid,
			edtype: "0",
			projectid: '',
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.DataCls.id,
			objid: "",
			attr: req,
			dataJson: [],
			}
			this.DataObjRunCustomEvent(info, "");
			onEnterChange(item) {
			let newVal = item.value
			if (typeof item.value == "string") {
			newVal = item.value.trim()
			if (!newVal) {
			item.oldvalue = newVal;
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = newVal;
			return
			}
			}

			},
			onChange(item) {
			console.log("onChange", item);
			if (item.oldvalue != item.value && item.value.trim() != "") {
			item.oldvalue = item.value;
			if (item.oldvalue != newVal) {
			item.oldvalue = newVal;
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			var eventid = item.bind.onChangeEvent.id; //内容变化后事件
			if (eventid) {
			// self.event_no_sub = 1;
			var obj_attr = this.head_styledef.form.model;
			// console.log(obj_attr);
			var req = Object.keys(obj_attr).map((a) => ({
			attr: a,
			value: obj_attr[a] \|\| "",
			}));
			var info = {
			eventid: eventid,
			edtype: "0",
			projectid: '',
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.$data.param.DataCls.id,
			objid: "",
			attr: req,
			dataJson: []
			}
			this.DataObjRunCustomEvent(info);
			}
			}

			},
			onModelValue(item) { //绑定Model值
			var attr = item.fieldId;
			if (item.oldvalue != item.value && item.value.trim() != "") {
			item.oldvalue = item.value;
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			this.head_styledef.form.model[attr] = newVal;
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
			// this.onScanValue(this.head_styledef.form.items[2].setting.colList[0], "test")
			if (onChangeEvent?.id) { //内容变化后事件
			this.onChange(onChangeEvent);
			}

			}

			},
			onCheckBoxValue(e) { //绑定Model值
			let values = e.detail.value \|\| []
			let attr = e.currentTarget?.dataset?.attr \|\| ""
			this.head_styledef.form.model[attr] = values;
			// 内容变化后事件
			async onChange(event) {
			var eventid = event?.id; //内容变化后事件
			if (eventid) {
			// self.event_no_sub = 1;
			var obj_attr = this.head_styledef.form.model;
			// console.log(obj_attr);
			var req = Object.keys(obj_attr).map((a) => ({
			attr: a,
			value: obj_attr[a] \|\| "",
			}));
			var info = {
			eventid: eventid,
			edtype: "0",
			projectid: '',
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: this.param.DataCls.id,
			objid: "",
			attr: req,
			dataJson: []
			}
			this.DataObjRunCustomEvent(info);
			}

			},
			onRadioBoxValue(e) { //绑定Model值
			let value = e.detail.value \|\| ""
			let attr = e.currentTarget?.dataset?.attr \|\| ""
			this.head_styledef.form.model[attr] = value;
			},

			classAttr_extButton(item) {
			console.log("classAttr_extButton", item)
			var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickEvent = item.bind.onSuffixClickEvent; //后图标点击回调

			@@ -894,7 +710,7 @@
			title: this.translateSys("tip"),
			content: this.translate('icon_click_callback_empty'),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return;
			}
			@@ -903,15 +719,16 @@
			title: this.translateSys("tip"),
			content: this.translate('icon_click_event_empty'),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return;
			}
			this.$data.popupType = 'right'
			this.popupType = 'right'
			// open 方法传入参数等同在 uni-popup 组件上绑定 type属性
			this.$refs.popup.open(this.popupType);

			this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
			this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent
			.id,
			item);
			},
			popupChange(e) {
			@@ -921,15 +738,15 @@
			// console.log(e.target.dataset);
			var index = e.target.dataset.index;
			var ischeck = e.target.dataset.ischeck;
			var data = this.$data.check_list.items;
			// this.$data.check_list.items=[];
			if (this.$data.check_list.multiple_choice == "0") { //判断时单选还是多选
			var data = this.check_list.items;
			// this.check_list.items=[];
			if (this.check_list.multiple_choice == "0") { //判断时单选还是多选
			for (var i in data) {
			data[i].check = false;
			}
			}
			data[index].check = ischeck ? false : true;
			this.$data.check_list.items = data;
			this.check_list.items = data;

			},
			popup_cancel(e) { //弹框取消
			@@ -937,7 +754,7 @@
			},
			popup_sava(e) { //弹框确定
			var $this = this;
			var items = $this.$data.check_list.items;
			var items = $this.check_list.items;
			var data = [];
			var name = "";
			for (var i = 0; i < items.length; i++) {
			@@ -951,12 +768,12 @@
			});
			}
			}
			if (!$this.$data.popupParam) {
			if (!$this.popupParam) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: "popupParam为空！",
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return;
			}
			@@ -965,11 +782,11 @@
			title: this.translateSys("tip"),
			content: this.translate("tip_no_select_data"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return;
			}
			var callback_eventid = $this.$data.popupParam.button_callback.trim();
			var callback_eventid = $this.popupParam.button_callback.trim();
			var info = {
			eventid: callback_eventid,
			edtype: "0",
			@@ -977,12 +794,12 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: $this.$data.param.DataCls.id,
			clsid: $this.param.DataCls.id,
			objid: "",
			attr: $this.$data.popupParam.req,
			attr: $this.popupParam.req,
			dataJson: data
			}
			$this.DataObjRunCustomEvent(info, $this.$data.popupParam.data_attr);
			$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
			this.$refs.popup.close();
			},

			@@ -990,18 +807,18 @@
			var $this = this;
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.DataCls.id, // 功能点主数据类标识
			cls_id: this.param.DataCls.id, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.DataCls.id, // button=bottom时 master的cls_id
			cls_id: this.param.DataCls.id, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			}
			};
			if (data_attr) {
			enviroment.edit_dlg = {
			type: 'small', //小窗口
			class_id: this.$data.param.DataCls.id, //当前数据类id
			class_id: this.param.DataCls.id, //当前数据类id
			}
			if (data_attr) {
			enviroment.edit_dlg.form_control = { //所属的表单控件
			@@ -1020,11 +837,12 @@
			// edtype: info.edtype, eventid: info.eventid, projectid: info.projectid.replace('{','').replace('}',''),
			// rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
			// attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: "",
			// global_attr: JSON.stringify(this.$data.global_attr), dataJson:JSON.stringify(info.dataJson)
			// global_attr: JSON.stringify(this.global_attr), dataJson:JSON.stringify(info.dataJson)
			// }
			enviroment = Base64.encode(JSON.stringify(enviroment)); //将字符串转换为base64编码
			var input_param = Base64.encode(JSON.stringify(info.attr)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify(this
			.global_attr)); //将字符串转换为base64编码
			if (info.dataJson)
			info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //将字符串转换为base64编码
			var obj_attr = {};
			@@ -1068,18 +886,20 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			content: tip + ',' + this.translateSys('tip') + ':' +
			data
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			var tip = data.info ? typeof data.info == 'string' ? data.info :
			data
			.info
			.join(
			'<br/>') : '';
			@@ -1087,7 +907,7 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});

			var actionlist = data.action;
			@@ -1101,28 +921,24 @@
			} else if (action.action_type == 'set_dlg_attr_show') {
			var result = action.value;
			$this.hideFormItems(result)
			// console.log($this.$data.head_styledef);
			// console.log($this.head_styledef);
			} else if (action.action_type == 'set_global_attr') {
			$this.$data.global_attr = action.value \|\| [];
			$this.global_attr = action.value \|\| [];
			} else if (action.action_type ==
			"set_dlg_current_edit_attr"
			) {
			if ($this
			.focusOldFieldId ==
			action.value) {
			if ($this.focusOldFieldId == action.value) {
			$this.setData({
			focusFieldId: ""
			})
			} else {
			$this.setData({
			focusFieldId: $this
			.focusOldFieldId
			focusFieldId: $this.focusOldFieldId
			})
			}
			$this.$nextTick(() => {
			$this.setData({
			focusFieldId: action
			.value
			focusFieldId: action.value
			})
			});
			} else {
			@@ -1136,7 +952,7 @@
			.translate(
			"tip_action_unprocessed"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			}
			@@ -1147,63 +963,7 @@
			console.log($this.head_styledef);

			if (data.result) {
			var result = data.result;
			for (var i = 0; i < result.length; i++) {
			for (var c = 0; c < $this.$data.head_styledef.form.items
			.length; c++) {
			var attr = $this.$data.head_styledef.form.items[c];
			//判断表单里是否有返回字段，没有就装载到model里，点击确定提交的时候带上这些数据
			if ($this.head_styledef.form.model[result[i].attr] ==
			undefined) {
			$this.head_styledef.form.model[result[i].attr] =
			result[i]
			.value;
			}
			//判断是否是栅格表单
			if (attr.name != 'Layout') {
			if (attr.fieldId == result[i].attr) {
			attr.value = '';
			attr.oldvalue = '';
			attr.value = result[i].value;
			attr.oldvalue = result[i].value;
			$this.head_styledef.form.model[attr.fieldId] =
			result[i]
			.value;
			}
			} else if (attr.name == 'Layout') {
			attr.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == result[i].attr) {
			col.value = '';
			col.oldvalue = '';
			col.value = result[i].value;
			col.oldvalue = result[i].value;
			$this.head_styledef.form.model[col
			.fieldId] =
			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.setFormValues(data.result)
			}
			}

			@@ -1217,7 +977,7 @@
			title: this.translateSys("error") + "3.1",
			content: exStr,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			});
			},
			@@ -1239,18 +999,6 @@
			attr: a,
			value: obj_attr[a] \|\| "",
			}));
			if ($this.refdatastore.length > 0) {
			for (var i = 0; i < $this.refdatastore.length; i++) {
			if (!req.filter(function(s) {
			return $this.refdatastore[i].attr == s.name
			}).length) {
			req.push({
			'attr': $this.refdatastore[i].attr,
			'value': $this.refdatastore[i].value
			});
			}
			}
			}

			var extinfo = enviroment;
			extinfo.edit_dlg = {
			@@ -1258,7 +1006,8 @@
			class_id: $this.param.DataCls.id, //当前数据类id
			}
			extinfo = Base64.encode(JSON.stringify(extinfo)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //将字符串转换为base64编码
			var global_attr = Base64.encode(JSON.stringify($this
			.global_attr)); //将字符串转换为base64编码
			var obj_attr = {};
			req.forEach(item2 => {
			obj_attr[item2.attr] = item2.value;
			@@ -1309,18 +1058,20 @@
			title: $this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: $this.translateSys("cancel")
			confirmText: $this.translateSys('close')
			});
			} else uni.showModal({
			title: $this.translateSys("tip"),
			content: tip + ',' + $this.translateSys('tip') + ':' + data
			content: tip + ',' + $this.translateSys('tip') + ':' +
			data
			.ret,
			showCancel: false,
			confirmText: $this.translateSys("cancel")
			confirmText: $this.translateSys('close')
			});
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			var tip = data.info ? typeof data.info == 'string' ? data.info :
			data
			.info
			.join(
			'<br/>') : '';
			@@ -1328,7 +1079,7 @@
			title: $this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: $this.translateSys("cancel")
			confirmText: $this.translateSys('close')
			});

			if (data != "") {
			@@ -1346,14 +1097,15 @@
			$this.translateSys("tip"),
			content: $this.translateSys(
			"quotation_mark_left") +
			action
			.action_type + $this.translateSys(
			"quotation_mark_right") + $this
			.translate(
			action.action_type + $this
			.translateSys(
			"quotation_mark_right") +
			$this.translate(
			"tip_action_unprocessed")
			});
			d.show();
			} else if (action.action_type == 'open_select_userdlg') {
			} else if (action.action_type ==
			'open_select_userdlg') {
			var style = val.style;
			// style == 'user' ? '选择人员' : style == 'department' ? '选择部门' : style == 'role' ? '选择角色' : ''
			var param = {
			@@ -1381,7 +1133,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: $this.$data.param
			clsid: $this.param
			.DataCls
			.id,
			objid: "",
			@@ -1389,13 +1141,15 @@
			inputparameter: data,
			dataJson: [],
			}
			$this.DataObjRunCustomEvent(info,
			$this.DataObjRunCustomEvent(
			info,
			param
			.data_attr);
			}
			}
			});
			} else if (action.action_type == 'open_data_query_dlg') {
			} 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"),
			@@ -1411,11 +1165,12 @@
			} else if (action.action_type == 'open_common_dlg') {

			if (val.common_dlg_id == 'check_list') {


			$this.setData({
			check_list: val.config
			})
			if (val.config.appear_style == 'sideslip') //判断是否是侧滑
			if (val.config.appear_style ==
			'sideslip') //判断是否是侧滑
			$this.setData({
			popupType: "right"
			})
			@@ -1435,7 +1190,8 @@
			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';
			@@ -1445,7 +1201,8 @@
			priRel = '1';
			else if (action.value.select_range == '我创建的')
			priRel = '2';
			else if (action.value.select_range == '我参与的' \|\| action
			else if (action.value.select_range == '我参与的' \|\|
			action
			.value
			.select_range == '我参加的')
			priRel = '3';
			@@ -1459,7 +1216,8 @@
			req: req
			}
			uni.navigateTo({
			url: '../selPrj/index?relation=' + priRel +
			url: '../selPrj/index?relation=' +
			priRel +
			'&param=' +
			JSON.stringify(param_),
			events: {
			@@ -1470,8 +1228,8 @@
			data[0].ID +
			';' + data[0].Name;

			// $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;
			// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
			// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
			var callback_eventid = param
			.button_callback
			.trim();
			@@ -1479,7 +1237,8 @@
			var info = {
			eventid: callback_eventid,
			edtype: "2",
			projectid: data[0].ID,
			projectid: data[0]
			.ID,
			rclsid: "",
			robjid: "",
			userlogin: "",
			@@ -1491,8 +1250,9 @@
			dataJson: [],
			}

			$this.DataObjRunCustomEvent(
			info);
			$this
			.DataObjRunCustomEvent(
			info);
			}
			}
			}
			@@ -1502,12 +1262,14 @@
			title: $this.translateSys("tip"),
			content: $this.translateSys(
			"quotation_mark_left") +
			action.action_type + $this.translateSys(
			action.action_type + $this
			.translateSys(
			"quotation_mark_right") + $this
			.translate(
			"tip_action_unprocessed"),
			showCancel: false,
			confirmText: $this.translateSys("cancel")
			confirmText: $this.translateSys(
			'close')
			});
			}
			}
			@@ -1515,12 +1277,14 @@
			} else {
			uni.showModal({
			title: $this.translateSys('tip') + "5.2",
			content: $this.translateSys("quotation_mark_left") +
			content: $this.translateSys(
			"quotation_mark_left") +
			"before_click_button" + $this.translateSys(
			"quotation_mark_right") + $this.translateSys(
			"quotation_mark_right") + $this
			.translateSys(
			"comma") + 'event_id' + eventid,
			showCancel: false,
			confirmText: $this.translateSys("cancel")
			confirmText: $this.translateSys('close')
			});
			}
			}
			@@ -1535,7 +1299,7 @@
			title: $this.translateSys('tip') + "5.1",
			content: exStr,
			showCancel: false,
			confirmText: $this.translateSys("cancel")
			confirmText: $this.translateSys('close')
			});
			});
			},
			@@ -1565,24 +1329,18 @@

			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.param.DataCls.id, // 功能点主数据类标识
			cls_id: this.param.DataCls.id, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.param.DataCls.id,
			cls_id: this.param.DataCls.id,
			}
			};
			enviroment = Base64.encode(JSON.stringify(enviroment)); //将字符串转换为base64编码

			// console.log(obj_attr);
			// var dataInfo={
			// class_id: this.$data.param.DataCls.id, data_obj_id: '', masterclsid: '',
			// req: JSON.stringify(req), upfile: JSON.stringify([]), post_data: JSON.stringify({}),
			// compose: JSON.stringify([]), refdatastore: JSON.stringify([]), extinfo: JSON.stringify(enviroment),
			// not_trigger_sys_event: ''
			// };

			var dataInfo = {
			class_id: this.$data.param.DataCls.id,
			class_id: this.param.DataCls.id,
			class_name: '',
			master_cls_id: '',
			master_obj_id: '',
			@@ -1613,19 +1371,21 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			content: tip + ',' + this.translateSys('tip') + ':' +
			data
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			this.saving = false
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			var tip = data.info ? typeof data.info == 'string' ? data.info :
			data
			.info
			.join(
			'<br/>') : '';
			@@ -1633,7 +1393,7 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			else {

			@@ -1645,12 +1405,13 @@
			}


			if (!this.$data.param.After_Btn_Not_Refresh) {
			if (!this.param.After_Btn_Not_Refresh) {
			//刷新
			uni.redirectTo({
			url: '../modal/3018_2?param=' + JSON.stringify(this.$data
			url: '../modal/3018_2?param=' + JSON.stringify(this
			.$data
			.param) +
			"&titlename=" + this.$data.title
			"&titlename=" + this.title
			});
			} else {
			var actionlist = data.action;
			@@ -1705,22 +1466,23 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			});
			},
			setFormValues(data) {
			const $this = this
			const head_styledef = this.head_styledef
			for (var i = 0; i < data.length; i++) {
			if (data[i].choice_list) {
			for (var c = 0; c < $this.head_styledef.form.items
			.length; c++) {
			var attr = $this.head_styledef.form.items[c];
			if (attr.name != 'Layout') {
			if (attr.fieldId == data[i].attr) {
			const attr = data[i]
			if (attr.choice_list) {
			for (var c = 0; c < head_styledef.form.items.length; c++) {
			const item = head_styledef.form.items[c];
			if (item.name != 'Layout') {
			if (item.fieldId == attr.attr) {
			var dictItemList = [];
			for (var d in data[i].choice_list) {
			var val = data[i].choice_list[d];
			for (var d in attr.choice_list) {
			var val = attr.choice_list[d];
			dictItemList.push({
			"CN_S_NAME": val,
			"CN_S_VALUE": val,
			@@ -1728,20 +1490,19 @@
			"value": val
			});
			}
			attr.dict = dictItemList;
			if (item.useDict) {
			item.dict = dictItemList;
			} else {
			item.selections = dictItemList;
			}
			}
			} else if (attr.name == 'Layout') {
			attr.setting.colList.forEach(col => {
			} else if (item.name == 'Layout') {
			item.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == data[
			i]
			.attr) {
			if (col.fieldId == attr.attr) {
			var dictItemList = [];
			for (var d in data[i]
			.choice_list) {
			var val = data[i]
			.choice_list[
			d];
			for (var d in attr.choice_list) {
			var val = attr.choice_list[d];
			dictItemList.push({
			"CN_S_NAME": val,
			"CN_S_VALUE": val,
			@@ -1749,8 +1510,11 @@
			"value": val
			});
			}
			col.dict =
			dictItemList;
			if (col.useDict) {
			col.dict = dictItemList;
			} else {
			col.selections = dictItemList;
			}
			}
			}
			});
			@@ -1758,71 +1522,47 @@

			}
			}
			for (var c = 0; c < $this.$data.head_styledef.form
			.items
			.length; c++) {
			var attr = $this.$data.head_styledef.form.items[c];
			// console.log(attr[j].Name+'=='+data[i].attr);
			for (var c = 0; c < head_styledef.form.items.length; c++) {
			const item = head_styledef.form.items[c];
			// console.log(attr[j].Name+'=='+attr.attr);
			//判断表单里是否有返回字段，没有就装载到model里，点击确定提交的时候带上这些数据
			if ($this.head_styledef.form.model[data[i]
			.attr] ==
			undefined) {
			$this.head_styledef.form.model[data[i]
			.attr] =
			data[i]
			.value;
			if (head_styledef.form.model[attr.attr] == undefined) {
			head_styledef.form.model[attr.attr] = attr.value;
			}
			//判断是否是栅格表单
			if (attr.name != 'Layout') {
			if (attr.fieldId == data[i].attr) {
			attr.value = '';
			attr.oldvalue = '';
			attr.value = data[i].value;
			attr.oldvalue = data[i].value;
			$this.head_styledef.form.model[attr
			.fieldId] =
			data[
			i].value;
			if (item.name != 'Layout') {
			if (item.fieldId == attr.attr) {
			item.value = '';
			item.oldvalue = '';
			item.value = attr.value;
			item.oldvalue = attr.value;
			head_styledef.form.model[item.fieldId] = attr.value;
			if (item.name == "Input") {
			if (attr.prompt) item.placeholder = attr.prompt;
			}
			if (attr.enable !== undefined) {
			if (attr.enable) item.disabled = false;
			else item.disabled = true;
			}
			}
			} else if (attr.name == 'Layout') {
			attr.setting.colList.forEach(col => {
			} else if (item.name == 'Layout') {
			item.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == data[i]
			.attr) {
			if (col.fieldId == attr.attr) {
			col.value = '';
			col.oldvalue = '';
			col.value = data[i]
			.value;
			col.oldvalue = data[i]
			.value;
			$this.head_styledef.form
			.model[
			col
			.fieldId] = data[
			i]
			.value;
			col.value = attr.value;
			col.oldvalue = attr.value;
			if (col.name == "Input") {
			if (attr.prompt) col.placeholder = attr.prompt;
			}
			if (attr.enable !== undefined) {
			if (attr.enable) col.disabled = false;
			else col.disabled = true;
			}
			}
			}
			});
			}
			}
			var length = 0;
			if (!$this.$data.refdatastore.filter(function(s) {
			return data[i].attr == s.attr
			}).length) {
			length = 1;
			$this.$data.refdatastore.push(data[i]);
			}
			if (length == 0) {
			for (var j = 0; j < $this.$data.refdatastore
			.length; j++) {
			if ($this.$data.refdatastore[j].attr == data[
			i]
			.attr) {
			$this.$data.refdatastore[j].value = data[
			i]
			.value;
			}
			}
			}
			}
			@@ -1830,42 +1570,25 @@
			},
			hideFormItems(data) {
			const $this = this
			const head_styledef = this.head_styledef
			data.forEach(async (attr, key) => {
			$this.$data.head_styledef.form.items
			.forEach(
			async (
			ele, index) => {
			//判断是否是栅格表单
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr
			.attr) {
			ele.show = attr
			.show;
			head_styledef.form.items.forEach(async (ele, index) => {
			//判断是否是栅格表单
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) {
			ele.show = attr.show;
			}
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach((col) => {
			if (col) {
			if (col.fieldId == attr.attr) {
			col.show = attr.show;
			}
			} else if (ele.name ==
			'Layout') {
			ele.setting.colList
			.forEach(
			col => {
			if (col) {
			if (col
			.fieldId ==
			attr
			.attr
			) {
			col.show =
			attr
			.show;
			}
			}
			});
			}
			});
			}
			});
			});
			var head_styledef = JSON.parse(JSON.stringify($this.$data
			.head_styledef));
			$this.$data.head_styledef = [];
			$this.$data.head_styledef = head_styledef;
			},
			afterOK() {
			this.saving = true
			@@ -1879,11 +1602,12 @@
			value: obj_attr[a],
			})),
			};
			if (!this.after_ok.id.includes('{')) this.after_ok.id = '{' + this.after_ok.id + '}';
			if (!this.after_ok.id.includes('{')) this.after_ok.id = '{' + this.after_ok.id +
			'}';
			var dataInfo = {
			ed_type: "0",
			start_transaction: true,
			class_id: this.$data.param.DataCls.id,
			class_id: this.param.DataCls.id,
			class_name: '',
			event_id: this.after_ok.id,
			event_name: '',
			@@ -1915,19 +1639,21 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			content: tip + ',' + this.translateSys('tip') + ':' +
			data
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			this.saving = false
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			var tip = data.info ? typeof data.info == 'string' ? data.info :
			data
			.info
			.join(
			'<br/>') : '';
			@@ -1935,14 +1661,15 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			if (!this.$data.param.After_Btn_Not_Refresh) {
			if (!this.param.After_Btn_Not_Refresh) {
			//刷新
			uni.redirectTo({
			url: '../modal/3018_2?param=' + JSON.stringify(this.$data
			url: '../modal/3018_2?param=' + JSON.stringify(this
			.$data
			.param) +
			"&titlename=" + this.$data.title
			"&titlename=" + this.title
			});
			} else {
			var actionlist = data.action;
			@@ -1995,7 +1722,7 @@
			title: this.translateSys('tip') + "7.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			});
			},
			@@ -2033,7 +1760,7 @@
			title: this.translateSys("tip"),
			content: this.translateSys("unrealized"),
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			}
			} else if (btn.FunCode == "TriggerEvent") {
			@@ -2088,18 +1815,20 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			} else uni.showModal({
			title: this.translateSys("tip"),
			content: tip + ',' + this.translateSys('tip') + ':' + data
			content: tip + ',' + this.translateSys('tip') + ':' +
			data
			.ret,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			return false
			} else {
			var tip = data.info ? typeof data.info == 'string' ? data.info : data
			var tip = data.info ? typeof data.info == 'string' ? data.info :
			data
			.info
			.join(
			'<br/>') : '';
			@@ -2107,14 +1836,15 @@
			title: this.translateSys("tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys('close')
			});
			if (!this.$data.param.After_Btn_Not_Refresh) {
			if (!this.param.After_Btn_Not_Refresh) {
			//刷新
			uni.redirectTo({
			url: '../modal/3018_2?param=' + JSON.stringify(this.$data
			url: '../modal/3018_2?param=' + JSON.stringify(this
			.$data
			.param) +
			"&titlename=" + this.$data.title
			"&titlename=" + this.title
			});
			} else {
			var actionlist = data.action;
			@@ -2165,7 +1895,7 @@
			title: this.translateSys('tip') + "7.1",
			content: tip,
			showCancel: false,
			confirmText: this.translateSys("cancel")
			confirmText: this.translateSys("close")
			});
			});

			@@ -2179,7 +1909,8 @@
			cls_name: btn.Cls_Name,
			Edit_dlg: btn.Edit_dlg
			};
			const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg
			const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn
			.Edit_dlg
			.Name +
			"&type=addDataObj"
			var $this = this;
			@@ -2191,9 +1922,10 @@
			console.log(resData);
			//刷新
			uni.redirectTo({
			url: '../modal/3018_2?param=' + JSON.stringify(this
			url: '../modal/3018_2?param=' + JSON.stringify(
			this
			.$data.param) +
			"&titlename=" + this.$data.title
			"&titlename=" + this.title
			});

			},
			@@ -2220,7 +1952,7 @@
			<style>
			.popup-content {
			@include flex;


			}

			.popup-height {
			@@ -2273,7 +2005,7 @@
			}

			.uni-icon {
			padding: 8rpx;
			padding: 10rpx 5rpx;
			font-size: 32rpx;
			color: rgb(192, 196, 204);
			}
			@@ -2294,7 +2026,7 @@

			.uni-icon {
			/* border: 1px solid red; */
			width: 8%;
			width: 30rpx;
			font-family: uniicons;
			font-size: 40rpx;
			font-weight: 400;
			@@ -2333,9 +2065,10 @@
			width: 45%;
			margin: 0 10rpx;
			// padding: 5rpx 10rpx;
			background: #4D6AF4;
			background: #27A6E1;
			border: none;
			color: #fff;
			font-size: 38rpx;
			float: left;
			display: inline-block;
			}
			@@ -2350,7 +2083,7 @@
			margin: 0 10rpx;
			background: #fff;
			border: none;
			color: #000;
			//color: #000;
			font-size: 38rpx;
			float: right;
			display: inline-block;
			@@ -2360,7 +2093,7 @@
			width: 90%;
			margin: 0 10rpx;
			background: #fff;
			border: none;
			// border: none;
			color: #000;
			font-size: 38rpx;
			float: right;
			@@ -2424,7 +2157,7 @@
			.popup-footer {
			float: right;
			position: absolute;
			bottom: 0;
			bottom: 10rpx;
			right: 20rpx;
			}

			@@ -2448,9 +2181,11 @@
			margin-top: 50rpx;
			padding: 15rpx;
			line-height: 1.5;
			background: #27A6E1;
			border: none;
			color: #fff;
			// background: #27A6E1;
			// border: none;
			// color: #fff;
			background: #fff;
			color: #000;
			font-size: 38rpx;
			font-weight: bold;
			/* float: right; */