From 25891ddbe1ac7a2123c9f775d0de2e141ac4a1c6 Mon Sep 17 00:00:00 2001
From: cyy <cuiqian2004@163.com>
Date: 星期六, 01 三月 2025 18:06:40 +0800
Subject: [PATCH] 5601 modify form smallwmd

---
 pages/modal/3037_2.vue |   80 +++++++++++++++++++++++++++++++---------
 1 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 3c4dbe2..6e08aaa 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -39,16 +39,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" :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" @change="onModelValue(item)">
+					: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>
@@ -128,17 +129,17 @@
 							</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="onRadioBoxValue" :data-attr="cols.fieldId">
 								<label v-for="(item2) in item.selections" :key="item2.value">
 									<radio :value="item2.value" :checked="item2.value === item.value" />
 									<text>{{item2.label}}</text>
@@ -194,17 +195,17 @@
 									<!-- 澶嶉�妗�-->
 									<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>
@@ -411,6 +412,23 @@
 							ele.show = true;
 							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
+										}
+									})
+								}
+
 							}
 						});
 					}
@@ -455,6 +473,21 @@
 						$this.detail1_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'sub');
+							} else {
+								if (ele?.name === "Select") {
+									const selections = ele?.selections || []
+									//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+									let itemName = ele.value || "";
+									if (itemName) {
+										$this.detail1_styledef.form.items[ele.fieldId] = itemName;
+									}
+									$this.detail1_styledef.form.items[index].dict = selections.map((a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
 							}
 						});
 					}
@@ -965,6 +998,17 @@
 					}
 				}
 			},
+			
+			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;
+			},
 			onModelValue(item) { //缁戝畾Model鍊� 				//console.log(e.target)
 				var attr = item.fieldId;

--
Gitblit v1.9.1