bug优化

src/request/enterprise_management.js

@@ -55,6 +55,9 @@ export const getElectronicFenceView = (params) =>
   post("/electronicfence/goEdit", params); // 电子围栏区域详情
 export const getFreightTrailerList = (params) =>
   post("/freightTrailer/list", params); // 货运挂车列表
+
+export const setFreightTrailerImport = (params) =>
+  upload("/freightTrailer/readExcel", params); // 货运挂车导入
 export const getFreightTrailerView = (params) =>
   post("/freightTrailer/goEdit", params); // 货运挂车查看
 export const setFreightTrailerAdd = (params) =>

src/views/driving_inspections/driving_commitment/index.vue

@@ -35,14 +35,14 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-        <el-table-column prop="INQUIRYCONTENT" label="问询内容" width="330" />
+        <el-table-column prop="INQUIRYCONTENT" label="问询内容" width="800" />
         <el-table-column
           prop="INQUIRYCONCLUSION"
           label="问询结果"
           width="230"
         />
-        <el-table-column prop="CREATTIME" label="创建时间" width="130" />
+        <el-table-column prop="CREATTIME" label="创建时间" width="200" />
-        <el-table-column prop="OPERATTIME" label="修改时间" width="130" />
+        <el-table-column prop="OPERATTIME" label="修改时间" width="200" />
         <el-table-column label="操作">
           <template #default="{ row }">
             <el-button

src/views/enterprise_management/basics_info_management/freight_trailer/index.vue

@@ -71,7 +71,11 @@
           width="150"
         />
         <el-table-column prop="DUE_DATE" label="到期日期" width="200" />
