From 55677507ac1868a1ea24af1442490629adc5dee1 Mon Sep 17 00:00:00 2001
From: chenxinying <1039655633@qq.com>
Date: Fri, 22 Mar 2024 15:08:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E4=B8=89=E6=A3=80=E6=89=BF?=
 =?UTF-8?q?=E8=AF=BA=E9=97=AE=E8=AF=A2=EF=BC=8C=E6=8E=92=E6=9F=A5=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E6=A3=80=E6=9F=A5=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/traffic_driving_log.js            |   6 +-
 .../driving_commitment/index.vue              |   2 -
 .../driving_inspections/driving_log/add.vue   | 229 ---------
 .../driving_log/drivingLog_info.vue           | 458 +++++-------------
 .../driving_inspections/driving_log/index.vue | 145 +++---
 .../driving_type/index.vue                    |  10 +-
 6 files changed, 199 insertions(+), 651 deletions(-)
 delete mode 100644 src/views/driving_inspections/driving_log/add.vue

diff --git a/src/request/traffic_driving_log.js b/src/request/traffic_driving_log.js
index 9493712..24137c4 100644
--- a/src/request/traffic_driving_log.js
+++ b/src/request/traffic_driving_log.js
@@ -1,9 +1,9 @@
 import { post } from "@/request/axios.js";
 export const getSafetyDrivingLogList = (params) =>
-  post("/drivinglog/listForSafetyDrivingLog", params); // 行车日志列表
+  post("/waybillregistration/listForSecurityWaybillre", params); // 行车日志列表
 
 export const setDrivingLogDelete = (params) =>
-  post("/drivinglog/delete", params); // 行车日志删除
+  post("/waybillregistration/delete", params); // 行车日志删除
 
 export const getSafetyDrivingLogView = (params) =>
-  post("/drivinglog/goEdit", params); // 安全例会详情
+  post("/waybillregistration/getDetail", params); // 安全例会详情
diff --git a/src/views/driving_inspections/driving_commitment/index.vue b/src/views/driving_inspections/driving_commitment/index.vue
index 4a8a997..afb9733 100644
--- a/src/views/driving_inspections/driving_commitment/index.vue
+++ b/src/views/driving_inspections/driving_commitment/index.vue
@@ -41,8 +41,6 @@
           width="330"
         />
         <el-table-column prop="INQUIRYCONCLUSION" label="问询结果" width="230" />
-        <el-table-column prop="CORP_NAME" label="经营企业" width="230" />
-        <el-table-column prop="TRANSPORTVEHICLE" label="经营类型" width="230" />
         <el-table-column prop="CREATTIME" label="创建时间" width="130" />
         <el-table-column prop="OPERATTIME" label="修改时间" width="130" />
         <el-table-column label="操作" >
