提交

src/view/fenghui/form.vue

@@ -287,22 +287,25 @@
                 </van-field>
 
                 <!-- 选择分论坛  -->
-                <van-field size="large" label-align="top" v-model="formData.active2" required
+                <van-field size="large" label-align="top" required
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activeContent }]"
                     :placeholder="lang[langType].activeContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active"></span>
                     </template>
                     <template #input>
-                        <van-radio-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
+                        <van-checkbox-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
                             v-model="formData.active2">
-                            <van-radio style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇">{{ lang[langType].active1
-                                }}</van-radio>
-                            <van-radio style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
-                                }}</van-radio>
-                            <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
-                                }}</van-radio>
-                        </van-radio-group>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇"  shape="square">
+                                {{ lang[langType].active1 }}
+                            </van-checkbox>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共筑网络安全防线"  shape="square">
+                                {{ lang[langType].active2 }}
+                            </van-checkbox>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共商人工智能发展治理"  shape="square">
+                                {{ lang[langType].active3 }}
+                            </van-checkbox>
+                        </van-checkbox-group>
                     </template>
                 </van-field>
 
@@ -594,20 +597,30 @@ const onSubmit = () => {
     if (loading) return
     loading = true
     const active = {
+        active2: '否',
+        active3: '否',
         active4: '否',
         active5: '否',
-        active6: '否'
+        active6: '否',
+        active7: '否'
     }
     if (!selectunde.value) {
         activitiesAttended.value.forEach((item) => {
             active[item] = '是'
         })
     }
+    if (formData.active2.includes('共享数字经济发展机遇')) {
+        active.active7 = '是'
+    }
+    if (formData.active2.includes('共筑网络安全防线')) {
+        active.active2 = '是'
+    }
+    if (formData.active2.includes('共商人工智能发展治理')) {
+        active.active3 = '是'
+    }
     saveData({
         ...active,
         active1: formData.active1 || '否',
-        active2: formData.active2 || '否',
-        active3: formData.active3 || '否',
         code: props.verificationCode, // 邀请码
         lastName: formData.lastName, // 姓
         firstName: formData.firstName, // 名

src/view/fenghui/form1.vue

@@ -272,22 +272,25 @@
                 </van-field>
 
                 <!-- 选择分论坛  -->
-                <van-field size="large" label-align="top" v-model="formData.active2" required
+                <van-field size="large" label-align="top" required
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activeContent }]"
                     :placeholder="lang[langType].activeContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active"></span>
                     </template>
                     <template #input>
-                        <van-radio-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
+                        <van-checkbox-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
                             v-model="formData.active2">
-                            <van-radio style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇">{{ lang[langType].active1
-                                }}</van-radio>
-                            <van-radio style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
-                                }}</van-radio>
-                            <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
-                                }}</van-radio>
-                        </van-radio-group>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇"  shape="square">
+                                {{ lang[langType].active1 }}
+                            </van-checkbox>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共筑网络安全防线"  shape="square">
+                                {{ lang[langType].active2 }}
+                            </van-checkbox>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共商人工智能发展治理"  shape="square">
+                                {{ lang[langType].active3 }}
+                            </van-checkbox>
+                        </van-checkbox-group>
                     </template>
                 </van-field>
 
@@ -581,20 +584,30 @@ const onSubmit = () => {
     if (loading) return
     loading = true
     const active = {
+        active2: '否',
+        active3: '否',
         active4: '否',
         active5: '否',
-        active6: '否'
+        active6: '否',
+        active7: '否'
     }
     if (!selectunde.value) {
         activitiesAttended.value.forEach((item) => {
             active[item] = '是'
         })
     }
+    if (formData.active2.includes('共享数字经济发展机遇')) {
+        active.active7 = '是'
+    }
+    if (formData.active2.includes('共筑网络安全防线')) {
+        active.active2 = '是'
+    }
+    if (formData.active2.includes('共商人工智能发展治理')) {
+        active.active3 = '是'
+    }
     saveData({
         ...active,
         active1: formData.active1 || '否',
-        active2: formData.active2 || '否',
-        active3: formData.active3 || '否',
         code: props.verificationCode, // 邀请码
         name: formData.name, // 姓名
         provinceCity: formData.provinceCity, // 省市区

src/view/fenghui/form1Recurrence.vue

@@ -273,22 +273,25 @@
                 </van-field>
 
                 <!-- 选择分论坛  -->
-                <van-field size="large" label-align="top" v-model="formData.active2" required
+                <van-field size="large" label-align="top" required
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activeContent }]"
                     :placeholder="lang[langType].activeContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active"></span>
                     </template>
                     <template #input>
-                        <van-radio-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
+                        <van-checkbox-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
                             v-model="formData.active2">
-                            <van-radio style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇">{{ lang[langType].active1
-                                }}</van-radio>
-                            <van-radio style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
-                                }}</van-radio>
-                            <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
-                                }}</van-radio>
-                        </van-radio-group>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇"  shape="square">
+                                {{ lang[langType].active1 }}
+                            </van-checkbox>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共筑网络安全防线"  shape="square">
+                                {{ lang[langType].active2 }}
+                            </van-checkbox>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共商人工智能发展治理"  shape="square">
+                                {{ lang[langType].active3 }}
+                            </van-checkbox>
+                        </van-checkbox-group>
                     </template>
                 </van-field>
 
