From b098bf7dcd3bb9c316221b015383da644e62906e Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Mon, 25 Mar 2024 09:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E5=BC=82=E5=B8=B8=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driving_commitment/index.vue              | 41 +++++-----
 .../driving_log/drivingLog_info.vue           | 64 ++++++++--------
 .../driving_inspections/driving_log/index.vue | 76 +++++++++----------
 .../driving_type/index.vue                    | 46 +++++------
 .../information/edit.vue                      |  5 +-
 .../driving_log/add.vue                       | 11 +--
 .../things_check/index.vue                    |  0
 7 files changed, 110 insertions(+), 133 deletions(-)
 delete mode 100644 src/views/safety_production_related/things_check/index.vue

diff --git a/src/views/driving_inspections/driving_commitment/index.vue b/src/views/driving_inspections/driving_commitment/index.vue
index afb9733..c1f65db 100644
--- a/src/views/driving_inspections/driving_commitment/index.vue
+++ b/src/views/driving_inspections/driving_commitment/index.vue
@@ -35,22 +35,21 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
+        <el-table-column prop="INQUIRYCONTENT" label="问询内容" width="330" />
         <el-table-column
-          prop="INQUIRYCONTENT"
-          label="问询内容"
-          width="330"
+          prop="INQUIRYCONCLUSION"
+          label="问询结果"
+          width="230"
         />
-        <el-table-column prop="INQUIRYCONCLUSION" label="问询结果" width="230" />
         <el-table-column prop="CREATTIME" label="创建时间" width="130" />
         <el-table-column prop="OPERATTIME" label="修改时间" width="130" />
-        <el-table-column label="操作" >
+        <el-table-column label="操作">
           <template #default="{ row }">
-
             <el-button
-                type="primary"
-                text
-                link
-                @click="fnAddOrEdit(row.DRIVINGCOMMITMENT_ID, 'edit')"
+              type="primary"
+              text
+              link
+              @click="fnAddOrEdit(row.DRIVINGCOMMITMENT_ID, 'edit')"
             >
               修改
             </el-button>
@@ -65,20 +64,17 @@
           </template>
         </el-table-column>
         <template #button>
-          <el-button
-              type="primary"
-              @click="fnAddOrEdit('', 'add')"
-          >
+          <el-button type="primary" @click="fnAddOrEdit('', 'add')">
             新增
           </el-button>
         </template>
       </layout-table>
     </layout-card>
     <add
-        v-model:visible="data.addOrEditDialog.visible"
-        v-model:form="data.addOrEditDialog.form"
-        :type="data.addOrEditDialog.type"
-        @get-data="fnResetPagination"
+      v-model:visible="data.addOrEditDialog.visible"
+      v-model:form="data.addOrEditDialog.form"
+      :type="data.addOrEditDialog.type"
+      @get-data="fnResetPagination"
     />
   </div>
 </template>
