src/assets/js/constant.js

@@ -110,13 +110,13 @@ export const DISPOSE_STATUS_LIST = [
 ];
 
 export const TAXES_PERIOD = [
-  // 税费周期
+  // 处理状态
   { ID: "1", NAME: "12个月", NUM: "12" },
   { ID: "0", NAME: "6个月", NUM: "6" },
 ];
 
 export const EXPIRE_STATUS = [
-  // 到期状态
+  // 处理状态
   { ID: "1", NAME: "未到期" },
   { ID: "0", NAME: "已到期" },
 ];
@@ -126,21 +126,3 @@ export const MAINTENANCE_LEVEL_LIST = [
   { ID: "1", NAME: "一级维保" },
   { ID: "2", NAME: "二级维保" },
 ];
-export const NETWORK_STATE = [
-  // 入网状态
-  { ID: "0", NAME: "已入网" },
-  { ID: "1", NAME: "未入网" },
-  { ID: "2", NAME: "超时入网" },
-];
-
-export const REMINDER_STATUS = [
-  // 提醒状态
-  { ID: "0", NAME: "开启" },
-  { ID: "1", NAME: "关闭" },
-];
-
-// export const MAINTENANCE_LEVEL_LIST = [
-//     //维保等级
-//     {ID:'1',NAME:'一级维保'},
-//     {ID:'2',NAME:'二级维保'},
-// ]

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

