From a02e32c07463c60273d5cf57ce5fb77e832a41aa Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 26 Aug 2024 10:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug,=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=BD=A6=E8=BE=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/addTripartiteTransfer.js |   11 +
 .../basicdata/vehicle/basicdataVehicle.vue    | 1766 +++++------------
 .../basicdata/vehicle/basicdataVehicle1.vue   | 1274 ++++++++++++
 .../basicdata/vehicle/basicdataVehicle2.vue   |  572 ------
 .../artery/TripartiteTransferDetails.vue      |    3 +-
 .../artery/addTripartiteTransfer.vue          |    6 +-
 .../artery/truckLoadingDetails.vue            |    4 +
 7 files changed, 1826 insertions(+), 1810 deletions(-)
 create mode 100644 src/views/basicdata/vehicle/basicdataVehicle1.vue
 delete mode 100644 src/views/basicdata/vehicle/basicdataVehicle2.vue

diff --git a/src/api/distribution/addTripartiteTransfer.js b/src/api/distribution/addTripartiteTransfer.js
index 1cf6a62e..73e3d915 100644
--- a/src/api/distribution/addTripartiteTransfer.js
+++ b/src/api/distribution/addTripartiteTransfer.js
@@ -87,3 +87,14 @@ export const postFindCarrierByName = data => {
     data,
   });
 };
+
+/**
+ * 通过名称查司机
+ */
+export const postFindDriverListByNameAndWarehouseId = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/findDriverListByNameAndWarehouseId',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue
index f883b5a4..16659710 100644
--- a/src/views/basicdata/vehicle/basicdataVehicle.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicle.vue
@@ -1,84 +1,179 @@
 <template>
-  <basic-container>
-    <avue-crud
-      v-if="edit"
-      :option="option"
-      v-model:search="search"
-      v-model:page="page"
-      v-model="form"
-      :table-loading="loading"
-      :data="data"
-      :permission="permissionList"
-      :before-open="beforeOpen"
-      ref="crud"
-      @row-update="rowUpdate"
-      @row-save="rowSave"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template #menu-left>
-        <!-- <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd">新 增 </el-button> -->
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          plain
-          v-if="permission.basicdataVehicle_delete"
-          @click="handleDelete"
-          >删 除
-        </el-button>
-        <el-button
-          type="danger"
-          plain
-          @click="ExportVehicle"
-          >导 出
-        </el-button>
+  <basic-container v-loading="details.loadingObj.pageLoading">
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="!search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="header_search">
+          <template v-for="item in details.columnList" :key="item.prop">
+            <el-form-item v-if="item.isTitleSearch" :label="item.label">
+              <!-- 普通输入框 -->
+              <template v-if="item.type === 2">
+                <el-input
+                  class="w100"
+                  :placeholder="`请输入${item.label}`"
+                  v-model="details.query[item.prop]"
+                  clearable
+                ></el-input>
+              </template>
 
-        <el-button
-          type="danger"
-          plain
-          @click="VehicleImport"
-          >导 入
-        </el-button>
-        <!--        <el-button type="warning"-->
-        <!--                   plain-->
-        <!--                   icon="el-icon-download"-->
-        <!--                   @click="handleExport">导 出-->
-        <!--        </el-button>-->
-      </template>
-      <template #menu="{ size, row, index }">
-        <el-button type="primary" text icon="el-icon-view" @click="editDeline(row)"
-          >编 辑</el-button
-        >
-        <el-button type="primary" text icon="el-icon-view" @click="viewDeline(row)"
-          >查 看</el-button
-        >
-      </template>
-    </avue-crud>
-    <basicdata-vehicleform
-      @returnvehicle="returnvehicle"
-      :vehicleformdata="vehicleformdata"
-      :dicDatas="dicDatas"
-      v-if="!edit"
-    />
-    <el-dialog title="车辆导入" append-to-body v-model="excelBox" width="555px">
-      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
-        <template #excelTemplate>
-          <el-button type="primary" @click="handleTemplate">
-            点击下载<i class="el-icon-download el-icon--right"></i>
+              <!-- 下拉框 -->
+              <template v-else-if="item.type === 3">
+                <el-select
+                  v-model="details.query[item.prop.replace('Name', '')]"
+                  :placeholder="`请选择${item.label}`"
+                  class="w100"
+                  clearable
+                  filterable
+                  :multiple="item.multiple || false"
+                  @change="
+                    val => {
+                      !val && delete details.query[item.prop.replace('Name', '')];
+                    }
+                  "
+                >
+                  <el-option
+                    v-for="val in item.checkarr"
+                    :key="val.value"
+                    :label="val.label"
+                    :value="val.value"
+                  />
+                </el-select>
+              </template>
+            </el-form-item>
+          </template>
+
+          <!-- 查询按钮 -->
+          <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">
+          <!-- 新增 -->
+          <el-button type="primary" icon="Plus" @click="handleAdd">新 增</el-button>
+
+          <!-- 删除 -->
+          <el-button type="primary" icon="Delete" @click="() => handleDelete(true)">
+            删 除
+          </el-button>
+
+          <!-- 导出 -->
+          <el-button type="primary" icon="Download" @click="handleExport">导 出</el-button>
+
+          <!-- 导入 -->
+          <el-button
+            type="primary"
+            icon="Upload"
+            @click="() => (details.popUpShow.UploadPackageDelivery = true)"
+            >导 入
           </el-button>
+        </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 @click="handleDelete(false, slotProps.scope.row)"> 删除 </el-text>
+
+            <el-text @click="handleEdit(slotProps.scope)"> 编辑 </el-text>
+
+            <el-text @click="handleView(slotProps.scope)"> 查看 </el-text>
+          </template>
         </template>
-      </avue-form>
-    </el-dialog>
+      </tablecmt>
+
+      <!-- 分页模块 -->
+      <div class="flex-c-sb mt20">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.current"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
+    </div>
   </basic-container>
+
+  <!-- 上传 -->
+  <MyUpload
+    ref="myUpload"
+    v-model="details.popUpShow.UploadPackageDelivery"
+    templateSrc=""
+    uploadAddress="/api/logpm-basicdata/vehicle/import-basicdataVehicle"
+    isDefined
+    :success="
+      () => {
+        details.popUpShow.UploadPackageDelivery = false;
+        onLoad();
+      }
+    "
+  >
+    <!-- <el-button type="danger" icon="Download" @click="handleDownloadTemplate"> 下载模板 </el-button> -->
+  </MyUpload>
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    v-model="details.columnList"
+  ></edittablehead>
 </template>
 
