BUG优化

src/request/enterprise_management.js

@@ -77,6 +77,9 @@ export const findTrailerByPlateNumber = (params) =>
 export const getChoiceTrailerList = (params) =>
   post("/taxationmanage/choicetrailerlist", params); // 车船税添加选择挂车
 
+export const getAllVehicleList = (params) =>
+  post("/freightTrailer/getAllVehicleList", params); // 获取营运车辆和货运挂车所有车辆
+
 const getCorpList = (params) => post("/freightTrailer/corpList", params);
 export const getFreightTrailerCorpList = async () => {
   const resData = await getCorpList();

src/views/electronic_waybill_management/waybill_registration/add.vue

@@ -410,6 +410,9 @@ const rules = {
   PRACTITIONER: [
     { required: true, message: "请选择从业人员", trigger: "change" },
   ],
+  DEPARTMENT_ID: [
+    { required: true, message: "请选择部门", trigger: "change"}
+  ]
 };
 
 const data = reactive({
@@ -501,6 +504,7 @@ const changeCONFIRMINGPERSON = (contactPersonId) => {
 const fnGetUnitsList = async () => {
   const resData = await getUserPersonTypeListAll({});
   data.userTypeList = resData.userList;
+  data.userTypeList = data.userTypeList.filter(( item ) => item.APPLY_STATUS === '1')
 };
 fnGetUnitsList();
 

src/views/enterprise_management/user_practitioner/details.vue

@@ -86,7 +86,92 @@
         {{ data.info.EMAIL }}
       </el-descriptions-item>
     </el-descriptions>
-    <div v-for="(item, index) in data.certificateList" :key="index">
+    <el-divider content-position="left">身份证</el-divider>
+    <el-descriptions :column="2" border>
+      <el-descriptions-item label="身份证（正面）">
+        <img
+          v-if="data.idCard.ID_PHOTO_FRONT !== null"
+          v-viewer
+          :src="data.idCard.ID_PHOTO_FRONT"
+          width="100"
+          height="100"
+          class="ml-10"
+        />
+      </el-descriptions-item>
+      <el-descriptions-item label="身份证（背面）">
+        <img
+          v-if="data.idCard.ID_PHOTO_BACK !== null"
+          v-viewer
+          :src="data.idCard.ID_PHOTO_BACK"
+          width="100"
+          height="100"
+          class="ml-10"
+        />
+      </el-descriptions-item>
+      <el-descriptions-item label = "住址">
+        {{ data.idCard.ID_ADDRESS }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "证件号码">
+        {{ data.idCard.ID_NO }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "签发机关">
+        {{ data.idCard.ID_ORGAN }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "有效期">
+        {{ data.idCard.ID_VALIDITY_START + "至" + data.idCard.ID_VALIDITY_END }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <el-divider content-position="left">驾驶证</el-divider>
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="驾驶证">
+        <img
+          v-if="data.drivingLicence.ID_PHOTO_FRONT !== null"
+          v-viewer
+          :src="data.drivingLicence.ID_PHOTO_FRONT"
+          width="100"
+          height="100"
+          class="ml-10"
+        />
+      </el-descriptions-item>
+      <el-descriptions-item label = "证件号码">
+        {{ data.drivingLicence.ID_NO }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "准驾车型">
+        {{ data.drivingLicence.ALLOW_QUALIFICATION }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "签发机关">
+        {{ data.drivingLicence.ID_ORGAN }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "有效期">
+        {{ data.drivingLicence.ID_VALIDITY_START + "至" + data.drivingLicence.ID_VALIDITY_END }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <el-divider content-position="left">道路运输从业资格证</el-divider>
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="道路运输从业资格证">
+        <img
+          v-if="data.qualificationCertificate.ID_PHOTO_FRONT !== null"
+          v-viewer
+          :src="data.qualificationCertificate.ID_PHOTO_FRONT"
+          width="100"
+          height="100"
+          class="ml-10"
+        />
+      </el-descriptions-item>
+      <el-descriptions-item label = "证件号码">
+        {{ data.qualificationCertificate.ID_NO }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "从业资格类别">
+        {{ data.qualificationCertificate.ALLOW_QUALIFICATION }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "签发机关">
+        {{ data.qualificationCertificate.ID_ORGAN }}
+      </el-descriptions-item>
+      <el-descriptions-item label = "有效期">
+        {{ data.qualificationCertificate.ID_VALIDITY_START + "至" + data.qualificationCertificate.ID_VALIDITY_END }}
+      </el-descriptions-item>
+    </el-descriptions>
+<!--    <div v-for="(item, index) in data.certificateList" :key="index">
       <el-divider content-position="left">
         {{
           item.CERTIFICATE_CATEGORY === "1"
@@ -184,7 +269,7 @@
           {{ item.ID_VALIDITY_START + "至" + item.ID_VALIDITY_END }}
         </el-descriptions-item>
       </el-descriptions>
-    </div>
+    </div>-->
     <div class="tc mt-10">
       <el-button type="primary" @click="router.back"> 返回 </el-button>
     </div>
@@ -204,6 +289,9 @@ const data = reactive({
   certificateList: [],
   statusInfo: {},
   dispose: "",
+  idCard: [],
+  drivingLicence: [],
+  qualificationCertificate: []
 });
 const fnGetData = async () => {
   if (!USER_ID) return;
@@ -233,6 +321,16 @@ const fnGetData = async () => {
       item.ALLOW_QUALIFICATION = null;
     }
   });
+  data.certificateList.forEach(( item ) => {
+    if(item.CERTIFICATE_CATEGORY === '1') {
+      data.idCard = item;
+    }else if(item.CERTIFICATE_CATEGORY === '2') {
+      data.drivingLicence = item
+    }else if(item.CERTIFICATE_CATEGORY === '3') {
+      data.qualificationCertificate = item
+    }
+  })
+  console.log("1111",data.certificateList);
   if (
     data.statusInfo.APPLY_TYPE === "1" ||
     data.statusInfo.APPLY_TYPE === "3"

src/views/enterprise_management/user_practitioner/index.vue

@@ -202,6 +202,7 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination } =
       // APPLY_TYPE: "1-3",
     },
   });
+console.log(await getPractitionerList());
 const data = reactive({
   personnelTypeList: [],
   reviewDialog: {

src/views/labor_contract/index.vue

@@ -16,14 +16,14 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+<!--          <el-col :span="6">
             <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
               <el-select v-model="searchForm.COMPLETIONSTATUS" clearable>
                 <el-option label="已上传" :value="1" />
                 <el-option label="未上传" :value="0" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>

src/views/management_staffing/index.vue

@@ -16,14 +16,14 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+<!--          <el-col :span="6">
             <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
               <el-select v-model="searchForm.COMPLETIONSTATUS" clearable>
                 <el-option label="已上传" :value="1" />
                 <el-option label="未上传" :value="0" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>

src/views/mechanical_files/assigned_manage/add.vue

@@ -411,6 +411,8 @@ const form = ref({
 });
 const info = ref({});
 const fnEditVehicleModel = async () => {
+  form.value.NOW_OWNERS = '';
+  form.value.NOW_OWNERS_NUMBER = '';
   form.value.VEHICLE_PLATE_NUMBER = null;
   form.value.VEHICLE = {};
   if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") {
@@ -422,6 +424,8 @@ const fnEditVehicleModel = async () => {
   }
 };
 const fnGetVehicleInfo = async () => {
+  form.value.NOW_OWNERS = '';
+  form.value.NOW_OWNERS_NUMBER = '';
   if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") {
     for (let i = 0; i < form.value.OPERATIONVEHICLELIST.length; i++) {
       if (

src/views/mechanical_files/production_accident/add.vue

@@ -42,10 +42,10 @@
               placeholder="请选择文化水平"
             >
               <el-option
-                v-for="item in EDUCATIONALMENU"
+                v-for="item in data.degreeOfEducationList"
-                :key="item.id"
+                :key="item.DICTIONARIES_ID"
-                :label="item.id"
+                :label="item.NAME"
-                :value="item.name"
+                :value="item.DICTIONARIES_ID"
               />
             </el-select>
           </el-form-item>
@@ -402,7 +402,7 @@
 
 <script setup>
 import { onMounted, reactive, ref, toRaw } from "vue";
-import { ACCIDENTNATUREMENU, EDUCATIONALMENU } from "@/assets/js/constant.js";
+import { ACCIDENTNATUREMENU } from "@/assets/js/constant.js";
 import LayoutUpload from "@/components/upload/index.vue";
 import useFormValidate from "@/assets/js/useFormValidate.js";
 import { ElMessage } from "element-plus";
@@ -414,6 +414,7 @@ import {
 } from "@/request/production_accident.js";
 import { addingPrefixFile } from "@/assets/js/utils.js";
 import { getPractitionerSelectList } from "@/request/user_practitioner.js";
+import { layoutFnGetDegreeOfEducation } from "@/assets/js/data_dictionary.js";
 
 // 获取路由实例
 const route = useRoute();
@@ -552,6 +553,12 @@ const data = reactive({
   },
 });
 
+const fnGetLevels = async () => {
+  const { value: degreeOfEducationList } = await layoutFnGetDegreeOfEducation();
+  data.degreeOfEducationList = degreeOfEducationList;
+}
+fnGetLevels();
+
 onMounted(() => {
   isEditMode.value = route.query.mode === "edit";
   ACCIDENTINVESTIGATION_ID.value = route.query.ACCIDENTINVESTIGATION_ID || "";

src/views/mechanical_files/production_accident/edit.vue

@@ -42,10 +42,10 @@
               placeholder="请选择文化水平"
             >
               <el-option
-                v-for="item in EDUCATIONALMENU"
+                v-for="item in data.degreeOfEducationList"
-                :key="item.id"
+                :key="item.DICTIONARIES_ID"
-                :label="item.id"
+                :label="item.NAME"
-                :value="item.name"
+                :value="item.DICTIONARIES_ID"
               />
             </el-select>
           </el-form-item>
@@ -402,7 +402,7 @@
 
 <script setup>
 import { onMounted, reactive, ref, toRaw } from "vue";
-import { ACCIDENTNATUREMENU, EDUCATIONALMENU } from "@/assets/js/constant.js";
+import { ACCIDENTNATUREMENU } from "@/assets/js/constant.js";
 import LayoutUpload from "@/components/upload/index.vue";
 import useFormValidate from "@/assets/js/useFormValidate.js";
 import { ElMessage } from "element-plus";
@@ -414,6 +414,7 @@ import {
 } from "@/request/production_accident.js";
 import { addingPrefixFile } from "@/assets/js/utils.js";
 import { getPractitionerSelectList } from "@/request/user_practitioner.js";
+import { layoutFnGetDegreeOfEducation } from "@/assets/js/data_dictionary.js";
 
 // 获取路由实例
 const route = useRoute();
@@ -566,6 +567,13 @@ onMounted(() => {
   }
 });
 
+const fnGetLevels = async () => {
+  const { value: degreeOfEducationList } = await layoutFnGetDegreeOfEducation();
+  data.degreeOfEducationList = degreeOfEducationList;
+}
+
+fnGetLevels();
+
 const fnGetData = async () => {
   const ACCIDENTINVESTIGATION_ID = route.query.ACCIDENTINVESTIGATION_ID;
   if (!ACCIDENTINVESTIGATION_ID) return;

src/views/mechanical_files/tank_truck_record/tank_truck_inspection_record/add.vue

@@ -213,7 +213,6 @@
 </template>
 
 <script setup>
-import { getUserListAll } from "@/request/data_dictionary.js";
 import LayoutUpload from "@/components/upload/index.vue";
 import { ref, reactive } from "vue";
 import { debounce } from "throttle-debounce";
@@ -230,6 +229,7 @@ import { useRoute, useRouter } from "vue-router";
 import useFormValidate from "@/assets/js/useFormValidate.js";
 import { addingPrefixToFile, subtractDaysFromDate } from "@/assets/js/utils.js";
 import { REMIND_DAYS } from "@/assets/js/constant.js";
+import { getUserPersonTypeListAll } from "@/request/waybill_registration.js";
 
 const route = useRoute();
 const router = useRouter();
@@ -318,8 +318,9 @@ const getRemiderDate = (val) => {
   }
 };
 const getUserList = async () => {
-  const resData = await getUserListAll();
+  const resData = await getUserPersonTypeListAll({});
   data.userList = resData.userList;
+  data.userList = data.userList.filter(( item ) => item.APPLY_STATUS === '1')
 };
 getUserList();
 const getVehicle = async (event) => {

src/views/production_course_regulate/violation_registration/add.vue

@@ -29,10 +29,10 @@
               placeholder="请选择车辆"
             >
               <el-option
-                v-for="item in TRUCKMENU"
+                v-for="item in data.vehicleList"
-                :key="item.id"
+                :key="item.PLATE_NUMBER"
-                :label="item.id"
+                :label="item.PLATE_NUMBER"
-                :value="item.name"
+                :value="item.PLATE_NUMBER"
               />
             </el-select>
           </el-form-item>
@@ -108,7 +108,7 @@
 
 <script setup>
 import { onMounted, reactive, ref, toRaw } from "vue";
-import { PENALTYMETHODMENU, TRUCKMENU } from "@/assets/js/constant.js";
+import { PENALTYMETHODMENU } from "@/assets/js/constant.js";
 import LayoutUpload from "@/components/upload/index.vue";
 import useFormValidate from "@/assets/js/useFormValidate.js";
 import { ElMessage } from "element-plus";
@@ -117,6 +117,9 @@ import {
   addViolationRegistrationView,
   editViolationRegistration,
 } from "@/request/violation_registration.js";
+import {
+  getAllVehicleList
+} from "@/request/enterprise_management.js"
 import { getPractitionerSelectList } from "@/request/user_practitioner.js";
 const router = useRouter();
 
@@ -154,6 +157,13 @@ onMounted(async () => {
   }); */
 });
 
+const fnGetAllVehicle = async () => {
+  const resData = await getAllVehicleList();
+  data.vehicleList = resData.varList
+  console.log(data.vehicleList);
+}
+fnGetAllVehicle();
+
 const fnGetUnitsList = async () => {
   const resData = await getPractitionerSelectList({
     PARENT_ID: "0b62f92b0b624aab8e89a77304a64d5e",
@@ -174,6 +184,7 @@ const data = reactive({
     PENALTYREGISTRANT: "",
     fileList: [],
   },
+  vehicleList: []
 });
 
 const fnSubmit = async () => {

src/views/production_course_regulate/violation_registration/index.vue

@@ -50,10 +50,7 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-        <el-table-column label="运输车辆" width="250">
+        <el-table-column label="运输车辆" width="250" prop="TRANSPORTVEHICLE">
-          <template #default="{ row }">
-            {{ convertTransportVehicle(row.TRANSPORTVEHICLE) }}
-          </template>
         </el-table-column>
         <el-table-column prop="NAME" label="从业人员" width="250" />
         <el-table-column prop="PHONE" label="联系电话" />
@@ -110,7 +107,7 @@
 <script setup>
 import { serialNumber } from "@/assets/js/utils.js";
 import useListData from "@/assets/js/useListData.js";
-import { PENALTYMETHODMENU, TRUCKMENU } from "@/assets/js/constant.js";
+import { PENALTYMETHODMENU } from "@/assets/js/constant.js";
 import { reactive } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useRouter } from "vue-router";
@@ -121,10 +118,6 @@ import {
 import { getUserSelectListAll } from "@/request/user_practitioner.js";
 
 const router = useRouter();
-const convertTransportVehicle = (name) => {
-  const vehicle = TRUCKMENU.find((item) => item.name === name);
-  return vehicle ? vehicle.id : "未知车牌号";
-};
 const convertPENALTYMETHOD = (name) => {
   const vehicle = PENALTYMETHODMENU.find((item) => item.name === name);
   return vehicle ? vehicle.id : "未知处罚方式";

src/views/safety_assessment/index.vue

@@ -16,14 +16,14 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+<!--          <el-col :span="6">
             <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
               <el-select v-model="searchForm.COMPLETIONSTATUS" clearable>
                 <el-option label="已上传" :value="1" />
                 <el-option label="未上传" :value="0" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>

src/views/safety_production/index.vue

@@ -16,14 +16,14 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+<!--          <el-col :span="6">
             <el-form-item label="完成状态" prop="COMPLETIONSTATUS">
               <el-select v-model="searchForm.COMPLETIONSTATUS" clearable>
                 <el-option label="已上传" :value="1" />
                 <el-option label="未上传" :value="0" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="6">
             <el-form-item label="有效状态" prop="VALIDSTATUS">
               <el-select v-model="searchForm.VALIDSTATUS" clearable>