Merge remote-tracking branch 'origin/dev' into dev

src/request/scrap_manage.js

@@ -1,9 +1,9 @@
 import { ref } from "vue";
-import { getLevelsByParentId } from "@/request/data_dictionary.js";
+import { getLevels } from "@/request/data_dictionary.js";
 import { post, upload } from "@/request/axios.js";
 
 export const layoutFnGetScrapType = async () => {
-  const resData = await getLevelsByParentId({
+  const resData = await getLevels({
     DICTIONARIES_ID: "78452f4ec77e4d98ae8cdd9c3386ae0c",
   });
   return ref(resData);

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

@@ -89,7 +89,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="车主/业主" prop="VEHICLEOWNER">
+          <el-form-item label="车主/业户" prop="VEHICLEOWNER">
             <el-input
               v-model="form.VEHICLEOWNER"
               placeholder="请填写车主/业主"
@@ -409,7 +409,7 @@ const rules = {
     { required: true, message: "车辆类型不能为空", trigger: "blur" },
   ],
   VEHICLEOWNER: [
-    { required: true, message: "车主/业主不能为空", trigger: "blur" },
+    { required: true, message: "车主/业户不能为空", trigger: "blur" },
   ],
   VEHICLEOWNER_NUMBER: [
     { required: true, message: "请输入", trigger: "blur" },

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

@@ -82,7 +82,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="车主/业主" prop="VEHICLEOWNER">
+          <el-form-item label="车主/业户" prop="VEHICLEOWNER">
             <el-input
               v-model="form.VEHICLEOWNER"
               placeholder="请填写车主/业主"
@@ -395,7 +395,7 @@ const rules = {
     { required: true, message: "车辆类型不能为空", trigger: "blur" },
   ],
   VEHICLEOWNER: [
-    { required: true, message: "车主/业主不能为空", trigger: "blur" },
+    { required: true, message: "车主/业户不能为空", trigger: "blur" },
   ],
   VEHICLEOWNER_NUMBER: [
     { required: true, message: "请输入", trigger: "blur" },

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

@@ -36,7 +36,7 @@
         <el-descriptions-item label="到期日期">
           {{ info.EXPIRE_DATE }}
         </el-descriptions-item>
-        <el-descriptions-item label="车主/业主">
+        <el-descriptions-item label="车主/业户">
           {{ info.VEHICLEOWNER }}
         </el-descriptions-item>
         <el-descriptions-item label="车主电话">

src/views/mechanical_files/assigned_manage/add.vue

@@ -8,6 +8,8 @@
             <el-input
               v-model="form.RECORD_NUMBER"
               placeholder="请输入登记编号"
+              maxlength="50"
+              show-word-limit
             />
           </el-form-item>
         </el-col>
@@ -56,7 +58,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="原车主/业主" prop="RAW_OWNERS">
+          <el-form-item label="原车主/业户" prop="RAW_OWNERS">
             <el-input
               v-model="form.VEHICLE.RAW_OWNERS"
               placeholder="--"
@@ -157,10 +159,12 @@
       </el-row>
       <el-row>
         <el-col :span="6">
-          <el-form-item label="现车主/业主" prop="NOW_OWNERS">
+          <el-form-item label="现车主/业户" prop="NOW_OWNERS">
             <el-input
               v-model="form.NOW_OWNERS"
-              placeholder="请填写现车主/业主"
+              placeholder="请填写现车主/业户"
+              maxlength="50"
+              show-word-limit
             />
           </el-form-item>
         </el-col>
@@ -169,12 +173,19 @@
             <el-input
               v-model="form.NOW_OWNERS_NUMBER"
               placeholder="请填写现车主电话"
+              maxlength="11"
+              show-word-limit
             />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="登记人" prop="REGISTRANT">
-            <el-input v-model="form.REGISTRANT" placeholder="请填写登记人" />
+            <el-input
+              v-model="form.REGISTRANT"
+              placeholder="请填写登记人"
+              maxlength="50"
+              show-word-limit
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -337,7 +348,7 @@ const rules = {
     },
   ],
   NOW_OWNERS: [
-    { required: true, message: "请输入现车主/业主", trigger: "blur" },
+    { required: true, message: "请输入现车主/业户", trigger: "blur" },
   ],
 };
 const formRef = ref(null);

src/views/mechanical_files/assigned_manage/index.vue

@@ -9,7 +9,10 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="过户类型" prop="ASSIGNED_TYPE">
-              <el-select v-model="searchForm.ASSIGNED_TYPE">
+              <el-select
+                v-model="searchForm.ASSIGNED_TYPE"
+                placeholder="请选择过户类型"
+              >
                 <el-option
                   v-for="item in relatedClassificationList"
                   :key="item.BIANMA"
@@ -21,7 +24,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="过户方式" prop="ASSIGNED_WAY">
-              <el-select v-model="searchForm.ASSIGNED_WAY">
+              <el-select
+                v-model="searchForm.ASSIGNED_WAY"
+                placeholder="请选择过户方式"
+              >
                 <el-option
                   v-for="item in assignedWayList"
                   :key="item.BIANMA"
@@ -33,7 +39,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="过户车型" prop="ASSIGNED_VEHICLE_MODEL">
-              <el-select v-model="searchForm.ASSIGNED_VEHICLE_MODEL">
+              <el-select
+                v-model="searchForm.ASSIGNED_VEHICLE_MODEL"
+                placeholder="请选择过户车型"
+              >
                 <el-option
                   v-for="item in assignedVehicleModel"
                   :key="item.BIANMA"
@@ -63,7 +72,7 @@
             <el-form-item label="现车主" prop="NOW_OWNERS">
               <el-input
                 v-model="searchForm.NOW_OWNERS"
-                placeholder="请填写现车主业主"
+                placeholder="请填写现车主业户"
               />
             </el-form-item>
           </el-col>
@@ -117,15 +126,15 @@
         <el-table-column prop="RECORD_NUMBER" label="档案号" />
         <el-table-column prop="ASSIGNED_TYPE" label="过户类型" width="80" />
         <el-table-column prop="PLATE_NUMBER" label="原车牌号" width="80" />
-        <el-table-column prop="NOW_PLATE_NUMBER" label="现车牌号" width="80" />
+        <el-table-column prop="NOW_PLATE_NUMBER" label="现车牌号" />
         <el-table-column
           prop="RAW_OWNERS"
-          label="原车主业主"
+          label="原车主业户"
           show-overflow-tooltip
         />
         <el-table-column
           prop="NOW_OWNERS"
-          label="现车主业主"
+          label="现车主业户"
           show-overflow-tooltip
         />
         <el-table-column

src/views/mechanical_files/assigned_manage/view.vue

@@ -45,7 +45,7 @@
         <el-descriptions-item label="原车牌号">
           {{ info.PLATE_NUMBER }}
         </el-descriptions-item>
-        <el-descriptions-item label="原车主业主">
+        <el-descriptions-item label="原车主业户">
           {{ info.RAW_OWNERS }}
         </el-descriptions-item>
         <el-descriptions-item label="原联系电话">
@@ -54,7 +54,7 @@
         <el-descriptions-item label="现车牌号">
           {{ info.NOW_PLATE_NUMBER }}
         </el-descriptions-item>
-        <el-descriptions-item label="现车主业主">
+        <el-descriptions-item label="现车主业户">
           {{ info.NOW_OWNERS }}
         </el-descriptions-item>
         <el-descriptions-item label="现联系电话">

src/views/mechanical_files/beidou/index.vue

@@ -9,17 +9,26 @@
         <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,12 +38,16 @@
                 value-format="YYYY-MM-DD"
                 format="YYYY-MM-DD"
                 type="date"
+                placeholder="请选择到期日期"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="到期状态" prop="DUE_DATE_TYPE">
-              <el-select v-model="searchForm.DUE_DATE_TYPE">
+              <el-select
+                v-model="searchForm.DUE_DATE_TYPE"
+                placeholder="请选择到期状态"
+              >
                 <el-option
                   v-for="item in DUE_STATUS_LIST"
                   :key="item.ID"
@@ -46,7 +59,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="提醒状态" prop="REMINDER_STATUS">
-              <el-select v-model="searchForm.REMINDER_STATUS">
+              <el-select
+                v-model="searchForm.REMINDER_STATUS"
+                placeholder="请选择提醒状态"
+              >
                 <el-option
                   v-for="item in REMINDER_STATUS_LIST"
                   :key="item.ID"

src/views/mechanical_files/inspect_annually/index.vue

@@ -44,7 +44,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="运营车型" prop="VEHICLE_MODEL">
-              <el-select v-model="searchForm.VEHICLE_MODEL">
+              <el-select
+                v-model="searchForm.VEHICLE_MODEL"
+                placeholder="请选择运营车辆"
+              >
                 <el-option
                   v-for="item in OPERATING_VEHICLE_TYPE_LIST"
                   :key="item.ID"
@@ -56,7 +59,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="到期状态" prop="DUE_DATE_TYPE">
-              <el-select v-model="searchForm.DUE_DATE_TYPE">
+              <el-select
+                v-model="searchForm.DUE_DATE_TYPE"
+                placeholder="请选择到期状态"
+              >
                 <el-option
                   v-for="item in DUE_STATUS_LIST"
                   :key="item.ID"
@@ -66,9 +72,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item label="提醒状态" prop="REMINDER_STATUS">
-              <el-select v-model="searchForm.REMINDER_STATUS">
+              <el-select
+                v-model="searchForm.REMINDER_STATUS"
+                placeholder="请选择提醒状态"
+              >
                 <el-option
                   v-for="item in REMINDER_STATUS_LIST"
                   :key="item.ID"

src/views/mechanical_files/insure/index.vue

@@ -44,7 +44,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="运营车型" prop="VEHICLE_MODEL">
-              <el-select v-model="searchForm.VEHICLE_MODEL">
+              <el-select
+                v-model="searchForm.VEHICLE_MODEL"
+                placeholder="请选择运营车辆"
+              >
                 <el-option
                   v-for="item in OPERATING_VEHICLE_TYPE_LIST"
                   :key="item.ID"
@@ -56,7 +59,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="到期状态" prop="DUE_DATE_TYPE">
-              <el-select v-model="searchForm.DUE_DATE_TYPE">
+              <el-select
+                v-model="searchForm.DUE_DATE_TYPE"
+                placeholder="请选择到期状态"
+              >
                 <el-option
                   v-for="item in DUE_STATUS_LIST"
                   :key="item.ID"
@@ -68,7 +74,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="提醒状态" prop="REMINDER_STATUS">
-              <el-select v-model="searchForm.REMINDER_STATUS">
+              <el-select
+                v-model="searchForm.REMINDER_STATUS"
+                placeholder="请选择提醒状态"
+              >
                 <el-option
                   v-for="item in REMINDER_STATUS_LIST"
                   :key="item.ID"
@@ -127,8 +136,8 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="PLATE_NUMBER" label="车牌号" width="100" />
+        <el-table-column prop="PLATE_NUMBER" label="车牌号" />
-        <el-table-column prop="CAR_OWNERS" label="车主业户" width="98" />
+        <el-table-column prop="CAR_OWNERS" label="车主业户" />
         <el-table-column prop="TELEPHONE" label="联系电话" width="100" />
         <el-table-column
           prop="PROCESSING_DATE_YEAR"
@@ -140,13 +149,13 @@
           label="保险项目"
           width="160"
         />
-        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="100" />
+        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="90" />
-        <el-table-column prop="EFFECTIVE_DATE" label="生效日期" width="100" />
+        <el-table-column prop="EFFECTIVE_DATE" label="生效日期" width="90" />
-        <el-table-column prop="DUE_DATE" label="到期日期" width="100" />
+        <el-table-column prop="DUE_DATE" label="到期日期" width="90" />
-        <el-table-column prop="REGISTRANT" label="登记人" width="120" />
+        <el-table-column prop="REGISTRANT" label="登记人" />
         <!--<el-table-column prop="NULLL" label="经营类型" width="150"/>-->
         <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
-        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="80">
+        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="75">
           <template #default="{ row }">
             <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
               >开启</el-tag
@@ -156,7 +165,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="80">
+        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="75">
           <template #default="{ row }">
             <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
               >未到期</el-tag
@@ -171,7 +180,7 @@
         </el-table-column>
         <!--        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
         <el-table-column prop="OPERATTIME" label="修改时间" width="150" />-->
-        <el-table-column label="操作" width="200">
+        <el-table-column label="操作" width="190">
           <template #default="{ row }">
             <el-button
               type="primary"

src/views/mechanical_files/maintenance/index.vue

@@ -9,17 +9,26 @@
         <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,12 +38,16 @@
                 value-format="YYYY-MM-DD"
                 format="YYYY-MM-DD"
                 type="date"
+                placeholder="请选择到期日期"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="到期状态" prop="DUE_DATE_TYPE">
-              <el-select v-model="searchForm.DUE_DATE_TYPE">
+              <el-select
+                v-model="searchForm.DUE_DATE_TYPE"
+                placeholder="请选择到期状态"
+              >
                 <el-option
                   v-for="item in DUE_STATUS_LIST"
                   :key="item.ID"
@@ -46,7 +59,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="提醒状态" prop="REMINDER_STATUS">
-              <el-select v-model="searchForm.REMINDER_STATUS">
+              <el-select
+                v-model="searchForm.REMINDER_STATUS"
+                placeholder="请选择提醒状态"
+              >
                 <el-option
                   v-for="item in REMINDER_STATUS_LIST"
                   :key="item.ID"
@@ -244,7 +260,6 @@ const data = reactive({
 const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
   useListData(getMaintenanceList);
 
-console.log(getMaintenanceList());
 const fnGetDataTransfer = () => {
   fnGetData({
     PLATE_NUMBER: searchForm.value.PLATE_NUMBER,

src/views/mechanical_files/production_accident/index.vue

@@ -9,7 +9,10 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="事故人员" prop="USER_ID">
-              <el-select v-model="searchForm.USER_ID">
+              <el-select
+                v-model="searchForm.USER_ID"
+                placeholder="请选择事故人员"
+              >
                 <el-option
                   v-for="item in data.unitsList"
                   :key="item.USER_ID"
@@ -26,7 +29,7 @@
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
-                placeholder="选择日期"
+                placeholder="请选择事故日期"
               />
             </el-form-item>
           </el-col>

src/views/mechanical_files/scrap_manage/add.vue

@@ -8,6 +8,8 @@
             <el-input
               v-model="form.RECORD_NUMBER"
               placeholder="请输入登记编号"
+              maxlength="50"
+              show-word-limit
             />
           </el-form-item>
         </el-col>
@@ -44,7 +46,7 @@
       <el-divider content-position="left">移除前数据</el-divider>
       <el-row>
         <el-col :span="6">
-          <el-form-item label="车主/业主" prop="VEHICLEOWNER">
+          <el-form-item label="车主/业户" prop="VEHICLEOWNER">
             <el-input
               v-model="form.VEHICLE.VEHICLEOWNER"
               placeholder="--"
@@ -152,7 +154,12 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="登记人" prop="REGISTRANT">
-            <el-input v-model="form.REGISTRANT" placeholder="请填写登记人" />
+            <el-input
+              v-model="form.REGISTRANT"
+              placeholder="请填写登记人"
+              maxlength="50"
+              show-word-limit
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -212,14 +219,13 @@ const getAllOperationVehicleList = await getScrapOperationVehicleList();
 const getAllFrailerList = await getScrapFreightTrailerList();
 
 const VEHICLE_MODEL = await layoutFnGetScrapType();
-
 const SCRAP_ID = route.query.SCRAP_ID;
 const rules = {
   SCRAP_VEHICLEMODEL: [
     { required: true, message: "移除车型不能为空", trigger: "change" },
   ],
   SCRAP_VEHICLE: [
-    { required: true, message: "移除车辆并不能为空", trigger: "blur" },
+    { required: true, message: "移除车辆不能为空", trigger: "blur" },
   ],
   SCRAP_DATE: [
     { required: true, message: "移除日期不能为空", trigger: "change" },

src/views/mechanical_files/scrap_manage/index.vue

@@ -31,10 +31,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="车主业主" prop="VEHICLEOWNER">
+            <el-form-item label="车主业户" prop="VEHICLEOWNER">
               <el-input
                 v-model="searchForm.VEHICLEOWNER"
-                placeholder="请填写车主业主"
+                placeholder="请填写车主业户"
               />
             </el-form-item>
           </el-col>
@@ -75,8 +75,12 @@
         </el-table-column>
         <el-table-column prop="RECORD_NUMBER" label="档案号" />
         <el-table-column prop="PLATE_NUMBER" label="车牌号" />
-        <el-table-column prop="SCRAP_VEHICLEMODEL" label="移除车型" width="80" />
+        <el-table-column
-        <el-table-column prop="VEHICLEOWNER" label="车主业主" />
+          prop="SCRAP_VEHICLEMODEL"
+          label="移除车型"
+          width="80"
+        />
+        <el-table-column prop="VEHICLEOWNER" label="车主业户" />
         <el-table-column
           prop="CONTACT_NUMBER"
           label="联系电话"

src/views/mechanical_files/scrap_manage/view.vue

@@ -9,15 +9,12 @@
         <el-descriptions-item label="车架号">
           {{ data.FRAMES_NUMBER }}
         </el-descriptions-item>
-        <el-descriptions-item label="车主业主">
+        <el-descriptions-item label="车主业户">
           {{ data.VEHICLEOWNER }}
         </el-descriptions-item>
         <el-descriptions-item label="车主电话">
           {{ data.VEHICLEOWNER_NUMBER }}
         </el-descriptions-item>
-        <!--      <el-descriptions-item label="发动机号">
-        {{ data.ENGINE_NUMBER }}
-      </el-descriptions-item>-->
         <el-descriptions-item label="初登日期">
           {{ data.FIRSTSHOW_DATE }}
         </el-descriptions-item>
@@ -27,12 +24,6 @@
         <el-descriptions-item label="车辆型号">
           {{ data.VEHICLE_MODEL }}
         </el-descriptions-item>
-        <!--      <el-descriptions-item label="动力类型">
-        {{ data.POWER_TYPE }}
-      </el-descriptions-item>
-      <el-descriptions-item label="排放标准">
-        {{ data.EMISSION_STANDARD }}
-      </el-descriptions-item>-->
       </el-descriptions>
       <el-divider content-position="left">报废数据</el-divider>
       <el-descriptions border>

src/views/mechanical_files/taxation_manage/add.vue

@@ -23,6 +23,8 @@
             <el-input
               v-model="form.RECORD_NUMBER"
               placeholder="请输入登记编号"
+              maxlength="50"
+              show-word-limit
             />
           </el-form-item>
         </el-col>
@@ -98,10 +100,12 @@
       <el-divider content-position="left">挂车税务信息</el-divider>
       <el-row>
         <el-col :span="6">
-          <el-form-item label="车主业主" prop="VEHICLEOWNER">
+          <el-form-item label="车主业户" prop="VEHICLEOWNER">
             <el-input
               v-model="form.VEHICLEOWNER"
-              placeholder="请填写车主业主"
+              placeholder="请填写车主业户"
+              maxlength="50"
+              show-word-limit
             />
           </el-form-item>
         </el-col>
@@ -110,12 +114,19 @@
             <el-input
               v-model="form.CONTACT_NUMBER"
               placeholder="请填写联系电话"
+              maxlength="11"
+              show-word-limit
             />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="登记人" prop="REGISTRANT">
-            <el-input v-model="form.REGISTRANT" placeholder="请填写登记人" />
+            <el-input
+              v-model="form.REGISTRANT"
+              placeholder="请填写登记人"
+              maxlength="50"
+              show-word-limit
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -250,7 +261,7 @@ const rules = {
     { required: true, message: "挂车车辆不能为空", trigger: "blur" },
   ],
   VEHICLEOWNER: [
-    { required: true, message: "车主/业主不能为空", trigger: "blur" },
+    { required: true, message: "车主/业户不能为空", trigger: "blur" },
   ],
   CONTACT_NUMBER: [
     { required: true, message: "请输入", trigger: "blur" },

src/views/mechanical_files/taxation_manage/edit.vue

@@ -41,7 +41,7 @@
       </el-row>
       <el-row>
         <el-col :span="6">
-          <el-form-item label="车主业主" prop="CAR_OWNERS">
+          <el-form-item label="车主业户" prop="CAR_OWNERS">
             <el-input v-model="form.CAR_OWNERS" placeholder="--" disabled />
           </el-form-item>
         </el-col>
@@ -93,10 +93,10 @@
       <el-divider content-position="left">挂车税务信息</el-divider>
       <el-row>
         <el-col :span="6">
-          <el-form-item label="车主业主" prop="VEHICLEOWNER">
+          <el-form-item label="车主业户" prop="VEHICLEOWNER">
             <el-input
               v-model="form.VEHICLEOWNER"
-              placeholder="请填写车主业主"
+              placeholder="请填写车主业户"
             />
           </el-form-item>
         </el-col>
@@ -248,7 +248,7 @@ const rules = {
     { required: true, message: "挂车车辆不能为空", trigger: "change" },
   ],
   VEHICLEOWNER: [
-    { required: true, message: "车主/业主不能为空", trigger: "blur" },
+    { required: true, message: "车主/业户不能为空", trigger: "blur" },
   ],
   CONTACT_NUMBER: [
     { required: true, message: "联系电话不能为空", trigger: "blur" },

src/views/mechanical_files/taxation_manage/index.vue

@@ -16,10 +16,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="车主业主" prop="VEHICLEOWNER">
+            <el-form-item label="车主业户" prop="VEHICLEOWNER">
               <el-input
                 v-model="searchForm.VEHICLEOWNER"
-                placeholder="请填写车主业主"
+                placeholder="请填写车主业户"
               />
             </el-form-item>
           </el-col>
@@ -44,7 +44,10 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="到期状态" prop="EXPIRE_STATUS">
-              <el-select v-model="searchForm.EXPIRE_STATUS">
+              <el-select
+                v-model="searchForm.EXPIRE_STATUS"
+                placeholder="请选择到期状态"
+              >
                 <el-option
                   v-for="item in DUE_STATUS_LIST"
                   :key="item.ID"
@@ -99,7 +102,7 @@
         </el-table-column>
         <el-table-column prop="RECORD_NUMBER" label="档案号" />
         <el-table-column prop="PLATE_NUMBER" label="车牌号" />
-        <el-table-column prop="VEHICLEOWNER" label="车主业主" />
+        <el-table-column prop="VEHICLEOWNER" label="车主业户" />
         <el-table-column prop="CONTACT_NUMBER" label="联系电话" />
         <el-table-column prop="TRANSACTION_DATA" label="办理日期" width="100" />
         <el-table-column prop="TAXESDUES_PERIOD" label="税费周期" width="80" />

src/views/mechanical_files/taxation_manage/view.vue

@@ -15,7 +15,7 @@
         <el-descriptions-item label="车辆类型">
           {{ data.VEHICLE_TYPE }}
         </el-descriptions-item>
-        <el-descriptions-item label="车主业主">
+        <el-descriptions-item label="车主业户">
           {{ data.VEHICLEOWNER }}
         </el-descriptions-item>
         <el-descriptions-item label="联系电话">

src/views/production_course_regulate/management_agreement/index.vue

@@ -52,11 +52,7 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="MANAGEMENTAGREEMENTNAME" label="名称" />
-          prop="MANAGEMENTAGREEMENTNAME"
-          label="名称"
-
-        />
         <el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="80">
           <template #default="{ row }">
             <el-tag v-if="row.COMPLETIONSTATUS === '1'">已上传</el-tag>