diff --git a/src/views/driving_inspections/driving_log/add.vue b/src/views/driving_inspections/driving_log/add.vue
deleted file mode 100644
index a93807e..0000000
--- a/src/views/driving_inspections/driving_log/add.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <layout-card>
-    <el-form
-      ref="formRef"
-      :model="data.form"
-      :rules="rules"
-      label-width="175px"
-    >
-      <el-divider content-position="left">添加</el-divider>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="会议标题" prop="MEETING_TITLE">
-            <el-input
-              v-model="data.form.MEETING_TITLE"
-              placeholder="请输入会议标题"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="5">
-          <el-form-item label="会议类型" prop="MEETING_TYPE">
-            <el-select
-              v-model="data.form.MEETING_TYPE"
-              placeholder="请选择会议类型"
-              @change="handleMeetingTypeChange"
-            >
-              <el-option
-                v-for="item in relatedClassificationList"
-                :key="item.BIANMA"
-                :label="item.NAME"
-                :value="item.BIANMA"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="运输企业" prop="TRANSPORTATIONCOMPANY">
-            <el-input
-              v-model="data.form.TRANSPORTATIONCOMPANY"
-              placeholder="请输入运输企业"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="会议地点" prop="MEETING_ADDRESS">
-            <el-input
-              v-model="data.form.MEETING_ADDRESS"
-              placeholder="请输入会议地点"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item prop="MEETING_DATE" label="会议时间">
-            <el-date-picker
-              type="daterange"
-              v-model="data.form.MEETING_DATE"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="主持人" prop="HOST_PERSON">
-            <el-input
-              v-model="data.form.HOST_PERSON"
-              placeholder="请输入主持人"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="记录人" prop="RECORDER">
-            <el-input v-model="data.form.RECORDER" placeholder="请输入记录人" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="从业身份" prop="PRACTITIONER_TYPE">
-            <el-checkbox-group
-              v-model="data.form.PRACTITIONER_TYPE"
-              @change="handleCheckedCitiesChange"
-            >
-              <el-checkbox v-for="city in cities" :key="city" :label="city">{{
-                city
-              }}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="24">
-          <el-form-item label="会议附件" prop="fileList">
-            <layout-upload
-              v-model:file-list="data.form.fileList"
-              accept=".pdf,.mp4"
-              delete-to-server
-              :limit="9"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="50">
-          <el-form-item label="会议记要" prop="MEETING_CONTENT">
-            <layout-editor
-              v-model="data.form.MEETING_CONTENT"
-              placeholder="请输入内容"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div class="tc mt-10">
-      <el-button type="primary" @click="fnSubmit"> 确定 </el-button>
-    </div>
-  </layout-card>
-</template>
-
-<script setup>
-import {
-  layoutFnGetMEETINGTYPEClassification,
-  getUserListAll,
-} from "@/request/safety_production_related.js";
-import { addSafetyMeetingView } from "@/request/traffic_safety_meeting.js";
-import { reactive, ref } from "vue";
-import LayoutUpload from "@/components/upload/index.vue";
-import LayoutEditor from "@/components/editor/index.vue";
-import useFormValidate from "@/assets/js/useFormValidate.js";
-import { ElMessage } from "element-plus";
-const formRef = ref(null);
-const cities = [
-  "驾驶员",
-  "押运员",
-  "安全管理员",
-  "装卸员",
-  "安全负责人",
-  "其他",
-  "监控员",
-];
-const handleCheckedCitiesChange = () => {};
-const rules = {
-  MEETING_TITLE: [
-    { required: true, message: "请输入会议标题", trigger: "blur" },
-  ],
-  MEETING_TYPE: [
-    { required: true, message: "请选择会议类型", trigger: "change" },
-  ],
-  TRANSPORTATIONCOMPANY: [
-    { required: true, message: "请输入运输企业", trigger: "blur" },
-  ],
-  MEETING_ADDRESS: [
-    { required: true, message: "请输入会议地点", trigger: "blur" },
-  ],
-  MEETING_DATE: [
-    { required: true, message: "请选择会议时间", trigger: "change" },
-  ],
-  HOST_PERSON: [{ required: true, message: "请输入主持人", trigger: "blur" }],
-  RECORDER: [{ required: true, message: "请输入记录人", trigger: "blur" }],
-  MEETING_CONTENT: [
-    { required: true, message: "请输入会议记要", trigger: "blur" },
-  ],
-};
-
-const fnGetUnitsList = async () => {
-  const resData = await getUserListAll({});
-  data.unitsList = resData.varList;
-};
-fnGetUnitsList();
-const relatedClassificationTempList =
-  await layoutFnGetMEETINGTYPEClassification();
-const relatedClassificationList = [];
-JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
-  relatedClassificationList.push({ name: e.id, BIANMA: e.name });
-});
-
-const data = reactive({
-  form: {
-    MEETING_TITLE: "",
-    MEETING_TYPE: "",
-    TRANSPORTATIONCOMPANY: "",
-    MEETING_ADDRESS: "",
-    MEETING_DATE: "",
-    HOST_PERSON: "",
-    RECORDER: "",
-    fileList: [],
-    PRACTITIONER_TYPE: [],
-    NOTIFICATIONCONTENT: "",
-  },
-});
-const handleMeetingTypeChange = (value) => {
-  data.form.MEETING_TYPE = value;
-};
-const fnSubmit = async () => {
-  await useFormValidate(formRef);
-  const formData = new FormData();
-
-  Object.keys(data.form).forEach((key) => {
-    formData.append(key, data.form[key]);
-  });
-
-  formData.delete("fileList");
-
-  for (let i = 0; i < data.form.fileList.length; i++) {
-    if (data.form.fileList[i].raw)
-      formData.append("FFILE", data.form.fileList[i].raw);
-  }
-
-  try {
-    await addSafetyMeetingView(formData);
-    ElMessage.success("添加成功");
-    Object.keys(data.form).forEach((key) => {
-      if (Array.isArray(data.form[key])) {
-        data.form[key] = [];
-      } else {
-        data.form[key] = "";
-      }
-    });
-  } catch (error) {
-    ElMessage.error("添加失败");
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.flexBox {
-  display: flex;
-  align-items: flex-end;
-
-  .addBtn {
-    margin-left: 12px;
-  }
-}
-</style>
diff --git a/src/views/driving_inspections/driving_log/drivingLog_info.vue b/src/views/driving_inspections/driving_log/drivingLog_info.vue
index 0d344c0..5479806 100644
--- a/src/views/driving_inspections/driving_log/drivingLog_info.vue
+++ b/src/views/driving_inspections/driving_log/drivingLog_info.vue
@@ -1,341 +1,139 @@
 <template>
-  <div>
-    <layout-card>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <el-descriptions :column="2" border>
-            <el-descriptions-item label="会议标题">
-              {{ detailItems.WAYBILLNUMBER }}
-            </el-descriptions-item>
-            <el-descriptions-item label="运输企业">
-              {{ detailItems.TRANSPORTATIONCOMPANY }}
-            </el-descriptions-item>
-            <el-descriptions-item label="运输任务">
-              <el-row :gutter="20">
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="运输车辆">
-                      {{ detailItems.TRANSPORTVEHICLE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="运输性能">
-                      {{ detailItems.TRANSPORTNATURE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="发车时间">
-                      {{ detailItems.DEPARTURETIME }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="发车地点">
-                      {{ detailItems.DEPARTUREPLACE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="车架号">
-                      {{ detailItems.FRAMENUMBER }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="从业人员">
-                      {{ detailItems.EMPLOYEES }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="收车时间">
-                      {{ detailItems.ARRIVALTIME }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="收车地点">
-                      {{ detailItems.ARRIVALPLACE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="天气情况">
-                      {{ detailItems.WEATHERCONDITION }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="联系电话">
-                      {{ detailItems.CONTACTPHONE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="额定载荷">
-                      {{ detailItems.RATEDLOAD }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="实际载荷">
-                      {{ detailItems.ACTUALLOAD }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-              </el-row>
-            </el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions :column="1" border>
-            <el-descriptions-item label="行车安全问询">
-              {{ detailItems.DRIVINGSAFETYINQUIRY }}
-            </el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions :column="1" border>
-            <el-descriptions-item label="出车前检查">
-              <el-row :gutter="20">
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="检查人">
-                      {{ detailItems.PREDEPARTUREINSPECTOR }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="检查时间">
-                      {{ detailItems.PREDEPARTUREINSPECTIONTIME }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="故障处理">
-                      {{ detailItems.PREDEPARTUREFAULTTREATMENT }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="出车结论">
-                      {{ detailItems.DEPARTURECONCLUSION }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="出车前照片">
-                      {{ detailItems.PREDEPARTUREPHOTO }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="出车前签字">
-                      {{ detailItems.PREDEPARTURESIGNATURE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-              </el-row>
-            </el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions :column="1" border>
-            <el-descriptions-item label="行车中检查">
-              <el-row :gutter="20">
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="检查人">
-                      {{ detailItems.INDRIVINGINSPECTOR }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="检查时间">
-                      {{ detailItems.INSPECTIONTIMEWHILEDRIVING }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="故障处理">
-                      {{ detailItems.INDRIVINGFAULTTREATMENT }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="行车中照片">
-                      {{ detailItems.PHOTOSWHILEDRIVING }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="行车中签字">
-                      {{ detailItems.SIGNINGWHILEDRIVING }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-              </el-row>
-            </el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions :column="1" border>
-            <el-descriptions-item label="收车后检查">
-              <el-row :gutter="20">
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="检查人">
-                      {{ detailItems.POSTARRIVALINSPECTOR }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="检查时间">
-                      {{ detailItems.POSTARRIVALINSPECTIONTIME }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="故障处理">
-                      {{ detailItems.POSTARRIVALFAULTTREATMENT }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="收车后照片">
-                      {{ detailItems.CHECKPHOTOS }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="收车后签字">
-                      {{ detailItems.CHECKSIGNATURE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-              </el-row>
-            </el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions :column="1" border>
-            <el-descriptions-item label="交接班记录">
-              <el-row :gutter="20">
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="驾驶时长">
-                      {{ detailItems.DRIVINGDURATION }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="时间区间">
-                      {{ detailItems.TIMEINTERVAL }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="交接地点">
-                      {{ detailItems.HANDOVERPLACE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="交接班人">
-                      {{ detailItems.HANDOVERPERSON }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-                <el-col :span="6">
-                  <el-descriptions :column="1" border>
-                    <el-descriptions-item label="接班图片">
-                      {{ detailItems.RELIEFPICTURE }}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-col>
-              </el-row>
-            </el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions :column="1" border>
-            <el-descriptions-item label="安全负责人">
-              {{ detailItems.SAFETYOFFICER }}
-            </el-descriptions-item>
-          </el-descriptions>
-        </el-col>
-      </el-row>
-    </layout-card>
-  </div>
+  <layout-card>
+    <div id="printContent">
+      <table class="archive_print_table">
+        <thead>
+        <tr>
+          <td colspan="10" style="border: none">
+            <el-divider content-position="left">
+              {{data.info.TRANSPORTVEHICLE}}车辆行车三检日志
+            </el-divider>
+          </td>
+        </tr>
+        </thead>
+        <tr>
+          <td class="title">运单编号</td>
+          <td colspan="5">{{ data.info.WAYBILLNUMBER }}</td>
+          <td class="title">运单状态</td>
+          <td colspan="4">
+            <span v-if="data.info.WAYBILLSTATUS === '0'">未出发</span>
+            <span v-else-if="data.info.WAYBILLSTATUS === '1'">已出发</span>
+            <span v-else-if="data.info.WAYBILLSTATUS === '2'">已完成</span>
+          </td>
+        </tr>
+        <tr>
+          <td :rowspan="4" class="title">运输任务</td>
+          <td class="title" rowspan="1">运输车辆</td>
+          <td colspan="4">{{ data.info.TRANSPORTVEHICLE }}</td>
+          <td class="title" colspan="1">车架号</td>
+          <td colspan="5">{{ data.info.VIN }}</td>
+        </tr>
+        <tr>
+          <td class="title" rowspan="1">从业人员</td>
+          <td colspan="4">{{ data.info.NAME }}</td>
+          <td class="title" colspan="1">联系电话</td>
+          <td colspan="5">{{ data.info.PHONE }}</td>
+        </tr>
+        <tr>
+          <td class="title" rowspan="1">发车时间</td>
+          <td colspan="4">{{ data.info.STARTTIME }}</td>
+          <td class="title" colspan="1">收车时间</td>
+          <td colspan="5">{{ data.info.STOPTIME }}</td>
+        </tr>
+        <tr>
+          <td class="title" rowspan="1">发车地点</td>
+          <td colspan="4">{{ data.info.ORIGIN_NAME }}</td>
+          <td class="title" colspan="1">收车地点</td>
+          <td colspan="5">{{ data.info.DESTINATION_NAME }}</td>
+        </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.varList" :key="index">
+          <td :rowspan="1" class="title">{{ item.CHECKTYPE_NAME }}检查</td>
+          <td colspan="8">
+            <table class="archive_print_table" v-for="(item1,index1) in item.pd1Children" :key="index1">
+              <tr>
+                <td :rowspan="10" class="title">检查记录</td>
+              </tr>
+              <tr v-for="(item2,index2) in item1.pd2Children" :key="index2">
+                <td class="title">检查项名称</td>
+                <td>{{item2.CHECKITEMNAME}}</td>
+                <td class="title">检查项说明</td>
+                <td>{{item2.REMARKS}}</td>
+              </tr>
+              <tr>
+                <td class="title">检查人</td>
+                <td>
+                  <img
+                      v-viewer
+                      :src="VITE_FILE_URL + item1.SIGN_PATH"
+                      alt=""
+                      width="20"
+                      height="20"
+                      class="mr-10 mt-10"
+                  />
+                </td>
+                <td class="title">检查时间</td>
+                <td>{{item1.SIGN_TIME}}</td>
+              </tr>
+              <tr>
+                <td class="title">检查照片</td>
+                <td colspan="3">
+                  <div>
+                    <template
+                        v-for="(item3, index3) in item1.IMG_PATH.split(',')"
+                        :key="index3"
+                    >
+                      <img
+                          v-viewer
+                          :src="VITE_FILE_URL + item3"
+                          alt=""
+                          width="20"
+                          height="20"
+                          class="mr-10 mt-10"
+                      />
+                    </template>
+
+                  </div>
+                </td>
+              </tr>
+
+            </table>
+          </td>
+        </tr>
+
+
+
+      </table>
+    </div>
+  </layout-card>
 </template>
 
 <script setup>
-import { ref } from "vue";
-import { getSafetyDrivingLogView } from "@/request/traffic_driving_log.js";
+import { reactive } from "vue";
 import { useRoute } from "vue-router";
-const route = useRoute();
-const { DRIVING_LOG_ID } = route.query;
-const detailItems = ref({
-  WAYBILLNUMBER: "",
-  TRANSPORTATIONCOMPANY: "",
-  TRANSPORTVEHICLE: "",
-  TRANSPORTNATURE: "",
-  DEPARTURETIME: "",
-  DEPARTUREPLACE: "",
-  FRAMENUMBER: "",
-  EMPLOYEES: "",
-  ARRIVALTIME: "",
-  ARRIVALPLACE: "",
-  WEATHERCONDITION: "",
-  CONTACTPHONE: "",
-  ACTUALLOAD: "",
-  DRIVINGSAFETYINQUIRY: "",
-  DEPARTURECONCLUSION: "",
-  PREDEPARTUREINSPECTOR: "",
-  PREDEPARTUREINSPECTIONTIME: "",
-  PREDEPARTUREFAULTTREATMENT: "",
-  INDRIVINGINSPECTOR: "",
-  INSPECTIONTIMEWHILEDRIVING: "",
-  INDRIVINGFAULTTREATMENT: "",
-  POSTARRIVALINSPECTOR: "",
-  POSTARRIVALINSPECTIONTIME: "",
-  POSTARRIVALFAULTTREATMENT: "",
-  DRIVINGDURATION: "",
-  TIMEINTERVAL: "",
-  HANDOVERPLACE: "",
-  HANDOVERPERSON: "",
-  RELIEFPICTURE: "",
-  SAFETYOFFICER: "",
-  PREDEPARTUREPHOTO: "",
-  PREDEPARTURESIGNATURE: "",
-  PHOTOSWHILEDRIVING: "",
-  SIGNINGWHILEDRIVING: "",
-  CHECKPHOTOS: "",
-  CHECKSIGNATURE: "",
-});
+import {getSafetyDrivingLogView} from "@/request/traffic_driving_log.js";
 
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
+const route = useRoute();
+const { WAYBILLREGISTRATION_ID } = route.query;
+const data = reactive({
+  info: {},
+  commitmentList: {},
+});
 const fnGetData = async () => {
-  const response = await getSafetyDrivingLogView({ DRIVING_LOG_ID });
-  detailItems.value = response.pd;
+  const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
+  data.info = resData.pd;
+  data.commitmentList = resData.commitmentList;
+
 };
 fnGetData();
 </script>
 
-<style scoped></style>
+<style scoped lang="scss"></style>
diff --git a/src/views/driving_inspections/driving_log/index.vue b/src/views/driving_inspections/driving_log/index.vue
index b7358b3..9c3d254 100644
--- a/src/views/driving_inspections/driving_log/index.vue
+++ b/src/views/driving_inspections/driving_log/index.vue
@@ -2,25 +2,37 @@
   <div>
     <el-card>
       <el-form
-        :model="searchForm"
-        label-width="100px"
-        @submit.prevent="fnResetPagination"
+          :model="searchForm"
+          label-width="100px"
+          @submit.prevent="fnResetPaginationTransfer"
       >
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="运输企业" prop="TRANSPORTCOMPANY">
-              <el-input v-model="searchForm.TRANSPORTCOMPANY" />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="运输车辆" prop="TRANSPORTVEHICLE">
-              <el-input v-model="searchForm.TRANSPORTVEHICLE" />
+              <el-input
+                  v-model="searchForm.TRANSPORTVEHICLE"
+                  placeholder="请输入运输车辆"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="状态" prop="STEP_ID">
+              <el-select v-model="searchForm.STEP_ID">
+                <el-option
+                    v-for="item in stepList"
+                    :key="item.STEP_ID"
+                    :label="item.STEP_NAME"
+                    :value="item.STEP_ID"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12">
             <el-form-item label-width="10px">
               <el-button type="primary" native-type="submit">搜索</el-button>
-              <el-button native-type="reset" @click="fnResetPagination">
+              <el-button native-type="reset" @click="fnResetPaginationTransfer">
                 重置
               </el-button>
             </el-form-item>
@@ -30,107 +42,78 @@
     </el-card>
     <layout-card>
       <layout-table
-        v-model:pagination="pagination"
-        :data="list"
-        @get-data="fnGetData"
+          v-model:pagination="pagination"
+          :data="list"
+          @get-data="fnGetData"
       >
         <el-table-column label="序号" width="60">
           <template #default="{ $index }">
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="REGISTRATIONNUMBER"
-          label="登记编号"
-          width="130"
-        />
-        <el-table-column prop="DEPARTURESTATUS" label="出车状态" width="130" />
-        <el-table-column prop="DRIVINGCONDITION" label="行车状态" width="130" />
-        <el-table-column prop="TRANSPORTVEHICLE" label="运输车辆" width="130" />
-        <el-table-column prop="EMPLOYEES" label="从业人员" width="130" />
-        <el-table-column prop="CONTACTPHONE" label="联系电话" width="130" />
-        <el-table-column prop="WEATHERCONDITION" label="天气预报" width="130" />
-        <el-table-column prop="TRANSPORTNATURE" label="运输性质" width="130" />
-        <el-table-column prop="DEPARTURETIME" label="发车时间" />
-        <el-table-column prop="ARRIVALTIME" label="收车时间" />
-        <el-table-column prop="TRANSPORTCOMPANY" label="运输企业" />
+        <el-table-column prop="WAYBILLNUMBER" label="运单编号" width="230"/>
+        <el-table-column label="行车状态" width="130" >
+          <template #default="{ row }">
+            <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>
+          </template>
+        </el-table-column>
+        <el-table-column prop="TRANSPORTVEHICLE" label="运输车辆" width="230" />
+        <el-table-column prop="NAME" label="从业人员" width="130" />
+        <el-table-column prop="PHONE" label="联系电话" width="130" />
+        <el-table-column prop="STARTTIME" label="发车时间" />
+        <el-table-column prop="STOPTIME" label="收车时间" />
         <el-table-column label="操作" width="180">
           <template #default="{ row }">
             <el-button
-              type="primary"
-              text
-              link
-              @click="
+                type="primary"
+                text
+                link
+                @click="
                 router.push({
                   path: '/driving_inspections/driving_log/drivingLog_info',
                   query: {
-                    DRIVING_LOG_ID: row.DRIVING_LOG_ID,
+                    WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID
                   },
                 })
               "
             >
               查看
             </el-button>
-            <el-button
-              type="primary"
-              text
-              link
-              @click="
-                router.push({
-                  path: '/driving_inspections/safety_meeting/add',
-                })
-              "
-            >
-              添加
-            </el-button>
-            <el-button
-              type="danger"
-              text
-              link
-              @click="deleteItem(row.DRIVING_LOG_ID)"
-            >
-              删除
-            </el-button>
+<!--            <el-button-->
+<!--                type="danger"-->
+<!--                text-->
+<!--                link-->
+<!--                @click="deleteItem(row.WAYBILLREGISTRATION_ID)"-->
+<!--            >-->
+<!--              删除-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </layout-table>
     </layout-card>
-    <edit
-      v-model:visible="data.analysisDialog.visible"
-      :info="data.analysisDialog.info"
-      @get-data="fnResetPagination"
-    />
   </div>
 </template>
 
 <script setup>
-import { serialNumber } from "@/assets/js/utils";
+import { serialNumber } from "@/assets/js/utils.js";
+import { useRouter } from "vue-router";
 import useListData from "@/assets/js/useListData.js";
-import { reactive } from "vue";
-import {
-  getSafetyDrivingLogList,
-  setDrivingLogDelete,
-} from "@/request/traffic_driving_log.js";
-import router from "@/router/index.js";
-import { ElMessage, ElMessageBox } from "element-plus";
+import { getSafetyDrivingLogList } from "@/request/traffic_driving_log.js";
 
+const router = useRouter();
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
-  useListData(getSafetyDrivingLogList);
-const data = reactive({
-  analysisDialog: {
-    visible: false,
-    info: {},
-  },
-});
-// 删除事件
-const deleteItem = async (value) => {
-  await ElMessageBox.confirm(`确定要删除吗？`, {
-    type: "warning",
+    useListData(getSafetyDrivingLogList);
+
+const fnResetPaginationTransfer = () => {
+  fnResetPagination({
+    TRANSPORTVEHICLE: searchForm.value.TRANSPORTVEHICLE,
+    CONFIRM_DEPARTMENT_ID: searchForm.value.CONFIRM_DEPARTMENT_ID,
+    WORK_START_DATE: searchForm.value.WORK_START_DATE,
   });
-  await setDrivingLogDelete({ DRIVING_LOG_ID: value });
-  ElMessage.success("删除成功");
-  fnGetData();
 };
+
 </script>
 
-<style scoped></style>
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/driving_inspections/driving_type/index.vue b/src/views/driving_inspections/driving_type/index.vue
index 2ce8647..cb4a7ee 100644
--- a/src/views/driving_inspections/driving_type/index.vue
+++ b/src/views/driving_inspections/driving_type/index.vue
@@ -47,12 +47,10 @@
           label="检查项名称"
           width="330"
         />
-        <el-table-column prop="CHECKTYPE_NAME" label="检查项类型" width="130" />
-        <el-table-column prop="REMARKS" label="检查项说明" width="230" />
-        <el-table-column prop="CORP_NAME" label="经营企业" width="230" />
-        <el-table-column prop="TRANSPORTVEHICLE" label="经营类型" width="230" />
-        <el-table-column prop="CREATTIME" label="创建时间" width="130" />
-        <el-table-column prop="OPERATTIME" label="修改时间" width="130" />
+        <el-table-column prop="CHECKTYPE_NAME" label="检查项类型" width="230" />
+        <el-table-column prop="REMARKS" label="检查项说明" width="330" />
+        <el-table-column prop="CREATTIME" label="创建时间" width="230" />
+        <el-table-column prop="OPERATTIME" label="修改时间" width="230" />
         <el-table-column label="操作" >
           <template #default="{ row }">