liyongli 1 päivä sitten
vanhempi
commit
c082c59e13

+ 18 - 17
src/view/fenghui/form.vue

@@ -27,7 +27,8 @@
                         :cancel-button-text="lang[langType].cancel" @confirm="countryRegionConfirm"
                         :title="lang[langType].countryRegion" @cancel="showCountryRegion = false">
                         <template #columns-top>
-                            <van-search @update:model-value="input" v-model="searchConuntry" :placeholder="lang[langType].searchText" />
+                            <van-search @update:model-value="input" v-model="searchConuntry"
+                                :placeholder="lang[langType].searchText" />
                         </template>
                     </van-picker>
                 </van-popup>
@@ -259,9 +260,9 @@
                         <van-radio-group checked-color="#3F5AC8" style="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>
@@ -279,9 +280,9 @@
                         <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>
@@ -296,13 +297,13 @@
                     <template #input>
                         <van-checkbox-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
                             v-model="formData.active2">
-                            <van-checkbox style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇"  shape="square">
+                            <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">
+                            <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">
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共商人工智能发展治理" shape="square">
                                 {{ lang[langType].active3 }}
                             </van-checkbox>
                         </van-checkbox-group>
@@ -340,10 +341,11 @@
                                     </template>
                                 </van-cell>
                             </van-checkbox-group>
-                            <van-cell clickable :title="lang[langType].active7" @click="selectunde = !selectunde,formData.activitiesAttended = selectunde ? 'undefined' : ''">
+                            <van-cell clickable :title="lang[langType].active7"
+                                @click="()=>isUndefined(checkboxRefs[3])">
                                 <template #icon>
-                                    <van-checkbox checked-color="#3F5AC8" @change="isUndefined" v-model="selectunde"
-                                        style="margin-right: 5px;" name="undefined" @click.stop shape="square" />
+                                    <van-checkbox checked-color="#3F5AC8" v-model="selectunde"
+                                        style="margin-right: 5px;"  :ref="el => checkboxRefs[3] = el" name="none" @click.stop shape="square" />
                                 </template>
                             </van-cell>
                         </div>
@@ -474,16 +476,15 @@ const onClickLeft = () => {
 };
 
 const isGroup = (val) => {
+    formData.activitiesAttended = val.join(',')
     if (val.length > 0) {
-        formData.activitiesAttended = val.join(',')
         selectunde.value = false
     }
 }
-const isUndefined = (val) => {
-    if (val) {
-        activitiesAttended.value = []
-        formData.activitiesAttended = 'undefined'
-    }
+const isUndefined = (ele) => {
+    ele.toggle()
+    formData.activitiesAttended = selectunde.value ? 'none' : ''; 
+    activitiesAttended.value = []
 }
 
 const reset = () => {

+ 21 - 19
src/view/fenghui/form1.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 }]"
@@ -26,7 +26,8 @@
                         :cancel-button-text="lang[langType].cancel" @confirm="countryRegionConfirm"
                         :title="lang[langType].countryRegion" @cancel="showCountryRegion = false">
                         <template #columns-top>
-                            <van-search @update:model-value="input" v-model="searchConuntry" :placeholder="lang[langType].searchText" />
+                            <van-search @update:model-value="input" v-model="searchConuntry"
+                                :placeholder="lang[langType].searchText" />
                         </template>
                     </van-picker>
                 </van-popup>
@@ -245,9 +246,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>
@@ -264,9 +265,9 @@
                         <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>
@@ -281,13 +282,13 @@
                     <template #input>
                         <van-checkbox-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
                             v-model="formData.active2">
-                            <van-checkbox style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇"  shape="square">
+                            <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">
+                            <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">
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共商人工智能发展治理" shape="square">
                                 {{ lang[langType].active3 }}
                             </van-checkbox>
                         </van-checkbox-group>
@@ -325,10 +326,11 @@
                                     </template>
                                 </van-cell> -->
                             </van-checkbox-group>
