修复部分bug

src/api/basicdata/basicdataVehicle.js

@@ -11,15 +11,13 @@ export const getList = (current, size, params) => {
     },
   });
 };
-export const getPage = (current, size, params) => {
+
+/** 获取车辆列表 */
+export const getPage = params => {
   return request({
     url: '/api/logpm-basicdata/vehicle/page',
     method: 'get',
-    params: {
+    params,
-      ...params,
-      current,
-      size,
-    },
   });
 };
 export const getVehicle = () => {

src/option/basicdata/basicdataVehicle2.js

@@ -1,342 +1,474 @@
-export default {
+export default [
-  expand: false,
+  {
-  index: true,
+    prop: '',
-  border: true,
+    label: '复选框',
-  selection: true,
+    type: 0,
-  column: [
+    width: 55,
-    {
+    fixed: true,
-      label: "主键",
+  },
-      prop: "id",
+  {
-      display: false,
+    prop: '',
-      hide: true,
+    label: '序号',
-    },
+    type: 12,
-    {
+    values: '',
-      label: "租户号",
+    width: 55,
-      prop: "tenantId",
+    fixed: true,
-      display: false,
+  },
-      hide: true,
+  {
-    },
+    label: '车牌号',
-    {
+    prop: 'vehicleNub',
-      label: "创建人",
+    type: 2,
-      prop: "createUser",
+    values: '',
-      display: false,
+    width: '150',
-      hide: true,
+    checkarr: [],
-    },
+    fixed: false,
-    {
+    sortable: true,
-      label: "创建时间",
+  },
-      prop: "createTime",
+  {
-      display: false,
+    label: '车辆来源',
-      hide: true,
+    prop: 'vehicleSource',
-    },
+    type: 1,
-    {
+    values: '',
-      label: "更新人",
+    width: '150',
-      prop: "updateUser",
+    checkarr: [],
-      display: false,
+    fixed: false,
-      hide: true,
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "更新时间",
+    label: '是否车头',
-      prop: "updateTime",
+    prop: 'isHead',
-      display: false,
+    type: 1,
-      hide: true,
+    values: '',
-    },
+    width: '150',
-    {
+    checkarr: [
-      label: "状态",
+      {
-      prop: "status",
+        label: '是',
-      display: false,
+        value: '1',
-      hide: true,
+      },
-    },
+      {
-    {
+        label: '否',
-      label: "是否已删除;1-未删除，2-已删除",
+        value: '0',
-      prop: "isDeleted",
+      },
-      display: false,
+    ],
-      hide: true,
+    fixed: false,
-    },
+    sortable: true,
-    {
+  },
-      label: "创建部门",
+  {
-      prop: "createDept",
+    label: '挂车类型',
-      display: false,
+    prop: 'trailerType',
-      hide: true,
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "车牌号",
+    checkarr: [],
-      prop: "vehicleNub",
+    fixed: false,
-      search: true,
+    sortable: true,
-      width:"100px"
+  },
-    },
+  {
-    {
+    label: '车辆类型',
-      label: "车辆来源",
+    prop: 'vehicleModel',
-      prop: "vehicleSource",
+    type: 1,
-      search: true,
+    values: '',
-      width:"100px"
+    width: '150',
-    },
+    checkarr: [],
-    {
+    fixed: false,
-      label: "是否车头",
+    sortable: true,
-      prop: "isHead",
+  },
-      width:"100px"
+  {
-    },
+    label: '车厢类型',
-    {
+    prop: 'carType',
-      label: "挂车类型",
+    type: 1,
-      prop: "trailerType",
+    values: '',
-      search: true,
+    width: '150',
-      width:"100px"
+    checkarr: [],
-    },
+    fixed: false,
-    {
+    sortable: true,
-      label: "车辆类型",
+  },
-      prop: "vehicleModel",
+  {
-      search: true,
+    label: '车长(M)',
-      width:"100px"
+    prop: 'vehicleCommander',
-    },
+    type: 1,
-    {
+    values: '',
-      label: "车厢类型",
+    width: '150',
-      prop: "carType",
+    checkarr: [],
-      width:"100px"
+    fixed: false,
-    },
+    sortable: true,
-    {
+  },
-      label: "车长(M)",
+  {
-      prop: "vehicleCommander",
+    label: '外廓高(M)',
-      width:"100px"
+    prop: 'vehicleHeight',
-    },
+    type: 1,
-    {
+    values: '',
-      label: "外廓高(M)",
+    width: '150',
-      prop: "vehicleHeight",
+    checkarr: [],
-      width:"100px"
+    fixed: false,
-    },
+    sortable: true,
-    {
+  },
-      label: "付款方式",
+  {
-      prop: "paymentMethod",
+    label: '付款方式',
-      search: true,
+    prop: 'paymentMethod',
-      width:"100px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "核定体积",
+    checkarr: [],
-      prop: "approvedVolume",
+    fixed: false,
-      width:"100px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "车牌颜色",
+    label: '核定体积',
-      prop: "licensePlateColor",
+    prop: 'approvedVolume',
-      width:"100px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "车身颜色",
+    checkarr: [],
-      prop: "vehicleColor",
+    fixed: false,
-      width:"100px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "能源类型",
+    label: '车牌颜色',
-      prop: "energyType",
+    prop: 'licensePlateColor',
-      width:"100px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "车牌类型",
+    checkarr: [],
-      prop: "licensePlateType",
+    fixed: false,
-      width:"100px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "备注",
+    label: '车身颜色',
-      prop: "notes",
+    prop: 'vehicleColor',
-      width:"100px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "车辆所属人",
+    checkarr: [],
-      prop: "vehicleOwner",
+    fixed: false,
-      width:"120px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "品牌型号",
+    label: '能源类型',
-      prop: "vehicleBrand",
+    prop: 'energyType',
-      width:"100px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "车辆代号",
+    checkarr: [],
-      prop: "vehicleCode",
+    fixed: false,
-      width:"100px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "发动机型号",
+    label: '车牌类型',
-      prop: "engineCode",
+    prop: 'licensePlateType',
-      width:"120px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "车辆总质量(T)",
+    checkarr: [],
-      prop: "vehicleQuality",
+    fixed: false,
-      width:"120px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "整备质量(T)",
+    label: '备注',
-      prop: "curbWeight",
+    prop: 'notes',
-      width:"120px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "载荷质量(T)",
+    checkarr: [],
-      prop: "loadMass",
+    fixed: false,
-      width:"120px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "外廓宽(M)",
+    label: '品牌型号',
-      prop: "outerWidth",
+    prop: 'vehicleBrand',
-      width:"120px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "到期时间",
+    checkarr: [],
-      prop: "expirationTime",
+    fixed: false,
-      format: "yyyy-MM-dd",
+    sortable: true,
-      valueFormat: "yyyy-MM-dd",
+  },
-      width:"120px"
+  {
-    },
+    label: '车辆代号',
-    {
+    prop: 'vehicleCode',
-      label: "道路运输证号",
+    type: 1,
-      prop: "roadTransport",
+    values: '',
-      width:"120px"
+    width: '150',
-    },
+    checkarr: [],
-    {
+    fixed: false,
-      label: "经营许可证号",
+    sortable: true,
-      prop: "businessLicense",
+  },
-      width:"120px"
+  {
-    },
+    label: '发动机型号',
-    {
+    prop: 'engineCode',
-      label: "车辆所属单位",
+    type: 1,
-      prop: "vehicleUnit",
+    values: '',
-      width:"120px"
+    width: '150',
-    },
+    checkarr: [],
-    {
+    fixed: false,
-      label: "车辆所属单位电话",
+    sortable: true,
-      prop: "vehicleUnitPhone",
+  },
-      width:"180px"
+  {
-    },
+    label: '车辆总质量(T)',
-    {
+    prop: 'vehicleQuality',
-      label: "车辆所属人手机号",
+    type: 1,
-      prop: "vehicleOwnerPhone",
+    values: '',
-      width:"180px"
+    width: '150',
-    },
+    checkarr: [],
-    {
+    fixed: false,
-      label: "车辆所属人身份证号",
+    sortable: true,
-      prop: "vehicleOwnerCard",
+  },
-      width:"180px"
+  {
-    },
+    label: '整备质量(T)',
-    // {
+    prop: 'curbWeight',
-    //   label: "行驶证正面照片",
+    type: 1,
-    //   prop: "drivingLicensePhoto",
+    values: '',
-    // },
+    width: '150',
-    // {
+    checkarr: [],
-    //   label: "行驶证照片反面",
+    fixed: false,
-    //   prop: "drivingLicensePhotoBack",
+    sortable: true,
-    // },
+  },
-    // {
+  {
-    //   label: "许可证照片",
+    label: '载荷质量(T)',
-    //   prop: "licensePhoto",
+    prop: 'loadMass',
-    // },
+    type: 1,
-    // {
+    values: '',
-    //   label: "车辆照片(最新)",
+    width: '150',
-    //   prop: "vehiclePhoto",
+    checkarr: [],
-    // },
+    fixed: false,
-    // {
+    sortable: true,
-    //   label: "车尾照片",
+  },
-    //   prop: "vehicleRearPhoto",
+  {
-    // },
+    label: '外廓宽(M)',
-    // {
+    prop: 'outerWidth',
-    //   label: "道路运输照片",
+    type: 1,
-    //   prop: "roadTransportPhoto",
+    values: '',
-    // },
+    width: '150',
-    // {
+    checkarr: [],
-    //   label: "人车合影照片",
+    fixed: false,
-    //   prop: "vehiclePeoplePhoto",
+    sortable: true,
-    // },
+  },
-    // {
+  {
-    //   label: "保险卡照片",
+    label: '到期时间',
-    //   prop: "insuranceCardPhoto",
+    prop: 'expirationTime',
-    // },
+    type: 1,
-    {
+    values: '',
-      label: "承运商",
+    width: '150',
-      prop: "carrierId",
+    checkarr: [],
-      width:"100px"
+    fixed: false,
-    },
+    sortable: true,
-    {
+  },
-      label: "车辆年审时间",
+  {
-      prop: "reviewTime",
+    label: '道路运输证号',
-      format: "yyyy-MM-dd",
+    prop: 'roadTransport',
-      valueFormat: "yyyy-MM-dd",
+    type: 1,
-      width:"150px"
+    values: '',
-    },
+    width: '150',
-    {
+    checkarr: [],
-      label: "车辆年审有效期(月)",
+    fixed: false,
-      prop: "reviewValidity",
+    sortable: true,
-      width:"180px"
+  },
-    },
+  {
-    {
+    label: '经营许可证号',
-      label: "车辆保险开始时间",
+    prop: 'businessLicense',
-      prop: "insuranceStartTime",
+    type: 1,
-      format: "yyyy-MM-dd",
+    values: '',
-      valueFormat: "yyyy-MM-dd",
+    width: '150',
-      width:"180px"
+    checkarr: [],
-    },
+    fixed: false,
-    {
+    sortable: true,
-      label: "车辆保险结束时间",
+  },
-      prop: "insuranceEndTime",
+  {
-      format: "yyyy-MM-dd",
+    label: '车辆所属单位',
-      valueFormat: "yyyy-MM-dd",
+    prop: 'vehicleUnit',
-      width:"180px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "有无车身广告",
+    checkarr: [],
-      prop: "bodyAdvertising",
+    fixed: false,
-      width:"180px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "车身广告跟新时间",
+    label: '车辆所属单位电话',
-      prop: "advertisementsNewTimes",
+    prop: 'vehicleUnitPhone',
-      width:"180px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "车辆挂靠公司",
+    checkarr: [],
-      prop: "vehicleParkingCompany",
+    fixed: false,
-      width:"120px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "是否有GPS",
+    label: '车辆所属人手机号',
-      prop: "withGps",
+    prop: 'vehicleOwnerPhone',
-      width:"100px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "GPS服务商",
+    checkarr: [],
-      prop: "gpsServiceProvider",
+    fixed: false,
-      width:"100px"
+    sortable: true,
-    },
+  },
-    {
+  {
-      label: "GPS型号",
+    label: '车辆所属人身份证号',
-      prop: "gpsModel",
+    prop: 'vehicleOwnerCard',
-      width:"100px"
+    type: 1,
-    },
+    values: '',
-    {
+    width: '150',
-      label: "预留1",
+    checkarr: [],
-      prop: "reserve1",
+    fixed: false,
-      display: false,
+    sortable: true,
-      hide: true,
+  },
-    },
+  {
-    {
+    label: '承运商',
-      label: "预留2",
+    prop: 'carrierId',
-      prop: "reserve2",
+    type: 3,
-      display: false,
+    values: '',
-      hide: true,
+    width: '150',
-    },
+    checkarr: [],
-    {
+    fixed: false,
-      label: "预留3",
+    sortable: true,
-      prop: "reserve3",
+  },
-      display: false,
+  {
-      hide: true,
+    label: '车辆年审时间',
-    },
+    prop: 'reviewTime',
-    {
+    type: 1,
-      label: "预留4",
+    values: '',
-      prop: "reserve4",
+    width: '150',
-      display: false,
+    checkarr: [],
-      hide: true,
+    fixed: false,
-    },
+    sortable: true,
-    {
+  },
-      label: "预留5",
+  {
-      prop: "reserve5",
+    label: '车辆年审有效期',
-      display: false,
+    prop: 'reviewValidity',
-      hide: true,
+    type: 1,
-    },
+    values: '',
-  ]
+    width: '200',
-}
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '车辆保险开始时间',
+    prop: 'insuranceStartTime',
+    type: 1,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '车辆保险结束时间',
+    prop: 'insuranceEndTime',
+    type: 1,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '有无车身广告',
+    prop: 'bodyAdvertising',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      {
+        label: '是',
+        value: '1',
+      },
+      {
+        label: '否',
+        value: '0',
+      },
+    ],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '车身广告更新时间',
+    prop: 'advertisementsNewTimes',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '是否有GPS',
+    prop: 'withGps',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      {
+        label: '是',
+        value: '1',
+      },
+      {
+        label: '否',
+        value: '0',
+      },
+    ],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: 'GPS服务商',
+    prop: 'gpsServiceProvider',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: 'GPS型号',
+    prop: 'gpsModel',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '车辆照片(最新)',
+    prop: 'vehiclePhoto',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '车尾照片',
+    prop: 'vehicleRearPhoto',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '车辆历史照片',
+    prop: 'historicPhotos',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '操作',
+    prop: '',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+    sortable: true,
+  },
+];

