Skip to content

H
hls-xcmg-vue-app
Commit 3e556449 authored by 郑娟's avatar 郑娟
Browse files
Options

Merge remote-tracking branch 'origin/dev20230131_android' into dev20230131_ios

parent 3a404225
Show whitespace changes
Inline Side-by-side
Showing with 386 additions and 167 deletions
src/pages/contractCreate/create-equip-info.vue
View file @ 3e556449
...@@ -53,36 +53,36 @@ ...@@ -53,36 +53,36 @@
<item> <item>
<div slot="name" class="required">是否上牌</div> <div slot="name" class="required">是否上牌</div>
<input slot="content" v-model="equipInfo.register_flag_n" readonly placeholder="请选择" <input slot="content" v-model="equipInfo.register_flag_n" readonly placeholder="请选择"
@click="showPicker('register_flag',index)"> @click="showPicker('register_flag', index)">
</item> </item>
<item> <item>
<div slot="name" class="required">是否挂靠</div> <div slot="name" class="required">是否挂靠</div>
<input slot="content" v-model="equipInfo.associate_flag_n" readonly placeholder="请选择" <input slot="content" v-model="equipInfo.associate_flag_n" readonly placeholder="请选择"
@click="showPicker('associate_flag',index)"> @click="showPicker('associate_flag', index)">
</item> </item>
<item> <item>
<div slot="name" class="required">挂靠单位全称</div> <div slot="name">挂靠单位全称</div>
<input slot="content" v-model="equipInfo.associate_company" placeholder="请输入"> <input slot="content" v-model="equipInfo.associate_company" placeholder="请输入">
</item> </item>
<item> <item>
<div slot="name" class="required">是否提供挂靠协议</div> <div slot="name" class="required">是否提供挂靠协议</div>
<input slot="content" v-model="equipInfo.associate_agreement_n" readonly placeholder="请选择" <input slot="content" v-model="equipInfo.associate_agreement_n" readonly placeholder="请选择"
@click="showPicker('associate_agreement',index)"> @click="showPicker('associate_agreement', index)">
</item> </item>
<item> <item>
<div slot="name" class="required">租赁物是否办理抵押</div> <div slot="name" class="required">租赁物是否办理抵押</div>
<input slot="content" v-model="equipInfo.lease_mortgage_n" readonly placeholder="请选择" <input slot="content" v-model="equipInfo.lease_mortgage_n" readonly placeholder="请选择"
@click="showPicker('lease_mortgage',index)"> @click="showPicker('lease_mortgage', index)">
</item> </item>
<item> <item>
<div slot="name" class="required">GPS是否安装</div> <div slot="name" class="required">GPS是否安装</div>
<input slot="content" v-model="equipInfo.gps_flag_n" readonly placeholder="请选择" <input slot="content" v-model="equipInfo.gps_flag_n" readonly placeholder="请选择"
@click="showPicker('gps_flag',index)"> @click="showPicker('gps_flag', index)">
</item> </item>
<item> <item>
<div slot="name" class="required">设备是否购买保险</div> <div slot="name" class="required">设备是否购买保险</div>
<input slot="content" v-model="equipInfo.insurance_flag_n" readonly placeholder="请选择" <input slot="content" v-model="equipInfo.insurance_flag_n" readonly placeholder="请选择"
@click="showPicker('insurance_flag',index)"> @click="showPicker('insurance_flag', index)">
</item> </item>
<div class="add-card-button"> <div class="add-card-button">
<button v-if="!isReadOnly" @click="saveRent()">保存</button> <button v-if="!isReadOnly" @click="saveRent()">保存</button>
...@@ -124,25 +124,26 @@ ...@@ -124,25 +124,26 @@
<img src="@/assets/contractCreate/finished.png"> <img src="@/assets/contractCreate/finished.png">
<p>基本信息</p> <p>基本信息</p>
</div> </div>
<span class="line"/> <span class="line" />
<div class="item"> <div class="item">
<img src="@/assets/contractCreate/finished.png"> <img src="@/assets/contractCreate/finished.png">
<p>租赁信息</p> <p>租赁信息</p>
</div> </div>
<span class="line"/> <span class="line" />
<div class="item"> <div class="item">
<img src="@/assets/contractCreate/finished.png"> <img src="@/assets/contractCreate/finished.png">
<p>设备清单</p> <p>设备清单</p>
</div> </div>
<span class="line"/> <span class="line" />
<div class="item"> <div class="item">
<img src="@/assets/contractCreate/finished.png"> <img src="@/assets/contractCreate/finished.png">
<p>附件信息</p> <p>附件信息</p>
</div> </div>
</div> </div>
<div class="userInfo">设备清单</div> <div class="userInfo">设备清单</div>
<div v-if="equipList.length>0"> <div v-if="equipList.length > 0">
<div v-for="(item, index) in equipList" :key="index" class="equipment" @click="downNum = true; getRent(item,item.project_lease_item_id);"> <div v-for="(item, index) in equipList" :key="index" class="equipment"
@click="downNum = true; getRent(item, item.project_lease_item_id);">
<div class="left"> <div class="left">
<span> <span>
<img src="@/assets/contractStart/list.png"> <img src="@/assets/contractStart/list.png">
...@@ -150,7 +151,8 @@ ...@@ -150,7 +151,8 @@
</div> </div>
<div class="center"> <div class="center">
<span>租赁物信息</span> <span>租赁物信息</span>
<span :class="['status',item.lease_status === 'Y' ? 'unMantain' : 'mantain',]">{{ item.lease_status === "Y" ? "已维护" : "待维护" }}</span> <span :class="['status', item.lease_status === 'Y' ? 'unMantain' : 'mantain',]">{{ item.lease_status === "Y" ?
"已维护" : "待维护" }}</span>
<p> <p>
产品型号 产品型号
<span>{{ item.product_code }}-{{ (index + 1) | lengthCheck }}</span> <span>{{ item.product_code }}-{{ (index + 1) | lengthCheck }}</span>
...@@ -163,17 +165,17 @@ ...@@ -163,17 +165,17 @@
<div class="right"> <div class="right">
<img src="@/assets/contractStart/into.png"> <img src="@/assets/contractStart/into.png">
</div> </div>
</div></div> </div>
</div>
<Empty v-else description="无"/> <Empty v-else description="无" />
</h-content> </h-content>
<bottom-tab class="add-box"> <bottom-tab class="add-box">
<tab-button class="before" @click.native="$routeGo()">上一步</tab-button> <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
<tab-button class="next" @click.native="next">下一步</tab-button> <tab-button class="next" @click.native="next">下一步</tab-button>
</bottom-tab> </bottom-tab>
<ActionSheet <ActionSheet v-model="picker_show" :actions="actions" :close-on-click-action="true" :closeable="false" title="请选择"
v-model="picker_show" :actions="actions" :close-on-click-action="true" :closeable="false" @select="onSelect" />
title="请选择" @select="onSelect" />
</h-view> </h-view>
</template> </template>
<script> <script>
...@@ -210,19 +212,19 @@ export default { ...@@ -210,19 +212,19 @@ export default {
certificate_number: '', certificate_number: '',
departure_date: '', departure_date: '',
invoice_date: '', invoice_date: '',
register_flag_n: '', register_flag_n: '否',
register_flag: '', register_flag: 'N',
associate_flag_n: '', associate_flag_n: '否',
associate_flag: '', associate_flag: 'N',
associate_company: '', associate_company: '',
associate_agreement_n: '', associate_agreement_n: '否',
associate_agreement: '', associate_agreement: 'N',
lease_mortgage_n: '', lease_mortgage_n: '否',
lease_mortgage: '', lease_mortgage: 'N',
gps_flag_n: '', gps_flag_n: '否',
gps_flag: '', gps_flag: 'N',
insurance_flag_n: '', insurance_flag_n: '否',
insurance_flag: '', insurance_flag: 'N',
}, },
isReadOnly: false, // 是否只读 isReadOnly: false, // 是否只读
YesNoType: [], // 是否类型 YesNoType: [], // 是否类型
...@@ -235,13 +237,14 @@ export default { ...@@ -235,13 +237,14 @@ export default {
} }
}, },
watch: { watch: {
'downNum' (newVal, oldVal) { 'downNum'(newVal, oldVal) {
console.log(newVal,'~~',this.equipList,this.equipInfo);
if (!newVal) { if (!newVal) {
this.vehicleImg = '' this.vehicleImg = ''
} }
}, },
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter(to, from, next) {
next(vm => { next(vm => {
vm.fromPage = window.localStorage.fromPage vm.fromPage = window.localStorage.fromPage
vm.status = window.localStorage.contractReadonly vm.status = window.localStorage.contractReadonly
...@@ -274,7 +277,9 @@ export default { ...@@ -274,7 +277,9 @@ export default {
nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'), nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'),
format: format, format: format,
callback: (date) => { callback: (date) => {
vm.$set(vm.equipInfo, 'departure_date', date) // vm.$set(vm.equipInfo, 'departure_date', date)
vm.equipInfo.departure_date = date
vm.$forceUpdate()
}, },
}) })
}, },
...@@ -291,11 +296,13 @@ export default { ...@@ -291,11 +296,13 @@ export default {
nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'), nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'),
format: format, format: format,
callback: (date) => { callback: (date) => {
vm.$set(vm.equipInfo, 'invoice_date', date) vm.equipInfo.invoice_date = date
// vm.$set(vm.equipInfo, 'invoice_date', date)
vm.$forceUpdate()
}, },
}) })
}, },
getEquipList () { getEquipList() {
let vm = this let vm = this
let url = process.env.basePath + 'prj_equip_list_query' let url = process.env.basePath + 'prj_equip_list_query'
let param = { let param = {
...@@ -308,6 +315,7 @@ export default { ...@@ -308,6 +315,7 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.equipList = res.lists vm.equipList = res.lists
vm.$forceUpdate()
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -315,10 +323,21 @@ export default { ...@@ -315,10 +323,21 @@ export default {
}, },
getRent (e, id) { getRent (e, id) {
let vm = this let vm = this
for (let i in vm.equipInfo) {
vm.equipInfo[i] = ''
}
vm.equipInfo = e vm.equipInfo = e
vm.equipInfo.register_flag_n = e.register_flag_n ? e.register_flag_n : '否'
vm.equipInfo.register_flag = e.register_flag ? e.register_flag : 'N'
vm.equipInfo.associate_flag_n = e.associate_flag_n ? e.associate_flag_n : '否'
vm.equipInfo.associate_flag = e.associate_flag ? e.associate_flag : 'N'
vm.equipInfo.associate_company = e.associate_company ? e.associate_company : ''
vm.equipInfo.associate_agreement_n = e.associate_agreement_n ? e.associate_agreement_n : '否'
vm.equipInfo.associate_agreement = e.associate_agreement ? e.associate_agreement : 'N'
vm.equipInfo.lease_mortgage_n = e.lease_mortgage_n ? e.lease_mortgage_n : '否'
vm.equipInfo.lease_mortgage = e.lease_mortgage ? e.lease_mortgage : 'N'
vm.equipInfo.gps_flag_n = e.gps_flag_n ? e.gps_flag_n : '否'
vm.equipInfo.gps_flag = e.gps_flag ? e.gps_flag : 'N'
vm.equipInfo.insurance_flag_n = e.insurance_flag_n ? e.insurance_flag_n : '否'
vm.equipInfo.insurance_flag = e.insurance_flag ? e.insurance_flag : 'N'
vm.$forceUpdate()
vm.downNum = true vm.downNum = true
vm.project_lease_item_id = id vm.project_lease_item_id = id
vm.getImg(id) vm.getImg(id)
...@@ -368,9 +387,11 @@ export default { ...@@ -368,9 +387,11 @@ export default {
hlsPopup.showLongCenter('是否上牌不能为空！') hlsPopup.showLongCenter('是否上牌不能为空！')
} else if (!this.equipInfo.associate_flag_n) { } else if (!this.equipInfo.associate_flag_n) {
hlsPopup.showLongCenter('是否挂靠不能为空！') hlsPopup.showLongCenter('是否挂靠不能为空！')
} else if (!this.equipInfo.associate_company) { }
hlsPopup.showLongCenter('挂靠单位全称不能为空！') // else if (!this.equipInfo.associate_company) {
} else if (!this.equipInfo.associate_agreement_n) { // hlsPopup.showLongCenter('挂靠单位全称不能为空！')
// }
else if (!this.equipInfo.associate_agreement_n) {
hlsPopup.showLongCenter('是否提供挂靠协议不能为空！') hlsPopup.showLongCenter('是否提供挂靠协议不能为空！')
} else if (!this.equipInfo.lease_mortgage_n) { } else if (!this.equipInfo.lease_mortgage_n) {
hlsPopup.showLongCenter('租赁物是否办理抵押不能为空！') hlsPopup.showLongCenter('租赁物是否办理抵押不能为空！')
...@@ -381,7 +402,7 @@ export default { ...@@ -381,7 +402,7 @@ export default {
} else { } else {
let param = { let param = {
master: { master: {
project_lease_item_id: this.equipInfo.project_lease_item_id, project_lease_item_id: this.project_lease_item_id,
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
frame_number: this.equipInfo.frame_number, frame_number: this.equipInfo.frame_number,
engine: this.equipInfo.engine, engine: this.equipInfo.engine,
...@@ -409,10 +430,11 @@ export default { ...@@ -409,10 +430,11 @@ export default {
if (res.result === 'S') { if (res.result === 'S') {
hlsPopup.showLongCenter('保存成功') hlsPopup.showLongCenter('保存成功')
this.downNum = false this.downNum = false
this.project_lease_item_id = res.master.project_lease_item_id
this.equipInfo.project_lease_item_id = res.master.project_lease_item_id this.equipInfo.project_lease_item_id = res.master.project_lease_item_id
if (this.uploadList.length > 0) { if (this.uploadList.length > 0) {
this.uploadList[0].pkvalue = this.equipInfo.project_lease_item_id this.uploadList[0].pkvalue = this.project_lease_item_id
this.uploadList[0].check_id = this.equipInfo.project_lease_item_id this.uploadList[0].check_id = this.project_lease_item_id
} }
this.savePicture(this.uploadList) this.savePicture(this.uploadList)
let ifPush = true let ifPush = true
...@@ -568,13 +590,14 @@ export default { ...@@ -568,13 +590,14 @@ export default {
vm.equipInfo.vehicle_model = result.car_type.word // 车辆型号 vm.equipInfo.vehicle_model = result.car_type.word // 车辆型号
vm.equipInfo.certificate_number = result.vechicle_ok_no.word vm.equipInfo.certificate_number = result.vechicle_ok_no.word
} }
vm.$forceUpdate()
vm.equipInfo.project_lease_item_id = '' vm.equipInfo.project_lease_item_id = ''
vm.equipInfo.departure_date = '' vm.equipInfo.departure_date = ''
vm.equipInfo.invoice_date = '' vm.equipInfo.invoice_date = ''
}) })
}, },
// 图片保存 // 图片保存
savePicture (list) { savePicture(list) {
// let vm = this // let vm = this
if (list.length) { if (list.length) {
// hlsPopup.showLoading('图片上传请稍候') // hlsPopup.showLoading('图片上传请稍候')
...@@ -668,7 +691,7 @@ export default { ...@@ -668,7 +691,7 @@ export default {
// vm.$routeGo() // vm.$routeGo()
// } // }
// }, // },
next () { next() {
let vm = this let vm = this
vm.$router.push({ vm.$router.push({
name: 'CreateEnclosureInfo', name: 'CreateEnclosureInfo',
...@@ -773,6 +796,7 @@ export default { ...@@ -773,6 +796,7 @@ export default {
background-color: rgba(56, 63, 69, 0.3); background-color: rgba(56, 63, 69, 0.3);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.down { .down {
position: relative; position: relative;
width: 314px; width: 314px;
...@@ -782,6 +806,7 @@ export default { ...@@ -782,6 +806,7 @@ export default {
background-color: #fff; background-color: #fff;
overflow-y: auto; overflow-y: auto;
} }
.top { .top {
width: 100%; width: 100%;
height: 44px; height: 44px;
...@@ -792,6 +817,7 @@ export default { ...@@ -792,6 +817,7 @@ export default {
line-height: 44px; line-height: 44px;
color: #fff; color: #fff;
background: #0041c4; background: #0041c4;
img { img {
width: 16px; width: 16px;
height: 16px; height: 16px;
...@@ -799,8 +825,10 @@ export default { ...@@ -799,8 +825,10 @@ export default {
right: 4vw; right: 4vw;
} }
} }
.down-content { .down-content {
margin-top: 8px; margin-top: 8px;
span:first-child { span:first-child {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 13px; font-size: 13px;
...@@ -808,6 +836,7 @@ export default { ...@@ -808,6 +836,7 @@ export default {
letter-spacing: 0; letter-spacing: 0;
margin-left: 15px; margin-left: 15px;
} }
.photo { .photo {
width: 172px; width: 172px;
height: 120px; height: 120px;
...@@ -817,12 +846,14 @@ export default { ...@@ -817,12 +846,14 @@ export default {
margin-top: 12px; margin-top: 12px;
background: url("../../assets/contractStart/photo.png") 70px no-repeat; background: url("../../assets/contractStart/photo.png") 70px no-repeat;
background-size: 24px 20px; background-size: 24px 20px;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }
button { button {
width: 240px; width: 240px;
height: 40px; height: 40px;
...@@ -833,12 +864,14 @@ export default { ...@@ -833,12 +864,14 @@ export default {
background-color: #0041c4; background-color: #0041c4;
border-radius: 4px; border-radius: 4px;
} }
.add-card-button{
width:100%; .add-card-button {
width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
margin: 2vh 0; margin: 2vh 0;
button{
button {
position: static; position: static;
} }
} }
...@@ -1203,15 +1236,16 @@ export default { ...@@ -1203,15 +1236,16 @@ export default {
text-align: center; text-align: center;
} }
} }
.item:nth-of-type(3){
.item:nth-of-type(3) {
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 12px; font-size: 12px;
color: #383f45; color: #383f45;
letter-spacing: 0.43px; letter-spacing: 0.43px;
span { span {
background-color: #ffa000; background-color: #ffa000;
} }
} }
} }
} }</style>
</style>
src/pages/userBindNew/np/base-info.vue
View file @ 3e556449
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
class="auto" class="auto"
> >
</item> </item>
<item> <!-- <item>
<div slot="name" class="required">年份</div> <div slot="name" class="required">年份</div>
<input <input
slot="content" slot="content"
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
placeholder="上传身份证自动填充" placeholder="上传身份证自动填充"
class="auto" class="auto"
> >
</item> </item> -->
<item> <item>
<div slot="name" class="required">户籍地址</div> <div slot="name" class="required">户籍地址</div>
<textarea <textarea
...@@ -169,36 +169,36 @@ ...@@ -169,36 +169,36 @@
<div slot="name" class="required">户籍地址省</div> <div slot="name" class="required">户籍地址省</div>
<input <input
slot="content" slot="content"
v-model="baseInfo.register_province_name" v-model="baseInfo.register_province_n"
placeholder="上传身份证自动填充" placeholder="上传身份证自动填充"
type="text" type="text"
readonly readonly
onfocus="this.blur()" onfocus="this.blur()"
@click="selectProvince()" @click="selectRegisterProvince()"
> >
</item> </item>
<item :showArrow="true"> <item :showArrow="true">
<div slot="name" class="required">户籍地址市</div> <div slot="name" class="required">户籍地址市</div>
<input <input
slot="content" slot="content"
v-model="baseInfo.register_city_name" v-model="baseInfo.register_city_n"
placeholder="上传身份证自动填充" placeholder="上传身份证自动填充"
type="text" type="text"
readonly readonly
onfocus="this.blur()" onfocus="this.blur()"
@click="selectCity()" @click="selectRegisterCity()"
> >
</item> </item>
<item :showArrow="true"> <item :showArrow="true">
<div slot="name" class="required">户籍地址区/县</div> <div slot="name" class="required">户籍地址区/县</div>
<input <input
slot="content" slot="content"
v-model="baseInfo.register_district_name" v-model="baseInfo.register_district_n"
placeholder="上传身份证自动填充" placeholder="上传身份证自动填充"
type="text" type="text"
readonly readonly
onfocus="this.blur()" onfocus="this.blur()"
@click="selectDistrict()" @click="selectRegisterDistrict()"
> >
</item> </item>
<item> <item>
...@@ -460,6 +460,9 @@ export default { ...@@ -460,6 +460,9 @@ export default {
bp_type: '', bp_type: '',
}, // 查询出来的第二个角色 }, // 查询出来的第二个角色
multiRoleList: [], // 查询出来的多角色 multiRoleList: [], // 查询出来的多角色
registerProvinceList: [],
registerCityList: [],
registerDistrictList: [],
baseInfo: { baseInfo: {
bp_type_n: '', bp_type_n: '',
academic_background_n: '', academic_background_n: '',
...@@ -478,11 +481,11 @@ export default { ...@@ -478,11 +481,11 @@ export default {
living_address: '', living_address: '',
address_on_resident_booklit: '', address_on_resident_booklit: '',
register_province: '', register_province: '',
register_province_name: '', register_province_n: '',
register_city: '', register_city: '',
register_city_name: '', register_city_n: '',
register_district: '', register_district: '',
register_district_name: '', register_district_n: '',
marital_status: '', marital_status: '',
academic_background: '', academic_background: '',
bp_name_sp: '', bp_name_sp: '',
...@@ -571,6 +574,11 @@ export default { ...@@ -571,6 +574,11 @@ export default {
this.getMarital() this.getMarital()
this.getDrivingLicenseType() this.getDrivingLicenseType()
this.getProvince() this.getProvince()
this.getCity()
this.getDistrict()
this.getRegisterProvince()
this.getRegisterCity()
this.getRegisterDistrict()
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
// 绑定查询入口 // 绑定查询入口
...@@ -611,11 +619,11 @@ export default { ...@@ -611,11 +619,11 @@ export default {
living_address: '', living_address: '',
address_on_resident_booklit: '', address_on_resident_booklit: '',
register_province: '', register_province: '',
register_province_name: '', register_province_n: '',
register_city: '', register_city: '',
register_city_name: '', register_city_n: '',
register_district: '', register_district: '',
register_district_name: '', register_district_n: '',
marital_status: '', marital_status: '',
academic_background: '', academic_background: '',
bp_name_sp: '', bp_name_sp: '',
...@@ -702,11 +710,11 @@ export default { ...@@ -702,11 +710,11 @@ export default {
living_address: '', living_address: '',
address_on_resident_booklit: '', address_on_resident_booklit: '',
register_province: '', register_province: '',
register_province_name: '', register_province_n: '',
register_city: '', register_city: '',
register_city_name: '', register_city_n: '',
register_district: '', register_district: '',
register_district_name: '', register_district_n: '',
marital_status: '', marital_status: '',
academic_background: '', academic_background: '',
bp_name_sp: '', bp_name_sp: '',
...@@ -776,6 +784,7 @@ export default { ...@@ -776,6 +784,7 @@ export default {
returnItem: function (index, obj) { returnItem: function (index, obj) {
vm.baseInfo.driving_license_type = obj.driving_type vm.baseInfo.driving_license_type = obj.driving_type
vm.baseInfo.driving_license_type_n = obj.driving_type_n vm.baseInfo.driving_license_type_n = obj.driving_type_n
vm.$forceUpdate()
}, },
}) })
}, },
...@@ -843,6 +852,10 @@ export default { ...@@ -843,6 +852,10 @@ export default {
vm.addRows(vm.baseInfo.address_on_resident_booklit) vm.addRows(vm.baseInfo.address_on_resident_booklit)
vm.addRowsLive(vm.baseInfo.living_address) vm.addRowsLive(vm.baseInfo.living_address)
// vm.peopleList = res.info.agent_username.split(',') // vm.peopleList = res.info.agent_username.split(',')
vm.getCity()
vm.getDistrict()
vm.getRegisterCity()
vm.getRegisterDistrict()
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -1697,70 +1710,48 @@ export default { ...@@ -1697,70 +1710,48 @@ export default {
code: 'bp_type', code: 'bp_type',
object: {}, object: {},
returnItem: function (index, obj) { returnItem: function (index, obj) {
if (e === 'register') {
vm.baseInfo.register_province = obj.bp_type
vm.baseInfo.register_province_name = obj.bp_type_n
} else {
vm.baseInfo.province_id = obj.bp_type vm.baseInfo.province_id = obj.bp_type
vm.baseInfo.province_name = obj.bp_type_n vm.baseInfo.province_name = obj.bp_type_n
} // 清空 市 区
vm.baseInfo.city_id = ''
vm.baseInfo.city_name = ''
vm.baseInfo.district_id = ''
vm.baseInfo.district_name = ''
//
vm.getCity() vm.getCity()
}, },
}) })
}, },
selectCity (e) { selectCity () {
let vm = this let vm = this
if (e === 'register') {
if (vm.baseInfo.register_province === '') {
hlsPopup.showLongCenter('请先选择省份')
}
} else {
if (vm.baseInfo.province_id === '') { if (vm.baseInfo.province_id === '') {
hlsPopup.showLongCenter('请先选择省份') hlsPopup.showLongCenter('请先选择省份')
} }
}
vm.hlsPopup.selectList({ vm.hlsPopup.selectList({
list: vm.cityList, list: vm.cityList,
code: 'bp_type', code: 'bp_type',
object: {}, object: {},
returnItem: function (index, obj) { returnItem: function (index, obj) {
if (e === 'register') {
vm.baseInfo.register_city = obj.bp_type
vm.baseInfo.register_city_name = obj.bp_type_n
} else {
vm.baseInfo.city_id = obj.bp_type vm.baseInfo.city_id = obj.bp_type
vm.baseInfo.city_name = obj.bp_type_n vm.baseInfo.city_name = obj.bp_type_n
} vm.baseInfo.district_id = ''
vm.baseInfo.district_name = ''
vm.getDistrict() vm.getDistrict()
}, },
}) })
}, },
selectDistrict (e) { selectDistrict () {
let vm = this let vm = this
if (e === 'register') {
if (vm.baseInfo.register_province === '' || vm.baseInfo.register_city === '') {
hlsPopup.showLongCenter('请先选择城市')
}
} else {
if (vm.baseInfo.city_id === '' || vm.baseInfo.province_id === '') { if (vm.baseInfo.city_id === '' || vm.baseInfo.province_id === '') {
hlsPopup.showLongCenter('请先选择城市') hlsPopup.showLongCenter('请先选择城市')
} }
}
vm.hlsPopup.selectList({ vm.hlsPopup.selectList({
list: vm.districtList, list: vm.districtList,
code: 'bp_type', code: 'bp_type',
object: {}, object: {},
returnItem: function (index, obj) { returnItem: function (index, obj) {
if (e === 'register') {
vm.baseInfo.register_district = obj.bp_type
vm.baseInfo.register_district_name = obj.bp_type_n
} else {
vm.baseInfo.district_id = obj.bp_type vm.baseInfo.district_id = obj.bp_type
vm.baseInfo.district_name = obj.bp_type_n vm.baseInfo.district_name = obj.bp_type_n
}
}, },
}) })
}, },
...@@ -1784,6 +1775,9 @@ export default { ...@@ -1784,6 +1775,9 @@ export default {
getCity () { getCity () {
let vm = this let vm = this
let url = process.env.basePath + 'fnd_city_query' let url = process.env.basePath + 'fnd_city_query'
if (!vm.baseInfo.province_id) {
return
}
let param = { let param = {
province_id: vm.baseInfo.province_id, province_id: vm.baseInfo.province_id,
} }
...@@ -1803,6 +1797,9 @@ export default { ...@@ -1803,6 +1797,9 @@ export default {
getDistrict () { getDistrict () {
let vm = this let vm = this
let url = process.env.basePath + 'fnd_district_query' let url = process.env.basePath + 'fnd_district_query'
if (!vm.baseInfo.city_id) {
return
}
let param = { let param = {
city_id: vm.baseInfo.city_id, city_id: vm.baseInfo.city_id,
} }
...@@ -1819,6 +1816,119 @@ export default { ...@@ -1819,6 +1816,119 @@ export default {
} }
}) })
}, },
selectRegisterProvince () {
let vm = this
vm.hlsPopup.selectList({
list: vm.registerProvinceList,
code: 'bp_type',
object: {},
returnItem: function (index, obj) {
vm.baseInfo.register_province = obj.bp_type
vm.baseInfo.register_province_n = obj.bp_type_n
// 清空 市 区
vm.baseInfo.register_city = ''
vm.baseInfo.register_city_n = ''
vm.baseInfo.register_district = ''
vm.baseInfo.register_district_n = ''
//
vm.getRegisterCity()
},
})
},
selectRegisterCity () {
let vm = this
if (vm.baseInfo.register_province === '') {
hlsPopup.showLongCenter('请先选择省份')
}
vm.hlsPopup.selectList({
list: vm.registerCityList,
code: 'bp_type',
object: {},
returnItem: function (index, obj) {
vm.baseInfo.register_city = obj.bp_type
vm.baseInfo.register_city_n = obj.bp_type_n
vm.baseInfo.register_district = ''
vm.baseInfo.register_district_n = ''
vm.getRegisterDistrict()
},
})
},
selectRegisterDistrict () {
let vm = this
if (vm.baseInfo.register_province === '' || vm.baseInfo.register_city === '') {
hlsPopup.showLongCenter('请先选择城市')
}
vm.hlsPopup.selectList({
list: vm.registerDistrictList,
code: 'bp_type',
object: {},
returnItem: function (index, obj) {
vm.baseInfo.register_district = obj.bp_type
vm.baseInfo.register_district_n = obj.bp_type_n
},
})
},
getRegisterProvince () {
let vm = this
let url = process.env.basePath + 'fnd_province_query'
let param = {}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.registerProvinceList = res.lists.map(item => {
return {
code: item.province_id,
code_name: item.province_name,
}
})
}
})
},
getRegisterCity () {
let vm = this
let url = process.env.basePath + 'fnd_city_query'
if (!vm.baseInfo.register_province) {
return
}
let param = {
province_id: vm.baseInfo.register_province,
}
// vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.registerCityList = res.lists.map(item => {
return {
code: item.city_id,
code_name: item.city_name,
}
})
}
})
},
getRegisterDistrict () {
let vm = this
let url = process.env.basePath + 'fnd_district_query'
if (!vm.baseInfo.register_city) {
return
}
let param = {
city_id: vm.baseInfo.register_city,
}
// vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.registerDistrictList = res.lists.map(item => {
return {
code: item.district_id,
code_name: item.district_name,
}
})
}
})
},
getMarital () { getMarital () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_marital_status_query' let url = process.env.basePath + 'bp_marital_status_query'
...@@ -1907,7 +2017,7 @@ export default { ...@@ -1907,7 +2017,7 @@ export default {
res.lists.forEach(item => { res.lists.forEach(item => {
if (item.province_code.indexOf(p) !== -1) { if (item.province_code.indexOf(p) !== -1) {
vm.$set(vm.baseInfo, 'register_province', item.province_id) vm.$set(vm.baseInfo, 'register_province', item.province_id)
vm.$set(vm.baseInfo, 'register_province_name', item.province_name) vm.$set(vm.baseInfo, 'register_province_n', item.province_name)
} }
}) })
} }
...@@ -1921,7 +2031,7 @@ export default { ...@@ -1921,7 +2031,7 @@ export default {
suc.lists.forEach(item => { suc.lists.forEach(item => {
if (item.city_code.indexOf(c) !== -1) { if (item.city_code.indexOf(c) !== -1) {
vm.$set(vm.baseInfo, 'register_city', item.city_id) vm.$set(vm.baseInfo, 'register_city', item.city_id)
vm.$set(vm.baseInfo, 'register_city_name', item.city_name) vm.$set(vm.baseInfo, 'register_city_n', item.city_name)
} }
}) })
} }
...@@ -1935,7 +2045,7 @@ export default { ...@@ -1935,7 +2045,7 @@ export default {
suc.lists.forEach(item => { suc.lists.forEach(item => {
if (item.district_code.indexOf(d) !== -1) { if (item.district_code.indexOf(d) !== -1) {
vm.$set(vm.baseInfo, 'register_district', item.district_id) vm.$set(vm.baseInfo, 'register_district', item.district_id)
vm.$set(vm.baseInfo, 'register_district_name', item.district_name) vm.$set(vm.baseInfo, 'register_district_n', item.district_name)
} }
}) })
} }
......
src/pages/userBindNew/org/baseInfo.vue
View file @ 3e556449
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
/> />
</item> </item>
<item v-if="businessDateShow" :showArrow="true"> <item v-if="businessDateShow" :showArrow="true">
<div slot="name" class="required">营业期限从</div> <div slot="name" >营业期限从</div>
<input <input
slot="content" slot="content"
v-model="baseInfo.business_term_from" v-model="baseInfo.business_term_from"
...@@ -160,8 +160,8 @@ ...@@ -160,8 +160,8 @@
@click="selectTime('YYYY-MM-DD',0)" @click="selectTime('YYYY-MM-DD',0)"
> >
</item> </item>
<item v-if="businessDateShow" :showArrow="true"> <item :showArrow="true">
<div slot="name" class="required">营业期限到</div> <div slot="name" >营业期限到</div>
<input <input
slot="content" slot="content"
v-model="baseInfo.business_term_to" v-model="baseInfo.business_term_to"
...@@ -171,13 +171,16 @@ ...@@ -171,13 +171,16 @@
@click="selectTime('YYYY-MM-DD',1)" @click="selectTime('YYYY-MM-DD',1)"
> >
</item> </item>
<item v-if="!businessDateShow" > <item :showArrow="true">
<div slot="name" class="required">营业期限</div> <div slot="name" >营业期限</div>
<input <input
slot="content" slot="content"
v-model="baseInfo.business_term_type_n" v-model="baseInfo.business_term_type_n"
placeholder="上传营业执照自动填充" placeholder="上传营业执照自动填充"
class="auto" type="text"
readonly
onfocus="this.blur()"
@click="selectBusinessType"
> >
</item> </item>
<item> <item>
...@@ -652,6 +655,7 @@ export default { ...@@ -652,6 +655,7 @@ export default {
registered_place: '', registered_place: '',
organization_code: '', organization_code: '',
registered_capital: '', registered_capital: '',
business_term_type: '',
business_term_type_n: '', business_term_type_n: '',
business_term_from: '', business_term_from: '',
business_term_to: '', business_term_to: '',
...@@ -769,6 +773,7 @@ export default { ...@@ -769,6 +773,7 @@ export default {
vm.$route.meta.keepAlive = true vm.$route.meta.keepAlive = true
vm.getBpType() vm.getBpType()
vm.getProvince() vm.getProvince()
vm.getBusinessTypeList()
vm.isAddNewType = false vm.isAddNewType = false
if (['/myBindUser', '/tab/my-info', '/tab/function-center', '/invoice'].includes(from.fullPath)) { /* || from.fullPath === '/margin-first-pay' */ if (['/myBindUser', '/tab/my-info', '/tab/function-center', '/invoice'].includes(from.fullPath)) { /* || from.fullPath === '/margin-first-pay' */
vm.bp_type_flag = false vm.bp_type_flag = false
...@@ -819,6 +824,7 @@ export default { ...@@ -819,6 +824,7 @@ export default {
registered_capital: '', registered_capital: '',
// business_license_num: '', // business_license_num: '',
bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'ORG', bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'ORG',
business_term_type: '',
business_term_type_n: '', business_term_type_n: '',
business_term_from: '', business_term_from: '',
business_term_to: '', business_term_to: '',
...@@ -929,6 +935,7 @@ export default { ...@@ -929,6 +935,7 @@ export default {
registered_capital: '', registered_capital: '',
// business_license_num: '', // business_license_num: '',
bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'ORG', bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'ORG',
business_term_type: '',
business_term_type_n: '', business_term_type_n: '',
business_term_from: '', business_term_from: '',
business_term_to: '', business_term_to: '',
...@@ -1301,7 +1308,7 @@ export default { ...@@ -1301,7 +1308,7 @@ export default {
vm.hlsPopup.showLongCenter('资产信息不能为空！') vm.hlsPopup.showLongCenter('资产信息不能为空！')
return return
} }
var reg = new RegExp('^[0-9]*$') var reg = new RegExp('(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{1,2}$)')
if (vm.baseInfo.registered_capital.indexOf('万元') == -1 || !reg.test(vm.baseInfo.registered_capital.replace('万元', '')) || vm.baseInfo.registered_capital.replace('万元', '').length == 0) { if (vm.baseInfo.registered_capital.indexOf('万元') == -1 || !reg.test(vm.baseInfo.registered_capital.replace('万元', '')) || vm.baseInfo.registered_capital.replace('万元', '').length == 0) {
vm.hlsPopup.showLongCenter('请输入正确格式的注册资本！(例如：3000万元)') vm.hlsPopup.showLongCenter('请输入正确格式的注册资本！(例如：3000万元)')
return return
...@@ -1515,19 +1522,19 @@ export default { ...@@ -1515,19 +1522,19 @@ export default {
vm.hlsPopup.showLongCenter('授权人身份证不正确') vm.hlsPopup.showLongCenter('授权人身份证不正确')
} }
} }
if (vm.lastInfo.business_term_type === 'FIXED_TERM') { // if (vm.lastInfo.business_term_type === 'FIXED_TERM') {
if (!vm.lastInfo.business_term_from && !vm.lastInfo.business_term_to) { // if (!vm.lastInfo.business_term_from && !vm.lastInfo.business_term_to) {
vm.msg_flag = false // vm.msg_flag = false
console.log('营业期限2', !vm.lastInfo.business_term_from, !vm.lastInfo.business_term_to); // console.log('营业期限2', !vm.lastInfo.business_term_from, !vm.lastInfo.business_term_to);
vm.hlsPopup.showLongCenter('营业期限未填') // vm.hlsPopup.showLongCenter('营业期限未填')
} // }
} else { // } else {
if (!vm.lastInfo.business_term_type_n) { // if (!vm.lastInfo.business_term_type_n) {
vm.msg_flag = false // vm.msg_flag = false
console.log('营业期限2', !vm.lastInfo.business_term_type_n); // console.log('营业期限2', !vm.lastInfo.business_term_type_n);
vm.hlsPopup.showLongCenter('营业期限未填') // vm.hlsPopup.showLongCenter('营业期限未填')
} // }
} // }
if (vm.msg_flag) { if (vm.msg_flag) {
vm.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片 vm.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
...@@ -1791,8 +1798,10 @@ export default { ...@@ -1791,8 +1798,10 @@ export default {
// 选择日期 // 选择日期
selectTime (format, flag) { selectTime (format, flag) {
let vm = this let vm = this
let date = new Date()
hlsPopup.showTime({ hlsPopup.showTime({
nowDate: (new Date()).format('YYYY-MM-DD'), nowDate: date.format('yyyy-MM-dd'),
// nowDate: (new Date()).format('YYYY-MM-DD'),
format: format, format: format,
callback: (date) => { callback: (date) => {
if (flag) { if (flag) {
...@@ -1803,6 +1812,25 @@ export default { ...@@ -1803,6 +1812,25 @@ export default {
}, },
}) })
}, },
// 选择 营业期限
selectBusinessType (e) {
let vm = this
vm.hlsPopup.selectList({
list: vm.businessTypeList,
code: 'type',
object: {},
returnItem: function (index, obj) {
if (obj.type === 'LONG_TERM') {
vm.baseInfo.business_term_to = ''
vm.baseInfo.business_term_from = ''
}
vm.baseInfo.business_term_type = obj.type
vm.baseInfo.business_term_type_n = obj.type_n
vm.$forceUpdate()
// console.log(vm.baseInfo);
},
})
},
// 选择省份 // 选择省份
selectProvince (e) { selectProvince (e) {
let vm = this let vm = this
...@@ -1813,6 +1841,12 @@ export default { ...@@ -1813,6 +1841,12 @@ export default {
returnItem: function (index, obj) { returnItem: function (index, obj) {
vm.baseInfo.province_id = obj.bp_type vm.baseInfo.province_id = obj.bp_type
vm.baseInfo.province_name = obj.bp_type_n vm.baseInfo.province_name = obj.bp_type_n
// 清空 市 区
vm.baseInfo.city_id = ''
vm.baseInfo.city_name = ''
vm.baseInfo.district_id = ''
vm.baseInfo.district_name = ''
//
vm.getCity() vm.getCity()
}, },
}) })
...@@ -1830,6 +1864,8 @@ export default { ...@@ -1830,6 +1864,8 @@ export default {
returnItem: function (index, obj) { returnItem: function (index, obj) {
vm.baseInfo.city_id = obj.bp_type vm.baseInfo.city_id = obj.bp_type
vm.baseInfo.city_name = obj.bp_type_n vm.baseInfo.city_name = obj.bp_type_n
vm.baseInfo.district_id = ''
vm.baseInfo.district_name = ''
vm.getDistrict() vm.getDistrict()
}, },
}) })
...@@ -1850,6 +1886,22 @@ export default { ...@@ -1850,6 +1886,22 @@ export default {
}, },
}) })
}, },
getBusinessTypeList () { // 营业期限值集获取
let vm = this
let url = $config.basePath + 'app_get_syscode'
let param = {
'BUSINESS_TERM_TYPE': 'BUSINESS_TERM_TYPE',
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.return_status === 'S') {
vm.businessTypeList = res.BUSINESS_TERM_TYPE
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// 省份查询 // 省份查询
getProvince () { getProvince () {
let vm = this let vm = this
...@@ -2023,11 +2075,11 @@ export default { ...@@ -2023,11 +2075,11 @@ export default {
if (res.info.business_term_type === 'FIXED_TERM') { if (res.info.business_term_type === 'FIXED_TERM') {
vm.baseInfo.business_term_from = /\d{4}-\d{1,2}-\d{1,2}/g.exec(res.info.business_term_from)[0] vm.baseInfo.business_term_from = /\d{4}-\d{1,2}-\d{1,2}/g.exec(res.info.business_term_from)[0]
vm.baseInfo.business_term_to = /\d{4}-\d{1,2}-\d{1,2}/g.exec(res.info.business_term_to)[0] vm.baseInfo.business_term_to = /\d{4}-\d{1,2}-\d{1,2}/g.exec(res.info.business_term_to)[0]
vm.businessDateShow = true // vm.businessDateShow = true
} }
if (res.info.business_term_type === 'LONG_TERM') { if (res.info.business_term_type === 'LONG_TERM') {
vm.baseInfo.business_term_type_n = '长期' vm.baseInfo.business_term_type_n = '长期'
vm.businessDateShow = false // // vm.businessDateShow = false
} }
console.log(vm.baseInfo) console.log(vm.baseInfo)
vm.authMsg.auth_person_name = res.info.auth_person_name vm.authMsg.auth_person_name = res.info.auth_person_name
...@@ -2261,15 +2313,38 @@ export default { ...@@ -2261,15 +2313,38 @@ export default {
vm.baseInfo.business_address = vm.baseInfo.registered_place // 经营地址默认为注册地址，支持修改 vm.baseInfo.business_address = vm.baseInfo.registered_place // 经营地址默认为注册地址，支持修改
// 营业期限 // 营业期限
if (['长期', '永久'].indexOf(result.有效期.words) !== -1) { if (['长期', '永久'].indexOf(result.有效期.words) !== -1) {
vm.businessDateShow = false // vm.businessDateShow = false
vm.baseInfo.business_term_type_n = '长期' vm.baseInfo.business_term_type_n = '长期'
vm.baseInfo.business_term_type = 'LONG_TERM' vm.baseInfo.business_term_type = 'LONG_TERM'
vm.baseInfo.business_term_to = ''
vm.baseInfo.business_term_from = ''
} else if (result.有效期.words==='无') {
vm.baseInfo.business_term_to = ''
vm.baseInfo.business_term_from = ''
vm.baseInfo.business_term_type_n = ''
vm.baseInfo.business_term_type = ''
} else { } else {
vm.businessDateShow = true // vm.businessDateShow = true
vm.baseInfo.business_term_to = (result.有效期.words).replace('年', '-').replace('月', '-').replace('日', '')
vm.baseInfo.business_term_from = (result.有效期起始日期.words).replace('年', '-').replace('月', '-').replace('日', '')
vm.baseInfo.business_term_type = 'FIXED_TERM' vm.baseInfo.business_term_type = 'FIXED_TERM'
vm.baseInfo.business_term_type_n = '固定期限' vm.baseInfo.business_term_type_n = '固定期限'
let reg = /^[0-9,/:-\s]+$/;
if (!isNaN(Date.parse(new Date(result.有效期.words.replace(/-/g, '/')))) && isNaN(result.有效期.words) && reg.test(times)) {
vm.baseInfo.business_term_to = (result.有效期.words).replace('年', '-').replace('月', '-').replace('日', '')
} else {
vm.baseInfo.business_term_to = ''
vm.baseInfo.business_term_type_n = ''
vm.baseInfo.business_term_type = ''
}
if (!isNaN(Date.parse(new Date(result.有效期起始日期.words.replace(/-/g, '/')))) && isNaN(result.有效期起始日期.words) && reg.test(result.有效期起始日期.words)) {
vm.baseInfo.business_term_from = (result.有效期起始日期.words).replace('年', '-').replace('月', '-').replace('日', '')
} else {
vm.baseInfo.business_term_from = ''
vm.baseInfo.business_term_type_n = ''
vm.baseInfo.business_term_type = ''
}
// vm.baseInfo.business_term_to = (result.有效期.words).replace('年', '-').replace('月', '-').replace('日', '')
// vm.baseInfo.business_term_from = (result.有效期起始日期.words).replace('年', '-').replace('月', '-').replace('日', '')
} }
if (result.社会信用代码.words.includes('(')) { if (result.社会信用代码.words.includes('(')) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment