diff --git a/src/views/contract/vehicle_detail.vue b/src/views/contract/vehicle_detail.vue index fcb4228..2ed5bcd 100644 --- a/src/views/contract/vehicle_detail.vue +++ b/src/views/contract/vehicle_detail.vue @@ -99,15 +99,15 @@
租赁信息
- + - - @@ -117,7 +117,7 @@ - @@ -127,9 +127,9 @@ -
+ +
租赁信息
-
@@ -176,10 +176,16 @@ const formData = reactive({ company_b_code: "", company_b_email: "@service.ebaoquan.org", num: "", - cars_info: { + cars_info: + [ + { id: "", license: "", - }, + type:"", + rent_time:"" + } + ] + , car_list: [], type: 0, status: 0, @@ -204,6 +210,11 @@ const handChangeFn = (e) => { }); }); }; +const typeFn=(type)=>{ +if(type==0)return"租赁车辆" +if(type==1)return"自有车辆" +if(type==2)return"购买车辆" +} const test = () => { window.open(formData.file, "_blank"); }; @@ -211,7 +222,10 @@ leaseContractDetail({ id: route.query.id }).then((res) => { for (let key in formData) { formData[key] = res[key]; } - formData.type ? (formData.type = "自有车辆") : (formData.type = "租赁车辆"); + // formData.type ? (formData.type = "自有车辆") : (formData.type = "租赁车辆"); + formData.cars_info.forEach(item=>{ + item.type=typeFn(item.type) + }) }); const handleAvatarSuccess_three = (response, uploadFile) => { diff --git a/src/views/contract/vehicle_list.vue b/src/views/contract/vehicle_list.vue index e6bab53..2a14864 100644 --- a/src/views/contract/vehicle_list.vue +++ b/src/views/contract/vehicle_list.vue @@ -60,7 +60,7 @@ }, }">详情 - 发送合同 重新发送{{ row.nums ? row.nums + "s" : "" }} @@ -125,7 +125,7 @@ const timeFn = (i: number) => { }, 1000); }; const sendContractPopFn = (id: number) => { - (showPop.value = true), (sendAgainPop.value = true), (contractId = id); + (showPop.value = true), (sendAgainPop.value = false), (contractId = id); }; const sendAgaintPopFn = (id: number) => { (showPop.value = true), (contractId = id); @@ -173,12 +173,12 @@ const typeFn = (status: number) => { switch (status) { case 0: return "租赁合同"; - case 1: - return "自由车辆合同"; - + return "自有车辆合同"; case 2: return "解除合同"; + case 3: + return "购买合同"; default: } };