解决分支冲突
This commit is contained in:
唐明明
@@ -122,6 +122,62 @@
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.now_company_name" placeholder="输入现单位名称">
|
||||
</view>
|
||||
<view class="from-item from-item-50">
|
||||
<label>
|
||||
<text>*</text>预留联系人1姓名
|
||||
<uni-icons v-if="baseInfo.check_params.one_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.one_contact.description)"></uni-icons>
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.one_contact" placeholder="姓名">
|
||||
</view>
|
||||
<view class="from-item from-item-50">
|
||||
<label>
|
||||
<text>*</text>预留联系人1关系
|
||||
<uni-icons v-if="baseInfo.check_params.one_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.one_contact_relation.description)"></uni-icons>
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.one_contact_relation" placeholder="关系">
|
||||
</view>
|
||||
<view class="from-item from-item-50">
|
||||
<label>
|
||||
预留联系人2姓名
|
||||
<uni-icons v-if="baseInfo.check_params.two_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.two_contact.description)"></uni-icons>
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.two_contact" placeholder="姓名">
|
||||
</view>
|
||||
<view class="from-item from-item-50">
|
||||
<label>
|
||||
预留联系人2关系
|
||||
<uni-icons v-if="baseInfo.check_params.two_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.two_contact_relation.description)"></uni-icons>
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.two_contact_relation" placeholder="关系">
|
||||
</view>
|
||||
<view class="from-item from-item-50">
|
||||
<label>
|
||||
预留联系人3姓名
|
||||
<uni-icons v-if="baseInfo.check_params.three_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.three_contact.description)"></uni-icons>
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.three_contact" placeholder="姓名">
|
||||
</view>
|
||||
<view class="from-item from-item-50">
|
||||
<label>
|
||||
预留联系人3关系
|
||||
<uni-icons v-if="baseInfo.check_params.three_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.three_contact_relation.description)"></uni-icons>
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.three_contact_relation" placeholder="关系">
|
||||
</view>
|
||||
<view class="from-item from-item-50">
|
||||
<label>
|
||||
预留联系人4姓名
|
||||
<uni-icons v-if="baseInfo.check_params.four_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.four_contact.description)"></uni-icons>
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.four_contact" placeholder="姓名">
|
||||
</view>
|
||||
<view class="from-item from-item-50">
|
||||
<label>
|
||||
预留联系人4关系
|
||||
<uni-icons v-if="baseInfo.check_params.four_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.four_contact_relation.description)"></uni-icons>
|
||||
</label>
|
||||
<input class="from-input" v-model="baseInfo.four_contact_relation" placeholder="关系">
|
||||
</view>
|
||||
</view>
|
||||
<view class="btn">
|
||||
<button size="default" @click="onSubmit">提交基础资料</button>
|
||||
@@ -129,7 +185,6 @@
|
||||
</block>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { perfectBase, updPerfectBase, historyBase } from '@/apis/interfaces/order.js'
|
||||
import { region } from '@/apis/interfaces/address.js'
|
||||
@@ -183,18 +238,26 @@
|
||||
// 提交基础资料
|
||||
onSubmit(){
|
||||
let data = {
|
||||
mobile : this.baseInfo.mobile,
|
||||
marriage : this.baseInfo.marriage,
|
||||
mate : this.baseInfo.mate,
|
||||
education : this.baseInfo.education,
|
||||
school : this.baseInfo.school,
|
||||
tmp_address : this.baseInfo.tmp_address,
|
||||
province_id : this.baseInfo.district_id,
|
||||
city_id : this.baseInfo.city_id,
|
||||
district_id : this.baseInfo.province_id,
|
||||
now_domicile : this.baseInfo.now_domicile,
|
||||
now_company_address : this.baseInfo.now_company_address,
|
||||
now_company_name : this.baseInfo.now_company_name
|
||||
mobile : this.baseInfo.mobile,
|
||||
marriage : this.baseInfo.marriage,
|
||||
mate : this.baseInfo.mate,
|
||||
education : this.baseInfo.education,
|
||||
school : this.baseInfo.school,
|
||||
tmp_address : this.baseInfo.tmp_address,
|
||||
province_id : this.baseInfo.district_id,
|
||||
city_id : this.baseInfo.city_id,
|
||||
district_id : this.baseInfo.province_id,
|
||||
now_domicile : this.baseInfo.now_domicile,
|
||||
now_company_address : this.baseInfo.now_company_address,
|
||||
now_company_name : this.baseInfo.now_company_name,
|
||||
one_contact : this.baseInfo.one_contact,
|
||||
one_contact_relation : this.baseInfo.one_contact_relation,
|
||||
two_contact : this.baseInfo.two_contact,
|
||||
two_contact_relation : this.baseInfo.two_contact_relation,
|
||||
three_contact : this.baseInfo.three_contact,
|
||||
three_contact_relation : this.baseInfo.three_contact_relation,
|
||||
four_contact : this.baseInfo.four_contact,
|
||||
four_contact_relation : this.baseInfo.four_contact_relation
|
||||
}
|
||||
uni.showModal({
|
||||
title : '提示',
|
||||
@@ -285,7 +348,6 @@
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.content{
|
||||
padding-top: 30rpx;
|
||||
@@ -386,4 +448,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
Reference in New Issue
Block a user