BUG 优化

src/request/operation_vehicle.js

@@ -100,6 +100,9 @@ export const editOperatingVehicleInfo = (params) =>
 export const getOperationVehicleInfo = (params) =>
   post("/operatingvehicles/findById", params); // 根据Id获取运营车辆信息
 
+export const setOperationsScrapStatus = (params) =>
+  post("/operatingvehicles/setOperationsScrapStatus", params); // 根据Id获取运营车辆信息
+
 export const findByPlateNumber = (params) =>
   post("/operatingvehicles/findByPlateNumber", params); // 根据Id获取运营车辆信息
 

src/views/mechanical_files/assigned_manage/add.vue

@@ -277,7 +277,7 @@ import {
   getFreightTrailerView,
 } from "@/request/enterprise_management.js";
 import {
-  findByIdOperatingVehicleInfo,
+  findByIdOperatingVehicleInfo
 } from "@/request/operation_vehicle.js";
 import LayoutUpload from "@/components/upload/index.vue";
 import { debounce } from "throttle-debounce";
@@ -308,7 +308,6 @@ const freightVehicleList = await getAssignedFreightTrailerList();
 const assignedWayList = await layoutFnGetAssignedWay();
 const operationList = await getAssignedOperationVehicleList();
 
-
 const rules = {
   ASSIGNED_VEHICLE_MODEL: [
     { required: true, message: "过户车型不能为空", trigger: "change" },
@@ -344,9 +343,6 @@ const rules = {
   NOW_OWNERS: [
     { required: true, message: "请输入现车主/业主", trigger: "blur" },
   ],
-  NOW_PLATE_NUMBER: [
-    { required: true, message: "请输入现车牌号", trigger: "blur" },
-  ]
 };
 const formRef = ref(null);
 const form = ref({

src/views/mechanical_files/inspect_annually/add.vue

@@ -351,7 +351,6 @@ const getDueDate = () => {
 };
 const getRemiderDate = (val) => {
   if (val) {
-    console.log("REMINDER_DAYS",form.value.REMINDER_DAYS);
     if (form.value.DUE_DATE) {
       form.value.REMINDER_DATE = subtractDaysFromDate(form.value.DUE_DATE, val);
     }

src/views/mechanical_files/inspect_annually/edit.vue

@@ -22,7 +22,7 @@
             <el-select v-model="form.VEHICLE" @change="getBusInfo">
               <el-option
                 v-for="item in data.vehicleList"
-                :key="item.ID"
+                :key="item.PLATE_NUMBER"
                 :label="item.PLATE_NUMBER"
                 :value="item.ID"
               />

src/views/mechanical_files/inspect_annually/view.vue

@@ -16,10 +16,10 @@
           {{ data.busInfo.TRAILER_TYPE }}
         </el-descriptions-item>
         <el-descriptions-item label-class-name="width_200" label="车辆型号">
-          {{ data.busInfo.VEHICLE_MODEL }}
+          {{ info.VEHICLE_TYPE }}
         </el-descriptions-item>
         <el-descriptions-item label-class-name="width_200" label="车辆品牌">
-          {{ data.busInfo.VEHICLE_BRAND }}
+          {{ info.VEHICLE_BRAND }}
         </el-descriptions-item>
         <el-descriptions-item label-class-name="width_200" label="车主业户">
           {{ data.busInfo.CAR_OWNERS }}
@@ -36,6 +36,12 @@
       </el-descriptions>
       <el-divider content-position="left">年检信息</el-divider>
       <el-descriptions :column="2" border>
+        <el-descriptions-item label-class-name="width_200" label="车主业主">
+          {{ info.CAR_OWNERS }}
+        </el-descriptions-item>
+        <el-descriptions-item label-class-name="width_200" label="联系电话">
+          {{ info.TELEPHONE }}
+        </el-descriptions-item>
         <el-descriptions-item label-class-name="width_200" label="办理日期">
           {{ info.PROCESSING_DATE }}
         </el-descriptions-item>
@@ -45,15 +51,28 @@
         <el-descriptions-item label-class-name="width_200" label="年检费用">
           {{ info.INSPECTFEES }}
         </el-descriptions-item>
+        <el-descriptions-item label-class-name="width_200" label="实收费用">
+          {{ info.ACTUAL_COLLECTION }}
+        </el-descriptions-item>
         <el-descriptions-item label-class-name="width_200" label="到期日期">
           {{ info.DUE_DATE }}
         </el-descriptions-item>
+        <el-descriptions-item label-class-name="width_200" label="提醒天数">
+          {{ info.REMINDER_DAYS }}
+        </el-descriptions-item>
+        <el-descriptions-item label-class-name="width_200" label="提醒日期">
+          {{ info.REMINDER_DATE }}
+        </el-descriptions-item>
         <el-descriptions-item label-class-name="width_200" label="年检地址">
           {{ info.ADDRESS }}
         </el-descriptions-item>
         <el-descriptions-item label-class-name="width_200" label="登记人">
           {{ info.REGISTRANT }}
         </el-descriptions-item>
+        <el-descriptions-item label-class-name="width_200" label="提醒状态">
+          <span v-if="info.REMINDER_STATUS === '1'">开启</span>
+          <span v-else-if="info.REMINDER_STATUS === '0'">关闭</span>
+        </el-descriptions-item>
         <el-descriptions-item
           label-class-name="width_200"
           label="年检资料"

src/views/mechanical_files/insure/add.vue

@@ -358,7 +358,8 @@ const rules = {
   REMINDER_DATE: [{ required: true, message: "请输入", trigger: "blur" }],
 };
 const getVehicle = async (event) => {
-  const resData = await getTrailerList({ TRAFFIC_TYPE: event });
+  const model = "insure"
+  const resData = await getTrailerList({ TRAFFIC_TYPE: event, model });
   data.vehicleList = resData.list;
   form.value.VEHICLE = "";
   data.busInfo.DRIVING_LICENSE_IMG = [];

src/views/mechanical_files/production_accident/add.vue

@@ -411,6 +411,7 @@ import { useRouter, useRoute } from "vue-router";
 import {
   addAccidentInvestigationView,
   editAccidentInvestigation,
+  infoAccidentInvestigation
 } from "@/request/production_accident.js";
 
 // 获取路由实例
@@ -513,7 +514,6 @@ const rules = reactive({
 onMounted(() => {
   isEditMode.value = route.query.mode === "edit";
   ACCIDENTINVESTIGATION_ID.value = route.query.ACCIDENTINVESTIGATION_ID || "";
-
   if (isEditMode.value) {
     Object.keys(rules).forEach((key) => {
       rules[key] = []; // 清空每项校验规则
@@ -521,6 +521,15 @@ onMounted(() => {
   }
 });
 
+const fnGetData = async () => {
+  const ACCIDENTINVESTIGATION_ID = route.query.ACCIDENTINVESTIGATION_ID
+  if (!ACCIDENTINVESTIGATION_ID) return;
+  const resData = await infoAccidentInvestigation({ ACCIDENTINVESTIGATION_ID });
+  data.form = resData.pd;
+
+};
+fnGetData();
+
 const router = useRouter();
 const fnGetUnitsList = async () => {
   const resData = await getUserListAll({});

src/views/mechanical_files/scrap_manage/add.vue

@@ -297,6 +297,7 @@ const fnGetVehicleInfo = async () => {
         form.value.SCRAP_VEHICLE
       ) {
         const OPERATING_ID = form.value.OPERATIONVEHICLELIST[i].OPERATING_ID;
+        await setOperationsScrapStatus({OPERATING_ID})
         const resData = await getOperationVehicleInfo({ OPERATING_ID });
         info.value = resData.pd;
         form.value.VEHICLE.VEHICLEOWNER = info.value.VEHICLEOWNER;

src/views/mechanical_files/taxation_manage/add.vue

@@ -335,6 +335,9 @@ const fnGetExpireDate = async () => {
     let day = date.getDate();
     day = day < 10 ? "0" + day : day;
     form.value.EXPIRE_DATE = year + "-" + month + "-" + day;
+    if(form.value.TRANSACTION_DATA === null) {
+      form.value.EXPIRE_DATE = null
+    }
   }
   fnGetReminderData()
 };
@@ -349,6 +352,9 @@ const fnGetReminderData = async () => {
     let day = date.getDate();
     day = day < 10 ? "0" + day : day;
     form.value.REMINDER_DATA = year + "-" + month + "-" + day;
+    if(form.value.TRANSACTION_DATA === null) {
+      form.value.REMINDER_DATA = null
+    }
   }
 };
 const fnGetTrailerInfo = async () => {