@@ -499,6 +502,9 @@ const initFormData = () => {
     subData.active4 === '是' && activitiesAttended.value.push('active4');
     subData.active5 === '是' && activitiesAttended.value.push('active5');
     subData.active6 === '是' && activitiesAttended.value.push('active6');
+    if (!formData.active2) {
+        formData.active2 = []
+    }
     for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
         if (key === 'photo') {
@@ -513,6 +519,15 @@ const initFormData = () => {
                 formData.unitTypeName = '';
             }
         }
+        if (key === 'active7') {
+            formData.active2.push('共享数字经济发展机遇')
+        }
+        if (key === 'active2') {
+            formData.active2.push('共筑网络安全防线')
+        }
+        if (key === 'active3') {
+            formData.active2.push('共商人工智能发展治理')
+        }
         formData[relationship[key]] = subData[key];
     }
 }
@@ -641,15 +656,27 @@ const onSubmit = () => {
     if (loading) return
     loading = true
     const active = {
+        active2: '否',
+        active3: '否',
         active4: '否',
         active5: '否',
-        active6: '否'
+        active6: '否',
+        active7: '否'
     }
     if (!selectunde.value) {
         activitiesAttended.value.forEach((item) => {
             active[item] = '是'
         })
     }
+    if (formData.active2.includes('共享数字经济发展机遇')) {
+        active.active7 = '是'
+    }
+    if (formData.active2.includes('共筑网络安全防线')) {
+        active.active2 = '是'
+    }
+    if (formData.active2.includes('共商人工智能发展治理')) {
+        active.active3 = '是'
+    }
     editData({
         ...active,
         active1: formData.active1 || '否',

src/view/fenghui/formRecurrence.vue

@@ -11,8 +11,8 @@
         </van-nav-bar>
         <div class="form">
             <van-form ref="form" @submit="onSubmit" label-width="8em">
-               <!-- 国家/地区 -->
-               <van-field size="large" input-align="right" clickable readonly
+                <!-- 国家/地区 -->
+                <van-field size="large" input-align="right" clickable readonly
                     @click="countryRegionList = lang[langType].countryRegionList, showCountryRegion = true"
                     right-icon="arrow"
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].countryRegionContent }]"
@@ -257,9 +257,9 @@
                         <van-radio-group checked-color="#3F5AC8" style="justify-content: flex-end;width: 100%;"
                             v-model="formData.interview" direction="horizontal">
                             <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm
-                                }}</van-radio>
+                            }}</van-radio>
                             <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel
-                                }}</van-radio>
+                            }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>
@@ -277,30 +277,33 @@
                         <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.active1"
                             direction="horizontal">
                             <van-radio style="flex: 1;margin-top: 10px " name="是">{{ lang[langType].confirm
-                            }}</van-radio>
+                                }}</van-radio>
                             <van-radio style="flex: 1;margin-top: 10px " name="否">{{ lang[langType].cancel
-                            }}</van-radio>
+                                }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>
 
                 <!-- 选择分论坛  -->
-                <van-field size="large" label-align="top" v-model="formData.active2" required
+                <van-field size="large" label-align="top" required
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activeContent }]"
                     :placeholder="lang[langType].activeContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].active"></span>
                     </template>
                     <template #input>
-                        <van-radio-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
+                        <van-checkbox-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
                             v-model="formData.active2">
-                            <van-radio style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇">{{ lang[langType].active1
-                            }}</van-radio>
-                            <van-radio style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
-                            }}</van-radio>
-                            <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
-                            }}</van-radio>
-                        </van-radio-group>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇" shape="square">
+                                {{ lang[langType].active1 }}
+                            </van-checkbox>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共筑网络安全防线" shape="square">
+                                {{ lang[langType].active2 }}
+                            </van-checkbox>
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共商人工智能发展治理" shape="square">
+                                {{ lang[langType].active3 }}
+                            </van-checkbox>
+                        </van-checkbox-group>
                     </template>
                 </van-field>
 
@@ -521,6 +524,9 @@ const initFormData = () => {
     subData.active4 === '是' && activitiesAttended.value.push('active4');
     subData.active5 === '是' && activitiesAttended.value.push('active5');
     subData.active6 === '是' && activitiesAttended.value.push('active6');
+    if (!formData.active2) {
+        formData.active2 = []
+    }
     for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
         if (key === 'photo') {
@@ -535,6 +541,15 @@ const initFormData = () => {
                 formData.unitTypeName = '';
             }
         }
+        if (key === 'active7') {
+            formData.active2.push('共享数字经济发展机遇')
+        }
+        if (key === 'active2') {
+            formData.active2.push('共筑网络安全防线')
+        }
+        if (key === 'active3') {
+            formData.active2.push('共商人工智能发展治理')
+        }
         formData[relationship[key]] = subData[key];
     }
 }
@@ -650,20 +665,30 @@ const onSubmit = () => {
     if (loading) return
     loading = true
     const active = {
+        active2: '否',
+        active3: '否',
         active4: '否',
         active5: '否',
-        active6: '否'
+        active6: '否',
+        active7: '否'
     }
     if (!selectunde.value) {
         activitiesAttended.value.forEach((item) => {
             active[item] = '是'
         })
     }
+    if (formData.active2.includes('共享数字经济发展机遇')) {
+        active.active7 = '是'
+    }
+    if (formData.active2.includes('共筑网络安全防线')) {
+        active.active2 = '是'
+    }
+    if (formData.active2.includes('共商人工智能发展治理')) {
+        active.active3 = '是'
+    }
     editData({
         ...active,
         active1: formData.active1 || '否',
-        active2: formData.active2 || '否',
-        active3: formData.active3 || '否',
         id: props.subData.id, // 人员id
         code: props.verificationCode, // 邀请码
         lastName: formData.lastName, // 姓

src/view/fenghui/lang.js

@@ -724,7 +724,7 @@ export default {
           ],
     },
     "es": {
-        "technicalAdvice": "Consultoría Técnica:",
+        "technicalAdvice": "Consultoría técnica: 18502918086",
         "level": "Obligatorio- Nivel",
         "levelContent": "Obligatorio- Nivel",
         "identityType": "Categoría de identidad",