~jt/MES-PDA.git

			@@ -16,7 +16,7 @@
			:placeholder="item.placeholder"
			:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix \|\| item.setting.suffix?'87%':'96%'}"
			:focus="focusMateria" @focus="ontap(item)" @keyup.enter="onEnterChange(item)"
			@blur="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>
			@@ -50,9 +50,8 @@
			<view v-if="item.name!='Layout'">
			<text class="txt_title"
			:style="{'width':item.labelWidth+'px'}">{{item.label}}：</text>
			<!-- 文本框/数字框 -->
			<view class="dv_input"
			v-if="(item.name=='Input' \|\| item.name=='InputNumber')">
			<!-- 文本框/数字框 -->
			<view class="dv_input" v-if="(item.name=='Input' \|\| item.name=='InputNumber')">
			<text v-if="item.setting.prefix" class="uni-icon"
			:class="[item.setting.prefix]" @change="onChange(item)"></text>
			<input class="uni-input" :class="item.disabled?'input-disabled':''"
			@@ -60,7 +59,8 @@
			v-model="item.value" :disabled="item.disabled"
			:placeholder="item.placeholder"
			:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix \|\| item.setting.suffix?'87%':'96%'}"
			:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
			:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)"
			:maxlength="-1" />
			<text v-if="item.setting.suffix" class="uni-icon"
			:class="[item.setting.suffix]" @click="onChange(item)"></text>
			</view>
			@@ -79,18 +79,20 @@
			</view>
			<!-- 复选框 -->
			<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
			:class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
			:data-ischeck="item.value" :disabled="item.disabled"
			:style="{'margin-left':'10rpx'}">
			<label>
			<checkbox :value="item.value" :checked="item.value" />
			<text>{{item.label}}</text>
			: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"
			:style="{'margin-left':'10rpx'}" @change="onModelValue(item)">
			:style="{'margin-left':'10rpx'}" @change="onModelValue(item)"
			: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>
			@@ -127,21 +129,19 @@
			v-model="cols.value" :disabled="cols.disabled"
			:placeholder="cols.placeholder"
			:style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix \|\| cols.setting.suffix?'87%':'96%'}"
			:focus="focusMateria" @focus="ontap(cols)"
			@blur="onevent(cols)" />
			:focus="focusMateria" @focus="ontap(cols)" @blur="onevent(cols)"
			:maxlength="-1" />
			<text v-if="cols.setting.suffix" class="uni-icon"
			:class="[cols.setting.suffix]"
			@click="onChange(cols)"></text>
			</view>
			<!-- 下拉框-单选 cols.useDict?cols.dict:cols.selections-->
			<uni-data-select id="dv_select"
			v-if="cols.name=='Select'"
			<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'">
			<view class="input-wrapper" v-if="cols.name=='Textarea'">
			<textarea class="uni-input" :value="cols.value"
			:class="cols.disabled?'input-disabled':''"
			:placeholder="cols.placeholder" @blur="onModelValue(cols)"
			@@ -150,12 +150,12 @@
			</view>
			<!-- 复选框 -->
			<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
			:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
			@change="onModelValue(cols)" :data-ischeck="cols.value"
			:style="{'margin-left':'10rpx'}">
			<label>
			<checkbox :value="cols.value" :checked="cols.value" />
			<text>{{cols.label}}</text>
			: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>
			<!-- 单选框 -->
			@@ -487,7 +487,25 @@
			console.log(ele.useDict);
			if (ele.useDict == true) { //判断useDict是否使用字典
			await this.DictGetInfo(ele.bind.dict, index, 'mast');
			} else {
			if (ele?.name === "Select") {
			const selections = ele?.selections \|\| []
			//有默认值，显示默认值
			let itemName = ele.value \|\| "";
			if (itemName) {
			$this.head_styledef.form
			.model[ele.fieldId] = itemName;
			}
			$this.head_styledef.form.items[index].dict = selections.map((a) => {
			return {
			value: a.value,
			text: a.label
			}
			})
			}

			}

			});

			}
			@@ -582,10 +600,10 @@
			var itemName = '';
			(result.dict_item_list \|\| []).forEach((item) => {
			if (item.is_default == '1')
			itemName = item.value ? item.value : item.name
			itemName = item.name
			list.push({
			text: item.value ? item.value : item.name,
			value: item.id,
			value: item.name,
			});
			});
			//有默认值，显示默认值
			@@ -2011,7 +2029,7 @@
			},
			};
			</script>
			<style lang="less">
			<style lang="scss">
			.uni-page-modal-3200 {
			display: flex;
			flex-direction: column;