From c57edc5b224dcf1ad21e58d0f3033be8d66a1bbc Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Wed, 3 Apr 2024 17:57:47 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/assigned_manage.js                |  4 +-
 src/request/scrap_manage.js                   |  4 +-
 .../user_practitioner/details.vue             | 12 ++--
 .../mechanical_files/assigned_manage/add.vue  | 16 ++---
 .../assigned_manage/index.vue                 |  3 +-
 .../mechanical_files/assigned_manage/view.vue |  3 +-
 src/views/mechanical_files/beidou/add.vue     |  4 +-
 src/views/mechanical_files/beidou/index.vue   | 22 ++++---
 .../mechanical_files/inspect_annually/add.vue |  5 +-
 .../inspect_annually/edit.vue                 | 12 ++--
 .../inspect_annually/index.vue                | 35 ++++++++---
 src/views/mechanical_files/insure/index.vue   | 26 ++++++--
 .../mechanical_files/maintenance/add.vue      |  4 +-
 .../mechanical_files/maintenance/index.vue    | 12 +---
 src/views/mechanical_files/operations/add.vue |  4 +-
 .../mechanical_files/operations/index.vue     | 61 +++++--------------
 .../mechanical_files/operations/view.vue      |  1 +
 .../production_accident/add.vue               |  4 +-
 .../taxation_manage/index.vue                 | 43 ++++++++-----
 src/views/security_commitment/details.vue     |  6 +-
 20 files changed, 141 insertions(+), 140 deletions(-)

diff --git a/src/request/assigned_manage.js b/src/request/assigned_manage.js
index a54eb81..b98ca3b 100644
--- a/src/request/assigned_manage.js
+++ b/src/request/assigned_manage.js
@@ -70,7 +70,7 @@ export const getVehicleView = (params) =>
   upload("/operatingvehicles/operationvehicleList", params); // 获取所有车船税
 
 export const getAssignedOperationVehicleList = (params) =>
-  post("/assignedmanage/getassignedoperationvehiclelist", params); // 车型选择营运车辆列表
+  post("/assignedmanage/getAssignedVehicleList", params); // 车型选择营运车辆列表
 
 export const getAssignedFreightTrailerList = (params) =>
-  post("/assignedmanage/getassignedfreighttrailerlist", params); // 车型选择货物挂车列表
+  post("/assignedmanage/getAssignedFreightTrailerList", params); // 车型选择货物挂车列表
diff --git a/src/request/scrap_manage.js b/src/request/scrap_manage.js
index 5e0f6e0..4b16304 100644
--- a/src/request/scrap_manage.js
+++ b/src/request/scrap_manage.js
@@ -26,7 +26,7 @@ export const getOperationVehicleList = (params) =>
   upload("/operatingvehicles/operationvehicleList", params); // 获取所有车船税
 
 export const getScrapOperationVehicleList = (params) =>
-  post("/scrapmanage/getscrapoperationvehiclelist", params); // 车型选择营运车辆列表
+  post("/scrapmanage/getScrapOperationVehicleList", params); // 车型选择营运车辆列表
 
 export const getScrapFreightTrailerList = (params) =>
-  post("/scrapmanage/getscrapfreighttrailerlist", params); // 车型选择货物挂车列表
+  post("/scrapmanage/getScrapFreightTrailerList", params); // 车型选择货物挂车列表
diff --git a/src/views/enterprise_management/user_practitioner/details.vue b/src/views/enterprise_management/user_practitioner/details.vue
index c84dd4c..17ec9f4 100644
--- a/src/views/enterprise_management/user_practitioner/details.vue
+++ b/src/views/enterprise_management/user_practitioner/details.vue
@@ -29,8 +29,8 @@
       <el-descriptions-item v-if="data.info.CORPINFO_ID" label="入职时间">
         {{ data.info.ENTRY_DATE }}
       </el-descriptions-item>
-      <el-descriptions-item label="生日">
-        {{ data.info.DATE_OF_BIRTH }}
+      <el-descriptions-item label="身份证号">
+        {{ data.info.USERNAME }}
       </el-descriptions-item>
       <el-descriptions-item label="性别">
         {{ data.info.SEX ? (data.info.SEX === "1" ? "男" : "女") : "" }}
