~jt/MES-PDA.git

			@@ -16,7 +16,7 @@
			: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)" />
			@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="onEnterChange(item)"></text>
			</view>
			@@ -38,7 +38,7 @@
			: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)" />
			@keyup.enter="onEnterChange(col)" @blur="onEnterChange(col)" :maxlength="-1"/>
			<text v-if="col.setting.suffix" class="uni-icon" :class="[col.setting.suffix]"
			@click="onEnterChange(col)"></text>
			</view>
			@@ -65,9 +65,10 @@
			src="../../images/mobox_log_200x40.png">
			</image>
			<checkbox-group @change="checkboxChange">
			<div class="dv-panel" v-for="(style,ii) in pageData.DefList" @tap="onPanelClick(ii)"
			<div class="dv-panel" v-for="(style,ii) in pageData.DefList"
			@tap="onPanelClick(ii,style.form.htmlobjId)"
			:id="'dvpanel'+style.form.htmlobjId"
			:class="style.form.htmlobjId==active_id?'bk-active':activelist[ii].active==true?'bk-active':''">
			:class="style.form.htmlobjId==active_id?'bk-active':''">
			<div class="dv-panel-input">
			<div class="dv-input" v-for="(item,index) in style.form.items">
			<!-- 普通布局 -->
			@@ -79,7 +80,7 @@
			<input class="uni-input" v-if="!item.disabled"
			:type="item.name=='InputNumber'?'number':'text'"
			v-model="item.value" :disabled="item.disabled"
			:placeholder="item.placeholder" />
			:placeholder="item.placeholder" :maxlength="-1"/>
			</view>
			<!-- 栅格布局 -->
			<uni-row class="demo-uni-row" v-else :gutter="item.setting.gutter">
			@@ -94,7 +95,7 @@
			<input class="uni-input" v-if="!cols.disabled"
			:type="cols.name=='InputNumber'?'number':'text'"
			v-model="cols.value" :disabled="cols.disabled"
			:placeholder="cols.placeholder" />
			:placeholder="cols.placeholder" :maxlength="-1"/>
			</view>
			</uni-col>
			</uni-row>
			@@ -174,7 +175,6 @@
			After_Del_Event: {},

			active_id: '',
			activelist: [],
			selectAttrObj: {},
			};
			},
			@@ -456,9 +456,9 @@
			var itemName = '';
			(result.dict_item_list \|\| []).forEach((item) => {
			if (item.is_default == '1')
			itemName = item.name;
			itemName = item.name
			list.push({
			text: item.value,
			text: item.value ? item.value : item.name,
			value: item.name,
			});
			});
			@@ -863,12 +863,7 @@
			if (pageData?.DefList) {
			pageData.DefList
			.forEach(ele => {
			$this
			.activelist[
			index
			]
			.active =
			false;

			if (ele
			.form
			.objId ==
			@@ -1204,9 +1199,7 @@

			pageData.DefList.push(detailStyle);
			this.$set(this.pageDetail, pageIndex, pageData)
			this.activelist.push({
			active: false
			});

			});
			}
			},
			@@ -1309,9 +1302,7 @@
			}
			// $this.setData({pageDetail:pageD})
			$this.$set(this.pageDetail, pageIndex, pageData)
			$this.activelist.push({
			active: false
			});

			});
			}

			@@ -1530,14 +1521,9 @@
			$this.runCustomEvent(pageData, event, input_param, list);
			},

			onPanelClick(value) {
			onPanelClick(value, id) {
			// console.log(value);
			this.active_id = '';
			this.activelist.forEach(ele => {
			ele.active = false;
			});
			this.activelist[value].active = true;
			// console.log(this.$data.activelist);
			this.active_id = id;
			},
			//确定
			ok(pageData) {