From 085cc1254229079d7736ee5b2b5d8e1b50832344 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 19 Oct 2023 14:20:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E4=B8=89=E8=BD=AE=E8=BD=A6?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contract/vehicle_detail.vue | 32 +++++++++++++++++++--------
 src/views/contract/vehicle_list.vue   | 10 ++++-----
 2 files changed, 28 insertions(+), 14 deletions(-)

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 @@
             <el-col :span="24" class="el-card pt-6" v-if="formData.cars_info">
                 <div class="tit">租赁信息</div>
                 <div>
-                    <el-row>
+                    <el-row v-for="(item,index) in formData.cars_info" :key="index">
                         <el-col :span="4">
-                            <el-form-item label-width="120px" label="车牌号"><el-input v-model="formData.cars_info.license"
+                            <el-form-item label-width="120px" label="车牌号"><el-input v-model="item.license"
                                     placeholder="请输入车牌号" clearable :style="{ width: '100%' }"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label-width="120px" label="车辆类型">
-                                <el-input v-model="formData.type" placeholder="请输入车辆类型" clearable
+                                <el-input v-model="item.type" placeholder="请输入车辆类型" clearable
                                     :style="{ width: '100%' }"></el-input></el-form-item>
                         </el-col>
                         <el-col :span="6">
@@ -117,7 +117,7 @@
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label-width="120px" label="签约时间">
-                                <el-input v-model="formData.update_time" placeholder="请输入签约时间" clearable
+                                <el-input v-model="item.rent_time" placeholder="请输入签约时间" clearable
                                     :style="{ width: '100%' }"></el-input></el-form-item>
                         </el-col>
                     </el-row>
@@ -127,9 +127,9 @@
         <!-- 小组公司申请车辆 -->
         <!-- {{ formData.contract_logistic_id }}
     {{ formData.type }} -->
-        <div v-if="formData.contract_logistic_id && formData.type == '租赁车辆'" class="el-card pt-6">
+ 
+        <div v-if="formData.contract_logistic_id && formData.type == 0 && formData.status==0" class="el-card pt-6">
             <div class="tit">租赁信息</div>
-
             <div style="padding: 0 2vw">
                 <el-checkbox-group :max="formData.num" v-model="checkList" @change="handChangeFn">
                     <el-checkbox :label="item.license" v-for="(item, index) in formData.car_list" :key="index" />
@@ -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 @@
                                     },
                                 }">详情</router-link>
                             </el-button>
-                            <el-button v-if="row.status == 1 && row.contract_logistic_id != 0" type="primary" link
+                            <el-button v-if="row.status == 1 " type="primary" link
                                 @click="sendContractPopFn(row.id)">发送合同</el-button>
                             <el-button v-if="row.status == 2" :disabled="row.nums > 0" @click="sendAgaintPopFn(row.id)" link
                                 type="primary">重新发送{{ row.nums ? row.nums + "s" : "" }}</el-button>
@@ -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:
     }
 };