@@ -47,15 +47,12 @@
       <el-descriptions-item label="参加工作时间">
         {{ data.info.WORKING_DATE }}
       </el-descriptions-item>
-      <el-descriptions-item label="部门排序">
+<!--      <el-descriptions-item label="部门排序">
         {{ data.info.SORT }}
-      </el-descriptions-item>
+      </el-descriptions-item>-->
       <el-descriptions-item label="邮箱">
         {{ data.info.EMAIL }}
       </el-descriptions-item>
-      <el-descriptions-item label="备注">
-        {{ data.info.BZ }}
-      </el-descriptions-item>
     </el-descriptions>
     <div v-for="(item, index) in data.certificateList" :key="index">
       <el-divider content-position="left">
@@ -180,6 +177,7 @@ const fnGetData = async () => {
   if (!USER_ID) return;
   const resData = await getPractitionerInfo({ USER_ID });
   data.info = resData.pd;
+  console.log("-=-=--=-=",data.info);
   resData.certificateList.forEach((item) => {
     item.ID_PHOTO_FRONT = FILE_URL + item.ID_PHOTO_FRONT;
     if (item.ID_PHOTO_BACK) {
diff --git a/src/views/mechanical_files/assigned_manage/add.vue b/src/views/mechanical_files/assigned_manage/add.vue
index 1f0a5e6..12c53f4 100644
--- a/src/views/mechanical_files/assigned_manage/add.vue
+++ b/src/views/mechanical_files/assigned_manage/add.vue
@@ -35,9 +35,9 @@
             >
               <el-option
                 v-for="item in form.ALLVEHICLE"
-                :key="item.PLATE_NUMBER"
+                :key="item.ID"
                 :label="item.PLATE_NUMBER"
-                :value="item.PLATE_NUMBER"
+                :value="item.ID"
                 placeholder="请选择过户车辆"
               />
             </el-select>
@@ -413,10 +413,7 @@ const fnEditVehicleModel = async () => {
 const fnGetVehicleInfo = async () => {
   if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") {
     for (let i = 0; i < form.value.OPERATIONVEHICLELIST.length; i++) {
-      if (
-        form.value.OPERATIONVEHICLELIST[i].PLATE_NUMBER ===
-        form.value.VEHICLE_PLATE_NUMBER
-      ) {
+      if (form.value.OPERATIONVEHICLELIST[i].OPERATING_ID === form.value.VEHICLE_PLATE_NUMBER) {
         const OPERATING_ID = form.value.OPERATIONVEHICLELIST[i].OPERATING_ID;
         const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID });
         info.value = resData.pd;
@@ -434,7 +431,7 @@ const fnGetVehicleInfo = async () => {
         form.value.ENGINE_NUMBER = info.value.ENGINE_NUMBER;
         form.value.POWER_TYPE = info.value.FUEL_TYPE;
         form.value.EMISSION_STANDARD = info.value.EMISSION_STANDARD;
-        form.value.RAW_PLATE_NUMBER = info.value.PLATE_NUMBER;
+        form.value.RAW_PLATE_NUMBER = info.value.OPERATING_ID;
         form.value.RAW_OWNERS = info.value.VEHICLEOWNER;
         form.value.RAW_CONTACT_NUMBER = info.value.CONTACT_NUMBER;
         form.value.RAW_OPERATION_CERTIFICATE = info.value.OPERATING_CERTIFICATE;
@@ -446,7 +443,7 @@ const fnGetVehicleInfo = async () => {
   } else if (form.value.ASSIGNED_VEHICLE_MODEL === "货运挂车") {
     for (let i = 0; i < form.value.FREIGHTVEHICLELIST.length; i++) {
       if (
-        form.value.FREIGHTVEHICLELIST[i].PLATE_NUMBER ===
+        form.value.FREIGHTVEHICLELIST[i].FREIGHTTRAILER_ID ===
         form.value.VEHICLE_PLATE_NUMBER
       ) {
         const FREIGHTTRAILER_ID =
@@ -463,12 +460,11 @@ const fnGetVehicleInfo = async () => {
           info.value.DRIVING_LICENSE_IMG;
         form.value.VEHICLE_BRAND = info.value.TRAILER_BRAND;
         form.value.VEHICLE_MODEL = info.value.TRAILER_MODEL;
-        form.value.RAW_PLATE_NUMBER = info.value.PLATE_NUMBER;
+        form.value.RAW_PLATE_NUMBER = info.value.FREIGHTTRAILER_ID;
         form.value.RAW_OWNERS = info.value.CAR_OWNERS;
         form.value.RAW_CONTACT_NUMBER = info.value.CAR_OWNERS_TEL;
         form.value.RAW_OPERATION_CERTIFICATE = info.value.OPER_CERTIFICATE_NUM;
         form.value.FRAMES_NUMBER = info.value.VIN;
-
         form.value.ENGINE_NUMBER = info.value.TRAILER_MODEL;
         form.value.POWER_TYPE = info.value.TRAILER_MODEL;
         form.value.VEHICLE.RAW_DRIVINGLICENSE_IMG = addingPrefixToFile(
diff --git a/src/views/mechanical_files/assigned_manage/index.vue b/src/views/mechanical_files/assigned_manage/index.vue
index 4f9b2a4..17402e1 100644
--- a/src/views/mechanical_files/assigned_manage/index.vue
+++ b/src/views/mechanical_files/assigned_manage/index.vue
@@ -116,7 +116,7 @@
 
         <el-table-column prop="RECORD_NUMBER" label="档案号" />
         <el-table-column prop="ASSIGNED_TYPE" label="过户类型" />
-        <el-table-column prop="RAW_PLATE_NUMBER" label="原车牌号" />
+        <el-table-column prop="PLATE_NUMBER" label="原车牌号" />
         <el-table-column prop="NOW_PLATE_NUMBER" label="现车牌号" />
         <el-table-column
           prop="RAW_OWNERS"
@@ -208,6 +208,7 @@ import { debounce } from "throttle-debounce";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { onMounted, ref } from "vue";
 
+console.log("-=-=-=-=-=", await getAssignedList());
 const router = useRouter();
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
   useListData(getAssignedList, {});
diff --git a/src/views/mechanical_files/assigned_manage/view.vue b/src/views/mechanical_files/assigned_manage/view.vue
index 7c36690..0200314 100644
--- a/src/views/mechanical_files/assigned_manage/view.vue
+++ b/src/views/mechanical_files/assigned_manage/view.vue
@@ -43,7 +43,7 @@
       <el-divider content-position="left">过户信息</el-divider>
       <el-descriptions border>
         <el-descriptions-item label="原车牌号">
-          {{ info.RAW_PLATE_NUMBER }}
+          {{ info.PLATE_NUMBER }}
         </el-descriptions-item>
         <el-descriptions-item label="原车主业主">
           {{ info.RAW_OWNERS }}
@@ -124,6 +124,7 @@ const info = ref({});
 const getData = async () => {
   const resData = await findByIdAssignedManageInfo({ ASSIGNED_ID });
   info.value = resData.pd;
+  console.log("-=-=",info.value);
   info.value.NOW_VEHICLE_OPERATION_CERTIFICATE = addingPrefixToFile(
     resData.nowVehicleOperationCertificateImgs
   );
diff --git a/src/views/mechanical_files/beidou/add.vue b/src/views/mechanical_files/beidou/add.vue
index 05ccfdf..ace6673 100644
--- a/src/views/mechanical_files/beidou/add.vue
+++ b/src/views/mechanical_files/beidou/add.vue
@@ -6,8 +6,8 @@
           <el-divider content-position="left">车辆选择</el-divider>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="北斗车辆" prop="VEHICLE">
-            <el-select v-model="form.VEHICLE" @change="getBusInfo">
+          <el-form-item label="北斗车辆">
+            <el-select v-model="form.PLATE_NUMBER" @change="getBusInfo">
               <el-option
                 v-for="item in data.vehicleList"
                 :key="item.ID"
diff --git a/src/views/mechanical_files/beidou/index.vue b/src/views/mechanical_files/beidou/index.vue
index 3157288..5715638 100644
--- a/src/views/mechanical_files/beidou/index.vue
+++ b/src/views/mechanical_files/beidou/index.vue
@@ -101,22 +101,26 @@
         <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
         <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
           <template #default="{ row }">
-            <el-tag v-if="row.REMINDER_STATUS === '1'">开启</el-tag>
-            <el-tag v-else-if="row.REMINDER_STATUS === '0'">关闭</el-tag>
+            <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
+            >开启</el-tag
+            >
+            <el-tag v-else-if="row.REMINDER_STATUS === '0'" type="info"
+            >关闭</el-tag
+            >
           </template>
         </el-table-column>
         <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
           <template #default="{ row }">
-            <el-tag v-if="row.DUE_DATE_TYPE === 1">未到期</el-tag>
-            <el-tag v-else-if="row.DUE_DATE_TYPE === 0">已到期</el-tag>
-            <el-tag v-else-if="row.DUE_DATE_TYPE === 2">即将到期</el-tag>
+            <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success">未到期</el-tag>
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 0" type="error">已到期</el-tag>
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 2" type="warning">即将到期</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="NEW_ARCHIVES_TYPE" label="车辆状态" width="150">
+        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
           <template #default="{ row }">
-            <el-tag v-if="row.NEW_ARCHIVES_TYPE === '1'">报废</el-tag>
-            <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '0'">正常</el-tag>
-            <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '2'">过户</el-tag>
+            <el-tag v-if="row.ARCHIVES_TYPE === '1'" type="error">报废</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success">正常</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '2'" type="warning">过户</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="CREATTIME" label="创建时间" width="150" />
diff --git a/src/views/mechanical_files/inspect_annually/add.vue b/src/views/mechanical_files/inspect_annually/add.vue
index 387c349..b815ba0 100644
--- a/src/views/mechanical_files/inspect_annually/add.vue
+++ b/src/views/mechanical_files/inspect_annually/add.vue
@@ -18,8 +18,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="年检车辆" prop="VEHICLE">
-            <el-select v-model="form.VEHICLE" @change="getBusInfo">
+          <el-form-item label="年检车辆">
+            <el-select v-model="form.PLATE_NUMBER" @change="getBusInfo">
               <el-option
                 v-for="item in data.vehicleList"
                 :key="item.ID"
@@ -414,6 +414,7 @@ const fnGetData = async () => {
   if (!INSPECTANNUALLY_ID) return;
   const resData = await getInspectAnnuallyView({ INSPECTANNUALLY_ID });
   form.value = resData.pd;
+  console.log("-==-=--=",form.value);
   const listData = await getTrailerList({
     TRAFFIC_TYPE: form.value.VEHICLE_MODEL,
   });
diff --git a/src/views/mechanical_files/inspect_annually/edit.vue b/src/views/mechanical_files/inspect_annually/edit.vue
index dc0d648..0e60588 100644
--- a/src/views/mechanical_files/inspect_annually/edit.vue
+++ b/src/views/mechanical_files/inspect_annually/edit.vue
@@ -3,7 +3,7 @@
     <el-form ref="formRef" :rules="rules" :model="form" label-width="140px">
       <el-row :gutter="20">
         <el-col :span="24">
-          <el-divider content-position="left">车辆选择</el-divider>
+          <el-divider content-position="left">车辆选择111</el-divider>
         </el-col>
         <el-col :span="12">
           <el-form-item label="年检车型" prop="VEHICLE_MODEL">
@@ -18,8 +18,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="年检车辆" prop="VEHICLE">
-            <el-select v-model="form.VEHICLE" @change="getBusInfo">
+          <el-form-item label="年检车辆" prop="PLATE_NUMBER">
+            <el-select v-model="form.PLATE_NUMBER" @change="getBusInfo">
               <el-option
                 v-for="item in data.vehicleList"
                 :key="item.PLATE_NUMBER"
@@ -79,11 +79,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属区域" prop="COMPANY_AREA">
-            <el-input v-model="data.busInfo.COMPANY_AREA" disabled />
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <el-divider content-position="left">年检信息</el-divider>
         </el-col>
@@ -398,6 +393,7 @@ const fnGetData = async () => {
   if (!INSPECTANNUALLY_ID) return;
   const resData = await getInspectAnnuallyView({ INSPECTANNUALLY_ID });
   form.value = resData.pd;
+  console.log("-=-=-=-", form.value);
   const listData = await getTrailerList({
     TRAFFIC_TYPE: form.value.VEHICLE_MODEL,
   });
diff --git a/src/views/mechanical_files/inspect_annually/index.vue b/src/views/mechanical_files/inspect_annually/index.vue
index a4f86ce..a4293b3 100644
--- a/src/views/mechanical_files/inspect_annually/index.vue
+++ b/src/views/mechanical_files/inspect_annually/index.vue
@@ -9,17 +9,23 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="车牌号" prop="PLATE_NUMBER">
-              <el-input v-model="searchForm.PLATE_NUMBER" />
+              <el-input v-model="searchForm.PLATE_NUMBER"
+              placeholder="请输入车牌号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="车主业户" prop="CAR_OWNERS">
-              <el-input v-model="searchForm.CAR_OWNERS" />
+              <el-input v-model="searchForm.CAR_OWNERS"
+              placeholder="请输入车主业户"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="登记人" prop="REGISTRANT">
-              <el-input v-model="searchForm.REGISTRANT" />
+              <el-input v-model="searchForm.REGISTRANT"
+              placeholder="请输入登记人"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -29,6 +35,7 @@
                 value-format="YYYY-MM-DD"
                 format="YYYY-MM-DD"
                 type="date"
+                placeholder="请选择到期日期"
               />
             </el-form-item>
           </el-col>
@@ -70,7 +77,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label-width="10px">
-              <el-button link native-type="submit">搜索</el-button>
+              <el-button type="primary" native-type="submit">搜索</el-button>
               <el-button native-type="reset" @click="fnResetPaginationTransfer">
                 重置
               </el-button>
@@ -129,12 +136,24 @@
         </el-table-column>
         <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="100">
           <template #default="{ row }">
-            <span v-if="row.DUE_DATE_TYPE === 1">未到期</span>
-            <span v-else-if="row.DUE_DATE_TYPE === 0">已到期</span>
-            <span v-else-if="row.DUE_DATE_TYPE === 2">即将到期</span>
+            <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
+            >未到期
+            </el-tag>
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 0" type="error"
+            >已到期
+            </el-tag>
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 2" type="info"
+            >即将到期
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="100">
+          <template #default="{ row }">
+            <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error">报废</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success">正常</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="warning">过户</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="ARCHIVES_TYPE" label="档案状态" width="100" />
         <el-table-column prop="CREATTIME" label="创建时间" width="100" />
         <el-table-column prop="OPERATTIME" label="修改时间" width="100" />
         <el-table-column label="操作" width="100">
diff --git a/src/views/mechanical_files/insure/index.vue b/src/views/mechanical_files/insure/index.vue
index 271df49..526c478 100644
--- a/src/views/mechanical_files/insure/index.vue
+++ b/src/views/mechanical_files/insure/index.vue
@@ -9,17 +9,23 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="车牌号" prop="PLATE_NUMBER">
-              <el-input v-model="searchForm.PLATE_NUMBER" />
+              <el-input v-model="searchForm.PLATE_NUMBER"
+              placeholder="请输入车牌号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="车主业户" prop="CAR_OWNERS">
-              <el-input v-model="searchForm.CAR_OWNERS" />
+              <el-input v-model="searchForm.CAR_OWNERS"
+              placeholder="请输入车主业户"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="登记人" prop="REGISTRANT">
-              <el-input v-model="searchForm.REGISTRANT" />
+              <el-input v-model="searchForm.REGISTRANT"
+              placeholder="请输入登记人"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -29,6 +35,7 @@
                 value-format="YYYY-MM-DD"
                 format="YYYY-MM-DD"
                 type="date"
+                placeholder="请选择到期日期"
               />
             </el-form-item>
           </el-col>
@@ -75,6 +82,7 @@
                 type="year"
                 value-format="YYYY"
                 format="YYYY"
+                placeholder="请选择保险年份"
               />
             </el-form-item>
           </el-col>
@@ -147,9 +155,15 @@
         </el-table-column>
         <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
           <template #default="{ row }">
-            <span v-if="row.DUE_DATE_TYPE === 1">未到期</span>
-            <span v-else-if="row.DUE_DATE_TYPE === 0">已到期</span>
-            <span v-else-if="row.DUE_DATE_TYPE === 2">即将到期</span>
+            <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
+            >未到期</el-tag
+            >
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 0" type="error"
+            >已到期</el-tag
+            >
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 2" type="warning "
+            >即将到期</el-tag
+            >
           </template>
         </el-table-column>
         <el-table-column prop="CREATTIME" label="创建时间" width="150" />
diff --git a/src/views/mechanical_files/maintenance/add.vue b/src/views/mechanical_files/maintenance/add.vue
index 54673b8..da4e526 100644
--- a/src/views/mechanical_files/maintenance/add.vue
+++ b/src/views/mechanical_files/maintenance/add.vue
@@ -6,8 +6,8 @@
           <el-divider content-position="left">车辆选择</el-divider>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="维保车辆" prop="VEHICLE">
-            <el-select v-model="form.VEHICLE" @change="getBusInfo">
+          <el-form-item label="维保车辆">
+            <el-select v-model="form.PLATE_NUMBER" @change="getBusInfo">
               <el-option
                 v-for="item in data.vehicleList"
                 :key="item.ID"
diff --git a/src/views/mechanical_files/maintenance/index.vue b/src/views/mechanical_files/maintenance/index.vue
index 6980159..f0aa673 100644
--- a/src/views/mechanical_files/maintenance/index.vue
+++ b/src/views/mechanical_files/maintenance/index.vue
@@ -131,15 +131,9 @@
         </el-table-column>
         <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
           <template #default="{ row }">
-            <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error"
-            >报废</el-tag
-            >
-            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
-            >正常</el-tag
-            >
-            <el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="info"
-            >过户</el-tag
-            >
+            <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error">报废</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success">正常</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="warning">过户</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="CREATTIME" label="创建时间" width="150" />
diff --git a/src/views/mechanical_files/operations/add.vue b/src/views/mechanical_files/operations/add.vue
index 201b31a..ac47ee3 100644
--- a/src/views/mechanical_files/operations/add.vue
+++ b/src/views/mechanical_files/operations/add.vue
@@ -18,8 +18,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="运营车辆" prop="VEHICLE">
-            <el-select v-model="form.VEHICLE" @change="getBusInfo">
+          <el-form-item label="运营车辆" prop="PLATE_NUMBER">
+            <el-select v-model="form.PLATE_NUMBER" @change="getBusInfo">
               <el-option
                 v-for="item in data.vehicleList"
                 :key="item.ID"
diff --git a/src/views/mechanical_files/operations/index.vue b/src/views/mechanical_files/operations/index.vue
index 1b6b2f9..0c74ef6 100644
--- a/src/views/mechanical_files/operations/index.vue
+++ b/src/views/mechanical_files/operations/index.vue
@@ -9,17 +9,23 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="车牌号" prop="PLATE_NUMBER">
-              <el-input v-model="searchForm.PLATE_NUMBER" />
+              <el-input v-model="searchForm.PLATE_NUMBER"
+              placeholder="请输入车牌号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="车主业户" prop="CAR_OWNERS">
-              <el-input v-model="searchForm.CAR_OWNERS" />
+              <el-input v-model="searchForm.CAR_OWNERS"
+              placeholder="请输入车主业户"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="登记人" prop="REGISTRANT">
-              <el-input v-model="searchForm.REGISTRANT" />
+              <el-input v-model="searchForm.REGISTRANT"
+              placeholder="请输入登记人"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -29,6 +35,7 @@
                 value-format="YYYY-MM-DD"
                 format="YYYY-MM-DD"
                 type="date"
+                placeholder="请选择到期日期"
               />
             </el-form-item>
           </el-col>
@@ -110,14 +117,12 @@
         <el-table-column prop="CAR_OWNERS" label="车主业户" width="150" />
         <el-table-column prop="TELEPHONE" label="联系电话" width="150" />
         <el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" />
-        <el-table-column prop="NAME" label="运营周期" width="150" />
+        <el-table-column prop="CYCLE_NAME" label="运营周期" width="150" />
         <el-table-column prop="DUE_DATE" label="到期日期" width="150" />
         <el-table-column prop="REGISTRANT" label="登记人" width="150" />
         <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
         <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
           <template #default="{ row }">
-            <!--            <span v-if="row.REMINDER_STATUS === '1'">开启</span>-->
-            <!--            <span v-else-if="row.REMINDER_STATUS === '0'">关闭</span>-->
             <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
               >开启
             </el-tag>
@@ -141,13 +146,9 @@
         </el-table-column>
         <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
           <template #default="{ row }">
-            <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error">报废 </el-tag>
-            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
-              >正常
-            </el-tag>
-            <el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="info"
-              >过户
-            </el-tag>
+            <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error">报废</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success">正常</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="warning">过户</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="CREATTIME" label="创建时间" width="150" />
@@ -187,24 +188,6 @@
             >
               删除
             </el-button>
-            <el-button
-              v-if="row.REMINDER_STATUS === '0'"
-              type="primary"
-              text
-              link
-              @click="fnStatusChange(row.OPERATIONS_ID, '1')"
-            >
-              开启
-            </el-button>
-            <el-button
-              v-if="row.REMINDER_STATUS === '1'"
-              type="primary"
-              text
-              link
-              @click="fnStatusChange(row.OPERATIONS_ID, '0')"
-            >
-              关闭
-            </el-button>
           </template>
         </el-table-column>
         <template #button>
@@ -234,7 +217,6 @@ import useListData from "@/assets/js/useListData.js";
 import {
   getOperationsList,
   setOperationsDelete,
-  setOperationsEdit2,
 } from "@/request/mechanical_files.js";
 
 import ExportExcel from "./components/export_excel.vue";
@@ -247,7 +229,6 @@ import {
   REMINDER_STATUS_LIST,
 } from "@/assets/js/constant.js";
 
-console.log("-=-=-==", await getOperationsList());
 const router = useRouter();
 const data = reactive({
   exportExcelDialog: {
@@ -289,19 +270,7 @@ const fnDelete = debounce(
   },
   { atBegin: true }
 );
-const fnStatusChange = debounce(
-  1000,
-  async (OPERATIONS_ID, REMINDER_STATUS) => {
-    const msg = REMINDER_STATUS === "0" ? "关闭" : "开启";
-    await ElMessageBox.confirm("确定要" + msg + "提醒吗？", {
-      type: "warning",
-    });
-    await setOperationsEdit2({ OPERATIONS_ID, REMINDER_STATUS });
-    ElMessage.success(msg + "成功");
-    fnResetPaginationTransfer();
-  },
-  { atBegin: true }
-);
+
 const buttonJurisdiction = await useButtonJurisdiction("hidden");
 const fnExport = () => {
   const selectionData = tableRef.value.getSelectionRows();
diff --git a/src/views/mechanical_files/operations/view.vue b/src/views/mechanical_files/operations/view.vue
index d54166a..d112f20 100644
--- a/src/views/mechanical_files/operations/view.vue
+++ b/src/views/mechanical_files/operations/view.vue
@@ -126,6 +126,7 @@ const fnGetData = async () => {
   if (!OPERATIONS_ID) return;
   const resData = await getOperationsView(OPERATIONS_ID);
   info.value = resData.pd;
+  console.log("-==-=-=--=",info.value);
   info.value.OPERATIONSINFO = [];
   fnBusChange(resData.pd.VEHICLE);
   info.value.OPERATIONSINFO = addingPrefixToFile(resData.operationsinfoImgs);
diff --git a/src/views/mechanical_files/production_accident/add.vue b/src/views/mechanical_files/production_accident/add.vue
index 1296298..6a42d09 100644
--- a/src/views/mechanical_files/production_accident/add.vue
+++ b/src/views/mechanical_files/production_accident/add.vue
@@ -23,7 +23,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="人员性别" prop="SEX">
+          <el-form-item label="人员性别" prop="GENDER">
             <el-select v-model="data.form.GENDER" placeholder="请选择人员性别">
               <el-option label="男" :value="'1'" />
               <el-option label="女" :value="'0'" />
@@ -424,7 +424,7 @@ const ACCIDENTINVESTIGATION_ID = ref("");
 const formRef = ref(null);
 const rules = reactive({
   USER_ID: [{ required: true, message: "请选择事故人员", trigger: "change" }],
-  SEX: [{ required: true, message: "请选择人员性别", trigger: "change" }],
+  GENDER: [{ required: true, message: "请选择人员性别", trigger: "change" }],
   AGE: [{ required: true, message: "请输入人员年龄", trigger: "blur" }],
   EDUCATIONALLEVEL: [
     { required: true, message: "请选择文化水平", trigger: "change" },
diff --git a/src/views/mechanical_files/taxation_manage/index.vue b/src/views/mechanical_files/taxation_manage/index.vue
index f034ce7..11091e4 100644
--- a/src/views/mechanical_files/taxation_manage/index.vue
+++ b/src/views/mechanical_files/taxation_manage/index.vue
@@ -44,13 +44,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="到期状态" prop="EXPIRE_STATUS">
-              <el-select
-                v-model="searchForm.EXPIRE_STATUS"
-                placeholder="请选择到期状态"
-                clearable
-              >
-                <el-option label="未到期" value="1"></el-option>
-                <el-option label="已到期" value="0"></el-option>
+              <el-select v-model="searchForm.EXPIRE_STATUS">
+                <el-option
+                  v-for="item in DUE_STATUS_LIST"
+                  :key="item.ID"
+                  :label="item.NAME"
+                  :value="item.ID"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -109,21 +109,32 @@
         <el-table-column prop="OPERATTIME" label="更改时间" />
         <el-table-column prop="REMINDER_STATUS" label="提醒状态">
           <template #default="{ row }">
-            <el-tag v-if="row.REMINDER_STATUS === '0'">开启</el-tag>
-            <el-tag v-else-if="row.REMINDER_STATUS === '1'">关闭</el-tag>
+            <el-tag v-if="row.REMINDER_STATUS === '0'" type="success"
+            >开启
+            </el-tag>
+            <el-tag v-else-if="row.REMINDER_STATUS === '1'" type="info"
+            >关闭
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="EXPIRE_STATUS" label="到期状态">
           <template #default="{ row }">
-            <el-tag v-if="row.EXPIRE_STATUS === '0'">已到期</el-tag>
-            <el-tag v-else-if="row.EXPIRE_STATUS === '1'">未到期</el-tag>
+            <el-tag v-if="row.EXPIRE_STATUS === '1'" type="success"
+            >未到期
+            </el-tag>
+            <el-tag v-else-if="row.EXPIRE_STATUS === '0'" type="error"
+            >已到期
+            </el-tag>
+            <el-tag v-else-if="row.EXPIRE_STATUS === '2'" type="info"
+            >即将到期
+            </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="NEW_ARCHIVES_TYPE" label="车辆状态" width="150">
+        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
           <template #default="{ row }">
-            <el-tag v-if="row.NEW_ARCHIVES_TYPE === '1'">报废</el-tag>
-            <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '0'">正常</el-tag>
-            <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '2'">过户</el-tag>
+            <el-tag v-if="row.ARCHIVES_TYPE === '1'" type = "error">报废</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type = "success">正常</el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '2'" type = "warning">过户</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="150">
@@ -193,7 +204,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 { REMINDER_STATUS } from "@/assets/js/constant.js";
+import { DUE_STATUS_LIST, REMINDER_STATUS } from "@/assets/js/constant.js";
 const router = useRouter();
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
   useListData(getTaxationManageList, {});
diff --git a/src/views/security_commitment/details.vue b/src/views/security_commitment/details.vue
index 9dcac82..7ec7237 100644
--- a/src/views/security_commitment/details.vue
+++ b/src/views/security_commitment/details.vue
@@ -148,11 +148,7 @@ function fileName(path) {
   return path.split("/").pop();
 }
 
-const fnAddOrEdit = async (
-  SECURITYCOMMITMENT_ID = "",
-  USER_ID = "",
-  type = "add"
-) => {
+const fnAddOrEdit = async (SECURITYCOMMITMENT_ID = "",USER_ID = "",type = "add") => {
   data.addOrEditDialog.visible = true;
   data.addOrEditDialog.type = type;
   if (type === "edit" && SECURITYCOMMITMENT_ID && USER_ID) {