src/views/driving_inspections/driving_commitment/index.vue

@@ -35,16 +35,17 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-        <el-table-column prop="INQUIRYCONTENT" label="问询内容" width="330" />
         <el-table-column
-          prop="INQUIRYCONCLUSION"
+          prop="INQUIRYCONTENT"
-          label="问询结果"
+          label="问询内容"
-          width="230"
+          width="330"
         />
+        <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="操作" >
           <template #default="{ row }">
+
             <el-button
                 type="primary"
                 text
@@ -64,7 +65,10 @@
           </template>
         </el-table-column>
         <template #button>
-          <el-button type="primary" @click="fnAddOrEdit('', 'add')">
+          <el-button
+              type="primary"
+              @click="fnAddOrEdit('', 'add')"
+          >
             新增
           </el-button>
         </template>
@@ -85,8 +89,7 @@ import useListData from "@/assets/js/useListData.js";
 import { nextTick,reactive } from "vue";
 import Add from "./components/add.vue";
 import {
-  getSafetyDrivingCommitmentList,
+  getSafetyDrivingCommitmentList, getSafetyDrivingCommitmentView,
-  getSafetyDrivingCommitmentView,
   setDrivingCommitmentDelete,
 } from "@/request/traffic_driving_commitment.js";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -108,9 +111,7 @@ const fnAddOrEdit = async (DRIVINGCOMMITMENT_ID, type) => {
   await nextTick();
   data.addOrEditDialog.type = type;
   if (type === "edit") {
-    const resData = await getSafetyDrivingCommitmentView({
+    const resData = await getSafetyDrivingCommitmentView({ DRIVINGCOMMITMENT_ID });
-      DRIVINGCOMMITMENT_ID,
-    });
     data.addOrEditDialog.form = resData.pd;
   }
 };

src/views/driving_inspections/driving_log/drivingLog_info.vue

@@ -57,11 +57,7 @@
         <tr v-for="(item, index) in data.info.varList" :key="index">
           <td :rowspan="1" class="title">{{ item.CHECKTYPE_NAME }}检查</td>
           <td colspan="8">
-            <table
+            <table class="archive_print_table" v-for="(item1,index1) in item.pd1Children" :key="index1">
-              v-for="(item1, index1) in item.pd1Children"
-              :key="index1"
-              class="archive_print_table"
-            >
               <tr>
                 <td :rowspan="10" class="title">检查记录</td>
               </tr>
@@ -103,12 +99,17 @@
                           class="mr-10 mt-10"
                       />
                     </template>
+
                   </div>
                 </td>
               </tr>
+
             </table>
           </td>
         </tr>
+
+
+
       </table>
     </div>
   </layout-card>
@@ -130,6 +131,7 @@ const fnGetData = async () => {
   const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
   data.info = resData.pd;
   data.commitmentList = resData.commitmentList;
+
 };
 fnGetData();
 </script>

src/views/driving_inspections/driving_log/index.vue

@@ -28,6 +28,7 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
 
+
           <el-col :span="12">
             <el-form-item label-width="10px">
               <el-button type="primary" native-type="submit">搜索</el-button>
@@ -73,7 +74,7 @@
                 router.push({
                   path: '/driving_inspections/driving_log/drivingLog_info',
                   query: {
-                    WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID,
+                    WAYBILLREGISTRATION_ID: row.WAYBILLREGISTRATION_ID
                   },
                 })
               "
@@ -112,6 +113,7 @@ const fnResetPaginationTransfer = () => {
     WORK_START_DATE: searchForm.value.WORK_START_DATE,
   });
 };
+
 </script>
 
 <style scoped></style>

src/views/driving_inspections/driving_type/index.vue

@@ -42,13 +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="操作" >
           <template #default="{ row }">
+
             <el-button
                 type="primary"
                 text
@@ -68,7 +73,10 @@
           </template>
         </el-table-column>
         <template #button>
-          <el-button type="primary" @click="fnAddOrEdit('', 'add')">
+          <el-button
+              type="primary"
+              @click="fnAddOrEdit('', 'add')"
+          >
             新增
           </el-button>
         </template>
@@ -89,8 +97,7 @@ import useListData from "@/assets/js/useListData.js";
 import { nextTick,reactive } from "vue";
 import Add from "./components/add.vue";
 import {
-  getSafetyDrivingTypeList,
+  getSafetyDrivingTypeList, getSafetyDrivingTypeView,
-  getSafetyDrivingTypeView,
   setDrivingTypeDelete,
 } from "@/request/traffic_driving_type.js";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -129,6 +136,7 @@ const deleteItem = async (value) => {
   fnGetData();
 };
 
+
 const drivingTypeList = await layoutFnGetDrivingType();
 </script>
 

src/views/enterprise_management/information/edit.vue

@@ -449,6 +449,7 @@
 <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";

src/views/safety_production_related/driving_log/add.vue

@@ -113,7 +113,10 @@
 </template>
 
 <script setup>
-import { getUserListAll } from "@/request/safety_production_related.js";
+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";
@@ -159,6 +162,12 @@ 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: {