@@ -86,10 +82,11 @@
 <script setup>
 import { serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
-import { nextTick,reactive } from "vue";
+import { nextTick, reactive } from "vue";
 import Add from "./components/add.vue";
 import {
-  getSafetyDrivingCommitmentList, getSafetyDrivingCommitmentView,
+  getSafetyDrivingCommitmentList,
+  getSafetyDrivingCommitmentView,
   setDrivingCommitmentDelete,
 } from "@/request/traffic_driving_commitment.js";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -111,7 +108,9 @@ const fnAddOrEdit = async (DRIVINGCOMMITMENT_ID, type) => {
   await nextTick();
   data.addOrEditDialog.type = type;
   if (type === "edit") {
-    const resData = await getSafetyDrivingCommitmentView({ DRIVINGCOMMITMENT_ID });
+    const resData = await getSafetyDrivingCommitmentView({
+      DRIVINGCOMMITMENT_ID,
+    });
     data.addOrEditDialog.form = resData.pd;
   }
 };
diff --git a/src/views/driving_inspections/driving_log/drivingLog_info.vue b/src/views/driving_inspections/driving_log/drivingLog_info.vue
index 5479806..c51eab7 100644
--- a/src/views/driving_inspections/driving_log/drivingLog_info.vue
+++ b/src/views/driving_inspections/driving_log/drivingLog_info.vue
@@ -3,13 +3,13 @@
     <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>
+          <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>
@@ -57,59 +57,58 @@
         <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">
+            <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 item1.pd2Children" :key="index2">
+              <tr v-for="(item2, index2) in item1.pd2Children" :key="index2">
                 <td class="title">检查项名称</td>
-                <td>{{item2.CHECKITEMNAME}}</td>
+                <td>{{ item2.CHECKITEMNAME }}</td>
                 <td class="title">检查项说明</td>
-                <td>{{item2.REMARKS}}</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"
+                    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>
+                <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"
+                      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"
+                        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>
@@ -118,7 +117,7 @@
 <script setup>
 import { reactive } from "vue";
 import { useRoute } from "vue-router";
-import {getSafetyDrivingLogView} from "@/request/traffic_driving_log.js";
+import { getSafetyDrivingLogView } from "@/request/traffic_driving_log.js";
 
 const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
 const route = useRoute();
@@ -131,7 +130,6 @@ const fnGetData = async () => {
   const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
   data.info = resData.pd;
   data.commitmentList = resData.commitmentList;
-
 };
 fnGetData();
 </script>
diff --git a/src/views/driving_inspections/driving_log/index.vue b/src/views/driving_inspections/driving_log/index.vue
index 7113c40..13fdeec 100644
--- a/src/views/driving_inspections/driving_log/index.vue
+++ b/src/views/driving_inspections/driving_log/index.vue
@@ -2,32 +2,31 @@
   <div>
     <el-card>
       <el-form
-          :model="searchForm"
-          label-width="100px"
-          @submit.prevent="fnResetPaginationTransfer"
+        :model="searchForm"
+        label-width="100px"
+        @submit.prevent="fnResetPaginationTransfer"
       >
         <el-row>
           <el-col :span="6">
             <el-form-item label="运输车辆" prop="TRANSPORTVEHICLE">
               <el-input
-                  v-model="searchForm.TRANSPORTVEHICLE"
-                  placeholder="请输入运输车辆"
+                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="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">
@@ -42,17 +41,17 @@
     </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="WAYBILLNUMBER" label="运单编号" width="230"/>
-        <el-table-column label="行车状态" width="130" >
+        <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>
@@ -67,28 +66,28 @@
         <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: {
-                    WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID
+                    WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID,
                   },
                 })
               "
             >
               查看
             </el-button>
-<!--            <el-button-->
-<!--                type="danger"-->
-<!--                text-->
-<!--                link-->
-<!--                @click="deleteItem(row.WAYBILLREGISTRATION_ID)"-->
-<!--            >-->
-<!--              删除-->
-<!--            </el-button>-->
+            <!--            <el-button-->
+            <!--                type="danger"-->
+            <!--                text-->
+            <!--                link-->
+            <!--                @click="deleteItem(row.WAYBILLREGISTRATION_ID)"-->
+            <!--            >-->
+            <!--              删除-->
+            <!--            </el-button>-->
           </template>
         </el-table-column>
       </layout-table>