@@ -387,17 +387,6 @@ const rules = {
   ],
   FRAMES_NUMBER: [
     { required: true, message: "车架号不能为空", trigger: "change" },
-    { min: 17, message: "车架号不能少于17位", trigger: "blur" },
-    {
-      validator: (rule, value, callback) => {
-        if (!/^[A-HJ-NPR-Z\d]{8}[X\d][A-HJ-NPR-Z\d]{3}\d{5}$/.test(value)) {
-          callback(new Error("车架号格式不正确"));
-        } else {
-          callback();
-        }
-      },
-      trigger: "blur",
-    },
   ],
   OPERATING_CERTIFICATE: [
     { required: true, message: "营运证号不能为空", trigger: "blur" },
@@ -445,19 +434,6 @@ const rules = {
   OPERATING_CERTIFICATE_PHOTO: [
     { required: true, message: "营运证照片不能为空", trigger: "blur" },
   ],
-  ENGINE_NUMBER: [
-    { required: true, message: "请输入发动机号", trigger: "blur" },
-    { min: 7, max: 8, message: "请输入7-8位发动机号", trigger: "blur" },
-    {
-      pattern:
-        /^[A-Z0-9a-z\d]{7,8}$/,
-      message: "请输入正确的发动机号",
-    },
-  ],
-  VOUCH_NUMBERLOAD: [
-    { required: true, message: "请输入核定载人数", trigger: "blur" },
-    { pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
-  ]
 };
 const formRef = ref(null);
 const form = ref({

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

@@ -69,7 +69,17 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="归属部门" prop="BELONGING_DEPARTMENT">
-            <layout-department v-model="form.BELONGING_DEPARTMENT" />
+            <el-select
+              v-model="form.BELONGING_DEPARTMENT"
+              placeholder="请选择归属部门"
+            >
+              <el-option
+                v-for="item in getBelongingDepartment"
+                :key="item.BIANMA"
+                :label="item.NAME"
+                :value="item.NAME"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -185,7 +195,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-divider content-position="left">详细信息</el-divider>
+        <el-divider content-position="left">检查内容</el-divider>
         <el-col :span="6">
           <el-form-item label="车辆品牌" prop="VEHICLE_BRAND">
             <el-input
@@ -320,6 +330,7 @@ import { ref } from "vue";
 import {
   layoutFnGetVehicleColor,
   layoutFnGetTransportCategory,
+  layoutFnGetBelongingDepartment,
   layoutFnGetFuelType,
   layoutFnGetEmissionStandard,
   layoutFnGetVehicleType,
@@ -338,22 +349,17 @@ import { debounce } from "throttle-debounce";
 import { useRoute, useRouter } from "vue-router";
 import { addingPrefixToFile } from "@/assets/js/utils.js";
 import { setUploadImg } from "@/request/api.js";
-import LayoutDepartment from "@/components/department/index.vue";
 
 const route = useRoute();
 const router = useRouter();
 const { OPERATING_ID } = route.query;
-let plateNumber = ''
 const isPlateNumberRepetition = async (rule, vehicleNumber, callback) => {
   if (vehicleNumber) {
+    console.log("车牌号0-=0",vehicleNumber);
     const vehicleCount = await findByPlateNumber({ vehicleNumber });
-    if(vehicleCount.pd) {
+    if (vehicleCount.pd) {
-      if(vehicleCount.pd.PLATE_NUMBER === plateNumber){
+      callback(new Error("车辆已存在"));
-        callback();
+    } else callback();
-      }else{
-        callback(new Error("车辆已存在"))
-      }
-    }else callback();
   }
 };
 const isVehicleNumber = (rule, vehicleNumber, callback) => {
@@ -479,6 +485,7 @@ const form = ref({
 });
 const getVehicleColorList = await layoutFnGetVehicleColor();
 const getTransportCategoryList = await layoutFnGetTransportCategory();
+const getBelongingDepartment = await layoutFnGetBelongingDepartment();
 const getFuelTypeList = await layoutFnGetFuelType();
 const getEmissionStandardList = await layoutFnGetEmissionStandard();
 const getVehicleTypeList = await layoutFnGetVehicleType();
@@ -495,7 +502,6 @@ const fnGetData = async () => {
   form.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile(
     resData.operatingcertificatephoto
   );
-  plateNumber = form.value.PLATE_NUMBER
 };
 fnGetData();
 const fnSubmit = debounce(

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

@@ -17,7 +17,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="车辆颜色" prop="VEHICLE_COLOR">
-              <el-select v-model="searchForm.VEHICLE_COLOR" clearable>
+              <el-select v-model="searchForm.VEHICLE_COLOR">
                 <el-option
                   v-for="item in troubleshootingCycleList"
                   :key="item.BIANMA"
@@ -47,19 +47,20 @@
 
           <el-col :span="6">
             <el-form-item label="入网状态" prop="NETWORK_STATUS">
-              <el-select v-model="searchForm.NETWORK_STATUS" clearable>
+              <el-select v-model="searchForm.NETWORK_STATUS">
                 <el-option
-                  v-for="item in NETWORK_STATE"
+                  v-for="item in networkStatusLevelList"
-                  :key="item.ID"
+                  :key="item.BIANMA"
                   :label="item.NAME"
                   :value="item.NAME"
                 />
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="6">
+
+          <el-col :span="6">
             <el-form-item label="主动安全" prop="ACTIVE_SAFETY">
-              <el-select v-model="searchForm.ACTIVE_SAFETY" clearable>
+              <el-select v-model="searchForm.ACTIVE_SAFETY">
                 <el-option
                   v-for="item in activeSafety"
                   :key="item.BIANMA"
@@ -68,16 +69,18 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>-->
+          </el-col>
           <el-col :span="10">
             <el-form-item label-width="10px">
               <el-button type="primary" native-type="submit">搜索</el-button>
-              <el-button native-type="reset" @click="fnResetPaginationTransfer">重置</el-button>
+              <el-button native-type="reset" @click="fnResetPaginationTransfer">
+                重置
+              </el-button>
             </el-form-item>
           </el-col>
           <el-col :span="30">
             <el-form-item label-width="10px" class="end">
-              <el-button @click="fnExport">导出</el-button>
+              <el-button>导出</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -85,9 +88,7 @@
     </el-card>
     <layout-card>
       <layout-table
-        ref="tableRef"
         v-model:pagination="pagination"
-        row-key="OPERATING_ID"
         :data="list"
         @get-data="fnGetDataTransfer"
       >
@@ -127,7 +128,19 @@
             >
               查看
             </el-button>
-
+            <el-button
+              type="primary"
+              text
+              link
+              @click="
+                router.push({
+                  path: '/enterprise_management/basics_info_management/operation_vehicle/view',
+                  query: { OPERATING_ID: row.OPERATING_ID },
+                })
+              "
+            >
+              画像
+            </el-button>
             <el-button
               type="primary"
               text
@@ -175,6 +188,8 @@ import { serialNumber } from "@/assets/js/utils.js";
 import useListData from "@/assets/js/useListData.js";
 import {
   layoutFnGetVehicleColor,
+  layoutFnGetNetworkStatus,
+  layoutFnGetActiveSafety,
 } from "@/assets/js/operation_vehicle.js";
 import {
   getOperationVehicleList,
@@ -184,12 +199,13 @@ import { useRouter } from "vue-router";
 import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
 import { debounce } from "throttle-debounce";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { NETWORK_STATE } from "@/assets/js/constant.js";
 
 const router = useRouter();
-const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef} =
+const { list, pagination, searchForm, fnGetData, fnResetPagination } =
   useListData(getOperationVehicleList, {});
 const troubleshootingCycleList = await layoutFnGetVehicleColor();
+const networkStatusLevelList = await layoutFnGetNetworkStatus();
+const activeSafety = await layoutFnGetActiveSafety();
 const fnGetDataTransfer = () => {
   fnGetData({
     DEPTIDS: searchForm.value.DEPTIDS?.join(","),
@@ -212,19 +228,6 @@ const fnDelete = debounce(
   { atBegin: true }
 );
 
-const fnExport = async () => {
-  const selectionData = tableRef.value.getSelectionRows();
-  await ElMessageBox.confirm("确定要导出到excel吗？", { type: "warning" });
-  const DATA_IDS = selectionData.map((item) => item.OPERATING_ID).join(",");
-  window.location.href =
-    import.meta.env[import.meta.env.DEV ? "VITE_PROXY" : "VITE_BASE_URL"] +
-    "/operationunit/excel?" +
-    "&KEYWORDS=" +
-    (searchForm.value.KEYWORDS || "") +
-    "&DATA_IDS=" +
-    DATA_IDS;
-};
-
 const buttonJurisdiction = await useButtonJurisdiction("operation");
 </script>
 <style scoped></style>

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

@@ -1,11 +1,8 @@
 <template>
   <layout-card>
     <div id="printContainer">
-    <el-divider content-position="left">基本信息</el-divider>
+    <el-divider content-position="left">车辆档案</el-divider>
     <el-descriptions border>
-      <el-descriptions-item label="编号">
-        {{ info.GOODSSELFNUMBER }}
-      </el-descriptions-item>
       <el-descriptions-item label="车牌号">
         {{ info.PLATE_NUMBER }}
       </el-descriptions-item>
@@ -21,11 +18,8 @@
       <el-descriptions-item label="营运证号">
         {{ info.OPERATING_CERTIFICATE }}
       </el-descriptions-item>
-      <el-descriptions-item label="归属部门">
+      <el-descriptions-item label="运输类别">
-        {{ info.BELONGING_DEPARTMENT }}
+        {{ info.TRANSPORT_TYPE }}
-      </el-descriptions-item>
-      <el-descriptions-item label="车辆类型">
-        {{ info.VEHICLE_TYPE }}
       </el-descriptions-item>
       <el-descriptions-item label="初登日期">
         {{ info.FIRSTSHOW_DATE }}
@@ -42,6 +36,9 @@
       <el-descriptions-item label="车主电话">
         {{ info.VEHICLEOWNER_NUMBER }}
       </el-descriptions-item>
+      <el-descriptions-item label="归属地区">
+        {{ info.HOME_TERRITORY }}
+      </el-descriptions-item>
       <el-descriptions-item label="车主住址">
         {{ info.VEHICLEOWNER_ADDRESS }}
       </el-descriptions-item>
@@ -57,12 +54,6 @@
       <el-descriptions-item label="实际住址">
         {{ info.PHYSICAL_ADDRESS }}
       </el-descriptions-item>
-      <el-descriptions-item label="车载设备">
-        {{ info.VEHICLE_EQUIPMENT }}
-      </el-descriptions-item>
-      <el-descriptions-item label="运输类别">
-        {{ info.TRANSPORT_TYPE }}
-      </el-descriptions-item>
     </el-descriptions>
     <el-divider content-position="left">详细信息</el-divider>
     <el-descriptions border>
@@ -87,8 +78,8 @@
       <el-descriptions-item label="准牵引质量">
         {{ info.RACTIONMASS_QUALITY }}
       </el-descriptions-item>
-      <el-descriptions-item label="核定载人数">
+      <el-descriptions-item label="运输类别">
-        {{ info.VOUCH_NUMBERLOAD }}
+        {{ info.TRANSPORT_TYPE }}
       </el-descriptions-item>
     </el-descriptions>
     <el-descriptions :column="1" border>
@@ -158,7 +149,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/assigned_manage/add.vue

@@ -308,7 +308,7 @@ const freightVehicleList = await getAssignedFreightTrailerList();
 const assignedWayList = await layoutFnGetAssignedWay();
 const operationList = await getAssignedOperationVehicleList();
 
-
+console.log("筛选后的挂车车辆",freightVehicleList);
 const rules = {
   ASSIGNED_VEHICLE_MODEL: [
     { required: true, message: "过户车型不能为空", trigger: "change" },
@@ -341,12 +341,6 @@ const rules = {
       message: "请输入正确的手机号码",
     },
   ],
-  NOW_OWNERS: [
-    { required: true, message: "请输入现车主/业主", trigger: "blur" },
-  ],
-  NOW_PLATE_NUMBER: [
-    { required: true, message: "请输入现车牌号", trigger: "blur" },
-  ]
 };
 const formRef = ref(null);
 const form = ref({
@@ -460,6 +454,7 @@ const fnGetVehicleInfo = async () => {
         const FREIGHTTRAILER_ID =
           form.value.FREIGHTVEHICLELIST[i].FREIGHTTRAILER_ID;
         const resData = await getFreightTrailerView({ FREIGHTTRAILER_ID });
+        console.log("选中的货运挂车信息", resData);
         info.value = resData.pd;
         form.value.VEHICLE.PLATE_NUMBER = info.value.PLATE_NUMBER;
         form.value.VEHICLE.RAW_OWNERS = info.value.CAR_OWNERS;

src/views/mechanical_files/beidou/index.vue

@@ -112,6 +112,9 @@
             <el-tag v-else-if="row.DUE_DATE_TYPE === 2">即将到期</el-tag>
           </template>
         </el-table-column>
+        <el-table-column prop="ARCHIVES_TYPE" label="档案状态" width="150" />
+        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
+        <el-table-column prop="OPERATTIME" label="修改时间" width="150" />
         <el-table-column label="操作" width="250">
           <template #default="{ row }">
             <el-button

src/views/mechanical_files/taxation_manage/add.vue

@@ -70,7 +70,7 @@
         <el-col :span="6">
           <el-form-item label="所属省份" prop="PROVINCE">
             <el-input
-              v-model="form.PROVINCE"
+              v-model="form.Trailer.PROVINCE"
               placeholder="--"
               disabled
             />
@@ -153,13 +153,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="到期日期" prop="EXPIRE_DATE">
-            <el-date-picker
+            <el-input v-model="form.EXPIRE_DATE" disabled />
-              v-model="form.EXPIRE_DATE"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
-              type="date"
-              disabled
-            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -175,13 +169,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="提醒日期" prop="REMINDER_DATA">
-            <el-date-picker
+            <el-input v-model="form.REMINDER_DATA" disabled />
-              v-model="form.REMINDER_DATA"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
-              type="date"
-              disabled
-            />
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -238,6 +226,7 @@ import { addingPrefixToFile } from "@/assets/js/utils.js";
 import { TAXES_PERIOD } from "@/assets/js/constant.js";
 const router = useRouter();
 const choiceTrailerList = await getChoiceTrailerList();
+console.log("筛选后的挂车车辆信息",choiceTrailerList);
 const rules = {
   TRAILER_VEHICLE: [
     { required: true, message: "挂车车辆不能为空", trigger: "blur" },
@@ -350,9 +339,6 @@ const fnGetTrailerInfo = async () => {
   const FREIGHTTRAILER_ID = form.value.FREIGHTTRAILER_ID;
   form.value.FREIGHTTRAILER_ID = FREIGHTTRAILER_ID;
   const resData = await getFreightTrailerView({ FREIGHTTRAILER_ID });
-  form.value.PROVINCE = resData.pd.PROVINCE
-  form.value.CITY = resData.pd.CITY
-  form.value.COUNTY = resData.pd.COUNTY
   form.value.PLATE_NUMBER = resData.pd.PLATE_NUMBER;
   form.value.FRAMES_NUMBER = resData.pd.VIN;
   form.value.VEHICLE_TYPE = resData.pd.TRAILER_TYPE;

src/views/mechanical_files/taxation_manage/edit.vue

@@ -143,13 +143,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="到期日期" prop="EXPIRE_DATE">
-            <el-date-picker
+            <el-input v-model="form.EXPIRE_DATE" disabled />
-              v-model="form.EXPIRE_DATE"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
-              type="date"
-              disabled
-            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -165,13 +159,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="提醒日期" prop="REMINDER_DATA">
-            <el-date-picker
+            <el-input v-model="form.REMINDER_DATA" disabled />
-              v-model="form.REMINDER_DATA"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
-              type="date"
-              disabled
-            />
           </el-form-item>
         </el-col>
         <el-col :span="6">

src/views/mechanical_files/taxation_manage/index.vue

@@ -47,7 +47,6 @@
               <el-select
                 v-model="searchForm.EXPIRE_STATUS"
                 placeholder="请选择到期状态"
-                clearable
               >
                 <el-option
                   v-for="item in EXPIRE_STATUS"
@@ -63,13 +62,12 @@
               <el-select
                 v-model="searchForm.REMINDER_STATUS"
                 placeholder="请选择提醒状态"
-                clearable
               >
                 <el-option
-                  v-for="item in REMINDER_STATUS"
+                  v-for="item in remindStatusList"
-                  :key="item.ID"
+                  :key="item.BIANMA"
                   :label="item.NAME"
-                  :value="item.ID"
+                  :value="item.NAME"
                 />
               </el-select>
             </el-form-item>
@@ -188,6 +186,9 @@
 <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 {
   getTaxationManageList,
   setTaxatonManageDelete,
@@ -196,11 +197,10 @@ 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";
 const router = useRouter();
+const remindStatusList = await layoutFnGetRemindStatus();
 const { list, pagination, searchForm, fnGetData, fnResetPagination } =
   useListData(getTaxationManageList, {});
-console.log("-=-=--=-==--==-=--==-",getTaxationManageList());
 const fnGetDataTransfer = () => {
   fnGetData({
     DEPTIDS: searchForm.value.DEPTIDS?.join(","),