提交

src/view/fenghui/form.vue

@@ -13,10 +13,10 @@
         <div class="form">
             <van-form ref="form" @submit="onSubmit" label-width="8em">
                 <!-- 国家/地区 -->
-                <van-field size="large" input-align="right" clickable readonly
-                    @click="showCountryRegion = true" right-icon="arrow"
+                <van-field size="large" input-align="right" clickable readonly @click="showCountryRegion = true"
+                    right-icon="arrow"
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].countryRegionContent }]"
-                    required v-model="formData.countryRegion" :placeholder="lang[langType].countryRegionContent">
+                    required v-model="formData.countryRegionName" :placeholder="lang[langType].countryRegionContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].countryRegion"></span>
                     </template>
@@ -135,8 +135,12 @@
                     <template #input>
                         <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.cardType"
                             direction="horizontal">
-                            <van-radio v-for="item in cardTypeList" :key="item.value"
-                                style="width: 50%;margin: 10px 0 0 0;" :name="item.value">{{ item.text }}</van-radio>
+                            <template v-for="item in cardTypeList" :key="item.value">
+                                <van-radio
+                                    v-if="item.value !== '身份证'"
+                                    style="width: 50%;margin: 10px 0 0 0;" :name="item.value">{{ item.text
+                                    }}</van-radio>
+                            </template>
                         </van-radio-group>
                     </template>
                 </van-field>
@@ -208,11 +212,12 @@
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].levelContent }]" required
                     :placeholder="lang[langType].levelContent">
                     <template #label>
-                        <span :style="langType === 'zh' ? 'text-align-last: justify;': ''" :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].level"></span>
+                        <span :style="langType === 'zh' ? 'text-align-last: justify;' : ''"
+                            :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].level"></span>
                     </template>
                     <template #input>
                         <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.level"
-                            :direction="langType == 'zh' ? 'horizontal': 'vertical'">
+                            :direction="langType == 'zh' ? 'horizontal' : 'vertical'">
                             <van-radio style="flex: 1;margin-top: 10px " :name="item.value"
                                 v-for="item in lang[langType].careerList" :key="item.value">{{
                                     item.text
@@ -250,9 +255,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>
@@ -270,9 +275,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>
@@ -285,14 +290,14 @@
                         <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;" v-model="formData.active2"
-                        >
+                        <van-radio-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>
                             <van-radio style="flex: 1;margin-top: 10px " name="共筑网络安全防线">{{ lang[langType].active2
-                                }}</van-radio>
+                            }}</van-radio>
                             <van-radio style="flex: 1;margin-top: 10px " name="共商人工智能发展治理">{{ lang[langType].active3
-                                }}</van-radio>
+                            }}</van-radio>
                         </van-radio-group>
                     </template>
                 </van-field>
@@ -458,6 +463,7 @@ const onUnitTypeConfirm = (values) => {
 }
 const countryRegionConfirm = (values) => {
     showCountryRegion.value = false;
+    formData.countryRegionName = values.selectedOptions[0].text;
     formData.countryRegion = values.selectedOptions[0].value;
 }
 

src/view/fenghui/formRecurrence.vue

@@ -14,7 +14,7 @@
                 <!-- 国家/地区 -->
                 <van-field size="large" input-align="right" clickable right-icon="arrow" readonly @click="showCountryRegion = true"
                     :rules="[{ required: true, trigger: 'onBlur', message: lang[langType].countryRegionContent }]"
-                    required v-model="formData.countryRegion" :placeholder="lang[langType].countryRegionContent">
+                    required v-model="formData.countryRegionName" :placeholder="lang[langType].countryRegionContent">
                     <template #label>
                         <span :class="langType === 'zh' ? 'label' : ''" v-html="lang[langType].countryRegion"></span>
                     </template>
@@ -132,8 +132,12 @@
                     <template #input>
                         <van-radio-group checked-color="#3F5AC8" style="width: 100%;" v-model="formData.cardType"
                             direction="horizontal">
-                            <van-radio v-for="item in cardTypeList" :key="item.value"
-                                style="width: 50%;margin: 10px 0 0 0;" :name="item.value">{{ item.text }}</van-radio>
+                            <template v-for="item in cardTypeList" :key="item.value">
+                                <van-radio
+                                    v-if="item.value !== '身份证'"
+                                    style="width: 50%;margin: 10px 0 0 0;" :name="item.value">{{ item.text
+                                    }}</van-radio>
+                            </template>
                         </van-radio-group>
                     </template>
                 </van-field>
@@ -514,6 +518,7 @@ const onUnitTypeConfirm = (values) => {
 }
 const countryRegionConfirm = (values) => {
     showCountryRegion.value = false;
+    formData.countryRegionName = values.selectedOptions[0].text;
     formData.countryRegion = values.selectedOptions[0].value;
 }
 

src/view/fenghui/lang.js

@@ -285,8 +285,8 @@ export default {
         "countryRegionContent": "Country/Region",
         "provinceCity": "Province/City",
         "provinceCityContent": "Province/City",
-        "passportContent": "Fill in according to the option",
-        "passport": "Fill in according to the option",
+        "passportContent": "Number",
+        "passport": "Number",
         "IDcardNumber": "Number",
         "IDcardNumberContent": "Number",
         "workGroupText": "Working Group",