From 7c9aa8603d0a894776dc1b490453b9abd425e148 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Fri, 10 May 2024 17:51:33 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E8=A1=8C=E8=BD=A6?=
 =?UTF-8?q?=E4=B8=89=E6=A3=80=20=E8=AF=A6=E6=83=85=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=89=BF=E8=AF=BA=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driving_log/drivingLog_info.vue           | 63 +++++++++++++++----
 .../driving_inspections/driving_log/index.vue |  1 +
 .../driving_type/index.vue                    |  3 +
 .../waybill_registration/view.vue             |  4 +-
 src/views/mechanical_files/insure/add.vue     | 38 ++++++++---
 5 files changed, 85 insertions(+), 24 deletions(-)

diff --git a/src/views/driving_inspections/driving_log/drivingLog_info.vue b/src/views/driving_inspections/driving_log/drivingLog_info.vue
index 529ce8d..2f4eec0 100644
--- a/src/views/driving_inspections/driving_log/drivingLog_info.vue
+++ b/src/views/driving_inspections/driving_log/drivingLog_info.vue
@@ -46,14 +46,56 @@
           <td class="title" colspan="1">收车地点</td>
           <td colspan="5">{{ data.info.DESTINATION_NAME }}</td>
         </tr>
-        <tr>
+        <!--        <tr>
           <td :rowspan="4" class="title">行车安全问询</td>
         </tr>
         <tr v-for="(item, index) in data.commitmentList" :key="index">
           <td colspan="9">
             <span>{{ item.INQUIRYCONTENT }}</span>
           </td>
+        </tr>-->
+        <tr v-for="(item, index) in data.info.varList2" :key="index">
+          <td :rowspan="1" class="title">行车安全问询</td>
+          <td colspan="8">
+            <table
+              v-for="(item1, index1) in item.pd1Children"
+              :key="index1"
+              class="archive_print_table"
+            >
+              <tr>
+                <td :rowspan="10" class="title">承诺记录</td>
+              </tr>
+              <tr v-for="(item2, index2) in data.commitmentList" :key="index2">
+                <td class="title">承诺项</td>
+                <td>{{ item2.INQUIRYCONTENT }}</td>
+
+                <td>
+                  <el-tag v-if="item2.STATUS === '0'">合格</el-tag>
+                  <el-tag v-else-if="item2.STATUS === '1'">不合格</el-tag>
+                  <el-tag v-else>不涉及</el-tag>
+                </td>
+              </tr>
+              <tr>
+                <td class="title">检查人</td>
+                <td colspan="3">
+                  <img
+                    v-viewer
+                    :src="VITE_FILE_URL + item1.SIGN_PATH"
+                    alt=""
+                    width="20"
+                    height="20"
+                    class="mr-10 mt-10"
+                  />
+                </td>
+              </tr>
+              <tr>
+                <td class="title">检查时间</td>
+                <td colspan="3">{{ item1.SIGN_TIME }}</td>
+              </tr>
+            </table>
+          </td>
         </tr>
+
         <tr v-for="(item, index) in data.info.varList" :key="index">
           <td :rowspan="1" class="title">{{ item.CHECKTYPE_NAME }}检查</td>
           <td colspan="8">
@@ -70,6 +112,10 @@
                 <td>{{ item2.CHECKITEMNAME }}</td>
                 <td class="title">检查项说明</td>
                 <td>{{ item2.REMARKS }}</td>
+                <td>
+                  <el-tag v-if="item2.STATUS === '0'">合格</el-tag>
+                  <el-tag v-else>不合格</el-tag>
+                </td>
               </tr>
               <tr>
                 <td class="title">检查人</td>
@@ -84,11 +130,11 @@
                   />
                 </td>
                 <td class="title">检查时间</td>
-                <td>{{ item1.SIGN_TIME }}</td>
+                <td colspan="2">{{ item1.SIGN_TIME }}</td>
               </tr>
-              <tr>
+              <tr v-if="item.CHECKTYPE_NAME !== '待承诺'">
                 <td class="title">检查照片</td>
-                <td colspan="1">
+                <td colspan="4">
                   <div>
                     <template
                       v-for="(item3, index3) in item1.IMG_PATH.split(',')"
@@ -105,15 +151,6 @@
                     </template>
                   </div>
                 </td>
-                <td v-if="item.CHECKTYPE_NAME === '出车前'" class="title">
-                  是否合格
-                </td>
-                <td v-if="item.CHECKTYPE_NAME === '出车前'" colspan="3">
-                  <el-tag v-if="item1.pd2Children[0].STATUS === '0'"
-                    >合格</el-tag
-                  >
-                  <el-tag v-else>不合格</el-tag>
-                </td>
               </tr>
               <!--              <tr v-if="item.CHECKTYPE_NAME === '出车前'">-->
               <!--                <td class="title">是否合格</td>-->