src/router/views/index.js

@@ -66,15 +66,15 @@ export default [
   {
     path: '/basicdata',
     component: Layout,
-    redirect: '/basicdata/vehicle/basicdtaVehicleAddForm',
+    redirect: '/basicdata/vehicle/basicdataVehicleAddForm',
     children: [
       {
-        path: 'vehicle/basicdtaVehicleAddForm',
+        path: 'vehicle/basicdataVehicleAddForm',
         name: '车辆添加',
         meta: {
           i18n: 'dict',
         },
-        component: () => import('@/views/basicdata/vehicle/basicdtaVehicleAddForm.vue'),
+        component: () => import('@/views/basicdata/vehicle/basicdataVehicleAddForm.vue'),
       },
     ],
   },
@@ -1524,7 +1524,6 @@ export default [
     ],
   },
 
-
   {
     path: '/aftersales/DataSynchronization',
     component: Layout,

src/views/basicdata/vehicle/basicdataVehicle2.vue

@@ -1,372 +0,0 @@
-<template>
-  <basic-container v-loading="details.loadingObj.pageLoading">
-    <div class="avue-crud">
-      <!-- 搜索模块 -->
-      <div v-h5uShow="!search">
-        <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class="header_search">
-          <el-form-item label="有效状态">
-            <el-select class="w100" v-model="query.value" clearable placeholder="有效状态">
-              <el-option label="有效" value="item.value" />
-              <el-option label="作废" value="item.value" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="运单号:" class="el-times">
-            <el-input v-model="query.stockupArea" clearable placeholder="请输入运单号"></el-input>
-          </el-form-item>
-          <el-form-item label="制单时间:" class="el-times">
-            <el-date-picker
-              v-model="stockupDate"
-              type="daterange"
-              unlink-panels
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              :shortcuts="shortcuts"
-              clearable
-            />
-          </el-form-item>
-
-          <el-form-item label="创建时间:" class="el-times">
-            <el-date-picker
-              v-model="stockupDate"
-              type="daterange"
-              unlink-panels
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              :shortcuts="shortcuts"
-              clearable
-            />
-          </el-form-item>
-
-          <el-form-item label="送货时间:" class="el-times">
-            <el-date-picker
-              v-model="stockupDate"
-              type="daterange"
-              unlink-panels
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              :shortcuts="shortcuts"
-              clearable
-            />
-          </el-form-item>
-
-          <el-form-item label="签收时间:" class="el-times">
-            <el-date-picker
-              v-model="stockupDate"
-              type="daterange"
-              unlink-panels
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              :shortcuts="shortcuts"
-              clearable
-            />
-          </el-form-item>
-          <!-- 查询按钮 -->
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <!-- 控件模块 -->
-      <div class="avue-crud__header">
-        <!-- 头部左侧按钮模块 -->
-        <div class="avue-crud__left"></div>
-        <!-- 头部右侧按钮模块 -->
-        <div class="avue-crud__right">
-          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-          <el-button icon="Search" @click="searchHide" circle></el-button>
-        </div>
-      </div>
-
-      <!-- 列表模块 -->
-      <tablecmt
-        :columnList="details.columnList"
-        :tableData="data"
-        :loading="loadingObj.list"
-        @inputTxt="inputsc"
-        @timeCheck="timesc"
-        @selectCheck="selectsc"
-        @selection="selectionChange"
-      >
-        <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '操作'">
-            <el-text
-              v-if="Number(slotProps.scope.row.abnormalStatus) === 0"
-              @click="handleAnException(slotProps.scope)"
-            >
-              处理
-            </el-text>
-          </template>
-        </template>
-      </tablecmt>
-
-      <!-- 分页模块 -->
-      <div class="flex-c-sb">
-        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-        <!-- 分页模块 -->
-        <el-pagination
-          align="right"
-          background
-          @size-change="sizeChange"
-          @current-change="currentChange"
-          :current-page="page.currentPage"
-          :page-sizes="[30, 50, 80, 120]"
-          :page-size="page.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="page.total"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </basic-container>
-
-  <!-- 列表配置显示 -->
-  <edittablehead
-    @closce="showdrawer"
-    :drawerShow="drawerShow"
-    v-model="details.columnList"
-  ></edittablehead>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
-import functions from '@/utils/functions.js';
-import dayjs from 'dayjs';
-import { mapGetters } from 'vuex';
-/** 获取字典 */
-import { getDictionaryBiz } from '@/api/system/dict';
-import {
-  downloadXls,
-  setNodeHeight,
-  getHtmls,
-  deepClone,
-  handleClearTableQuery,
-  debounce,
-  handleSelectQuery,
-  handleInputQuery,
-} from '@/utils/util';
-import { columnList } from '@/option/distribution/abnormalList';
-import { useRouter } from 'vue-router';
-import { ElMessage, ElMessageBox } from 'element-plus';
-
-// 获取路由实例
-const $router = useRouter();
-
-const details = reactive<any>({
-  /** 是否开启搜索 */
-  search: true,
-  /** 表格搜索条件 */
-  query: {},
-  /** 时间快捷选择设置 */
-  shortcuts: [
-    {
-      text: '最近一周',
-      value: () => {
-        const end = new Date();
-        const start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        return [start, end];
-      },
-    },
-    {
-      text: '最近一个月',
-      value: () => {
-        const end = new Date();
-        const start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-        return [start, end];
-      },
-    },
-    {
-      text: '最近三个月',
-      value: () => {
-        const end = new Date();
-        const start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-        return [start, end];
-      },
-    },
-  ],
-  /** 列表 */
-  columnList: deepClone(columnList),
-  /** 列表数据 */
-  data: [{}],
-  /** 页面loading */
-  loadingObj: {
-    /** 列表加载loading */
-    list: false,
-    /** 页面loading */
-    pageLoading: false,
-  },
-  /** 列表复选框选中的数据 */
-  selectionList: [],
-  /** 是否显示设置表格 */
-  drawerShow: false,
-  /** 分页参数 */
-  page: {
-    pageNum: 1,
-    pageSize: 30,
-    total: 0,
-  },
-  /** 弹出层显示 */
-  popUpShow: {
-    /** 图片预览 */
-    abnormalVisited: false,
-  },
-  /** 列表Dom节点 */
-  listNode: '',
-  form: {},
-  /** 全屏 */
-  fullscreenObj: {
-    /** 查看 */
-    view: false,
-  },
-});
-
-const { search, query, shortcuts, stockupDate, data, loadingObj, selectionList, drawerShow, page } =
-  toRefs(details);
-
-/** vuex */
-const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
-
-onMounted(() => {
-  const timer = setTimeout(() => {
-    details.listNode = document.querySelector('.maboxhi');
-    details.listNode.style.transition = 'all .5s ease-out';
-    clearTimeout(timer);
-  }, 100);
-});
-
-/** 请求页面数据 */
-const onLoad = debounce(async (page?: any, params = {}) => {
-  try {
-    details.loadingObj.list = true;
-    let _page = details.page;
-    if (page) _page = page;
-    // 获取暂存单列表
-    const res = await postFindPageList({ ..._page, ...details.query, ...params });
-    console.log('res :>> ', res);
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.data = data.records;
-
-    const valueArr = details.columnList.filter(val => val.type === 3);
-
-    for (let i = 0; i < details.data.length; i++) {
-      const value = details.data[i];
-
-      for (let index = 0; index < valueArr.length; index++) {
-        const item = valueArr[index];
-        const label = item.prop.replace('Name', '');
-        value[item.prop] =
-          (item.checkarr.find(val => Number(val.value) === Number(value[label])) || {}).label ||
-          value[label];
-      }
-    }
-
-    details.page.total = data.total;
-  } catch (error) {
-  } finally {
-    details.loadingObj.list = false;
-  }
-}, 10);
-
-onLoad();
-
-/** 搜索 */
-const searchChange = () => {
-  onLoad(details.page);
-};
-
-/** 清空表单 */
-const searchReset = () => {
-  details.query = {};
-  details.stockupDate = [];
-  details.page.currentPage = 1;
-  handleClearTableQuery(details.columnList);
-  onLoad(details.page);
-};
-
-/** 展开列表控件 */
-const showdrawer = (_flag?: boolean) => {
-  details.drawerShow = _flag;
-};
-
-/** 是否开启搜索区 */
-const searchHide = () => {
-  details.search = !details.search;
-
-  setNodeHeight(details.listNode, '', true);
-};
-
-/** 表格表头输入框搜索 */
-const inputsc = (index, row) => {
-  handleInputQuery(index, row, details.query);
-  onLoad(details.page);
-};
-
-/** 表格表头时间选择 */
-const timesc = (index, row) => {
-  console.log(index, row);
-  if (!!index) {
-    index = dayjs(index).format('YYYY-MM-DD');
-  }
-  details.query[row.prop] = index;
-  if (!index) {
-    delete details.query[row.prop];
-  }
-  onLoad(details.page);
-};
-
-/** 表格表头下拉框选择 */
-const selectsc = (index, row) => {
-  handleSelectQuery(index, row, details.query);
-
-  onLoad(details.page);
-};
-
-/** 表格表头复选框选择 */
-const selectionChange = (list: any) => {
-  details.selectionList = list;
-};
-
-/** 每页数量改变执行的回调 */
-const sizeChange = (pageSize: number) => {
-  details.page.pageSize = pageSize;
-  onLoad(details.page);
-};
-
-/** 页码改变执行的回调 */
-const currentChange = current => {
-  details.page.pageNum = current;
-  onLoad();
-};
-</script>
-
-<style scoped lang="scss">
-// 日期选择器
-:deep(.el-date-editor.el-input) {
-  height: 100% !important;
-  width: 100% !important;
-}
-
-:deep(.el-range-editor.el-input__wrapper) {
-  height: 100% !important;
-}
-
-.mt20 {
-  margin-top: 20px;
-}
-
-.fwb {
-  font-weight: bold;
-}
-</style>

src/views/basicdata/vehicle/basicdataVehicleAddForm.vue

@@ -0,0 +1,416 @@
+<template>
+  <basic-container>
+    <div class="main">
+      <!-- 车辆基本信息 -->
+      <div class="pageTitle">
+        <div>车辆基本信息</div>
+      </div>
+
+      <el-form inline class="mt20 pl20">
+        <el-form-item
+          v-for="item in details.carBasicForm"
+          :label="item.label"
+          label-width="160px"
+          :class="item.type !== 5 ? 'w20' : 'w100'"
+        >
+          <!-- 普通输入框 -->
+          <template v-if="item.type === 1">
+            <el-input
+              class="w100"
+              :placeholder="`请输入${item.label}`"
+              v-model="details.form[item.prop]"
+              clearable
+            ></el-input>
+          </template>
+
+          <!-- 数字输入框 -->
+          <template v-else-if="item.type === 2">
+            <el-input-number
+              :controls="false"
+              v-model="details.form[item.prop]"
+              :placeholder="`请输入${item.label}`"
+              :min="item.min || 0"
+              :value-on-clear="0"
+              class="w100"
+            ></el-input-number>
+          </template>
+
+          <!-- 下拉框 -->
+          <template v-else-if="item.type === 3">
+            <el-select
+              v-model="details.form[item.prop]"
+              :placeholder="`请选择${item.label}`"
+              class="w100"
+              clearable
+            >
+              <el-option
+                v-for="val in item.checkarr"
+                :key="val.value"
+                :label="val.label"
+                :value="val.value"
+              />
+            </el-select>
+          </template>
+
+          <!-- 时间选择 -->
+          <template v-else-if="item.type === 4">
+            <el-date-picker
+              v-model="details.form[item.prop]"
+              type="date"
+              :placeholder="`请选择${item.label}`"
+              class="w100"
+              :default-value="new Date()"
+              clearable
+            />
+          </template>
+
+          <template v-else-if="item.type === 5">
+            <el-input
+              type="textarea"
+              v-model="details.form[item.prop]"
+              clearable
+              :placeholder="`请选择${item.label}`"
+              class="w100"
+            />
+          </template>
+        </el-form-item>
+      </el-form>
+
+      <!-- 相关图片 -->
+      <div class="pageTitle">
+        <div>相关图片</div>
+      </div>
+
+      <div class="mt20 pl20 imgContainer">
+        <div>
+          <div class="title">123123</div>
+        </div>
+      </div>
+    </div>
+  </basic-container>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue';
+
+const details = reactive({
+  carBasicForm: [
+    {
+      label: '车牌号',
+      prop: 'vehicleNub',
+      type: 2,
+      checkarr: [],
+    },
+    {
+      label: '车辆来源',
+      prop: 'vehicleSource',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '是否车头',
+      prop: 'isHead',
+      type: 3,
+      checkarr: [
+        {
+          label: '是',
+          value: '1',
+        },
+        {
+          label: '否',
+          value: '0',
+        },
+      ],
+    },
+    {
+      label: '挂车类型',
+      prop: 'trailerType',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '车辆类型',
+      prop: 'vehicleModel',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '车厢类型',
+      prop: 'carType',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '车长(M)',
+      prop: 'vehicleCommander',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '外廓高(M)',
+      prop: 'vehicleHeight',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '付款方式',
+      prop: 'paymentMethod',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '核定体积',
+      prop: 'approvedVolume',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '车牌颜色',
+      prop: 'licensePlateColor',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '车身颜色',
+      prop: 'vehicleColor',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '能源类型',
+      prop: 'energyType',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '车牌类型',
+      prop: 'licensePlateType',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '品牌型号',
+      prop: 'vehicleBrand',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '车辆代号',
+      prop: 'vehicleCode',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '发动机型号',
+      prop: 'engineCode',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '车辆总质量(T)',
+      prop: 'vehicleQuality',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '整备质量(T)',
+      prop: 'curbWeight',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '载荷质量(T)',
+      prop: 'loadMass',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '外廓宽(M)',
+      prop: 'outerWidth',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '到期时间',
+      prop: 'expirationTime',
+      type: 4,
+      checkarr: [],
+    },
+    {
+      label: '道路运输证号',
+      prop: 'roadTransport',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '经营许可证号',
+      prop: 'businessLicense',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '车辆所属单位',
+      prop: 'vehicleUnit',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '车辆所属单位电话',
+      prop: 'vehicleUnitPhone',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '车辆所属人手机号',
+      prop: 'vehicleOwnerPhone',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '车辆所属人身份证号',
+      prop: 'vehicleOwnerCard',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '承运商',
+      prop: 'carrierId',
+      type: 3,
+      checkarr: [],
+    },
+    {
+      label: '车辆年审时间',
+      prop: 'reviewTime',
+      type: 4,
+      checkarr: [],
+    },
+    {
+      label: '车辆年审有效期',
+      prop: 'reviewValidity',
+      type: 4,
+      checkarr: [],
+    },
+    {
+      label: '车辆保险开始时间',
+      prop: 'insuranceStartTime',
+      type: 4,
+      checkarr: [],
+    },
+    {
+      label: '车辆保险结束时间',
+      prop: 'insuranceEndTime',
+      type: 4,
+      checkarr: [],
+    },
+    {
+      label: '有无车身广告',
+      prop: 'bodyAdvertising',
+      type: 3,
+      checkarr: [
+        {
+          label: '是',
+          value: '1',
+        },
+        {
+          label: '否',
+          value: '0',
+        },
+      ],
+    },
+    {
+      label: '车身广告更新时间',
+      prop: 'advertisementsNewTimes',
+      type: 4,
+      checkarr: [],
+    },
+    {
+      label: '是否有GPS',
+      prop: 'withGps',
+      type: 3,
+      checkarr: [
+        {
+          label: '是',
+          value: '1',
+        },
+        {
+          label: '否',
+          value: '0',
+        },
+      ],
+    },
+    {
+      label: 'GPS服务商',
+      prop: 'gpsServiceProvider',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: 'GPS型号',
+      prop: 'gpsModel',
+      type: 1,
+      checkarr: [],
+    },
+    {
+      label: '备注',
+      prop: 'notes',
+      type: 5,
+      checkarr: [],
+    },
+  ],
+  imgArr: [
+    { label: '行驶证正面照片' },
+    { label: '行驶证反面照片' },
+    { label: '许可证照片' },
+    { label: '车辆照片(最新)' },
+    { label: '车尾照片' },
+    { label: '道理运输照片' },
+    { label: '人车合影照片' },
+    { label: '保险卡照片' },
+  ],
+  form: {},
+});
+</script>
+
+<style lang="scss" scoped>
+.main {
+  padding: 20px;
+}
+
+.pl20 {
+  padding-left: 20px;
+}
+
+.pageTitle {
+  font-size: 18px;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+
+  &::before {
+    content: '';
+    display: inline-block;
+    height: 100%;
+    width: 4px;
+    background: #d3832a;
+    height: 18px;
+    margin-right: 10px;
+  }
+}
+
+.imgContainer {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.w20 {
+  width: 22%;
+}
+
+.w100 {
+  width: 100% !important;
+}
+
+:deep(.el-input__inner) {
+  text-align: left;
+}
+</style>

src/views/basicdata/vehicle/basicdtaVehicleAddForm.vue

@@ -1,11 +0,0 @@
-<template>
-  <basic-container>
-    <div class="pageTitle">
-      <div>车辆基本信息</div>
-    </div>
-  </basic-container>
-</template>
-
-<script setup lang="ts"></script>
-
-<style lang="scss" scoped></style>

src/views/distribution/inventory/BookingNote.vue

@@ -882,7 +882,7 @@
             <div class="table-row">
               <el-form-item label="备注:" class="el-times">
                 <el-input
-                  v-model="pageInfo.remark"
+                  v-model="query.remark"
                   type="textarea"
                   readonly
                   placeholder="备注"