~jt/MES-PDA.git

			@@ -1,122 +1,10 @@
			<template>
			<view class="uni-page-modal-5601">
			<!-- 表头样式 -->
			<uni-forms ref="baseForm" label-align="right">
			<view v-for="(item,index) in head_styledef.form.items" :key="index" class="v-head-style">
			<!-- 普通布局 -->
			<uni-forms-item v-if="item.name != 'Layout'" :label="item.label ?item.label +'：':'' "
			:label-width="item.labelWidth+'px'">
			<uni-data-picker v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
			v-model="item.value" :localdata="item.useDict ? item.dict : item.selections"
			@change="onEnterChange(item)" :readonly="item.disabled" :clear-icon="false"
			:popup-title="item.label"></uni-data-picker>
			<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':''"
			:style="{'padding-left':item.setting.prefix?0 : '8rpx','right':item.setting.suffix?0 : '8rpx'}"
			:type="item.name=='Input'?'text':'number'" v-model="item.value" :disabled="item.disabled"
			:placeholder="item.placeholder" :focus="focusFieldId == item.fieldId" @focus="ontap(item)"
			@click="onClick(item)" @keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)"
			:maxlength="-1" />
			<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
			@click="classAttr_extButton(item)"></text>
			</view>
			<!-- 复选框 -->
			<checkbox-group v-if="item.name=='Checkbox'" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" @change="onCheckBoxValue" :data-attr="item.fieldId"
			:data-index="index">
			<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 v-if="item.name=='Radio'" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" @change="onRadioBoxValue" :data-attr="item.fieldId"
			:data-index="index">
			<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="onEnterChange(item)" />
			<OIDatePicker v-if="item.name=='DatePicker'" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
			:defaultToday="item.setting.defaultToday" :format="item.setting.format"
			@change="onModelValue(item)" />
			<OIDatePickerRange v-if="item.name=='DatePickerRange'" :rangeSeparator="item.setting.separator"
			:format="item.setting.format" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
			@change="onModelValue(item)" />
			<OITimePicker v-if="item.name=='TimePicker'" :class="item.disabled?'input-disabled':''"
			:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
			@change="onModelValue(item)" />
			<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>

			</uni-forms-item>
			<!-- 栅格布局 -->
			<uni-row v-else :gutter="item.setting.gutter">
			<uni-col
			:span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
			v-for="(col,key) in item.setting.colList">
			<uni-forms-item v-if="col!=null" :label="col.label ? col.label +'：':''"
			:label-width="col.labelWidth+'px'">
			<uni-data-picker v-if="col.name=='Select'" :class="col.disabled?'input-disabled':''"
			v-model="col.value" :localdata="col.useDict ? col.dict : col.selections"
			@change="onEnterChange(col)" :readonly="col.disabled" :clear-icon="false"
			:popup-title="col.label"></uni-data-picker>
			<view class="input-wrapper" v-if="col.name=='Input' \|\| col.name=='InputNumber'">
			<text v-if="col.setting.prefix" class="uni-icon" :class="[col.setting.prefix]"
			@click="classAttr_extButton(col)"></text>
			<input class="uni-input" :class="col.disabled?'input-disabled':''"
			:style="{'padding-left':col.setting.prefix?0 : '8px','right':col.setting.suffix?0 : '8px'}"
			:type="col.name=='Input'?'text':'number'" v-model="col.value"
			:disabled="col.disabled" :placeholder="col.placeholder"
			:focus="focusFieldId == col.fieldId" @focus="ontap(col)" @click="onClick(col)"
			@keyup.enter="onEnterChange(col)" @blur="onEnterChange(col)" :maxlength="-1" />
			<text v-if="col.setting.suffix" class="uni-icon" :class="[col.setting.suffix]"
			@click="classAttr_extButton(col)"></text>
			</view>
			<!-- 复选框 -->
			<checkbox-group v-if="col.name=='Checkbox'" :class="col.disabled?'input-disabled':''"
			:disabled="col.disabled" @change="onCheckBoxValue" :data-attr="col.fieldId"
			:data-index="index" :data-iindex="key">
			<label v-for="(col2) in col.selections" :key="col2.value">
			<checkbox :value="col2.value" :checked="col.value.includes(col2.value)" />
			<text>{{col2.label}}</text>
			</label>
			</checkbox-group>
			<!-- 单选框 -->
			<radio-group v-if="col.name=='Radio'" :class="col.disabled?'input-disabled':''"
			:disabled="col.disabled" @change="onRadioBoxValue" :data-attr="col.fieldId"
			:data-index="index" :data-iindex="key">
			<label v-for="(col2) in col.selections" :key="col2.value">
			<radio :value="col2.value" :checked="col2.value === col.value" />
			<text>{{col2.label}}</text>
			</label>
			</radio-group>
			<!-- Switch开关 -->
			<switch v-if="col.name=='Switch'" :class="col.disabled?'input-disabled':''"
			:disabled="col.disabled" v-model="col.value" @change="onEnterChange(col)" />
			<OIDatePicker v-if="col.name=='DatePicker'" :class="col.disabled?'input-disabled':''"
			:disabled="col.disabled" v-model="col.value" :placeholder="col.placeholder"
			:defaultToday="col.setting.defaultToday" :format="col.setting.format"
			@change="onModelValue(col)" />
			<OIDatePickerRange v-if="col.name=='DatePickerRange'"
			:rangeSeparator="col.setting.separator" :format="col.setting.format"
			:class="col.disabled?'input-disabled':''" :disabled="col.disabled" v-model="col.value"
			:placeholder="col.placeholder" @change="onModelValue(col)" />
			<OITimePicker v-if="col.name=='TimePicker'" :class="col.disabled?'input-disabled':''"
			:disabled="col.disabled" v-model="col.value" :placeholder="col.placeholder"
			@change="onModelValue(col)" />
			</uni-forms-item>
			<uni-forms-item v-else label=""></uni-forms-item>
			</uni-col>
			</uni-row>
			</view>
			</uni-forms>
			<view class="view-content">
			<!-- 码盘子界面 -->
			<view v-if="param.Show_Welcom_Page==false" class="uni-panel-content">
			@@ -135,47 +23,15 @@
			src="../../images/mobox_log_200x40.png">
			</image>
			<checkbox-group @change="checkboxChange">
			<div class="dv-panel" v-for="(style,ii) in pageData.DefList"
			<div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
			@tap="onPanelClick(ii,style.form.htmlobjId)"
			:id="'dvpanel'+style.form.htmlobjId"
			:class="style.form.htmlobjId==active_id?'bk-active':''">
			<uni-forms class="dv-panel-form" label-align="right">
			<div class="dv-panel-form-item" v-for="(item,index) in style.form.items">
			<!-- 普通布局 -->
			<uni-forms-item v-if="item.name != 'Layout'"
			:label="item.label ?item.label +'：':'' "
			:label-width="item.labelWidth+'px'">
			<span class="form-item-span"
			v-if="item.disabled">{{item.value}}</span>
			<input v-else class="uni-input"
			:type="item.name=='InputNumber'?'number':'text'"
			v-model="item.value" :disabled="item.disabled"
			:placeholder="item.placeholder" :maxlength="-1" />
			</uni-forms-item>
			<!-- 栅格布局 -->
			<uni-row v-else :gutter="item.setting.gutter">
			<uni-col
			:span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : (24 / item.setting.col)"
			v-for="(col,key) in item.setting.colList">
			<uni-forms-item v-if="col!=null"
			:label="col.label ? col.label +'：':''"
			:label-width="col.labelWidth+'px'">
			<span class="form-item-span"
			v-if="col.disabled">{{col.value}}</span>
			<input v-else class="uni-input"
			:type="col.name=='InputNumber'?'number':'text'"
			v-model="col.value" :disabled="col.disabled"
			:placeholder="col.placeholder" :maxlength="-1" />
			</uni-forms-item>
			<uni-forms-item v-else label=""></uni-forms-item>
			</uni-col>
			</uni-row>
			</div>
			</uni-forms>
			<OIForm class="dv-panel-form" :form="style.form" viewMode></OIForm>
			<div class="dv-panel-button"
			v-if="pageData.Select_Button==true \|\| pageData.Row_Button.length > 0">

			<checkbox v-if="pageData.Select_Button==true" :model="ii"
			<checkbox v-if="pageData.Select_Button==true" :value="ii"
			:checked="style.SelBut_Checked" />
			<!-- <text></text> -->
			<!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">保存</Button> -->
			@@ -183,8 +39,8 @@
			:key="btnIndex" type="default"
			:class="btn.FunCode == 'Delete' ? 'btn-warn' : 'btn-primary'"
			@click="onRowBtnClick(btn, pageData,ii)">
			<Icon v-if="btn.Style == 'img' \|\| btn.Style == 'img_text'"
			class="Img" />
			<text v-if="btn.Style == 'img' \|\| btn.Style == 'img_text'"
			class="Img"></text>
			{{(btn.Style == 'text'\|\| btn.Style == 'img_text') ? btn.ShowName :""}}
			</button>
			</div>
			@@ -194,21 +50,18 @@
			</view>
			<view class="view-bottom" v-if="pageData.Button.length >0 ">
			<button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex" type="default"
			:class="{'btn-disabled':(btn.FunCode != 'Cancel' && pageData.okLoading),
			'btn-primary':(btn.FunCode != 'Cancel'),
			:class="{'btn-primary':(btn.FunCode != 'Cancel'),
			'btn-cancel':(btn.FunCode == 'Cancel'),
			'btn-one':pageData.Button.length == 1,
			'btn-left':(btnIndex < pageData.Button.length - 1),
			'btn-right': btnIndex > 0 && btnIndex == pageData.Button.length - 1 ,
			'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}"
			:disabled="(btn.FunCode != 'Cancel' && pageData.okLoading)? true:false"
			@click="onBtnClick(btn, pageData)">
			<Icon v-if="btn.Style == 'img' \|\| btn.Style == 'img_text'" class="Img" />
			'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}" @click="onBtnClick(btn, pageData)">
			<text v-if="btn.Style == 'img' \|\| btn.Style == 'img_text'" class="Img"></text>
			{{(btn.Style == 'text'\|\| btn.Style == 'img_text') ? btn.ShowName :""}}
			</button>
			<view class="btn-right" v-if="pageData.DropDownButton.length >0 ">
			<a @click="clickDropdownBtns(pageData)">
			<Icon class="mobox-normal-more" />
			<text class="mobox-normal-more"></text>
			</a>
			</view>
			</view>
			@@ -256,7 +109,9 @@
			</template>

			<script>
			import Base64 from '../../components/js-base64/base64.js'
			import {
			Base64
			} from '@/js/Base64.js';
			import {
			dictGetInfo
			} from "@/api/mobox.js"
			@@ -265,20 +120,23 @@
			runCustomEvent,
			} from "@/api/data.js"
			import dayjs from "dayjs";
			import OIDatePicker from '@/components/oi-date-time-picker/oi-date-picker.vue'
			import OIDatePickerRange from '@/components/oi-date-time-picker/oi-date-picker-range.vue'
			import OITimePicker from '@/components/oi-date-time-picker/oi-time-picker.vue'
			import OIForm from '@/components/oi-form/index.vue'
			import OIFormItem from '@/components/oi-form/list/index.vue'
			import OIFormInput from '@/components/oi-form/list/input/index.vue'
			import OIFormInputNumber from '@/components/oi-form/list/input-number/index.vue'
			import buttonClickMixin from '@/mixins/button-click.js';

			export default {
			name: "PageModal5601",
			modules: {
			Base64,
			},
			mixins: [buttonClickMixin],
			components: {
			OIDatePicker,
			OIDatePickerRange,
			OITimePicker
			OIForm,
			OIFormItem,
			OIFormInput,
			OIFormInputNumber

			},

			data() {
			return {
			title: this.translateSys("inventory"),
			@@ -299,7 +157,6 @@
			selectAttrObj: {},

			global_attr: [],
			refdatastore: [], //引用数据存储区// {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
			popupType: "center",
			check_list: {},
			popupParam: {},
			@@ -364,7 +221,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) {
			@@ -386,10 +243,10 @@
			})
			}
			//加载初始界面
			if (this.$data.param.Show_Welcom_Page) {
			this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
			this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
			this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
			if (this.param.Show_Welcom_Page) {
			this.param.Welcome_Page.Img = this.param.Welcome_Page.Img.replace(/ /g, '+');
			this.param.Welcome_Page.Width = parseInt(this.param.Welcome_Page.Width);
			this.param.Welcome_Page.Height = parseInt(this.param.Welcome_Page.Height);
			};
			//加载Tab页签
			const pageList = this.param.Sub_Page \|\| []
			@@ -508,21 +365,18 @@
			Name: page.After_Delete?.Name
			};
			}

			if (evt.ID) {
			return [{
			Cls_Name: this.param?.master_cls?.name \|\| "",
			Cls_ID: this.param?.master_cls?.id \|\| "",
			FunCode: "Delete",
			ShowName: this.$t("sys.delete"),
			Style: "text",
			Prompt: false,
			NotTriggerSYSEvent: false,
			DataStateVerify: false,
			AttrVerify: false,
			AfterProcess_Event: evt,
			}];
			}
			return [{
			Cls_Name: this.param?.master_cls?.name \|\| "",
			Cls_ID: this.param?.master_cls?.id \|\| "",
			FunCode: "Delete",
			ShowName: this.$t("sys.delete"),
			Style: "text",
			Prompt: false,
			NotTriggerSYSEvent: false,
			DataStateVerify: false,
			AttrVerify: false,
			AfterProcess_Event: evt,
			}];
			}
			return [];
			}
			@@ -763,60 +617,84 @@

			},
			onClick(item) {
			console.log("onClick", item)
			this.focusFieldId = item.fieldId
			},
			ontap(item) { //扫码功能
			// var $ele = e;
			//console.log(e.target)
			this.focusOldFieldId = item.fieldId
			getApp().onScan((result) => {
			getApp().onScan(async (result) => {
			console.log(result.decodedata);
			item.value = result.decodedata;
			var $this = this;
			if (item.oldvalue != item.value && item.value.trim() != "") {
			item.oldvalue = item.value;
			let newVal = item.value.trim()
			if (newVal) {
			item.oldvalue = newVal;
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			this.head_styledef.form.model[attr] = newVal;
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
			var onSuffixClickCallbackEvent = item.bind
			.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickEvent = item.bind
			.onSuffixClickEvent; //后图标点击回调
			var isflag = false;

			if (item.changeEventRunding)
			return
			item.changeEventRunding = true
			if (onChangeEvent?.id) { //内容变化后事件
			$this.onChange(onChangeEvent);
			await this.onChange(onChangeEvent);
			}
			if (item.value) { //第一个输入框不为空
			//初始化，下个输入框focus属性
			var findd = false
			for (let i in $this.head_styledef.form.items) {
			const ele = $this.head_styledef.form.items[i]
			item.changeEventRunding = false
			//初始化，下个输入框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
			}

			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');

			}
			} 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
			})
			if (curIndex > -1) {
			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]
			@@ -824,116 +702,40 @@
			})
			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
			}
			}
			}

			}

			}
			}

			}
			})
			},

			onEnterChange(item) { //回车，点击按钮，取消节点事件
			async onEnterChange(item) { //回车，点击按钮，取消节点事件
			console.log(item);
			if (item.oldvalue != item.value && item.value.trim() != "") {
			item.oldvalue = item.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] = newVal;
			return
			}

			}
			if (item.oldvalue != newVal) {
			item.oldvalue = newVal;
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			this.head_styledef.form.model[attr] = newVal;
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件

			if (onChangeEvent?.id) { //内容变化后事件
			this.onChange(onChangeEvent);
			await this.onChange(onChangeEvent);
			}

			}
			},
			onCheckBoxValue(e) { //绑定Model值
			let values = e.detail.value \|\| []
			const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index \|\| 0]
			if (item?.setting?.colList) {
			const col = item.setting.colList[e.currentTarget?.dataset?.iindex \|\| 0]
			if (col) {
			col.value = values
			let attr = col.fieldId;
			this.head_styledef.form.model[attr] = col.value;
			var onChangeEvent = col.bind.onChangeEvent; //内容变化后事件
			if (onChangeEvent?.id) { //内容变化后事件
			this.onChange(onChangeEvent);
			}
			return
			}
			} else {
			if (item) {
			item.value = values
			let attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
			if (onChangeEvent?.id) { //内容变化后事件
			this.onChange(onChangeEvent);
			}
			}
			}

			},
			onRadioBoxValue(e) { //绑定Model值
			let values = e.detail.value \|\| ""
			const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index \|\| 0]
			if (item?.setting?.colList) {
			const col = item.setting.colList[e.currentTarget?.dataset?.iindex \|\| 0]
			if (col) {
			col.value = values
			let attr = col.fieldId;
			this.head_styledef.form.model[attr] = col.value;
			var onChangeEvent = col.bind.onChangeEvent; //内容变化后事件
			if (onChangeEvent?.id) { //内容变化后事件
			this.onChange(onChangeEvent);
			}
			return
			}
			} else {
			if (item) {
			item.value = values
			let attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
			if (onChangeEvent?.id) { //内容变化后事件
			this.onChange(onChangeEvent);
			}
			}

			}

			},
			onModelValue(item) {
			var attr = item.fieldId;
			this.head_styledef.form.model[attr] = item.value;
			},
			classAttr_extButton(item) {
			var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //后图标点击事件
			var onSuffixClickEvent = item.bind.onSuffixClickEvent; //后图标点击回调
			@@ -956,7 +758,7 @@
			});
			return;
			}
			this.$data.popupType = 'right'
			this.popupType = 'right'
			// open 方法传入参数等同在 uni-popup 组件上绑定 type属性
			this.$refs.popup.open(this.popupType);

			@@ -1068,7 +870,7 @@
			var dataInfo = {
			ed_type: 0,
			start_transaction: true,
			class_id: this.$data.head_styledef.form.clsId,
			class_id: this.head_styledef.form.clsId,
			class_name: '',
			event_id: event.id,
			event_name: '',
			@@ -1084,173 +886,176 @@
			global_attr: '',
			input_param: input_param,
			};
			runCustomEvent(dataInfo).then(result => {
			console.log(result);
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result
			.err_info == 'string' ? result
			.err_info : result.err_info.join('<br/>') :
			'';
			if (result.ret == 801) {
			if (this.param.Only_Script_Error) {
			let pos = tip.indexOf("：");
			if (pos > -1) tip = tip.substring(pos +
			1);
			}
			uni.showModal({
			title: this.translateSys(
			"tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys(
			'close')
			});
			} else uni.showModal({
			title: this.translateSys('tip'),
			content: tip + ',' + this
			.translateSys('tip') + ':' +
			result
			.ret,
			showCancel: false,
			confirmText: this.translateSys(
			'close')
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info ==
			'string' ? result.info :
			result.info.join('<br/>') : '';
			if (tip) uni.showModal({
			title: this.translateSys('tip'),
			const result = await runCustomEvent(dataInfo)
			console.log(result);
			if (result.ret != 0) {
			var tip = result.err_info ? typeof result
			.err_info == 'string' ? result
			.err_info : result.err_info.join('<br/>') :
			'';
			if (result.ret == 801) {
			if (this.param.Only_Script_Error) {
			let pos = tip.indexOf("：");
			if (pos > -1) tip = tip.substring(pos +
			1);
			}
			uni.showModal({
			title: this.translateSys(
			"tip"),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys(
			'close')
			});

			if (result.result_type == 0 && result.action) {
			result.action.forEach(item => {
			if (item.action_type == "insert_subtable_page_row") { //码盘中
			$this.$data.param.Show_Welcom_Page = false;
			var value = item.value;
			$this.viewAceionRow(value);
			} else if (item.action_type ==
			"set_subtable_page_content") { //已码盘
			$this.$data.param.Show_Welcom_Page = false;
			var value = item.value;
			const pageData = $this.pageDetail.find((page) => {
			return value.page_name == page.Name;
			});
			if (value.clear_confirm != false && value.clear == true &&
			pageData && pageData.DefList.length > 0
			) { //判断是否清空页签内容,正在码盘是否有数据
			uni.showModal({
			title: this.translateSys('tip'),
			content: this.translate(
			"are_you_sure_clear_first") +
			this.translateSys(
			"quotation_mark_left") +
			value.page_name +
			this.translateSys(
			"quotation_mark_right") +
			this.translate(
			"are_you_sure_clear_last"),
			cancelText: $this.translateSys('ok'),
			confirmText: $this.translateSys('cancel'),
			success: function(res) {
			if (res.cancel) {
			if (pageData)
			pageData.DefList = [];
			$this.viewAceionContent(value);
			} else if (res.confirm) {
			if (pageData)
			pageData.DefList = [];
			$this.viewAceionContent(value);
			}
			}
			});
			} else {
			if (pageData)
			pageData.DefList = [];
			$this.viewAceionContent(value);
			}
			} else if (item.action_type == "select_subtable_page_row") {
			// value = {"page_name":"码盘中", "row":{"id":"xx"}}
			var value = item.value;
			$this.viewActionSelectRow(value)
			} else if (item.action_type ==
			"remove_subtable_page_row") { //清除面板中指定id的数据
			var value = item.value;
			$this.viewActionRemoveRow(value)
			} else if (item.action_type == "set_subtable_page_row") {
			$this.viewActionSetRow(item.value)

			} else if (item.action_type == "set_subtable_page_ext_data") {
			var value = item.value;
			const pageData = $this.pageDetail.find((page) => {
			return value.page_name == page.Name;
			});
			if (pageData)
			pageData.ExtData = value.ext_data

			} else if (item.action_type == "clear_subpage_rows") {
			var value = item.value;
			const pageData = $this.pageDetail.find((page) => {
			return value.page_name == page.Name;
			});
			if (pageData) {
			pageData.DefList = []
			pageData.ExtData = {}
			}

			} else if (item.action_type == "set_dlg_current_edit_attr") {

			if ($this.focusOldFieldId == item.value) {
			$this.setData({
			focusFieldId: ""
			})
			} else {
			$this.setData({
			focusFieldId: $this.focusOldFieldId
			})
			}
			$this.$nextTick(() => {
			$this.setData({
			focusFieldId: item.value
			})
			});
			} else if (item.action_type == "set_dlg_attr") {
			// value = {"attr":"xxx", "value":"xxx"}
			var data = item.value;
			$this.setFormValues(data)
			}
			});
			} else {

			if (result.info) {
			uni.showModal({
			title: this.translateSys(
			"error") + "4.3",
			content: result.info,
			showCancel: false,
			confirmText: this
			.translateSys('close')
			});
			}
			}

			}

			}).catch(ex => {
			// console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "4.1",
			} else uni.showModal({
			title: this.translateSys('tip'),
			content: tip + ',' + this
			.translateSys('tip') + ':' +
			result
			.ret,
			showCancel: false,
			confirmText: this.translateSys(
			'close')
			});
			return false;
			} else {
			var tip = result.info ? typeof result.info ==
			'string' ? result.info :
			result.info.join('<br/>') : '';
			if (tip) uni.showModal({
			title: this.translateSys('tip'),
			content: tip,
			showCancel: false,
			confirmText: this.translateSys('close')
			confirmText: this.translateSys(
			'close')
			});
			});

			if (result.result_type == 0 && result.action) {
			result.action.forEach(item => {
			if (item.action_type == "insert_subtable_page_row") { //码盘中
			$this.param.Show_Welcom_Page = false;
			var value = item.value;
			$this.viewAceionRow(value);
			} else if (item.action_type ==
			"set_subtable_page_content") { //已码盘
			$this.param.Show_Welcom_Page = false;
			var value = item.value;
			const pageData = $this.pageDetail.find((page) => {
			return value.page_name == page.Name;
			});
			if (value.clear_confirm != false && value.clear == true &&
			pageData && pageData.DefList.length > 0
			) { //判断是否清空页签内容,正在码盘是否有数据
			uni.showModal({
			title: this.translateSys('tip'),
			content: this.translate(
			"are_you_sure_clear_first") +
			this.translateSys(
			"quotation_mark_left") +
			value.page_name +
			this.translateSys(
			"quotation_mark_right") +
			this.translate(
			"are_you_sure_clear_last"),
			cancelText: $this.translateSys('ok'),
			confirmText: $this.translateSys('cancel'),
			success: function(res) {
			if (res.cancel) {
			if (pageData)
			pageData.DefList = [];
			$this.viewAceionContent(value);
			} else if (res.confirm) {
			if (pageData)
			pageData.DefList = [];
			$this.viewAceionContent(value);
			}
			}
			});
			} else {
			if (pageData)
			pageData.DefList = [];
			$this.viewAceionContent(value);
			}
			} else if (item.action_type == "select_subtable_page") {
			var value = item.value;
			const pageIndex = $this.pageDetail.findIndex((page) => {
			return value.page_name == page.Name;
			});
			if (pageIndex > -1) {
			$this.setData({
			current: pageIndex
			})
			}
			} else if (item.action_type == "select_subtable_page_row") {
			// value = {"page_name":"码盘中", "row":{"id":"xx"}}
			var value = item.value;
			$this.viewActionSelectRow(value)
			} else if (item.action_type ==
			"remove_subtable_page_row") { //清除面板中指定id的数据
			var value = item.value;
			$this.viewActionRemoveRow(value)
			} else if (item.action_type == "set_subtable_page_row") {
			$this.viewActionSetRow(item.value)

			} else if (item.action_type == "set_subtable_page_ext_data") {
			var value = item.value;
			const pageData = $this.pageDetail.find((page) => {
			return value.page_name == page.Name;
			});
			if (pageData)
			pageData.ExtData = value.ext_data

			} else if (item.action_type == "clear_subpage_rows") {
			var value = item.value;
			const pageIndex = $this.pageDetail.findIndex((page) => {
			return value.page_name == page.Name;
			});
			if (pageIndex > -1) {
			const pageData = $this.pageDetail[pageIndex]
			pageData.DefList = []
			pageData.ExtData = {}

			$this.$set(this.pageDetail, pageIndex, pageData)
			}

			} else if (item.action_type == "set_dlg_current_edit_attr") {

			if ($this.focusOldFieldId == item.value) {
			$this.setData({
			focusFieldId: ""
			})
			} else {
			$this.setData({
			focusFieldId: $this.focusOldFieldId
			})
			}
			$this.$nextTick(() => {
			$this.setData({
			focusFieldId: item.value
			})
			});
			} else if (item.action_type == "set_dlg_attr") {
			// value = {"attr":"xxx", "value":"xxx"}
			var data = item.value;
			$this.setFormValues(data)
			}
			});
			} else {

			if (result.info) {
			uni.showModal({
			title: this.translateSys(
			"error") + "4.3",
			content: result.info,
			showCancel: false,
			confirmText: this
			.translateSys('close')
			});
			}
			}

			}

			}
			} catch (ex) {
			var tip = typeof ex == "string" ? ex : ex.message;
			@@ -1302,8 +1107,59 @@
			return value.page_name == page.Name;
			});
			if (pageData?.DefList) {
			pageData.DefList.forEach(ele => {
			if (ele.form.objId == value.row.id) {
			const detailStyleDefList = pageData.DefList \|\| []
			let bFindRow = false;
			for (let index = 0; index < detailStyleDefList.length; index++) {
			const ele = detailStyleDefList[index]

			if (value.row.id) {
			if (ele.form.objId == value.row.id) {
			bFindRow = true;
			}
			} else {
			const conditions = row.condition \|\| [];
			if (conditions.length > 0) {
			for (let index = 0; index < detailStyleDefList.length; index++) {
			const ele = detailStyleDefList[index]
			let bFindCondition = true;
			for (let i in conditions) {
			const condition = conditions[i];
			let bFind = false;
			for (let i2 in ele.form.items) {
			const ele2 = ele.form.items[i2];
			if (ele2.name != "Layout") {
			if (ele2.fieldId == condition.attr) {
			if (condition.value == ele2.value) {
			bFind = true;
			}
			break;
			}
			} else {
			const colList = ele2.setting.colList \|\| [];
			for (let i3 in colList) {
			const col = colList[i3];
			if (col.fieldId == condition.attr) {
			if (condition.value == col.value) {
			bFind = true;
			}
			break;
			}
			}
			if (bFind) break;
			}
			}
			if (!bFind) {
			bFindCondition = false;
			break;
			}
			}
			if (bFindCondition) {
			bFindRow = true;
			}
			}
			}
			}
			if (bFindRow) {
			ele.SelBut_Checked = true;
			this.active_id = ele.form.htmlobjId;
			//自动滚动到指定元素
			@@ -1319,7 +1175,8 @@
			}).exec();
			}).exec();
			}
			});
			break
			}
			}

			},
			@@ -1328,85 +1185,117 @@
			if (JSON.stringify(value.row) == '{}') {
			return;
			}
			const pageData = this.pageDetail.find((page) => {
			const pageIndex = this.pageDetail.findIndex((page, index2, arr) => {
			return value.page_name == page.Name;
			});
			})
			if (pageIndex < 0)
			return
			const pageData = this.pageDetail[pageIndex]
			if (pageData?.DefList) //判断返回的action的page_name是否是待分拣//清除面板中指定id的数据
			{
			const detailStyleDefList = pageData.DefList \|\| []
			value.row.forEach((row) => {
			pageData.DefList.forEach((ele, index) => {
			if (ele.form.objId == row.id) {
			pageData.DefList.splice(index, 1);
			if (row.id) {
			for (let index = 0; index < detailStyleDefList.length; index++) {
			const ele = detailStyleDefList[index]
			if (ele.form.objId == row.id) {
			detailStyleDefList.splice(index, 1);
			index--;
			}
			}
			});

			} else {
			const conditions = row.condition \|\| [];
			if (conditions.length > 0) {
			for (let index = 0; index < detailStyleDefList.length; index++) {
			const ele = detailStyleDefList[index]
			let bFindCondition = true;
			for (let i in conditions) {
			const condition = conditions[i];
			let bFind = false;
			for (let i2 in ele.form.items) {
			const ele2 = ele.form.items[i2];
			if (ele2.name != "Layout") {
			if (ele2.fieldId == condition.attr) {
			if (condition.value == ele2.value) {
			bFind = true;
			}
			break;
			}
			} else {
			const colList = ele2.setting.colList \|\| [];
			for (let i3 in colList) {
			const col = colList[i3];
			if (col.fieldId == condition.attr) {
			if (condition.value == col.value) {
			bFind = true;
			}
			break;
			}
			}
			if (bFind) break;
			}
			}
			if (!bFind) {
			bFindCondition = false;
			break;
			}
			}
			if (bFindCondition) {
			detailStyleDefList.splice(index, 1);

			}
			}
			}

			}
			});
			}
			this.$set(this.pageDetail, pageIndex, pageData)
			},
			//更新分页签中的列表项内容
			viewActionSetRow(value) {
			const $this = this
			const pageIndex = $this.pageDetail.findIndex((
			page, index2, arr) => {
			const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => {
			return value.page_name == page.Name;
			})
			if (pageIndex < 0)
			return
			const pageData = $this.pageDetail[pageIndex]
			var detailStyleDefList = pageData.DefList \|\| []
			const detailStyleDefList = pageData.DefList \|\| []
			detailStyleDefList.forEach(ele => {
			value.row.forEach((rowData) => {
			if (rowData.id) {
			if (ele.form.objId == rowData.id) {
			rowData.attrs.forEach(attr => {
			ele.form.items.forEach(ele2 => {
			if (ele2.name !=
			'Layout') {
			if (ele2.fieldId ==
			attr
			.attr) {
			ele2.value =
			$this
			.operationNumber(
			ele2
			.value,
			attr
			.value,
			attr
			.operation
			)
			if (ele2.name != 'Layout') {
			if (ele2.fieldId == attr.attr) {
			ele2.value = $this.operationNumber(
			ele2.value,
			attr.value,
			attr.operation
			)
			}
			} else if (ele2.name ==
			'Layout') {
			ele2.setting
			.colList
			.forEach(
			col => {
			if (
			col) {
			if (col
			.fieldId ==
			attr
			.attr
			) {
			col.value =
			$this
			.operationNumber(
			col
			.value,
			attr
			.value,
			attr
			.operation
			)
			}
			}
			})
			} else if (ele2.name == 'Layout') {
			ele2.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr) {
			col.value = $this
			.operationNumber(
			col.value,
			attr.value,
			attr.operation
			)
			}
			}
			})
			}
			});
			});
			}
			} else if (rowData.condition) {
			const conditions = rowData.condition;
			const conditions = rowData.condition
			let bFindCondition = true;
			for (let i in conditions) {
			const condition = conditions[i];
			@@ -1440,62 +1329,40 @@
			}
			}
			if (bFindCondition) {

			rowData.attrs.forEach(attr => {
			ele.form.items.forEach(ele2 => {
			if (ele2.name !=
			'Layout') {
			if (ele2.fieldId ==
			attr
			.attr) {
			if (ele2.name != 'Layout') {
			if (ele2.fieldId == attr.attr) {
			ele2.value =
			$this
			.operationNumber(
			ele2
			.value,
			attr
			.value,
			attr
			.operation
			$this.operationNumber(
			ele2.value,
			attr.value,
			attr.operation
			)
			}
			} else if (ele2.name ==
			'Layout') {
			ele2.setting
			.colList
			.forEach(
			col => {
			if (
			col) {
			if (col
			.fieldId ==
			attr
			.attr
			) {
			col.value =
			$this
			.operationNumber(
			col
			.value,
			attr
			.value,
			attr
			.operation
			)
			}
			}
			})
			} else if (ele2.name == 'Layout') {
			ele2.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr) {
			col.value =
			$this.operationNumber(
			col.value, attr
			.value, attr
			.operation)
			}
			}
			})
			}
			});
			});

			}

			}
			})
			});
			pageData.DefList = detailStyleDefList
			$this.$set(this.pageDetail, pageIndex, pageData)

			},
			//加载正在码盘内容
			viewAceionRow(data) {
			@@ -1517,28 +1384,22 @@
			data.row.forEach(row => {
			detailStyle = JSON.parse(styleStr);
			detailStyle.form.objId = row.id;
			detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '')
			detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '')
			.replace(
			'{', '').replace('}',
			'') : 'null';
			'}', '') : 'null';
			detailStyle.form.attrs = row.attrs;
			row.attrs.forEach(attr => {
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele
			.value =
			attr.value;
			if (ele.fieldId == attr.attr)
			ele.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(
			col => {
			if (col) {
			if (col.fieldId ==
			attr
			.attr) col
			.value = attr
			.value;
			}
			});
			ele.setting.colList.forEach(col => {
			if (col) {
			if (col.fieldId == attr.attr)
			col.value = attr.value;
			}
			});
			}
			});
			});
			@@ -1581,18 +1442,15 @@
			cont.attrs.forEach(attr => {
			detailStyle.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr) ele
			.value =
			attr.value;
			if (ele.fieldId == attr.attr)
			ele.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(
			col => {
			if (col) {
			if (col.fieldId ==
			attr
			.attr) col
			.value = attr
			.value;
			attr.attr)
			col.value = attr.value;
			}
			});
			}
			@@ -1602,42 +1460,25 @@
			if (data.clear == false) {
			var isflag = true;
			pageData.DefList.forEach((style, index) => {
			if (style.form.objId == detailStyle.form
			.objId) {
			if (style.form.objId == detailStyle.form.objId) {
			cont.attrs.forEach(attr => {
			style.form.items.forEach(
			ele => {
			if (ele.name !=
			'Layout') {
			if (ele
			.fieldId ==
			attr.attr)
			ele
			.value =
			attr.value;
			} else if (ele
			.name ==
			'Layout') {
			ele.setting
			.colList
			.forEach(
			col => {
			if (
			col
			) {
			if (col
			.fieldId ==
			attr
			.attr
			)
			col
			.value =
			attr
			.value;
			}
			});
			}
			});
			style.form.items.forEach(ele => {
			if (ele.name != 'Layout') {
			if (ele.fieldId == attr.attr)
			ele.value = attr.value;
			} else if (ele.name == 'Layout') {
			ele.setting.colList.forEach(
			col => {
			if (col) {
			if (col.fieldId ==
			attr
			.attr)
			col.value =
			attr.value;
			}
			});
			}
			});
			});
			isflag = false;
			}
			@@ -1651,7 +1492,7 @@

			});
			}

			$this.$set(this.pageDetail, pageIndex, pageData)
			},
			setFormValues(attrs) {
			const head_styledef = this.head_styledef
			@@ -1701,6 +1542,13 @@
			if (ele.fieldId == attr.attr) {
			ele.value = attr.value;
			ele.oldvalue = attr.value;
			if (ele.name == "Input") {
			if (attr.prompt) ele.placeholder = attr.prompt;
			}
			if (attr.enable !== undefined) {
			if (attr.enable) ele.disabled = false;
			else ele.disabled = true;
			}
			}
			} else if (ele.name == "Layout") {
			ele.setting.colList.forEach((col) => {
			@@ -1708,6 +1556,13 @@
			if (col.fieldId == attr.attr) {
			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;
			}
			}
			}
			});
			@@ -1731,7 +1586,7 @@
			async del(pageData, style, event) {
			//获取表头属性
			var head_attr = {};
			this.$data.head_styledef.form.items.forEach(item => {
			this.head_styledef.form.items.forEach(item => {
			if (item.name == "Layout") { //判断是否是栅栏格式
			item.setting.colList.forEach(col => {
			if (col != null) head_attr[col.fieldId] =
			@@ -1824,15 +1679,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) { //弹框取消
			@@ -1840,7 +1695,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++) {
			@@ -1854,7 +1709,7 @@
			});
			}
			}
			if (!$this.$data.popupParam) {
			if (!$this.popupParam) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: "popupParam为空！",
			@@ -1872,7 +1727,7 @@
			});
			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",
			@@ -1880,12 +1735,12 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: $this.$data.ClsID,
			clsid: $this.ClsID,
			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();
			},

			@@ -1893,18 +1748,18 @@
			var $this = this;
			var enviroment = {
			'function': '3000', // 功能点编号
			cls_id: this.$data.ClsID, // 功能点主数据类标识
			cls_id: this.ClsID, // 功能点主数据类标识
			'button': 'top', // top/bottom
			button_name: this.translateSys('add2'),
			master: {
			cls_id: this.$data.ClsID, // button=bottom时 master的cls_id
			cls_id: this.ClsID, // button=bottom时 master的cls_id
			//obj_id: '' // button=bottom时 master的obj_id
			}
			};
			if (data_attr) {
			enviroment.edit_dlg = {
			type: 'small', //小窗口
			class_id: this.$data.ClsID, //当前数据类id
			class_id: this.ClsID, //当前数据类id
			}
			if (data_attr) {
			enviroment.edit_dlg.form_control = { //所属的表单控件
			@@ -1920,7 +1775,7 @@
			}
			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 = {};
			@@ -1997,44 +1852,41 @@
			} else if (action.action_type == 'set_dlg_attr_show') {
			var result = action.value;
			result.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;
			$this.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;
			// console.log($this.$data.head_styledef);
			$this.head_styledef = [];
			$this.head_styledef = 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 {
			uni.showModal({
			title: this.translateSys("tip"),
			@@ -2054,62 +1906,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(result)
			}
			}

			@@ -2146,18 +1943,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 = {
			@@ -2288,7 +2073,7 @@
			rclsid: '',
			robjid: '',
			userlogin: '',
			clsid: $this.$data.param
			clsid: $this.param
			.DataCls
			.id,
			objid: "",
			@@ -2377,8 +2162,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();
			@@ -2490,7 +2275,13 @@
			})

			} else {
			this.onButtonClicked(btn, pageData, -1);
			this.handleButtonClick((done) => {
			this.onButtonClicked(btn, pageData, -1);
			setTimeout(() => {
			done(); // 重置状态
			}, 1000);
			});

			}
			},
			onRowBtnClick(btn, pageData, index) {
			@@ -2511,7 +2302,13 @@
			})

			} else {
			this.onButtonClicked(btn, pageData, index);
			this.handleButtonClick((done) => {
			this.onButtonClicked(btn, pageData, index);
			setTimeout(() => {
			done(); // 重置状态
			}, 1000);
			});

			}
			},
			onButtonClicked(btn, pageData, index) {
			@@ -2537,7 +2334,8 @@
			const style = pageData.DefList[index];
			//删除码盘中样式面板
			pageData.DefList.splice(index, 1);
			this.del(pageData, style, btn.AfterProcess_Event);
			if (btn.AfterProcess_Event.ID)
			this.del(pageData, style, btn.AfterProcess_Event);
			this.$set(this.pageDetail, pageIndex, pageData)
			}
			} else if (btn.FunCode == "Modify") {
			@@ -2606,7 +2404,8 @@
			} else {
			ele.setting.colList.forEach(async (col) => {
			if (col) {
			let value = formData[col.fieldId]
			let value = formData[col
			.fieldId]
			if (value)
			col.value = value
			}
			@@ -2614,7 +2413,6 @@
			}
			})
			$this.$set($this.pageDetail, pageIndex, pageData)

			},

			}
			@@ -2657,7 +2455,8 @@
			} else {
			ele.setting.colList.forEach(async (col) => {
			if (col) {
			let value = formData[col.fieldId]
			let value = formData[col
			.fieldId]
			if (value)
			col.value = value
			}
			@@ -2665,6 +2464,7 @@
			}
			})
			$this.$set($this.pageDetail, pageIndex, pageData)
			console.log($this.pageDetail)

			},
			}
			@@ -2676,33 +2476,32 @@
			this.After_OK_Event = pageData.After_ok;
			// console.log(this.Before_OK_Event);
			// console.log(this.After_OK_Event);
			if (this.$data.Before_OK_Event.ID) //是否有确定前事件
			this.sava(pageData, this.$data.Before_OK_Event);
			else if (this.$data.After_OK_Event.ID) //是否有确定后事件
			this.sava(pageData, this.$data.After_OK_Event);
			if (this.Before_OK_Event.ID) //是否有确定前事件
			this.sava(pageData, this.Before_OK_Event);
			else if (this.After_OK_Event.ID) //是否有确定后事件
			this.sava(pageData, this.After_OK_Event);
			},
			sava(pageData, event) {
			var $this = this;
			if (pageData.DefList.length == 0) {
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate(
			"tip_no_data_first") +
			this.translateSys(
			"quotation_mark_left") + pageData.Name + this
			.translateSys(
			"quotation_mark_right") +
			this.translate(
			"tip_no_data_last"),
			showCancel: false,
			confirmText: this.translateSys('close')
			});
			return false;
			}
			// if (pageData.DefList.length == 0) {
			// uni.showModal({
			// title: this.translateSys("tip"),
			// content: this.translate(
			// "tip_no_data_first") +
			// this.translateSys(
			// "quotation_mark_left") + pageData.Name + this
			// .translateSys(
			// "quotation_mark_right") +
			// this.translate(
			// "tip_no_data_last"),
			// showCancel: false,
			// confirmText: this.translateSys('close')
			// });
			// return false;
			// }
			//获取表头属性
			pageData.okLoading = true
			var head_attr = {};
			this.$data.head_styledef.form.items.forEach(item => {
			this.head_styledef.form.items.forEach(item => {
			if (item.name == "Layout") { //判断是否是栅栏格式
			item.setting.colList.forEach(col => {
			if (col != null) head_attr[col.fieldId] =
			@@ -2780,7 +2579,6 @@
			});
			});
			if (jsonlist.length == 0) {
			pageData.okLoading = false
			uni.showModal({
			title: this.translateSys("tip"),
			content: this.translate("tip_no_select_data"),
			@@ -2810,7 +2608,7 @@
			var dataInfo = {
			ed_type: 0,
			start_transaction: true,
			class_id: this.$data.ClsID,
			class_id: this.ClsID,
			class_name: '',
			event_id: event.ID,
			event_name: '',
			@@ -2826,8 +2624,6 @@
			global_attr: '',
			input_param: input_param,
			};

			// console.log(dataInfo);
			runCustomEvent(dataInfo).then(result => {
			console.log(result);
			if (result.ret != 0) {
			@@ -2875,58 +2671,81 @@

			result.action.forEach(item => {
			if (item.action_type ==
			"insert_subtable_page_row"
			) { //码盘中
			"insert_subtable_page_row") { //码盘中
			var value = item.value;
			//加载已经码盘数据
			$this.viewAceionRow(value);
			//清空条码内容
			$this.$data.head_styledef.form.items.forEach((item, index) => {
			if (item.fieldId != "S_CNTR_CODE") {
			$this.head_styledef.form.items.forEach((item,
			index) => {
			if (item.fieldId !=
			"S_CNTR_CODE") {
			item.value = '';
			item.oldvalue = '';
			$this.$data.head_styledef.form.model[item
			$this.head_styledef.form.model[
			item
			.fieldId] = '';
			}
			});

			uni.showModal({
			title: $this.translateSys("tip"),
			content: $this.translate('execute_event_success'),
			content: $this.translate(
			'execute_event_success'),
			showCancel: false,
			confirmText: $this.translateSys('close')
			confirmText: $this.translateSys(
			'close')
			});
			} else if (item.action_type ==
			"set_subtable_page_content"
			) { //已码盘
			$this.$data.param.Show_Welcom_Page = false;
			$this.param.Show_Welcom_Page = false;
			var value = item.value;
			const pageData = $this.pageDetail.find((page) => {
			return value.page_name == page.Name;
			const pageData = $this.pageDetail.find((
			page) => {
			return value.page_name == page
			.Name;
			});
			if (value.clear_confirm != false && value.clear == true &&
			if (value.clear_confirm != false && value
			.clear == true &&
			pageData && pageData.DefList.length > 0
			) { //判断是否清空页签内容,正在码盘是否有数据
			uni.showModal({
			title: $this.translateSys('tip'),
			title: $this.translateSys(
			'tip'),
			content: $this.translate(
			"are_you_sure_clear_first") +
			$this.translateSys("quotation_mark_left") +
			"are_you_sure_clear_first"
			) +
			$this.translateSys(
			"quotation_mark_left"
			) +
			value.page_name +
			$this.translateSys(
			"quotation_mark_right") +
			$this.translate("are_you_sure_clear_last"),
			cancelText: $this.translateSys('ok'),
			confirmText: $this.translateSys('cancel'),
			"quotation_mark_right"
			) +
			$this.translate(
			"are_you_sure_clear_last"
			),
			cancelText: $this.translateSys(
			'ok'),
			confirmText: $this
			.translateSys('cancel'),
			success: function(res) {
			if (res.cancel) {
			if (pageData)
			pageData.DefList = [];
			$this.viewAceionContent(value);
			} else if (res.confirm) {
			pageData
			.DefList = [];
			$this
			.viewAceionContent(
			value);
			} else if (res
			.confirm) {
			if (pageData)
			pageData.DefList = [];
			$this.viewAceionContent(value);
			pageData
			.DefList = [];
			$this
			.viewAceionContent(
			value);
			}
			}
			});
			@@ -2936,42 +2755,70 @@
			$this.viewAceionContent(value);
			}
			} else if (item.action_type ==
			"select_subtable_page") {
			var value = item.value;
			const pageIndex = $this.pageDetail.findIndex((
			page) => {
			return value.page_name == page
			.Name;
			});
			if (pageIndex > -1) {
			$this.setData({
			current: pageIndex
			})
			}
			} else if (item.action_type ==
			"remove_subtable_page_row") { //清除面板中指定id的数据
			let value = item.value;
			$this.viewActionRemoveRow(value)
			} else if (item.action_type == "set_subtable_page_row") {
			} else if (item.action_type ==
			"set_subtable_page_row") {
			$this.viewActionSetRow(item.value)
			} else if (item.action_type == "set_subtable_page_ext_data") {
			} else if (item.action_type ==
			"set_subtable_page_ext_data") {
			let value = item.value;
			const pageData = $this.pageDetail.find((page) => {
			return value.page_name == page.Name;
			const pageData = $this.pageDetail.find((
			page) => {
			return value.page_name == page
			.Name;
			});
			if (pageData) {
			pageData.ExtData = value.ext_data
			}

			} else if (item.action_type == "clear_subpage_rows") {
			} else if (item.action_type ==
			"clear_subpage_rows") {
			var value = item.value;
			const pageData = $this.pageDetail.find((page) => {
			return value.page_name == page.Name;
			const pageIndex = $this.pageDetail.findIndex((
			page) => {
			return value.page_name == page
			.Name;
			});
			if (pageData) {
			if (pageIndex > -1) {
			const pageData = $this.pageDetail[
			pageIndex]
			pageData.DefList = []
			pageData.ExtData = {}

			$this.$set(this.pageDetail, pageIndex,
			pageData)
			}
			} else if (item.action_type == "set_dlg_current_edit_attr") {
			} else if (item.action_type ==
			"set_dlg_current_edit_attr") {
			if ($this.focusOldFieldId == item.value)
			$this.setData({
			focusFieldId: ""
			})
			else {
			$this.setData({
			focusFieldId: $this.focusOldFieldId
			focusFieldId: $this
			.focusOldFieldId
			})
			}
			$this.$nextTick(() => {
			$this.setData({
			focusFieldId: item.value
			focusFieldId: item
			.value
			})
			});
			} else if (item.action_type ==
			@@ -2983,8 +2830,8 @@

			});
			} else {
			if ($this.$data.After_OK_Event.ID != event.ID) { //判断当前事件是否是确定后事件
			$this.sava(pageParam, $this.$data.After_OK_Event); //执行确定后事件
			if ($this.After_OK_Event.ID != event.ID) { //判断当前事件是否是确定后事件
			$this.sava(pageParam, $this.After_OK_Event); //执行确定后事件

			}
			}
			@@ -3001,9 +2848,8 @@
			}
			}

			pageParam.okLoading = false
			}).catch(ex => {
			pageParam.okLoading = false
			console.log(ex);
			let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
			uni.showModal({
			title: this.translateSys("error") + "8.1",
			@@ -3057,38 +2903,6 @@
			flex-direction: column;
			}

			.v-head-style {
			width: 98%;

			.uni-forms-item {
			margin-bottom: 11rpx;
			}

			.input-wrapper {
			border: 1px solid #d5d5d5;
			width: 100%;
			display: flex;
			flex-direction: row;

			.uni-input {
			flex: 1;
			padding: 12rpx 8rpx;
			color: #2d8cf0;
			// height: 40rpx;
			// line-height: 40rpx;
			}

			.uni-icon {
			padding: 10rpx 5rpx;
			font-size: 32rpx;
			color: rgb(192, 196, 204);
			}
			}

			.input-wrapper:hover {
			border: 1px solid rgb(41, 121, 255);
			}
			}

			.view-content {
			display: flex;
			@@ -3231,11 +3045,6 @@
			padding: 0px;
			margin: 0;

			.dv-panel-form-item {
			margin: 0;
			padding: 0px;
			}

			.uni-forms-item {
			padding-bottom: 5rpx;
			margin-bottom: 0;
			@@ -3244,33 +3053,7 @@
			height: 20px !important;
			padding: 0 10rpx 0 0 !important;
			}

			.uni-input {
			width: calc(100% - 12rpx);
			padding: 5rpx;
			border: 1px solid #d5d5d5;
			color: #2d8cf0;
			height: 20px;
			background: #FFF;
			line-height: 20px;
			border-radius: 6px !important;
			font-size: 14px;
			font-family: inherit;
			box-shadow: none !important;
			transition-duration: 0.1s;
			vertical-align: middle;
			}

			.form-item-span {
			vertical-align: text-top;
			color: #2d8cf0;
			white-space: normal;
			word-break: break-all;
			width: 100%;
			}
			}



			}

			@@ -3391,14 +3174,6 @@

			.input-disabled {
			background-color: #f3f3f3 !important;
			}

			::v-deep .uni-row {
			margin-bottom: 0px;
			}

			.view-tabpage ::v-deep .uni-row {
			margin-bottom: 5px;
			}

			.demo-uni-col {