-                            <van-cell clickable :title="lang[langType].active7" @click="selectunde = !selectunde,formData.activitiesAttended = selectunde ? 'undefined' : ''">
+                            <van-cell clickable :title="lang[langType].active7"
+                                @click="()=>isUndefined(checkboxRefs[3])">
                                 <template #icon>
-                                    <van-checkbox checked-color="#3F5AC8" @change="isUndefined" v-model="selectunde"
-                                        style="margin-right: 5px;" name="undefined" @click.stop shape="square" />
+                                    <van-checkbox checked-color="#3F5AC8" v-model="selectunde"
+                                        style="margin-right: 5px;"  :ref="el => checkboxRefs[3] = el" name="none" @click.stop shape="square" />
                                 </template>
                             </van-cell>
                         </div>
@@ -459,17 +461,17 @@ const reset = () => {
     form.value.resetValidation();
 }
 
+
 const isGroup = (val) => {
+    formData.activitiesAttended = val.join(',')
     if (val.length > 0) {
-        formData.activitiesAttended = val.join(',')
         selectunde.value = false
     }
 }
-const isUndefined = (val) => {
-    if (val) {
-        activitiesAttended.value = []
-        formData.activitiesAttended = 'undefined'
-    }
+const isUndefined = (ele) => {
+    ele.toggle()
+    formData.activitiesAttended = selectunde.value ? 'none' : ''; 
+    activitiesAttended.value = []
 }
 const countryRegionConfirm = (values) => {
     showCountryRegion.value = false;

+ 31 - 29
src/view/fenghui/form1Recurrence.vue

@@ -10,9 +10,9 @@
             </template>
         </van-nav-bar>
         <div class="form">
-            <van-form ref="form" @submit="onSubmit" label-width="8em"> 
+            <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 }]"
@@ -26,7 +26,8 @@
                         :cancel-button-text="lang[langType].cancel" @confirm="countryRegionConfirm"
                         :title="lang[langType].countryRegion" @cancel="showCountryRegion = false">
                         <template #columns-top>
-                            <van-search @update:model-value="input" v-model="searchConuntry" :placeholder="lang[langType].searchText" />
+                            <van-search @update:model-value="input" v-model="searchConuntry"
+                                :placeholder="lang[langType].searchText" />
                         </template>
                     </van-picker>
                 </van-popup>
@@ -246,9 +247,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>
@@ -265,9 +266,9 @@
                         <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>
@@ -282,13 +283,13 @@
                     <template #input>
                         <van-checkbox-group checked-color="#3F5AC8" style="width: 100%;padding-left: 16px;"
                             v-model="formData.active2">
-                            <van-checkbox style="flex: 1;margin-top: 10px " name="共享数字经济发展机遇"  shape="square">
+                            <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">
+                            <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">
+                            <van-checkbox style="flex: 1;margin-top: 10px " name="共商人工智能发展治理" shape="square">
                                 {{ lang[langType].active3 }}
                             </van-checkbox>
                         </van-checkbox-group>
@@ -296,7 +297,7 @@
                 </van-field>
 
                 <!-- 拟参加的活动  -->
-                <!-- <van-field size="large" label-align="top" v-model="formData.activitiesAttended" required
+                <van-field size="large" label-align="top" v-model="formData.activitiesAttended" required
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].activitiesAttendedContent }]"
                     :placeholder="lang[langType].activitiesAttendedContent">
                     <template #label>
@@ -319,23 +320,24 @@
                                             name="active5" @click.stop shape="square" />
                                     </template>
                                 </van-cell>
-                                <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
+                                <!-- <van-cell clickable :title="lang[langType].active6" @click="checkboxRefs[2].toggle()">
                                     <template #icon>
                                         <van-checkbox :ref="el => checkboxRefs[2] = el" style="margin-right: 5px;"
                                             name="active6" @click.stop shape="square" />
                                     </template>
-                                </van-cell>
+                                </van-cell> -->
                             </van-checkbox-group>
