From 15dcf7158d4c5d66d4b196e4e0b2030e1070d448 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 03 三月 2025 16:46:24 +0800
Subject: [PATCH] 5601 form

---
 pages/modal/3018_2.vue |   77 +++++++++++++++++++++++++++++++-------
 1 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 4c59b99..ac66596 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -5,7 +5,7 @@
 			<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 +'锛� "
+					<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-->
@@ -36,17 +36,17 @@
 						</view>
 						<!-- 澶嶉�妗�-->
 						<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
-							:class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
-							:disabled="item.disabled" :data-ischeck="item.value">
-							<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"
-							@change="onModelValue(item)">
+							@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>
@@ -68,7 +68,7 @@
 					<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 +'锛�"
+							<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]"
@@ -98,17 +98,16 @@
 								<!-- 澶嶉�妗�-->
 								<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
 									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
-									@change="onModelValue(cols)" :data-ischeck="cols.value"
-									:style="{'margin-left':'10rpx'}">
-									<label>
-										<checkbox :value="cols.value" :checked="cols.value" />
-										<text>{{cols.label}}</text>
+									@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="onModelValue(cols)">
+									@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>
@@ -388,6 +387,24 @@
 									await $this.DictGetInfo(ele.bind.dict,
 										styledefHead.form.model,
 										ele);
+								} else {
+									if (ele?.name === "Select") {
+										const selections = ele?.selections || []
+										//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+										let itemName = ele.value || "";
+										if (itemName) {
+											styledefHead.form
+												.model[ele.fieldId] = itemName;
+										}
+										ele.dict = selections.map((a) => {
+											return {
+												value: a.value,
+												text: a.label
+											}
+										})
+
+									}
+
 								}
 								if ($this.focusFieldId == "") {
 									if (ele.name == 'Input' || ele.name ==
@@ -408,6 +425,25 @@
 												.dict,
 												styledefHead.form
 												.model, col);
+										} else {
+											if (col?.name === "Select") {
+												const selections = col?.selections || []
+												//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+												let itemName = col.value || "";
+												if (itemName) {
+													styledefHead.form
+														.model[col.fieldId] = itemName;
+												}
+												col.dict = selections.map((a) => {
+													return {
+														value: a.value,
+														text: a.label
+													}
+												})
+
+
+											}
+
 										}
 										if ($this.focusFieldId == "") {
 											if (col.name == 'Input' || col
@@ -828,6 +864,17 @@
 			onModelValue(item) { //缁戝畾Model鍊� 				var attr = item.fieldId;
 				this.head_styledef.form.model[attr] = item.value;
+				console.log(item.value)
+			},
+			onCheckBoxValue(e) { //缁戝畾Model鍊�+				let values = e.detail.value || []
+				let attr = e.currentTarget?.dataset?.attr || ""
+				this.head_styledef.form.model[attr] = values;
+			},
+			onRadioBoxValue(e) { //缁戝畾Model鍊�+				let value = e.detail.value || ""
+				let attr = e.currentTarget?.dataset?.attr || ""
+				this.head_styledef.form.model[attr] = value;
 			},
 			classAttr_extButton(item) {
 				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�@@ -855,7 +902,7 @@
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
 
-				this.dataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
+				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
 					item);
 			},
 			popupChange(e) {

--
Gitblit v1.9.1