diff --git a/h5/pages/premarital/form/form.vue b/h5/pages/premarital/form/form.vue index b25bce7..529b2c8 100644 --- a/h5/pages/premarital/form/form.vue +++ b/h5/pages/premarital/form/form.vue @@ -220,41 +220,22 @@ let post_data = JSON.parse(JSON.stringify(input_data.value)) post_data['证件类型'] = input_data.value['证件类型'] post_data['配偶证件类型'] = input_data.value['配偶证件类型'] + for (let i in post_data) { if (!post_data[i] && post_data[i]!==0) { return uni.$lu.toast(`请填写${i}`) } } - if(input_data.value['配偶证件号']==input_data.value['证件号']){ - return uni.$lu.toast('配偶证件号不能与'+input_data.value['姓名']+'证件号相同') + let PeiOuStatus=false; + PeiOuStatus = await CheckPeiOu() + if(PeiOuStatus===true){ + let checkcode=false; + checkcode=await CheckMsgCode() + if(checkcode===true){ + HunQianQuestionSubmit(post_data) + } } - //调用接口查询配偶是否建档 - const response = await $api('hunjianBySFZ', { - sfz: input_data.value['配偶证件号'], - }) - $response(response, async () => { - if(response.status){ - if(response.data.info.code ==200){ - let peiou_info=$store.getPeiOuUser() - peiou_info={ - name:input_data.value['配偶姓名'], - sfz:input_data.value['配偶证件号'] - } - $store.setPeiOuUser(peiou_info); - let checkcode=false; - checkcode=await CheckMsgCode() - if(checkcode===true){ - HunQianQuestionSubmit(post_data) - } - - }else{ - uni.$lu.toast("配偶未建档,请先建档") - } - - - } - }) } @@ -295,6 +276,33 @@ }) return status } + const CheckPeiOu= async()=>{ + let CheckStatus=false; + if(input_data.value['配偶证件号']==input_data.value['证件号']){ + return uni.$lu.toast('配偶证件号不能与'+input_data.value['姓名']+'证件号相同') + } + //调用接口查询配偶是否建档 + const response = await $api('hunjianBySFZ', { + sfz: input_data.value['配偶证件号'], + }) + $response(response, async () => { + if(response.status){ + if(response.data.info.code ==200){ + let peiou_info=$store.getPeiOuUser() + peiou_info={ + name:input_data.value['配偶姓名'], + sfz:input_data.value['配偶证件号'] + } + $store.setPeiOuUser(peiou_info); + CheckStatus=true + }else{ + uni.$lu.toast("配偶未建档,请先建档") + CheckStatus=false + } + } + }) + return CheckStatus; + } const HunQianQuestionSubmit = async (post_data) => { const response = await $api('HunQianQuestionSubmit', { person_id: $store.getUser()?.person_id, @@ -362,6 +370,9 @@ popup-title="请选择城市" :localdata="address_data" :step-searh="true" @change="(e)=>{addressChange(e,k)}"> +