-                            <van-cell clickable :title="lang[langType].active7" @click="selectunde = !selectunde,formData.activitiesAttended = selectunde ? 'undefined' : ''">
+                            <van-cell clickable :title="lang[langType].active7"
+                                @click="()=>isUndefined(checkboxRefs[3])">
                                 <template #icon>
-                                    <van-checkbox checked-color="#3F5AC8" @change="isUndefined" v-model="selectunde"
-                                        style="margin-right: 5px;" name="undefined" @click.stop shape="square" />
+                                    <van-checkbox checked-color="#3F5AC8" v-model="selectunde"
+                                        style="margin-right: 5px;"  :ref="el => checkboxRefs[3] = el" name="none" @click.stop shape="square" />
                                 </template>
                             </van-cell>
                         </div>
 
                     </template>
-                </van-field> -->
+                </van-field>
 
 
                 <div style="background-color: #F7F7F7;height: 10px;"></div>
@@ -541,18 +543,18 @@ const reset = () => {
     form.value.resetValidation();
 }
 
-// const isGroup = (val) => {
-//     if (val.length > 0) {
-//         formData.activitiesAttended = val.join(',')
-//         selectunde.value = false
-//     }
-// }
-// const isUndefined = (val) => {
-//     if (val) {
-//         activitiesAttended.value = []
-//         formData.activitiesAttended = 'undefined'
-//     }
-// }
+
+const isGroup = (val) => {
+    formData.activitiesAttended = val.join(',')
+    if (val.length > 0) {
+        selectunde.value = false
+    }
+}
+const isUndefined = (ele) => {
+    ele.toggle()
+    formData.activitiesAttended = selectunde.value ? 'none' : ''; 
+    activitiesAttended.value = []
+}
 
 const onClickLeft = () => {
     emits('closeComponent');

+ 16 - 14
src/view/fenghui/formRecurrence.vue

@@ -26,7 +26,8 @@
                         :cancel-button-text="lang[langType].cancel" @confirm="countryRegionConfirm"
                         :title="lang[langType].countryRegion" @cancel="showCountryRegion = false">
                         <template #columns-top>
-                            <van-search @update:model-value="input" v-model="searchConuntry" :placeholder="lang[langType].searchText" />
+                            <van-search @update:model-value="input" v-model="searchConuntry"
+                                :placeholder="lang[langType].searchText" />
                         </template>
                     </van-picker>
                 </van-popup>
@@ -257,9 +258,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,9 +278,9 @@
                         <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>
@@ -338,10 +339,11 @@
                                     </template>
                                 </van-cell>
                             </van-checkbox-group>
-                            <van-cell clickable :title="lang[langType].active7" @click="selectunde = !selectunde,formData.activitiesAttended = selectunde ? 'undefined' : ''">
+                            <van-cell clickable :title="lang[langType].active7"
+                                @click="()=>isUndefined(checkboxRefs[3])">
                                 <template #icon>
-                                    <van-checkbox checked-color="#3F5AC8" @change="isUndefined" v-model="selectunde"
-                                        style="margin-right: 5px;" name="undefined" @click.stop shape="square" />
+                                    <van-checkbox checked-color="#3F5AC8" v-model="selectunde"
+                                        style="margin-right: 5px;"  :ref="el => checkboxRefs[3] = el" name="none" @click.stop shape="square" />
                                 </template>
                             </van-cell>
                         </div>
@@ -472,17 +474,17 @@ const onClickLeft = () => {
     emits('closeComponent');
 };
 
+
 const isGroup = (val) => {
+    formData.activitiesAttended = val.join(',')
     if (val.length > 0) {
-        formData.activitiesAttended = val.join(',')
         selectunde.value = false
     }
 }
-const isUndefined = (val) => {
-    if (val) {
-        activitiesAttended.value = []
-        formData.activitiesAttended = 'undefined'
-    }
+const isUndefined = (ele) => {
+    ele.toggle()
+    formData.activitiesAttended = selectunde.value ? 'none' : ''; 
+    activitiesAttended.value = []
 }
 /**
  * 将subData数据转换为formData