-        <el-table-column prop="DEPARTMENT_NAME" label="归属部门" width="150" />
+        <el-table-column label="归属部门" width="150">
+          <template #default="{ row }">
+            {{ row.DEPARTMENT_NAME || row.BELONGING_DEPT || "" }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="150">
           <template #default="{ row }">
             <el-button
@@ -141,10 +145,10 @@ import useListData from "@/assets/js/useListData.js";
 import {
   getFreightTrailerList,
   setFreightTrailerDelete,
+  setFreightTrailerImport,
 } from "@/request/enterprise_management.js";
 import { debounce } from "throttle-debounce";
 import { ElMessageBox, ElMessage } from "element-plus";
-import { setRiskPointImport } from "@/request/risk_control.js";
 import LayoutImportFile from "@/components/import_file/index.vue";
 import { reactive } from "vue";
 const router = useRouter();
@@ -173,7 +177,7 @@ const fnImportDialogChangeShow = () => {
   data.importDialogVisible = !data.importDialogVisible;
 };
 const fnSubmitImport = async (formData) => {
-  const resData = await setRiskPointImport(formData);
+  const resData = await setFreightTrailerImport(formData);
   if (resData.resultStr) {
     ElMessage({
       dangerouslyUseHTMLString: true,

src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue

@@ -158,7 +158,6 @@ const info = ref({});
 const fnGetData = async () => {
   if (!OPERATING_ID) return;
   const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID });
-  console.log("-=-=-=-",resData);
   info.value = resData.pd;
   info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto);
   info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile(

src/views/mechanical_files/taxation_manage/index.vue

@@ -185,8 +185,6 @@
 <script setup>
 import { serialNumber } from "@/assets/js/utils.js";
 import useListData from "@/assets/js/useListData.js";
-import { layoutFnGetRemindStatus } from "@/assets/js/taxation_manage.js";
-import {
 import {
   getTaxationManageList,
   setTaxatonManageDelete,
@@ -195,7 +193,7 @@ import { useRouter } from "vue-router";
 import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
 import { debounce } from "throttle-debounce";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { EXPIRE_STATUS, REMINDER_STATUS } from "@/assets/js/constant.js";
+import { REMINDER_STATUS } from "@/assets/js/constant.js";
 const router = useRouter();
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
   useListData(getTaxationManageList, {});

src/views/production_course_regulate/entrench_thing_grant/add.vue

@@ -88,35 +88,44 @@ const router = useRouter();
 const PROTECTIVEEQUIPMENT_ID = route.query.PROTECTIVEEQUIPMENT_ID;
 
 const rules = {
-  MANAGING_ENTERPRISE: [
+  PERSON_NAME: [
-    { required: true, message: "经营企业不能为空", trigger: "blur" },
+    { required: true, message: "人员名称不能为空", trigger: "blur" },
   ],
   GLOVE: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "手套数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
   MASK: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "口罩数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
   OVERALL: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "工作服数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
   FOOTWARE: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "工作鞋数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
   WINTER_COAT: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "防寒服数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
   RAINCOAT: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "雨衣数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
   GOGGLES: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "护目镜数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
   AID_KIT: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "急救药箱数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
   HELMET: [
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
+    { required: true, message: "安全帽数量不能为空", trigger: "blur" },
+    { pattern: /^([1-9][0-9]*)$/, message: "请输入正整数", trigger: "blur" },
   ],
 };
 

src/views/production_course_regulate/firefighting_equipment_facility/add.vue

@@ -191,9 +191,9 @@ const fnSubmit = debounce(
   },
   { atBegin: true }
 );
-const fnUploadImage = async (HIDDEN_ID, FFILE, TYPE) => {
+const fnUploadImage = async (currentEquipmentFacilityId, FFILE, TYPE) => {
   const formData = new FormData();
-  formData.append("FOREIGN_KEY", HIDDEN_ID);
+  formData.append("FOREIGN_KEY", currentEquipmentFacilityId);
   formData.append("TYPE", TYPE);
   formData.append("FFILE", FFILE);
   await setUploadImg(formData);

src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue

@@ -22,7 +22,11 @@
       </el-descriptions-item>
     </el-descriptions>
     <el-divider content-position="left">保养记录</el-divider>
-    <layout-table :data="list" :show-pagination="false">
+    <layout-table
+      :data="list"
+      :show-pagination="false"
+      @submit.prevent="fnResetPagination"
+    >
       <el-table-column type="index" label="序号" align="center" />
       <el-table-column prop="MAINTAIN_DATE" label="保养时间" />
       <el-table-column prop="MAINTAIN_CONDITION" label="保养情况" />
@@ -95,7 +99,7 @@ const getData = async () => {
   data.value = pd;
 };
 getData();
-const { list } = useListData(getMaintainFindFirefightingId, {
+const { list, fnResetPagination } = useListData(getMaintainFindFirefightingId, {
   otherParams: { FIREFIGHTINGFACILITY_ID },
   usePagination: false,
 });
@@ -106,6 +110,7 @@ const fnDelete = debounce(
     await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
     await setFirefightingMaintainDelete({ FIREFIGHTINGMAINTAIN_ID });
     ElMessage.success("删除成功");
+    fnResetPagination();
   },
   { atBegin: true }
 );

src/views/production_course_regulate/firefighting_equipment_facility/view.vue

@@ -6,6 +6,9 @@
         <el-descriptions-item label="设施编号">
           {{ data.FACILITY_NUMBER }}
         </el-descriptions-item>
+        <el-descriptions-item label="设施名称">
+          {{ data.FACILITY_NAME }}
+        </el-descriptions-item>
         <el-descriptions-item label="登记时间">
           {{ data.REGISTRATION_TIME }}
         </el-descriptions-item>
@@ -21,6 +24,18 @@
         <el-descriptions-item label="设施负责人">
           {{ data.FACILITY_PRINCIPAL }}
         </el-descriptions-item>
+        <el-descriptions-item label="设施设备">
+          <img
+            v-for="item in data.Images"
+            :key="item.FILEPATH"
+            v-viewer
+            :src="item.url"
+            width="100"
+            height="100"
+            alt=""
+            class="ml-10"
+          />
+        </el-descriptions-item>
       </el-descriptions>
       <el-divider content-position="left">保养记录</el-divider>
       <layout-table :data="list" :show-pagination="false">
@@ -47,14 +62,17 @@ import { useRoute } from "vue-router";
 import { ref } from "vue";
 import useListData from "@/assets/js/useListData.js";
 import { PRINT_STYLE } from "@/assets/js/constant.js";
+import { addingPrefixToFile } from "@/assets/js/utils.js";
 const route = useRoute();
 const { FIREFIGHTINGFACILITY_ID } = route.query;
 const data = ref({});
+
 const getData = async () => {
-  const { pd } = await getFirefightingEquipmentFacilityView({
+  const response = await getFirefightingEquipmentFacilityView({
     FIREFIGHTINGFACILITY_ID,
   });
-  data.value = pd;
+  data.value = response.pd;
+  data.value.Images = addingPrefixToFile(response.firefightingequipmentImg);
 };
 getData();
 const { list } = useListData(getMaintainFindFirefightingId, {

src/views/production_course_regulate/management_agreement/components/add.vue

@@ -90,6 +90,9 @@ const emits = defineEmits(["update:visible", "update:form", "get-data"]);
 const { visible, form } = useVModels(props, emits);
 const rules = {
   file: [{ required: true, message: "请上传附件", trigger: "change" }],
+  EXPIRYDATE: [
+    { required: true, message: "请选择到期时间", trigger: "change" },
+  ],
   MANAGEMENTAGREEMENTNAME: [
     { required: true, message: "请输入名称", trigger: "blur" },
   ],

src/views/production_course_regulate/reported_incident_dispose/index.vue

@@ -65,7 +65,7 @@
         </el-table-column>
         <el-table-column prop="REPORTPERSON" label="上报人" width="150" />
         <el-table-column prop="DISPOSE_STATUS" label="处理状态" width="150" />
-        <el-table-column prop="REPORTED_CONTENT" label="上报内容" width="300" />
+        <el-table-column prop="REPORTED_CONTENT" label="上报内容" width="600" />
         <el-table-column prop="DISPOSE_RESULT" label="处理结果" width="150" />
         <el-table-column prop="REPORTED_TIME" label="上报时间" width="180" />
         <el-table-column prop="DISPOSE_DATE" label="处理时间" width="180" />

src/views/production_course_regulate/violation_registration/add.vue

@@ -6,7 +6,9 @@
       :rules="rules"
       label-width="175px"
     >
-      <el-divider content-position="left">添加</el-divider>
+      <el-divider content-position="left">{{
+        isEditMode ? "编辑" : "添加"
+      }}</el-divider>
       <el-row>
         <el-col :span="5">
           <el-form-item label="从业人员" prop="USER_ID">
@@ -115,6 +117,7 @@ import { useRouter, useRoute } from "vue-router";
 import {
   addViolationRegistrationView,
   editViolationRegistration,
+  infoViolationRegistration,
 } from "@/request/violation_registration.js";
 
 const formRef = ref(null);
@@ -143,9 +146,13 @@ const route = useRoute();
 const isEditMode = ref(false);
 const registrationId = ref("");
 
-onMounted(() => {
+onMounted(async () => {
   isEditMode.value = route.query.mode === "edit";
-  registrationId.value = route.query.registrationId || "";
+  registrationId.value = route.query.REGISTRATION_ID || "";
+  const resData = await infoViolationRegistration({
+    REGISTRATION_ID: registrationId.value,
+  });
+  console.log(resData, "11111111111111");
 });
 
 const router = useRouter();

src/views/production_course_regulate/violation_registration/index.vue

@@ -139,12 +139,12 @@ const data = reactive({
     info: {},
   },
 });
-const fnAddOrEdit = (registrationId) => {
+const fnAddOrEdit = async (REGISTRATION_ID) => {
   router.push({
     path: "/production_course_regulate/violation_registration/add",
     query: {
       mode: "edit",
-      registrationId,
+      REGISTRATION_ID,
     },
   });
 };

src/views/safety_culture/safety_activities/index.vue

@@ -150,11 +150,17 @@ const fnAddOrEdit = async (ACTIVITIES_ID = "", type = "add") => {
   data.addOrEditDialog.visible = true;
   data.addOrEditDialog.type = type;
   if (type === "edit" && ACTIVITIES_ID) {
-    data.addOrEditDialog.form.ACTIVITIES_ID = ACTIVITIES_ID;
+    const resData = await infoActivitiesView({ ACTIVITIES_ID });
+    if (resData && resData.pd) {
+      data.addOrEditDialog.form = {
+        ...resData.pd,
+        OPERATINGCOMPANY: resData.pd.CORP_NAME,
+        EXPIRYDATE: resData.pd.EXPIRYDATE,
+      };
+    }
   } else {
     data.addOrEditDialog.form = {};
   }
-
   await nextTick();
 };
 

src/views/safety_culture/safety_manual/index.vue

@@ -141,15 +141,22 @@ const data = reactive({
     info: {},
   },
 });
+
 const fnAddOrEdit = async (MANUAL_ID = "", type = "add") => {
   data.addOrEditDialog.visible = true;
   data.addOrEditDialog.type = type;
   if (type === "edit" && MANUAL_ID) {
-    data.addOrEditDialog.form.MANUAL_ID = MANUAL_ID;
+    const resData = await infoManualView({ MANUAL_ID });
+    if (resData && resData.pd) {
+      data.addOrEditDialog.form = {
+        ...resData.pd,
+        OPERATINGCOMPANY: resData.pd.CORP_NAME,
+        EXPIRYDATE: resData.pd.EXPIRYDATE,
+      };
+    }
   } else {
     data.addOrEditDialog.form = {};
   }
-
   await nextTick();
 };
 

src/views/safety_production_related/safety_meeting/details.vue

@@ -60,7 +60,7 @@
           </template>
         </el-table-column>
         <el-table-column label="从业人员" prop="NAME" />
-        <el-table-column label="从业类型" prop="PRACTITIONER_TYPE" />
+        <el-table-column label="从业类型" prop="DICTIONARIES_NAME" />
         <el-table-column label="联系电话" prop="USERNAME" />
         <el-table-column label="参会状态" prop="ATTENDANCE_STATUS">
           <template #default="{ row }">

src/views/safety_production_related/security_notice/components/select_person.vue

@@ -55,7 +55,7 @@
       <el-table-column prop="USER_ID" label="用户Id" />
       <el-table-column prop="NAME" label="姓名" />
       <el-table-column prop="DEPARTMENT_NAME" label="部门" />
-      <el-table-column prop="PRACTITIONERTYPE" label="从业类型" />
+      <el-table-column prop="PERSONNEL_TYPE_NAME" label="从业类型" />
     </layout-table>
     <template #footer>
       <el-button @click="fnClose">取消</el-button>