@@ -104,7 +103,7 @@ import { getSafetyDrivingLogList } from "@/request/traffic_driving_log.js";
 
 const router = useRouter();
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
-    useListData(getSafetyDrivingLogList);
+  useListData(getSafetyDrivingLogList);
 
 const fnResetPaginationTransfer = () => {
   fnResetPagination({
@@ -113,7 +112,6 @@ const fnResetPaginationTransfer = () => {
     WORK_START_DATE: searchForm.value.WORK_START_DATE,
   });
 };
-
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/driving_inspections/driving_type/index.vue b/src/views/driving_inspections/driving_type/index.vue
index cb4a7ee..0afc585 100644
--- a/src/views/driving_inspections/driving_type/index.vue
+++ b/src/views/driving_inspections/driving_type/index.vue
@@ -11,10 +11,10 @@
             <el-form-item label="检查项类型" prop="CHECKTYPE_ID">
               <el-select v-model="searchForm.CHECKTYPE_ID">
                 <el-option
-                    v-for="item in drivingTypeList"
-                    :key="item.BIANMA"
-                    :label="item.NAME"
-                    :value="item.BIANMA"
+                  v-for="item in drivingTypeList"
+                  :key="item.BIANMA"
+                  :label="item.NAME"
+                  :value="item.BIANMA"
                 />
               </el-select>
             </el-form-item>
@@ -42,23 +42,18 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="CHECKITEMNAME"
-          label="检查项名称"
-          width="330"
-        />
+        <el-table-column prop="CHECKITEMNAME" label="检查项名称" width="330" />
         <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="操作" >
+        <el-table-column label="操作">
           <template #default="{ row }">
-
             <el-button
-                type="primary"
-                text
-                link
-                @click="fnAddOrEdit(row.DRIVINGTYPE_ID, 'edit')"
+              type="primary"
+              text
+              link
+              @click="fnAddOrEdit(row.DRIVINGTYPE_ID, 'edit')"
             >
               修改
             </el-button>
@@ -73,20 +68,17 @@
           </template>
         </el-table-column>
         <template #button>
-          <el-button
-              type="primary"
-              @click="fnAddOrEdit('', 'add')"
-          >
+          <el-button type="primary" @click="fnAddOrEdit('', 'add')">
             新增
           </el-button>
         </template>
       </layout-table>
     </layout-card>
     <add
-        v-model:visible="data.addOrEditDialog.visible"
-        v-model:form="data.addOrEditDialog.form"
-        :type="data.addOrEditDialog.type"
-        @get-data="fnResetPagination"
+      v-model:visible="data.addOrEditDialog.visible"
+      v-model:form="data.addOrEditDialog.form"
+      :type="data.addOrEditDialog.type"
+      @get-data="fnResetPagination"
     />
   </div>
 </template>
@@ -94,14 +86,15 @@
 <script setup>
 import { serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
-import { nextTick,reactive } from "vue";
+import { nextTick, reactive } from "vue";
 import Add from "./components/add.vue";
 import {
-  getSafetyDrivingTypeList, getSafetyDrivingTypeView,
+  getSafetyDrivingTypeList,
+  getSafetyDrivingTypeView,
   setDrivingTypeDelete,
 } from "@/request/traffic_driving_type.js";
 import { ElMessage, ElMessageBox } from "element-plus";
-import {layoutFnGetDrivingType} from "@/assets/js/data_dictionary.js";
+import { layoutFnGetDrivingType } from "@/assets/js/data_dictionary.js";
 
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
   useListData(getSafetyDrivingTypeList);
@@ -136,7 +129,6 @@ const deleteItem = async (value) => {
   fnGetData();
 };
 
-
 const drivingTypeList = await layoutFnGetDrivingType();
 </script>
 
diff --git a/src/views/enterprise_management/information/edit.vue b/src/views/enterprise_management/information/edit.vue
index 6e10da1..4d176eb 100644
--- a/src/views/enterprise_management/information/edit.vue
+++ b/src/views/enterprise_management/information/edit.vue
@@ -29,7 +29,7 @@
               <el-input v-model="data.form.CODE" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">
+          <!--          <el-col :span="12">
             <el-form-item label="市行业监管部门" prop="INDUSTRY_DEPARTMENTName">
               <el-input
                 v-model="data.form.INDUSTRY_DEPARTMENTName"
@@ -47,7 +47,7 @@
               />
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">
+          <!--          <el-col :span="12">
             <el-form-item label="监管类型" prop="REGULARTYPE">
               <layout-regulatory-type
                 v-model="data.form.REGULARTYPE"
@@ -449,7 +449,6 @@
 <script setup>
 import { reactive, ref } from "vue";
 import LayoutTerritory from "@/components/territory/index.vue";
-import LayoutRegulatoryType from "@/components/regulatory_type/index.vue";
 import LayoutIndustry from "@/components/industry/index.vue";
 import LayoutEconomicType from "@/components/economic_type/index.vue";
 import LayoutLearningTrainType from "@/components/learning_train_type/index.vue";
diff --git a/src/views/safety_production_related/driving_log/add.vue b/src/views/safety_production_related/driving_log/add.vue
index de2477b..2eeeb83 100644
--- a/src/views/safety_production_related/driving_log/add.vue
+++ b/src/views/safety_production_related/driving_log/add.vue
@@ -113,10 +113,7 @@
 </template>
 
 <script setup>
-import {
-  layoutFnGetMEETINGTYPEClassification,
-  getUserListAll,
-} from "@/request/safety_production_related.js";
+import { 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";
@@ -162,12 +159,6 @@ const fnGetUnitsList = async () => {
   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: {
diff --git a/src/views/safety_production_related/things_check/index.vue b/src/views/safety_production_related/things_check/index.vue
deleted file mode 100644
index e69de29..0000000