diff --git a/src/views/driving_inspections/driving_log/index.vue b/src/views/driving_inspections/driving_log/index.vue
index 4e50bd8..17d0eb4 100644
--- a/src/views/driving_inspections/driving_log/index.vue
+++ b/src/views/driving_inspections/driving_log/index.vue
@@ -56,6 +56,7 @@
             <el-tag v-if="row.WAYBILLSTATUS === '0'">未出发</el-tag>
             <el-tag v-else-if="row.WAYBILLSTATUS === '1'">已出发</el-tag>
             <el-tag v-else-if="row.WAYBILLSTATUS === '2'">收车后</el-tag>
+            <el-tag v-else-if="row.WAYBILLSTATUS === '3'">待承诺</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="TRANSPORTVEHICLE" label="运输车辆" width="100" />
diff --git a/src/views/driving_inspections/driving_type/index.vue b/src/views/driving_inspections/driving_type/index.vue
index cf463d2..46ef296 100644
--- a/src/views/driving_inspections/driving_type/index.vue
+++ b/src/views/driving_inspections/driving_type/index.vue
@@ -54,6 +54,9 @@
             <el-tag v-if="row.CHECKTYPE_NAME === '收车后'" type="success">{{
               row.CHECKTYPE_NAME
             }}</el-tag>
+            <el-tag v-if="row.CHECKTYPE_NAME === '待承诺'" type="error">{{
+                row.CHECKTYPE_NAME
+              }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="REMARKS" label="检查项说明" />
diff --git a/src/views/electronic_waybill_management/waybill_registration/view.vue b/src/views/electronic_waybill_management/waybill_registration/view.vue
index fbdf5d4..b395d8e 100644
--- a/src/views/electronic_waybill_management/waybill_registration/view.vue
+++ b/src/views/electronic_waybill_management/waybill_registration/view.vue
@@ -53,7 +53,7 @@
             {{ data.info.ORIGIN_NAME }}
           </el-descriptions-item>
           <el-descriptions-item label="起运地址">
-            {{ data.info.SHIPPINGADDRESS }}
+            {{ data.info.SHIPPING_ADDR}}
           </el-descriptions-item>
           <el-descriptions-item label="行政区域">
             {{ data.info.STARTADMINISTRATIVEAREA }}
@@ -62,7 +62,7 @@
             {{ data.info.DESTINATION_NAME }}
           </el-descriptions-item>
           <el-descriptions-item label="目的地址">
-            {{ data.info.DESTINATIONADDRESS }}
+            {{ data.info.DESTINATION_ADDR }}
           </el-descriptions-item>
           <el-descriptions-item label="行政区域">
             {{ data.info.ENDDMINISTRATIVEAREA }}
diff --git a/src/views/mechanical_files/insure/add.vue b/src/views/mechanical_files/insure/add.vue
index f84c5f0..3d69d60 100644
--- a/src/views/mechanical_files/insure/add.vue
+++ b/src/views/mechanical_files/insure/add.vue
@@ -356,17 +356,37 @@ const data = reactive({
 });
 
 const insureType = async (rule, insureType, callback) => {
-  if (insureType) {
-    data.info = await getInsureList();
-    data.info.varList.forEach((item) => {
-      if(item.VEHICLE === data.busInfo.ID) {
-        if(insureType === item.INSURANCE_COVERAGE) {
-          callback(new Error("该保险已被此车辆重复选择"));
+  if(!INSURE_ID) {
+    if (insureType) {
+      data.info = await getInsureList();
+      data.info.varList.forEach((item) => {
+        if(item.VEHICLE === data.busInfo.ID) {
+          if(insureType === item.INSURANCE_COVERAGE) {
+            callback(new Error("该保险已被此车辆重复选择"));
+          }
         }
+      });
+    } else {
+      callback();
+    }
+  }else{
+    if (insureType) {
+      const resData = await getInsureView({ INSURE_ID })
+      if(insureType === resData.pd.INSURANCE_COVERAGE) {
+        callback();
+      }else{
+        data.info = await getInsureList();
+        data.info.varList.forEach((item) => {
+          if(item.VEHICLE === data.busInfo.ID) {
+            if(insureType === item.INSURANCE_COVERAGE) {
+              callback(new Error("该保险已被此车辆重复选择"));
+            }
+          }
+        });
       }
-    });
-  } else {
-    callback();
+    } else {
+      callback();
+    }
   }
 };