liyongli 1 개월 전
부모
커밋
effb75a12b

+ 0 - 1
src/utils/request.js

@@ -45,7 +45,6 @@ export default function (ori) {
       }
       xhttp.setRequestHeader(key, ori.header[key]);
     }
-    console.log(ori);
     if (ori.isFormData) {
       xhttp.send(ori.data);
     } else {

+ 2 - 2
src/view/fenghui/form.vue

@@ -217,8 +217,8 @@
                 <template #input>
                     <van-radio-group style="justify-content: flex-end;width: 100%;" v-model="formData.interview"
                         direction="horizontal">
-                        <van-radio :name="lang[langType].confirm">{{ lang[langType].confirm }}</van-radio>
-                        <van-radio :name="lang[langType].cancel">{{ lang[langType].cancel }}</van-radio>
+                        <van-radio name="是">{{ lang[langType].confirm }}</van-radio>
+                        <van-radio name="否">{{ lang[langType].cancel }}</van-radio>
                     </van-radio-group>
                 </template>
             </van-field>

+ 2 - 2
src/view/fenghui/form1.vue

@@ -199,8 +199,8 @@
                 <template #input>
                     <van-radio-group style="justify-content: flex-end;width: 100%;" v-model="formData.interview"
                         direction="horizontal">
-                        <van-radio :name="lang[langType].confirm">{{ lang[langType].confirm }}</van-radio>
-                        <van-radio :name="lang[langType].cancel">{{ lang[langType].cancel }}</van-radio>
+                        <van-radio name="是">{{ lang[langType].confirm }}</van-radio>
+                        <van-radio name="否">{{ lang[langType].cancel }}</van-radio>
                     </van-radio-group>
                 </template>
             </van-field>

+ 48 - 3
src/view/fenghui/form1Recurrence.vue

@@ -199,8 +199,8 @@
                 <template #input>
                     <van-radio-group style="justify-content: flex-end;width: 100%;" v-model="formData.interview"
                         direction="horizontal">
-                        <van-radio :name="lang[langType].confirm">{{ lang[langType].confirm }}</van-radio>
-                        <van-radio :name="lang[langType].cancel">{{ lang[langType].cancel }}</van-radio>
+                        <van-radio name="是">{{ lang[langType].confirm }}</van-radio>
+                        <van-radio name="否">{{ lang[langType].cancel }}</van-radio>
                     </van-radio-group>
                 </template>
             </van-field>
@@ -286,6 +286,8 @@ const props = defineProps(['langType','verificationCode', 'subData']);
 
 const emits = defineEmits(['closeComponent']);
 
+console.log(props.subData);
+
 const formData = reactive({})
 const cardTypeList = computed(() => lang[props.langType].cardTypeList)
 const unitTypeList = computed(() => lang[props.langType].foreignCountryUnitType)
@@ -298,6 +300,49 @@ const showCheckOutTime = ref(false)
 const form = ref(null);
 const photo = ref([]);
 
+/**
+ * 将subData数据转换为formData
+ */
+const initFormData = () => {
+    if(!props.subData) return;
+    const relationship = {
+        name: 'name', // 姓名
+        provinceCity: 'provinceCity', // 省市区
+        gender: 'gender', // 性别
+        birthDate: 'birthday', // 出生日期
+        photo: 'photoUrl', // 照片
+        phone: 'contact', // 手机号
+        email: 'email', // 邮箱
+        emergencyContact: 'emergencyContact', // 紧急联系人
+        emergencyContactPhone: 'emergencyContactPhone', // 紧急联系人电话
+        cardType: 'cardTypeName', // 证件类型
+        idCard: 'passport', // 证件号
+        dietaryRequirements: 'catering', // 饮食要求
+        workUnit: 'workUnit', // 工作单位
+        unitType: 'unitTypeName', // 单位类型
+        position: 'career', // 职务
+        fax: 'fax', // fax
+        interviewIntention: 'interview', // 接受采访意向
+        officeAddress: 'officeAddress', // 办公地址
+        arrivalNumberXian: 'reachTrainNumber', // 抵达西安交通车次
+        arrivalTimeXian: 'reachTime', // 抵达西安时间
+        departureNumber: 'leavingTrainNumber', // 离开车次
+        departureTime: 'leavingTime', // 离开时间
+        checkOutTime: 'checkOutTime', // 离店时间
+        remarks: 'message', // 备注
+    }
+    const keys = Object.keys(props.subData || {});
+    for(let i = 0 ; i < keys.length; i++) {
+        const key = keys[i];
+        if (key === 'photo') {
+            photo.value.push({
+                url: props.subData[key],
+            })
+        }
+        formData[relationship[key]] = props.subData[key];
+    }        
+}
+initFormData()
 const reset = () => {
     form.value.resetFields();
 }
@@ -425,7 +470,7 @@ const onSubmit = () => {
         email: formData.email, // 邮箱
         emergencyContact: formData.emergencyContact, // 紧急联系人
         emergencyContactPhone: formData.emergencyContactPhone, // 紧急联系人电话
-        cardTypeName: formData.cardTypeName, // 证件类型
+        cardType: formData.cardTypeName, // 证件类型
         idCard: formData.passport, // 证件号
         dietaryRequirements: formData.catering, // 饮食要求
         workUnit: formData.workUnit, // 工作单位

+ 1 - 0
src/view/fenghui/form2Recurrence.vue

@@ -90,6 +90,7 @@ const props = defineProps(['langType','verificationCode', 'subData']);
 
 const emits = defineEmits(['closeComponent']);
 
+console.log(props.subData)
 const formData = reactive({})
 const unitTypeList = computed(() => lang[props.langType].workGroup)
 const showUnitType = ref(false)

+ 2 - 2
src/view/fenghui/formRecurrence.vue

@@ -217,8 +217,8 @@
                 <template #input>
                     <van-radio-group style="justify-content: flex-end;width: 100%;" v-model="formData.interview"
                         direction="horizontal">
-                        <van-radio :name="lang[langType].confirm">{{ lang[langType].confirm }}</van-radio>
-                        <van-radio :name="lang[langType].cancel">{{ lang[langType].cancel }}</van-radio>
+                        <van-radio name="是">{{ lang[langType].confirm }}</van-radio>
+                        <van-radio name="否">{{ lang[langType].cancel }}</van-radio>
                     </van-radio-group>
                 </template>
             </van-field>

+ 3 - 3
src/view/fenghui/index.vue

@@ -19,11 +19,11 @@
         <Work25 ref="work25" v-if="componentId === 'work25'" :verificationCode="verificationCode" :langType="langSelect"
             @closeComponent="closeComponent" />
 
-        <Fore25-recurrence ref="fore25" v-if="componentId === 'fore25'" :subData="subData" :verificationCode="verificationCode" :langType="langSelect"
+        <Fore25-recurrence ref="fore25" v-if="componentId === 'fore25Recurrence'" :subData="subData" :verificationCode="verificationCode" :langType="langSelect"
             @closeComponent="closeComponent" />
-        <Chin25-recurrence ref="chin25" v-if="componentId === 'chin25'" :subData="subData" :verificationCode="verificationCode" :langType="langSelect"
+        <Chin25-recurrence ref="chin25" v-if="componentId === 'chin25Recurrence'" :subData="subData" :verificationCode="verificationCode" :langType="langSelect"
             @closeComponent="closeComponent" />
-        <Work25-recurrence ref="work25" v-if="componentId === 'work25'" :subData="subData" :verificationCode="verificationCode" :langType="langSelect"
+        <Work25-recurrence ref="work25" v-if="componentId === 'work25Recurrence'" :subData="subData" :verificationCode="verificationCode" :langType="langSelect"
             @closeComponent="closeComponent" />
     </div>
 </template>