-<script>
+<script setup lang="ts">
+import { ref, reactive, toRefs, computed, onMounted, nextTick, getCurrentInstance } 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,
+  handleTranslationDataSeclect,
+  getObjType,
+} from '@/utils/util';
+import columnList from '@/option/basicdata/basicdataVehicle2.js';
+import { useStore } from 'vuex';
+import { useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { dateNow } from '@/utils/date';
 import {
   getList,
   getDetail,
@@ -88,1187 +183,390 @@ import {
   getPage,
   getVehicle,
   $_Exportvehicle,
+  getDictionary,
+  getVehicleExport,
 } from '@/api/basicdata/basicdataVehicle';
 import { getOwn } from '@/api/basicdata/basicdataDriverArtery';
-import option from '@/option/basicdata/basicdataVehicle';
-import { mapGetters } from 'vuex';
-import { exportBlob } from '@/api/common';
-import { getToken } from '@/utils/auth';
-import { downloadXls } from '@/utils/util';
-import { dateNow } from '@/utils/date';
-import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
-import BasicdataVehicleform from '/src/views/basicdata/vehicle/basicdataVehicleform.vue';
-import { ElMessage } from 'element-plus'
-export default {
-  components: { BasicdataVehicleform },
-  data() {
-    return {
-      excelBox:false,
-      excelForm: {},
-      excelOption: {
-        submitBtn: false,
-        emptyBtn: false,
-        column: [
-          {
-            label: '文件上传',
-            prop: 'excelFile',
-            type: 'upload',
-            drag: true,
-            loadText: '文件上传，请稍等',
-            span: 24,
-            propsHttp: {
-              res: 'data',
-            },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
-            action: '/api/logpm-basicdata/vehicle/import-basicdataVehicle',
-          },
-          {
-            label: '模板下载',
-            prop: 'excelTemplate',
-            formslot: true,
-            span: 24,
-          },
-        ],
-      },
-      form: {},
-      query: {},
-      search: {},
-      loading: true,
-      vehicleformdata: {},
-      dicDatas: [],
-      edit: true, //修改
-      page: {
-        pageSize: 30,
-        currentPage: 1,
-        total: 0,
-      },
-      selectionList: [],
-      option: {
-        height: 'auto',
-        calcHeight: 30,
-        tip: false,
-        searchShow: false,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        viewBtn: false,
-        editBtn: false,
-        selection: true,
-        // 新增按钮不显示
-        // addBtn: false,
-        dialogClickModal: false,
-        column: [
-          {
-            label: '主键',
-            prop: 'id',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '租户号',
-            prop: 'tenantId',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '创建人',
-            prop: 'createUser',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '创建时间',
-            prop: 'createTime',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '更新人',
-            prop: 'updateUser',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '更新时间',
-            prop: 'updateTime',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '状态',
-            prop: 'status',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '是否已删除;1-未删除，2-已删除',
-            prop: 'isDeleted',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '创建部门',
-            prop: 'createDept',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '车牌号',
-            prop: 'vehicleNub',
-            type: 'input',
-            search: true,
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            rules: [{ required: true, message: '请输入车牌号!', trigger: 'blur' }],
-          },
-          //  {
-          //    label: '承运商名称',
-          //    labelWidth: '150',
-          //   // width: 'fit-content',
-          //     width: '100px',
-          //    align: 'center',
-          //    span: 11,
-          //    prop: 'carrierName',
-          //    type: 'input',
-          //    editDisplay: false,
-          //    addDisplay: false,
-          // },
-          {
-            label: '绑定驾驶人',
-            prop: 'vehicleOwners',
-            type: 'select',
-            labelWidth: '150',
-            width: '200px',
-            align: 'center',
-            span: 11,
-            multiple: true,
-            // dicData: [],
-            dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
-            props: {
-              label: 'vehicleNub',
-              value: 'id',
-            },
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '车辆来源',
-            prop: 'vehicleSource',
-            type: 'select',
-            search: true,
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_source',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '是否车头',
-            prop: 'isHead',
-            type: 'select',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=isHead_yes_no',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '挂车类型',
-            prop: 'trailerType',
-            type: 'select',
-            search: true,
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_trailer_type',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '车辆类型',
-            prop: 'vehicleModel',
-            type: 'select',
-            search: true,
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_model',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '车厢类型',
-            prop: 'carType',
-            type: 'select',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_car_type',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '车长(M)',
-            prop: 'vehicleCommander',
-            type: 'input',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '外廓高',
-            prop: 'vehicleHeight',
-            type: 'input',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '付款方式',
-            prop: 'paymentMethod',
-            type: 'select',
-            search: true,
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            filterable: true,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basicdata_vehicle_paymentmethod',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '核定体积',
-            prop: 'approvedVolume',
-            type: 'input',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车牌颜色',
-            prop: 'licensePlateColor',
-            type: 'select',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_plate_color',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '车身颜色',
-            prop: 'vehicleColor',
-            type: 'select',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_color',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '能源类型',
-            prop: 'energyType',
-            type: 'select',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_energy_type',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '车牌类型',
-            prop: 'licensePlateType',
-            type: 'select',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_plate_type',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '备注',
-            prop: 'notes',
-            type: 'input',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-          },
-          // {
-          //   label: "车辆所属人",
-          //   prop: "vehicleOwner",
-          //   type: "input",
-          //   labelWidth:'150',
-          //   width:"100px",
-          //   align:'center',
-          //   span:11,
-          // },
-          {
-            label: '品牌型号',
-            prop: 'vehicleBrand',
-            type: 'input',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车辆代号',
-            prop: 'vehicleCode',
-            type: 'input',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '发动机型号',
-            prop: 'engineCode',
-            type: 'input',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车辆总质量(T)',
-            prop: 'vehicleQuality',
-            type: 'input',
-            labelWidth: '150',
-            width: '120px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '整备质量(T)',
-            prop: 'curbWeight',
-            type: 'input',
-            labelWidth: '150',
-            width: '120px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '载荷质量(T)',
-            prop: 'loadMass',
-            type: 'input',
-            labelWidth: '150',
-            width: '120px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '外廓宽(M)',
-            prop: 'outerWidth',
-            type: 'input',
-            labelWidth: '150',
-            width: '120px',
-            align: 'center',
-            span: 11,
-          },
-          // {
-          //   label: '到期时间',
-          //   prop: 'expirationTime',
-          //   type: 'input',
-          //   labelWidth: '150',
-          //   width: '100px',
-          //   align: 'center',
-          //   span: 11,
-          // },
-            {
-              label: '到期时间',
-              prop: 'expirationTime',
-              type: 'date',
-              format: 'YYYY-MM-DD',
-              valueFormat: 'YYYY-MM-DD',
-              labelWidth: '150',
-              width: '150px',
-              align: 'center',
-              span: 11,
-            },
-          {
-            label: '道路运输证号',
-            prop: 'roadTransport',
-            type: 'input',
-            labelWidth: '150',
-            width: '150px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '经营许可证号',
-            prop: 'businessLicense',
-            type: 'input',
-            labelWidth: '150',
-            width: '150px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车辆所属单位',
-            prop: 'vehicleUnit',
-            type: 'input',
-            labelWidth: '150',
-            width: '150px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车辆所属单位电话',
-            prop: 'vehicleUnitPhone',
-            type: 'input',
-            labelWidth: '150',
-            width: '180px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车辆所属人手机号',
-            prop: 'vehicleOwnerPhone',
-            type: 'input',
-            labelWidth: '150',
-            width: '180px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车辆所属人身份证号',
-            prop: 'vehicleOwnerCard',
-            type: 'input',
-            labelWidth: '150',
-            width: '180px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '承运商',
-            prop: 'carrierId',
-            type: 'select',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            search: true,
-            span: 11,
-            filterable: true,
-            dicUrl: '/api/logpm-basicdata/carrier/dictionary',
-            props: {
-              label: 'carrierName',
-              value: 'id',
-            },
-            rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }],
-          },
-          {
-            label: '车辆年审时间',
-            prop: 'reviewTime',
-            width: '120px',
-            align: 'center',
-            type: 'date',
-            format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD',
-            labelWidth: '150',
-            span: 11,
-          },
-          // {
-          //   label: '车辆年审有效期',
-          //   prop: 'reviewValidity',
-          //   type: 'input',
-          //   labelWidth: '150',
-          //   width: '150px',
-          //   align: 'center',
-          //   span: 11,
-          // },
 
-          {
-            label: '车辆年审有效期',
-            prop: 'reviewValidity',
-            type: 'date',
-            format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD',
-            labelWidth: '150',
-            width: '150px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车辆保险开始时间',
-            prop: 'insuranceStartTime',
-            type: 'date',
-            format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD',
-            labelWidth: '150',
-            width: '150px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '车辆保险结束时间',
-            prop: 'insuranceEndTime',
-            type: 'date',
-            format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD',
-            labelWidth: '150',
-            width: '150px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '有无车身广告',
-            prop: 'bodyAdvertising',
-            type: 'select',
-            labelWidth: '150',
-            width: '150px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=bodyAdvertising_yes_no',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: '车身广告更新时间',
-            prop: 'advertisementsNewTimes',
-            type: 'date',
-            format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD',
-            labelWidth: '150',
-            width: '180px',
-            align: 'center',
-            span: 11,
-          },
-          // {
-          //   label: "车辆挂靠公司",
-          //   prop: "vehicleParkingCompany",
-          //   type: "input",
-          //   labelWidth:'150',
-          //   width:"150px",
-          //   align:'center',
-          //   span:11,
-          // },
-          {
-            label: '是否有GPS',
-            prop: 'withGps',
-            type: 'select',
-            labelWidth: '150',
-            width: '150px',
-            align: 'center',
-            span: 11,
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey',
-            },
-          },
-          {
-            label: 'GPS服务商',
-            prop: 'gpsServiceProvider',
-            type: 'input',
-            labelWidth: '150',
-            width: '120px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: 'GPS型号',
-            prop: 'gpsModel',
-            type: 'input',
-            labelWidth: '150',
-            width: '120px',
-            align: 'center',
-            span: 11,
-          },
-          {
-            label: '行驶证正面照片',
-            prop: 'drivingLicensePhoto',
-            type: 'upload',
-            dataType: 'string',
-            listType: 'picture-img',
-            hide: true,
-            labelWidth: '150',
-            span: 11,
-            multiple: false,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
-          {
-            label: '行驶证照片反面',
-            prop: 'drivingLicensePhotoBack',
-            type: 'upload',
-            dataType: 'string',
-            listType: 'picture-img',
-            hide: true,
-            labelWidth: '150',
-            span: 11,
-            multiple: false,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
-          {
-            label: '许可证照片',
-            prop: 'licensePhoto',
-            type: 'upload',
-            dataType: 'string',
-            listType: 'picture-img',
-            hide: true,
-            labelWidth: '150',
-            span: 11,
-            multiple: false,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
-          {
-            label: '车辆照片(最新)',
-            prop: 'vehiclePhoto',
-            type: 'upload',
-            listType: 'picture-img',
-            dataType: 'string',
-            labelWidth: '150',
-            span: 11,
-            multiple: false,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            // limit: 3,
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
-          {
-            label: '车尾照片',
-            prop: 'vehicleRearPhoto',
-            type: 'upload',
-            listType: 'picture-img',
-            dataType: 'string',
-            labelWidth: '150',
-            span: 11,
-            multiple: false,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            // limit: 3,
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
-          {
-            label: '道路运输照片',
-            prop: 'roadTransportPhoto',
-            type: 'upload',
-            dataType: 'string',
-            listType: 'picture-img',
-            hide: true,
-            labelWidth: '150',
-            span: 11,
-            multiple: false,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
-          {
-            label: '人车合影照片',
-            prop: 'vehiclePeoplePhoto',
-            type: 'upload',
-            dataType: 'string',
-            listType: 'picture-img',
-            hide: true,
-            labelWidth: '150',
-            span: 11,
-            multiple: false,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
-          {
-            label: '保险卡照片',
-            prop: 'insuranceCardPhoto',
-            type: 'upload',
-            dataType: 'string',
-            listType: 'picture-img',
-            hide: true,
-            labelWidth: '150',
-            span: 11,
-            multiple: false,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
-          {
-            label: '车俩历史照片',
-            prop: 'historicPhotos',
-            type: 'upload',
-            listType: 'picture-card',
-            dataType: 'string',
-            labelWidth: '150',
-            span: 11,
-            multiple: true,
-            width: '200px',
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            limit: 3,
-            disabled: true,
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-          },
+// 获取路由实例
+const $router = useRouter();
+
+const $store = useStore();
 
-          {
-            label: '预留1',
-            prop: 'reserve1',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '预留2',
-            prop: 'reserve2',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '预留3',
-            prop: 'reserve3',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '预留4',
-            prop: 'reserve4',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-          {
-            label: '预留5',
-            prop: 'reserve5',
-            type: 'input',
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            hide: true,
-          },
-        ],
+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];
       },
-      data: [],
-    };
-  },
-  computed: {
-    ...mapGetters(['permission']),
-    permissionList() {
-      return {
-        // addBtn: this.validData(this.permission.basicdataVehicle_add, false),
-        viewBtn: this.validData(this.permission.basicdataVehicle_view, false),
-        delBtn: this.validData(this.permission.basicdataVehicle_delete, false),
-        editBtn: this.validData(this.permission.basicdataVehicle_edit, false),
-      };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
+    {
+      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,
   },
-  methods: {
-    rowSave(row, done, loading) {
-      // if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) {
-      //   row.vehicleOwners = row.vehicleOwners.join(",");
-      //   console.log(row.vehicleOwners);
-      // }else{
-      //   row.vehicleOwners=''
-      // }
-      if (Array.isArray(row.vehicleOwners)) {
-        row.vehicleOwners = row.vehicleOwners.join(',');
-        console.log(row.vehicleOwners);
-      }
-      console.log(row.vehicleOwners, '=====1231231');
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    current: 1,
+    size: 30,
+    total: 0,
+  },
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 图片预览 */
+    abnormalVisited: false,
+    /** 上传 */
+    UploadPackageDelivery: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 查看 */
+    view: false,
+  },
+});
 
-      console.log('================================================================', row);
-      add(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          window.console.log(error);
-        }
-      );
-    },
-    editDeline(row) {
-      console.log('触发了编辑');
-      console.log('row>>>>>>>>>>>>>>>', row);
-      console.log('this.dicDatas>>>>>>>>>>>>>>>', this.dicDatas);
-      this.vehicleformdata = row;
-      this.vehicleformdata.view = false;
-      this.edit = false;
-    },
-    viewDeline(row) {
-      console.log('>>>>>>>>>>>>>>>', row);
-      this.vehicleformdata = row;
-      this.vehicleformdata.view = true;
-      console.log('this.vehicleformdata.view>>>>>>>>>>>>>>>', this.vehicleformdata.view);
-      this.edit = false;
-    },
-    returnvehicle(val) {
-      console.log('取消>>>>>', val);
-      this.edit = true;
-    },
-    rowUpdate(row, index, done, loading) {
-      update(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          console.log(error);
-        }
-      );
-    },
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
-    /**
-     * 新增车辆
-     */
-    handleAdd() {
-      // 跳转到添加页面
-      this.$router.push('/basicdata/vehicle/basicdtaVehicleAddForm');
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
+const { search, query, shortcuts, stockupDate, data, loadingObj, selectionList, drawerShow, page } =
+  toRefs(details);
 
-    // 导出车辆信息
-    ExportVehicle() {
-      
-      if(!this.selectionList.length){
-        ElMessage({
-        message: '请勾选要导出的数据',
-        type: 'warning',
-        })  
-        return
-      }
+const instance = getCurrentInstance();
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
 
-      let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle?${
-        this.website.tokenHeader
-      }=${getToken()}`;
-      let values = {
-        ids:'',
+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 getPage({ ..._page, ...details.query, ...params });
+    console.log('res :>> ', res);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.data = data.records;
+
+    handleTranslationDataSeclect(details.data, details.columnList);
+
+    details.page.total = data.total;
+  } catch (error) {
+  } finally {
+    details.loadingObj.list = false;
+  }
+}, 10);
+
+const handleData = (key, res) => {
+  const { code, data } = res.data;
+  if (code !== 200) return;
+  for (let i = 0; i < details.columnList.length; i++) {
+    const value = details.columnList[i];
+
+    if (value.label === key)
+      return (value.checkarr =
+        getObjType(data) === 'array'
+          ? data.map(val => {
+              val.label = val.dictValue;
+              val.value = val.dictKey;
+              return val;
+            })
+          : []);
+  }
+};
+
+// 获取字典数据
+const initData = async () => {
+  await Promise.all([
+    // 车辆来源
+    getDictionaryBiz('basic_vehicle_source').then(res => handleData('车辆来源', res)),
+    // 是否车头
+    getDictionaryBiz('yes_no').then(res => handleData('是否车头', res)),
+    // 挂车类型
+    getDictionaryBiz('basic_trailer_type').then(res => handleData('挂车类型', res)),
+    // 车辆类型
+    getDictionaryBiz('basic_vehicle_model').then(res => handleData('车辆类型', res)),
+    // 车厢类型
+    getDictionaryBiz('basic_car_type').then(res => handleData('车厢类型', res)),
+    // 付款方式
+    getDictionaryBiz('basicdata_vehicle_paymentmethod').then(res => handleData('付款方式', res)),
+    // 车牌颜色
+    getDictionaryBiz('basic_plate_color').then(res => handleData('车牌颜色', res)),
+    // 车身颜色
+    getDictionaryBiz('basic_vehicle_color').then(res => handleData('车身颜色', res)),
+    // 能源类型
+    getDictionaryBiz('basic_energy_type').then(res => handleData('能源类型', res)),
+    // 车牌类型
+    getDictionaryBiz('basic_plate_type').then(res => handleData('车牌类型', res)),
+    // 承运商
+    getDictionary().then(res => {
+      const { code, data } = res.data;
+      if (code !== 200) return;
+      for (let i = 0; i < details.columnList.length; i++) {
+        const value = details.columnList[i];
+
+        if (value.label === '承运商')
+          return (value.checkarr =
+            getObjType(data) === 'array'
+              ? data.map(val => {
+                  val.label = val.carrierName;
+                  val.value = val.id;
+                  return val;
+                })
+              : []);
       }
-      values.ids = this.selectionList.map(item => item.id).join(',');
-      this.$confirm('是否导出数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        this.loading=true
-        NProgress.start();
-        exportBlob(downloadUrl, values).then(res => {
-          downloadXls(res.data, `车辆信息导出${dateNow()}.xlsx`);
-          NProgress.done();
-          this.loading=false
-        }).catch(()=>{
-          this.loading=false
-        });
-      });
-    },
-    // 导入
-    VehicleImport(){
-      this.excelBox=true;// 打开导入弹窗
-    },
-    handleExport() {
-      let downloadUrl = `/blade-basicdataVehicle/basicdataVehicle/export-basicdataVehicle?${
-        this.website.tokenHeader
-      }=${getToken()}`;
-      const {} = this.query;
-      let values = {};
-      this.$confirm('是否导出数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        NProgress.start();
-        exportBlob(downloadUrl, values).then(res => {
-          downloadXls(res.data, `车辆信息表${dateNow()}.xlsx`);
-          NProgress.done();
-        });
-      });
-    },
-    beforeOpen(done, type) {
-      if (['edit', 'view'].includes(type)) {
-        getDetail(this.form.id).then(res => {
-          this.form = res.data.data;
-          console.log('this.form>>>>>>>>>>>>>', this.form);
-        });
+    }),
+    onLoad(),
+  ]);
+
+  await nextTick();
+  handleTranslationDataSeclect(details.data, details.columnList);
+  console.log('details.columnList :>> ', details.columnList);
+};
+
+initData();
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad(details.page);
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.stockupDate = [];
+  details.page.current = 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 = (size: number) => {
+  details.page.size = size;
+  onLoad(details.page);
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.current = current;
+  onLoad();
+};
+
+/** 新增 */
+const handleAdd = () => {
+  $store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
+
+  $router.push({
+    path: '/basicdata/vehicle/basicdataVehicleAddForm',
+    query: { type: 'add' },
+  });
+};
+
+/** 编辑 */
+const handleEdit = ({ row }) => {
+  $store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
+
+  $router.push({
+    path: '/basicdata/vehicle/basicdataVehicleAddForm',
+    query: { type: 'edit', name: `${row.vehicleNub} -- 编辑`, id: row.id },
+  });
+};
+
+/** 查看 */
+const handleView = ({ row }) => {
+  $store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
+
+  $router.push({
+    path: '/basicdata/vehicle/basicdataVehicleAddForm',
+    query: { type: 'view', name: `${row.vehicleNub} -- 查看`, id: row.id },
+  });
+};
+
+/** 删除
+ * isBatch 是否批量删除
+ * row 单个删除时当前行的数据
+ */
+const handleDelete = (isBatch, row: any = {}) => {
+  let ids = '';
+
+  if (isBatch) {
+    if (!details.selectionList.length) {
+      ElMessage.warning('请选择要删除的数据');
+      return;
+    }
+    ids = details.selectionList.map(v => v.id).join(',');
+  } else {
+    ids = row.id;
+  }
+
+  ElMessageBox.confirm('确定删除该数据吗?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(async () => {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const res = await remove(ids);
+        const { code, msg } = res.data;
+        if (code !== 200) return ElMessage.error(msg);
+        ElMessage.success('删除成功');
+        onLoad(details.page);
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
       }
-      done();
-    },
-            //下载模板
-    handleTemplate() {
-      this.excelBox=true
-      console.log('下载模板！！！');
-      exportBlob(
-        `/api/logpm-basicdata/vehicle/export-vehicleTemplate?${this.website.tokenHeader}=${getToken()}`
-      ).then(res => {
-        this.excelBox=false
-        downloadXls(res.data, '车辆信息导入模板.xlsx');
-        ElMessage({
-        message: '下载成功',
-        type: 'success',
-        })
-      }).catch(()=>{
-        this.excelBox=false
-      });
-    },
-    uploadAfter(res, done, loading, column) {
-      window.console.log(column);
-      this.excelBox = false;
-      this.refreshChange();
-      done();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
+    })
+    .catch(() => {});
+};
 
-      const { vehicleNub, vehicleSource, trailerType, vehicleModel, paymentMethod, carrierId } =
-        this.query;
-      let values = {
-        vehicleNub: vehicleNub,
-        vehicleSource: vehicleSource,
-        trailerType: trailerType,
-        vehicleModel: vehicleModel,
-        paymentMethod: paymentMethod,
-        carrierId: carrierId,
-      };
+/** 导出 */
+const handleExport = () => {
+  console.log('instance :>> ', instance);
 
-      getPage(page.currentPage, page.pageSize, values).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.option.column[10].dicData = [];
-        this.dicDatas = [];
-        //查询绑定人
-        this.getOwns();
-        this.getOwns();
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-    //查询绑定人
-    getOwns() {
-      getOwn().then(res => {
-        console.log('res.data.data>>>>>>>', res.data.data);
-        res.data.data.map(v => {
-          let value = {
-            label: v.name,
-            value: v.id,
-          };
-          this.option.column[10].dicData.push(value);
-          this.dicDatas.push(value);
-        });
-      });
-    },
-  },
+  if (!details.selectionList.length) {
+    ElMessage({
+      message: '请勾选要导出的数据',
+      type: 'warning',
+    });
+    return;
+  }
+
+  let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle?Blade-Auth=${getToken()}`;
+  let submitData = {
+    ids: '',
+  };
+  submitData.ids = details.selectionList.map(item => item.id).join(',');
+  ElMessageBox.confirm('是否导出数据?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await exportBlob(downloadUrl, submitData);
+      const { status, data } = res;
+      if (status !== 200) retrun;
+
+      downloadXls(res.data, `车辆信息导出${dateNow()}.xlsx`);
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
 };
 </script>
 
 <style scoped lang="scss">
-:deep(.avue-form__row) {
-  margin-left: 10px;
-  max-width: 250px !important;
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
 }
-:deep(.avue-form__row) {
-  margin-left: 0;
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
 }
-:deep(.el-form-item__label) {
-  width: auto !important;
+
+.mt20 {
+  margin-top: 20px;
 }
-:deep(.no-print) {
-  max-width: 120px !important;
-  margin-left: auto;
-  .el-button {
-    margin-right: 0;
-  }
+
+.fwb {
+  font-weight: bold;
 }
 </style>
diff --git a/src/views/basicdata/vehicle/basicdataVehicle1.vue b/src/views/basicdata/vehicle/basicdataVehicle1.vue
new file mode 100644
index 00000000..f883b5a4
--- /dev/null
+++ b/src/views/basicdata/vehicle/basicdataVehicle1.vue
@@ -0,0 +1,1274 @@
+<template>
+  <basic-container>
+    <avue-crud
+      v-if="edit"
+      :option="option"
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <!-- <el-button type="primary" icon="el-icon-plus" plain @click="handleAdd">新 增 </el-button> -->
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="permission.basicdataVehicle_delete"
+          @click="handleDelete"
+          >删 除
+        </el-button>
+        <el-button
+          type="danger"
+          plain
+          @click="ExportVehicle"
+          >导 出
+        </el-button>
+
+        <el-button
+          type="danger"
+          plain
+          @click="VehicleImport"
+          >导 入
+        </el-button>
+        <!--        <el-button type="warning"-->
+        <!--                   plain-->
+        <!--                   icon="el-icon-download"-->
+        <!--                   @click="handleExport">导 出-->
+        <!--        </el-button>-->
+      </template>
+      <template #menu="{ size, row, index }">
+        <el-button type="primary" text icon="el-icon-view" @click="editDeline(row)"
+          >编 辑</el-button
+        >
+        <el-button type="primary" text icon="el-icon-view" @click="viewDeline(row)"
+          >查 看</el-button
+        >
+      </template>
+    </avue-crud>
+    <basicdata-vehicleform
+      @returnvehicle="returnvehicle"
+      :vehicleformdata="vehicleformdata"
+      :dicDatas="dicDatas"
+      v-if="!edit"
+    />
+    <el-dialog title="车辆导入" append-to-body v-model="excelBox" width="555px">
+      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+        <template #excelTemplate>
+          <el-button type="primary" @click="handleTemplate">
+            点击下载<i class="el-icon-download el-icon--right"></i>
+          </el-button>
+        </template>
+      </avue-form>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getPage,
+  getVehicle,
+  $_Exportvehicle,
+} from '@/api/basicdata/basicdataVehicle';
+import { getOwn } from '@/api/basicdata/basicdataDriverArtery';
+import option from '@/option/basicdata/basicdataVehicle';
+import { mapGetters } from 'vuex';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import BasicdataVehicleform from '/src/views/basicdata/vehicle/basicdataVehicleform.vue';
+import { ElMessage } from 'element-plus'
+export default {
+  components: { BasicdataVehicleform },
+  data() {
+    return {
+      excelBox:false,
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '文件上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '文件上传，请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data',
+            },
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: '/api/logpm-basicdata/vehicle/import-basicdataVehicle',
+          },
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
+      form: {},
+      query: {},
+      search: {},
+      loading: true,
+      vehicleformdata: {},
+      dicDatas: [],
+      edit: true, //修改
+      page: {
+        pageSize: 30,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: false,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: false,
+        editBtn: false,
+        selection: true,
+        // 新增按钮不显示
+        // addBtn: false,
+        dialogClickModal: false,
+        column: [
+          {
+            label: '主键',
+            prop: 'id',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '租户号',
+            prop: 'tenantId',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '创建人',
+            prop: 'createUser',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '创建时间',
+            prop: 'createTime',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '更新人',
+            prop: 'updateUser',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '更新时间',
+            prop: 'updateTime',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '状态',
+            prop: 'status',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '是否已删除;1-未删除，2-已删除',
+            prop: 'isDeleted',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '创建部门',
+            prop: 'createDept',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '车牌号',
+            prop: 'vehicleNub',
+            type: 'input',
+            search: true,
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            rules: [{ required: true, message: '请输入车牌号!', trigger: 'blur' }],
+          },
+          //  {
+          //    label: '承运商名称',
+          //    labelWidth: '150',
+          //   // width: 'fit-content',
+          //     width: '100px',
+          //    align: 'center',
+          //    span: 11,
+          //    prop: 'carrierName',
+          //    type: 'input',
+          //    editDisplay: false,
+          //    addDisplay: false,
+          // },
+          {
+            label: '绑定驾驶人',
+            prop: 'vehicleOwners',
+            type: 'select',
+            labelWidth: '150',
+            width: '200px',
+            align: 'center',
+            span: 11,
+            multiple: true,
+            // dicData: [],
+            dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
+            props: {
+              label: 'vehicleNub',
+              value: 'id',
+            },
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '车辆来源',
+            prop: 'vehicleSource',
+            type: 'select',
+            search: true,
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_source',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '是否车头',
+            prop: 'isHead',
+            type: 'select',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=isHead_yes_no',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '挂车类型',
+            prop: 'trailerType',
+            type: 'select',
+            search: true,
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_trailer_type',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '车辆类型',
+            prop: 'vehicleModel',
+            type: 'select',
+            search: true,
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_model',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '车厢类型',
+            prop: 'carType',
+            type: 'select',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_car_type',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '车长(M)',
+            prop: 'vehicleCommander',
+            type: 'input',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '外廓高',
+            prop: 'vehicleHeight',
+            type: 'input',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '付款方式',
+            prop: 'paymentMethod',
+            type: 'select',
+            search: true,
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            filterable: true,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basicdata_vehicle_paymentmethod',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '核定体积',
+            prop: 'approvedVolume',
+            type: 'input',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车牌颜色',
+            prop: 'licensePlateColor',
+            type: 'select',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_plate_color',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '车身颜色',
+            prop: 'vehicleColor',
+            type: 'select',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_color',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '能源类型',
+            prop: 'energyType',
+            type: 'select',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_energy_type',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '车牌类型',
+            prop: 'licensePlateType',
+            type: 'select',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_plate_type',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '备注',
+            prop: 'notes',
+            type: 'input',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+          },
+          // {
+          //   label: "车辆所属人",
+          //   prop: "vehicleOwner",
+          //   type: "input",
+          //   labelWidth:'150',
+          //   width:"100px",
+          //   align:'center',
+          //   span:11,
+          // },
+          {
+            label: '品牌型号',
+            prop: 'vehicleBrand',
+            type: 'input',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车辆代号',
+            prop: 'vehicleCode',
+            type: 'input',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '发动机型号',
+            prop: 'engineCode',
+            type: 'input',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车辆总质量(T)',
+            prop: 'vehicleQuality',
+            type: 'input',
+            labelWidth: '150',
+            width: '120px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '整备质量(T)',
+            prop: 'curbWeight',
+            type: 'input',
+            labelWidth: '150',
+            width: '120px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '载荷质量(T)',
+            prop: 'loadMass',
+            type: 'input',
+            labelWidth: '150',
+            width: '120px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '外廓宽(M)',
+            prop: 'outerWidth',
+            type: 'input',
+            labelWidth: '150',
+            width: '120px',
+            align: 'center',
+            span: 11,
+          },
+          // {
+          //   label: '到期时间',
+          //   prop: 'expirationTime',
+          //   type: 'input',
+          //   labelWidth: '150',
+          //   width: '100px',
+          //   align: 'center',
+          //   span: 11,
+          // },
+            {
+              label: '到期时间',
+              prop: 'expirationTime',
+              type: 'date',
+              format: 'YYYY-MM-DD',
+              valueFormat: 'YYYY-MM-DD',
+              labelWidth: '150',
+              width: '150px',
+              align: 'center',
+              span: 11,
+            },
+          {
+            label: '道路运输证号',
+            prop: 'roadTransport',
+            type: 'input',
+            labelWidth: '150',
+            width: '150px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '经营许可证号',
+            prop: 'businessLicense',
+            type: 'input',
+            labelWidth: '150',
+            width: '150px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车辆所属单位',
+            prop: 'vehicleUnit',
+            type: 'input',
+            labelWidth: '150',
+            width: '150px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车辆所属单位电话',
+            prop: 'vehicleUnitPhone',
+            type: 'input',
+            labelWidth: '150',
+            width: '180px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车辆所属人手机号',
+            prop: 'vehicleOwnerPhone',
+            type: 'input',
+            labelWidth: '150',
+            width: '180px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车辆所属人身份证号',
+            prop: 'vehicleOwnerCard',
+            type: 'input',
+            labelWidth: '150',
+            width: '180px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '承运商',
+            prop: 'carrierId',
+            type: 'select',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            search: true,
+            span: 11,
+            filterable: true,
+            dicUrl: '/api/logpm-basicdata/carrier/dictionary',
+            props: {
+              label: 'carrierName',
+              value: 'id',
+            },
+            rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }],
+          },
+          {
+            label: '车辆年审时间',
+            prop: 'reviewTime',
+            width: '120px',
+            align: 'center',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            labelWidth: '150',
+            span: 11,
+          },
+          // {
+          //   label: '车辆年审有效期',
+          //   prop: 'reviewValidity',
+          //   type: 'input',
+          //   labelWidth: '150',
+          //   width: '150px',
+          //   align: 'center',
+          //   span: 11,
+          // },
+
+          {
+            label: '车辆年审有效期',
+            prop: 'reviewValidity',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            labelWidth: '150',
+            width: '150px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车辆保险开始时间',
+            prop: 'insuranceStartTime',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            labelWidth: '150',
+            width: '150px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '车辆保险结束时间',
+            prop: 'insuranceEndTime',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            labelWidth: '150',
+            width: '150px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '有无车身广告',
+            prop: 'bodyAdvertising',
+            type: 'select',
+            labelWidth: '150',
+            width: '150px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=bodyAdvertising_yes_no',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: '车身广告更新时间',
+            prop: 'advertisementsNewTimes',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            labelWidth: '150',
+            width: '180px',
+            align: 'center',
+            span: 11,
+          },
+          // {
+          //   label: "车辆挂靠公司",
+          //   prop: "vehicleParkingCompany",
+          //   type: "input",
+          //   labelWidth:'150',
+          //   width:"150px",
+          //   align:'center',
+          //   span:11,
+          // },
+          {
+            label: '是否有GPS',
+            prop: 'withGps',
+            type: 'select',
+            labelWidth: '150',
+            width: '150px',
+            align: 'center',
+            span: 11,
+            dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
+          },
+          {
+            label: 'GPS服务商',
+            prop: 'gpsServiceProvider',
+            type: 'input',
+            labelWidth: '150',
+            width: '120px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: 'GPS型号',
+            prop: 'gpsModel',
+            type: 'input',
+            labelWidth: '150',
+            width: '120px',
+            align: 'center',
+            span: 11,
+          },
+          {
+            label: '行驶证正面照片',
+            prop: 'drivingLicensePhoto',
+            type: 'upload',
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth: '150',
+            span: 11,
+            multiple: false,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: '行驶证照片反面',
+            prop: 'drivingLicensePhotoBack',
+            type: 'upload',
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth: '150',
+            span: 11,
+            multiple: false,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: '许可证照片',
+            prop: 'licensePhoto',
+            type: 'upload',
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth: '150',
+            span: 11,
+            multiple: false,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: '车辆照片(最新)',
+            prop: 'vehiclePhoto',
+            type: 'upload',
+            listType: 'picture-img',
+            dataType: 'string',
+            labelWidth: '150',
+            span: 11,
+            multiple: false,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            // limit: 3,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: '车尾照片',
+            prop: 'vehicleRearPhoto',
+            type: 'upload',
+            listType: 'picture-img',
+            dataType: 'string',
+            labelWidth: '150',
+            span: 11,
+            multiple: false,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            // limit: 3,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: '道路运输照片',
+            prop: 'roadTransportPhoto',
+            type: 'upload',
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth: '150',
+            span: 11,
+            multiple: false,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: '人车合影照片',
+            prop: 'vehiclePeoplePhoto',
+            type: 'upload',
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth: '150',
+            span: 11,
+            multiple: false,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: '保险卡照片',
+            prop: 'insuranceCardPhoto',
+            type: 'upload',
+            dataType: 'string',
+            listType: 'picture-img',
+            hide: true,
+            labelWidth: '150',
+            span: 11,
+            multiple: false,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+          {
+            label: '车俩历史照片',
+            prop: 'historicPhotos',
+            type: 'upload',
+            listType: 'picture-card',
+            dataType: 'string',
+            labelWidth: '150',
+            span: 11,
+            multiple: true,
+            width: '200px',
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            limit: 3,
+            disabled: true,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+          },
+
+          {
+            label: '预留1',
+            prop: 'reserve1',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '预留2',
+            prop: 'reserve2',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '预留3',
+            prop: 'reserve3',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '预留4',
+            prop: 'reserve4',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '预留5',
+            prop: 'reserve5',
+            type: 'input',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+        ],
+      },
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        // addBtn: this.validData(this.permission.basicdataVehicle_add, false),
+        viewBtn: this.validData(this.permission.basicdataVehicle_view, false),
+        delBtn: this.validData(this.permission.basicdataVehicle_delete, false),
+        editBtn: this.validData(this.permission.basicdataVehicle_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      // if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) {
+      //   row.vehicleOwners = row.vehicleOwners.join(",");
+      //   console.log(row.vehicleOwners);
+      // }else{
+      //   row.vehicleOwners=''
+      // }
+      if (Array.isArray(row.vehicleOwners)) {
+        row.vehicleOwners = row.vehicleOwners.join(',');
+        console.log(row.vehicleOwners);
+      }
+      console.log(row.vehicleOwners, '=====1231231');
+
+      console.log('================================================================', row);
+      add(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          window.console.log(error);
+        }
+      );
+    },
+    editDeline(row) {
+      console.log('触发了编辑');
+      console.log('row>>>>>>>>>>>>>>>', row);
+      console.log('this.dicDatas>>>>>>>>>>>>>>>', this.dicDatas);
+      this.vehicleformdata = row;
+      this.vehicleformdata.view = false;
+      this.edit = false;
+    },
+    viewDeline(row) {
+      console.log('>>>>>>>>>>>>>>>', row);
+      this.vehicleformdata = row;
+      this.vehicleformdata.view = true;
+      console.log('this.vehicleformdata.view>>>>>>>>>>>>>>>', this.vehicleformdata.view);
+      this.edit = false;
+    },
+    returnvehicle(val) {
+      console.log('取消>>>>>', val);
+      this.edit = true;
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          console.log(error);
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    /**
+     * 新增车辆
+     */
+    handleAdd() {
+      // 跳转到添加页面
+      this.$router.push('/basicdata/vehicle/basicdtaVehicleAddForm');
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+
+    // 导出车辆信息
+    ExportVehicle() {
+      
+      if(!this.selectionList.length){
+        ElMessage({
+        message: '请勾选要导出的数据',
+        type: 'warning',
+        })  
+        return
+      }
+
+      let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      let values = {
+        ids:'',
+      }
+      values.ids = this.selectionList.map(item => item.id).join(',');
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.loading=true
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `车辆信息导出${dateNow()}.xlsx`);
+          NProgress.done();
+          this.loading=false
+        }).catch(()=>{
+          this.loading=false
+        });
+      });
+    },
+    // 导入
+    VehicleImport(){
+      this.excelBox=true;// 打开导入弹窗
+    },
+    handleExport() {
+      let downloadUrl = `/blade-basicdataVehicle/basicdataVehicle/export-basicdataVehicle?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const {} = this.query;
+      let values = {};
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `车辆信息表${dateNow()}.xlsx`);
+          NProgress.done();
+        });
+      });
+    },
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+          console.log('this.form>>>>>>>>>>>>>', this.form);
+        });
+      }
+      done();
+    },
+            //下载模板
+    handleTemplate() {
+      this.excelBox=true
+      console.log('下载模板！！！');
+      exportBlob(
+        `/api/logpm-basicdata/vehicle/export-vehicleTemplate?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        this.excelBox=false
+        downloadXls(res.data, '车辆信息导入模板.xlsx');
+        ElMessage({
+        message: '下载成功',
+        type: 'success',
+        })
+      }).catch(()=>{
+        this.excelBox=false
+      });
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+
+      const { vehicleNub, vehicleSource, trailerType, vehicleModel, paymentMethod, carrierId } =
+        this.query;
+      let values = {
+        vehicleNub: vehicleNub,
+        vehicleSource: vehicleSource,
+        trailerType: trailerType,
+        vehicleModel: vehicleModel,
+        paymentMethod: paymentMethod,
+        carrierId: carrierId,
+      };
+
+      getPage(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.option.column[10].dicData = [];
+        this.dicDatas = [];
+        //查询绑定人
+        this.getOwns();
+        this.getOwns();
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    //查询绑定人
+    getOwns() {
+      getOwn().then(res => {
+        console.log('res.data.data>>>>>>>', res.data.data);
+        res.data.data.map(v => {
+          let value = {
+            label: v.name,
+            value: v.id,
+          };
+          this.option.column[10].dicData.push(value);
+          this.dicDatas.push(value);
+        });
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+:deep(.avue-form__row) {
+  margin-left: 10px;
+  max-width: 250px !important;
+}
+:deep(.avue-form__row) {
+  margin-left: 0;
+}
+:deep(.el-form-item__label) {
+  width: auto !important;
+}
+:deep(.no-print) {
+  max-width: 120px !important;
+  margin-left: auto;
+  .el-button {
+    margin-right: 0;
+  }
+}
+</style>
diff --git a/src/views/basicdata/vehicle/basicdataVehicle2.vue b/src/views/basicdata/vehicle/basicdataVehicle2.vue
deleted file mode 100644
index 16659710..00000000
--- a/src/views/basicdata/vehicle/basicdataVehicle2.vue
+++ /dev/null
@@ -1,572 +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">
-          <template v-for="item in details.columnList" :key="item.prop">
-            <el-form-item v-if="item.isTitleSearch" :label="item.label">
-              <!-- 普通输入框 -->
-              <template v-if="item.type === 2">
-                <el-input
-                  class="w100"
-                  :placeholder="`请输入${item.label}`"
-                  v-model="details.query[item.prop]"
-                  clearable
-                ></el-input>
-              </template>
-
-              <!-- 下拉框 -->
-              <template v-else-if="item.type === 3">
-                <el-select
-                  v-model="details.query[item.prop.replace('Name', '')]"
-                  :placeholder="`请选择${item.label}`"
-                  class="w100"
-                  clearable
-                  filterable
-                  :multiple="item.multiple || false"
-                  @change="
-                    val => {
-                      !val && delete details.query[item.prop.replace('Name', '')];
-                    }
-                  "
-                >
-                  <el-option
-                    v-for="val in item.checkarr"
-                    :key="val.value"
-                    :label="val.label"
-                    :value="val.value"
-                  />
-                </el-select>
-              </template>
-            </el-form-item>
-          </template>
-
-          <!-- 查询按钮 -->
-          <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">
-          <!-- 新增 -->
-          <el-button type="primary" icon="Plus" @click="handleAdd">新 增</el-button>
-
-          <!-- 删除 -->
-          <el-button type="primary" icon="Delete" @click="() => handleDelete(true)">
-            删 除
-          </el-button>
-
-          <!-- 导出 -->
-          <el-button type="primary" icon="Download" @click="handleExport">导 出</el-button>
-
-          <!-- 导入 -->
-          <el-button
-            type="primary"
-            icon="Upload"
-            @click="() => (details.popUpShow.UploadPackageDelivery = true)"
-            >导 入
-          </el-button>
-        </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 @click="handleDelete(false, slotProps.scope.row)"> 删除 </el-text>
-
-            <el-text @click="handleEdit(slotProps.scope)"> 编辑 </el-text>
-
-            <el-text @click="handleView(slotProps.scope)"> 查看 </el-text>
-          </template>
-        </template>
-      </tablecmt>
-
-      <!-- 分页模块 -->
-      <div class="flex-c-sb mt20">
-        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-        <!-- 分页模块 -->
-        <el-pagination
-          align="right"
-          background
-          @size-change="sizeChange"
-          @current-change="currentChange"
-          :current-page="page.current"
-          :page-sizes="[30, 50, 80, 120]"
-          :page-size="page.size"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="page.total"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </basic-container>
-
-  <!-- 上传 -->
-  <MyUpload
-    ref="myUpload"
-    v-model="details.popUpShow.UploadPackageDelivery"
-    templateSrc=""
-    uploadAddress="/api/logpm-basicdata/vehicle/import-basicdataVehicle"
-    isDefined
-    :success="
-      () => {
-        details.popUpShow.UploadPackageDelivery = false;
-        onLoad();
-      }
-    "
-  >
-    <!-- <el-button type="danger" icon="Download" @click="handleDownloadTemplate"> 下载模板 </el-button> -->
-  </MyUpload>
-
-  <!-- 列表配置显示 -->
-  <edittablehead
-    @closce="showdrawer"
-    :drawerShow="drawerShow"
-    v-model="details.columnList"
-  ></edittablehead>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, toRefs, computed, onMounted, nextTick, getCurrentInstance } 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,
-  handleTranslationDataSeclect,
-  getObjType,
-} from '@/utils/util';
-import columnList from '@/option/basicdata/basicdataVehicle2.js';
-import { useStore } from 'vuex';
-import { useRouter } from 'vue-router';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import { exportBlob } from '@/api/common';
-import { getToken } from '@/utils/auth';
-import { dateNow } from '@/utils/date';
-import {
-  getList,
-  getDetail,
-  add,
-  update,
-  remove,
-  getPage,
-  getVehicle,
-  $_Exportvehicle,
-  getDictionary,
-  getVehicleExport,
-} from '@/api/basicdata/basicdataVehicle';
-import { getOwn } from '@/api/basicdata/basicdataDriverArtery';
-
-// 获取路由实例
-const $router = useRouter();
-
-const $store = useStore();
-
-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: {
-    current: 1,
-    size: 30,
-    total: 0,
-  },
-  /** 弹出层显示 */
-  popUpShow: {
-    /** 图片预览 */
-    abnormalVisited: false,
-    /** 上传 */
-    UploadPackageDelivery: false,
-  },
-  /** 列表Dom节点 */
-  listNode: '',
-  form: {},
-  /** 全屏 */
-  fullscreenObj: {
-    /** 查看 */
-    view: false,
-  },
-});
-
-const { search, query, shortcuts, stockupDate, data, loadingObj, selectionList, drawerShow, page } =
-  toRefs(details);
-
-const instance = getCurrentInstance();
-
-/** 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 getPage({ ..._page, ...details.query, ...params });
-    console.log('res :>> ', res);
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.data = data.records;
-
-    handleTranslationDataSeclect(details.data, details.columnList);
-
-    details.page.total = data.total;
-  } catch (error) {
-  } finally {
-    details.loadingObj.list = false;
-  }
-}, 10);
-
-const handleData = (key, res) => {
-  const { code, data } = res.data;
-  if (code !== 200) return;
-  for (let i = 0; i < details.columnList.length; i++) {
-    const value = details.columnList[i];
-
-    if (value.label === key)
-      return (value.checkarr =
-        getObjType(data) === 'array'
-          ? data.map(val => {
-              val.label = val.dictValue;
-              val.value = val.dictKey;
-              return val;
-            })
-          : []);
-  }
-};
-
-// 获取字典数据
-const initData = async () => {
-  await Promise.all([
-    // 车辆来源
-    getDictionaryBiz('basic_vehicle_source').then(res => handleData('车辆来源', res)),
-    // 是否车头
-    getDictionaryBiz('yes_no').then(res => handleData('是否车头', res)),
-    // 挂车类型
-    getDictionaryBiz('basic_trailer_type').then(res => handleData('挂车类型', res)),
-    // 车辆类型
-    getDictionaryBiz('basic_vehicle_model').then(res => handleData('车辆类型', res)),
-    // 车厢类型
-    getDictionaryBiz('basic_car_type').then(res => handleData('车厢类型', res)),
-    // 付款方式
-    getDictionaryBiz('basicdata_vehicle_paymentmethod').then(res => handleData('付款方式', res)),
-    // 车牌颜色
-    getDictionaryBiz('basic_plate_color').then(res => handleData('车牌颜色', res)),
-    // 车身颜色
-    getDictionaryBiz('basic_vehicle_color').then(res => handleData('车身颜色', res)),
-    // 能源类型
-    getDictionaryBiz('basic_energy_type').then(res => handleData('能源类型', res)),
-    // 车牌类型
-    getDictionaryBiz('basic_plate_type').then(res => handleData('车牌类型', res)),
-    // 承运商
-    getDictionary().then(res => {
-      const { code, data } = res.data;
-      if (code !== 200) return;
-      for (let i = 0; i < details.columnList.length; i++) {
-        const value = details.columnList[i];
-
-        if (value.label === '承运商')
-          return (value.checkarr =
-            getObjType(data) === 'array'
-              ? data.map(val => {
-                  val.label = val.carrierName;
-                  val.value = val.id;
-                  return val;
-                })
-              : []);
-      }
-    }),
-    onLoad(),
-  ]);
-
-  await nextTick();
-  handleTranslationDataSeclect(details.data, details.columnList);
-  console.log('details.columnList :>> ', details.columnList);
-};
-
-initData();
-
-/** 搜索 */
-const searchChange = () => {
-  onLoad(details.page);
-};
-
-/** 清空表单 */
-const searchReset = () => {
-  details.query = {};
-  details.stockupDate = [];
-  details.page.current = 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 = (size: number) => {
-  details.page.size = size;
-  onLoad(details.page);
-};
-
-/** 页码改变执行的回调 */
-const currentChange = current => {
-  details.page.current = current;
-  onLoad();
-};
-
-/** 新增 */
-const handleAdd = () => {
-  $store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
-
-  $router.push({
-    path: '/basicdata/vehicle/basicdataVehicleAddForm',
-    query: { type: 'add' },
-  });
-};
-
-/** 编辑 */
-const handleEdit = ({ row }) => {
-  $store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
-
-  $router.push({
-    path: '/basicdata/vehicle/basicdataVehicleAddForm',
-    query: { type: 'edit', name: `${row.vehicleNub} -- 编辑`, id: row.id },
-  });
-};
-
-/** 查看 */
-const handleView = ({ row }) => {
-  $store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
-
-  $router.push({
-    path: '/basicdata/vehicle/basicdataVehicleAddForm',
-    query: { type: 'view', name: `${row.vehicleNub} -- 查看`, id: row.id },
-  });
-};
-
-/** 删除
- * isBatch 是否批量删除
- * row 单个删除时当前行的数据
- */
-const handleDelete = (isBatch, row: any = {}) => {
-  let ids = '';
-
-  if (isBatch) {
-    if (!details.selectionList.length) {
-      ElMessage.warning('请选择要删除的数据');
-      return;
-    }
-    ids = details.selectionList.map(v => v.id).join(',');
-  } else {
-    ids = row.id;
-  }
-
-  ElMessageBox.confirm('确定删除该数据吗?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  })
-    .then(async () => {
-      try {
-        details.loadingObj.pageLoading = true;
-
-        const res = await remove(ids);
-        const { code, msg } = res.data;
-        if (code !== 200) return ElMessage.error(msg);
-        ElMessage.success('删除成功');
-        onLoad(details.page);
-      } catch (error) {
-        console.log('error :>> ', error);
-      } finally {
-        details.loadingObj.pageLoading = false;
-      }
-    })
-    .catch(() => {});
-};
-
-/** 导出 */
-const handleExport = () => {
-  console.log('instance :>> ', instance);
-
-  if (!details.selectionList.length) {
-    ElMessage({
-      message: '请勾选要导出的数据',
-      type: 'warning',
-    });
-    return;
-  }
-
-  let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle?Blade-Auth=${getToken()}`;
-  let submitData = {
-    ids: '',
-  };
-  submitData.ids = details.selectionList.map(item => item.id).join(',');
-  ElMessageBox.confirm('是否导出数据?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(async () => {
-    try {
-      details.loadingObj.pageLoading = true;
-
-      const res = await exportBlob(downloadUrl, submitData);
-      const { status, data } = res;
-      if (status !== 200) retrun;
-
-      downloadXls(res.data, `车辆信息导出${dateNow()}.xlsx`);
-    } catch (error) {
-      console.log('error :>> ', error);
-    } finally {
-      details.loadingObj.pageLoading = false;
-    }
-  });
-};
-</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>
diff --git a/src/views/distribution/artery/TripartiteTransferDetails.vue b/src/views/distribution/artery/TripartiteTransferDetails.vue
index f8f88f7a..029458d7 100644
--- a/src/views/distribution/artery/TripartiteTransferDetails.vue
+++ b/src/views/distribution/artery/TripartiteTransferDetails.vue
@@ -333,6 +333,7 @@ import {
   postFindDriverListByName,
   postFindUseOrderList,
 } from '@/api/distribution/AddVehicleStowage';
+import { postFindDriverListByNameAndWarehouseId } from '@/api/distribution/addTripartiteTransfer';
 import { postCarsLoadDetailInfo } from '@/api/distribution/VehicleStowageDetails.js';
 import { postFindCarsLoadLogs } from '@/api/distribution/VehicleStowageDetails.js';
 import { useRouter, useRoute } from 'vue-router';
@@ -675,7 +676,7 @@ const searchHide = async () => {
 
 /** 查询司机信息 */
 const remoteMethodDriver = async val => {
-  const res = await postFindDriverListByName({ driverName: val });
+  const res = await postFindDriverListByNameAndWarehouseId({ driverName: val });
   console.log('res :>> ', res);
   const { code, data } = res.data;
   if (code !== 200) return;
diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue
index 313ce999..49f68f2a 100644
--- a/src/views/distribution/artery/addTripartiteTransfer.vue
+++ b/src/views/distribution/artery/addTripartiteTransfer.vue
@@ -514,7 +514,7 @@
 
 <script lang="ts">
 export default {
-  name: 'addTripartiteTransfer',
+  name: '/distribution/artery/addTripartiteTransfer',
 };
 </script>
 
@@ -537,7 +537,6 @@ import { columnList, newColumnList } from '@/option/distribution/addVehicleStowa
 import {
   postloadFindLoadInitData,
   postFindAllOrderList,
-  postFindDriverListByName,
   postFindCarrierByName,
   postFindUseOrderList,
   postSelectEditDetailByLoadId,
@@ -546,6 +545,7 @@ import {
 import {
   postSaveNewTripartiteTransfer,
   postUpdateTripartiteTransfer,
+  postFindDriverListByNameAndWarehouseId,
 } from '@/api/distribution/addTripartiteTransfer.js';
 import type { FormInstance, FormRules } from 'element-plus';
 import { ElMessage } from 'element-plus';
@@ -992,7 +992,7 @@ remoteMethod('');
 
 /** 查询司机信息 */
 const remoteMethodDriver = async val => {
-  const res = await postFindDriverListByName({ driverName: val });
+  const res = await postFindDriverListByNameAndWarehouseId({ driverName: val });
   console.log('res :>> ', res);
   const { code, data } = res.data;
   if (code !== 200) return;
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index 487666f8..ff2e5c1a 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -834,6 +834,7 @@ const handleBatchUnLoad = async () => {
             waybillNo: iterator.waybillNo,
             enterNum: iterator.num,
             orderCode: iterator.orderCode,
+            carsLoadScanId: iterator.id,
           });
         }
 
@@ -958,6 +959,7 @@ const handleBatchUnLoad = async () => {
               waybillNo: iterator.waybillNo,
               enterNum: iterator.num,
               orderCode: iterator.orderCode,
+              carsLoadScanId: iterator.id,
             });
           }
         }
@@ -1157,6 +1159,7 @@ const handleZeroUnLoadSubmit = async () => {
             waybillNo: details.zeroItem.waybillNo,
             enterNum: details.zeroItem.enterNum,
             orderCode: details.zeroItem.orderCode,
+            carsLoadScanId: details.zeroItem.id,
           },
         ],
         incomingType: '7',
@@ -1170,6 +1173,7 @@ const handleZeroUnLoadSubmit = async () => {
         enterNum: details.zeroItem.num,
         orderCode: details.zeroItem.orderCode,
         incomingType: '7',
+        carsLoadScanId: details.zeroItem.id,
       };
 
       res = await postTransferUnloadZero(submitData);