From 29692b6c32c8c9d3f5070b810b68bf6bdd07343c Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 18 Oct 2024 22:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/basicMaterial.js                |  73 +-
 src/option/basic/basicMaterial1.js            | 354 ++++++++++
 .../distribution/VehicleArrivalManagement.js  |   2 +-
 src/option/distribution/VehicleStowage.js     |   2 +-
 src/views/basic/material/basicMaterial2.vue   | 646 ++++++++++++++++++
 .../driverArtery/basicdataDriverArtery.vue    |  41 +-
 .../artery/VehicleArrivalManagement.vue       |  25 +-
 .../distribution/artery/VehicleStowage.vue    |  31 +-
 .../artery/truckLoadingDetails.vue            |   4 +-
 .../distribution/inventory/BookingNote.vue    |   3 +-
 src/views/waybill/WaybillOrderList.vue        |   4 +-
 11 files changed, 1120 insertions(+), 65 deletions(-)
 create mode 100644 src/option/basic/basicMaterial1.js
 create mode 100644 src/views/basic/material/basicMaterial2.vue

diff --git a/src/api/basic/basicMaterial.js b/src/api/basic/basicMaterial.js
index fa13c012..8ef9e7c4 100644
--- a/src/api/basic/basicMaterial.js
+++ b/src/api/basic/basicMaterial.js
@@ -1,6 +1,6 @@
 import request from '@/axios';
 
-export const getList = (current, size, params) => {
+export const getList = params => {
   return request({
     url: '/api/logpm-basic/material/list',
     method: 'get',
@@ -8,9 +8,18 @@ export const getList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
+
+/** 获取物料列表 */
+export const getMaterialList = params => {
+  return request({
+    url: '/api/logpm-basic/material/list',
+    method: 'get',
+    params,
+  });
+};
 
 export const getListMaterial = (current, size, params) => {
   return request({
@@ -20,59 +29,57 @@ export const getListMaterial = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const materialList= (params) => {
+export const materialList = params => {
   return request({
     url: '/api/logpm-basic/material/materialList',
     method: 'get',
-    params
-  })
-}
-
+    params,
+  });
+};
 
-export const $_getListMaterial = (params) => {
+export const $_getListMaterial = params => {
   return request({
     url: '/api/logpm-basic/material//findPidList',
     method: 'get',
     params,
-  })
-}
-export const getDetail = (id) => {
+  });
+};
+export const getDetail = id => {
   return request({
     url: '/api/logpm-basic/material/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-basic/material/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-basic/material/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-basic/material/submit',
     method: 'post',
-    data: row
-  })
-}
-
+    data: row,
+  });
+};
diff --git a/src/option/basic/basicMaterial1.js b/src/option/basic/basicMaterial1.js
new file mode 100644
index 00000000..046b26db
--- /dev/null
+++ b/src/option/basic/basicMaterial1.js
@@ -0,0 +1,354 @@
+/** 物料管理表头 */
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    label: '产品编码',
+    prop: 'productCode',
+    width: '130',
+    type: 2,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isTitleSearch: true,
+  },
+  {
+    label: '物品sku',
+    prop: 'sku',
+    width: '130',
+    type: 2,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '计量单位',
+    prop: 'logpmUnit',
+    width: '130',
+    type: 3,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isTitleSearch: true,
+  },
+  {
+    label: '名称',
+    prop: 'name',
+    width: '130',
+    type: 2,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isTitleSearch: true,
+  },
+  {
+    label: '属性',
+    prop: 'property',
+    width: '130',
+    type: 'input',
+    type: 2,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '包装规格',
+    prop: 'packingSpecification',
+    type: 'input',
+    width: '130',
+    type: 2,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '包装数量',
+    prop: 'packageNum',
+    width: '130',
+    type: 1,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '包装材质',
+    prop: 'packagingMaterial',
+    width: '130',
+    type: 2,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '长',
+    prop: 'extent',
+    width: '130',
+    type: 1,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '宽',
+    prop: 'breadth',
+    width: '130',
+    type: 1,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '高度',
+    prop: 'altitude',
+    width: '130',
+    type: 1,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '体积',
+    prop: 'volume',
+    width: '130',
+    type: 1,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '重量',
+    prop: 'weight',
+    width: '130',
+    type: 1,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '备注',
+    prop: 'remark',
+    width: '130',
+    type: 2,
+    values: '',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+  },
+];
+
+/** 新增 | 编辑 物料字段 */
+export const formOptions = [
+  {
+    label: '产品编码',
+    prop: 'productCode',
+    type: 'input',
+    rules: [
+      {
+        required: true,
+        message: '请输入产品编码',
+        trigger: ['blur', 'change'],
+      },
+      {
+        pattern: /^[a-zA-Z0-9]{1,50}$/,
+        message: '产品编码只能包含字母和数字，长度不能超过50位',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    overHidden: true,
+  },
+  {
+    label: '物品sku',
+    prop: 'sku',
+    type: 'input',
+    rules: [
+      {
+        required: true,
+        message: '请输入物品sku',
+        trigger: ['blur', 'change'],
+      },
+      {
+        pattern: /^[a-zA-Z0-9]{1,50}$/,
+        message: '物品sku只能包含字母和数字，长度不能超过50位',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    overHidden: true,
+  },
+  {
+    label: '计量单位',
+    prop: 'logpmUnit',
+    type: 'select',
+    rules: [
+      {
+        required: true,
+        message: '请选择计量单位',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    checkarr: [],
+  },
+  {
+    label: '名称',
+    prop: 'name',
+    type: 'input',
+    rules: [
+      {
+        required: true,
+        message: '请输入名称',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    overHidden: true,
+  },
+  {
+    label: '属性',
+    prop: 'property',
+    rules: [
+      {
+        required: true,
+        message: '请输入属性',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    type: 'input',
+  },
+  {
+    label: '包装规格',
+    prop: 'packingSpecification',
+    type: 'input',
+    rules: [
+      {
+        required: true,
+        message: '请输入包装规格',
+        trigger: ['blur', 'change'],
+      },
+    ],
+  },
+  {
+    label: '包装数量',
+    prop: 'packageNum',
+    type: 'number',
+    min: 0,
+    precision: 0,
+    max: 100000,
+    controls: false,
+    rules: [
+      {
+        required: true,
+        message: '请输入包装数量',
+        trigger: ['blur', 'change'],
+      },
+    ],
+  },
+  {
+    label: '包装材质',
+    prop: 'packagingMaterial',
+    type: 'input',
+    rules: [
+      {
+        required: true,
+        message: '请输入包装材质',
+        trigger: ['blur', 'change'],
+      },
+    ],
+  },
+  {
+    label: '长',
+    prop: 'extent',
+    type: 'input',
+    overHidden: true,
+    rules: [
+      {
+        required: true,
+        message: '请输入长度',
+        trigger: ['blur', 'change'],
+      },
+    ],
+  },
+  {
+    label: '宽',
+    prop: 'breadth',
+    type: 'input',
+    rules: [
+      {
+        required: true,
+        message: '请输入宽度',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    overHidden: true,
+  },
+  {
+    label: '高度',
+    prop: 'altitude',
+    type: 'input',
+    rules: [
+      {
+        required: true,
+        message: '请输入高度',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    overHidden: true,
+  },
+  {
+    label: '体积',
+    prop: 'volume',
+    type: 'input',
+    rules: [
+      {
+        required: true,
+        message: '请输入体积',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    overHidden: true,
+  },
+  {
+    label: '重量',
+    prop: 'weight',
+    type: 'input',
+  },
+  {
+    label: '备注',
+    prop: 'remark',
+    type: 'input',
+  },
+];
+
+export default columnList;
diff --git a/src/option/distribution/VehicleArrivalManagement.js b/src/option/distribution/VehicleArrivalManagement.js
index a247324b..df08a80d 100644
--- a/src/option/distribution/VehicleArrivalManagement.js
+++ b/src/option/distribution/VehicleArrivalManagement.js
@@ -16,7 +16,7 @@ export const columnList = [
   },
   {
     prop: 'carsNo',
-    label: '批次号',
+    label: '车次号',
     type: 13,
     values: '',
     width: '150',
diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js
index d8206c88..4b30abb8 100644
--- a/src/option/distribution/VehicleStowage.js
+++ b/src/option/distribution/VehicleStowage.js
@@ -16,7 +16,7 @@ export const columnList = [
   },
   {
     prop: 'carsNo',
-    label: '批次号',
+    label: '车次号',
     type: 13,
     values: '',
     width: '150',
diff --git a/src/views/basic/material/basicMaterial2.vue b/src/views/basic/material/basicMaterial2.vue
new file mode 100644
index 00000000..9920a1a4
--- /dev/null
+++ b/src/views/basic/material/basicMaterial2.vue
@@ -0,0 +1,646 @@
+<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="Download" @click="handleExport">导 出</el-button>
+
+          <!-- 导入 -->
+          <el-button
+            type="primary"
+            icon="Upload"
+            @click="() => (details.popUpShow.UploadPackageDelivery = true)"
+            >导 入
+          </el-button>
+
+          <!-- 删除 -->
+          <el-button type="primary" icon="Delete" @click="() => handleBatchPrint(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>
+      <el-dialog
+        :title="details.handleMaterialOption.type === 'add' ? '新增' : '编辑'"
+        :append-to-body="false"
+        v-model="details.popUpShow.addMaterial"
+        width="80%"
+      >
+        <el-form inline :model="details.handleMaterialOption.form">
+          <el-form-item
+            style="flex: 1; min-width: 45%; margin: 10px"
+            v-for="item in details.handleMaterialOption.formOptions"
+            :key="item.prop"
+            :label="item.label"
+            label-width="120px"
+            :prop="item.prop"
+            :rules="item.rules"
+          >
+            <template v-if="item.type === 'input'">
+              <el-input
+                v-model="details.handleMaterialOption.form[item.prop]"
+                style="width: 100% !important"
+                :placeholder="item.placeholder"
+              ></el-input>
+            </template>
+
+            <template v-else-if="item.type === 'number'">
+              <el-input-number
+                style="width: 100%"
+                v-model="details.handleMaterialOption.form[item.prop]"
+                :precision="item.precision || 0"
+                :controls="item.controls || false"
+                :min="item.min || 0"
+                :max="item.max || Infinity"
+                :value-on-clear="0"
+              />
+            </template>
+
+            <template v-else-if="item.type === 'select'">
+              <el-select
+                v-model="details.handleMaterialOption.form[item.prop]"
+                style="width: 100% !important"
+                filterable
+                :placeholder="item.placeholder"
+              >
+                <el-option
+                  v-for="val in item.checkarr"
+                  :key="val.value"
+                  :label="val.label"
+                  :value="val.value"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
+    </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 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, formOptions } from '@/option/basic/basicMaterial1';
+import { getMaterialList, getDetail, add, update, remove } from '@/api/basic/basicMaterial';
+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 { getOwn } from '@/api/basicdata/basicdataDriverArtery';
+import { isNumber } from '@antfu/utils';
+
+// 获取路由实例
+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: {
+    /** 新增 | 编辑 物料 */
+    addMaterial: false,
+    /** 上传 */
+    UploadPackageDelivery: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 查看 */
+    view: false,
+  },
+  handleMaterialOption: {
+    /** 表单 */
+    form: {},
+    /** 类型 */
+    type: 'add' as 'add' | 'edit',
+    formOptions: deepClone(formOptions),
+  },
+});
+
+const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, page } =
+  toRefs(details);
+
+const instance = getCurrentInstance();
+
+onMounted(() => {
+  const timer = setTimeout(() => {
+    details.listNode = document.querySelector('.maboxhi');
+    details.listNode.style.transition = 'all .5s ease-out';
+    clearTimeout(timer);
+  }, 100);
+});
+
+/** 请求页面数据 */
+const onLoad = debounce(async () => {
+  try {
+    details.loadingObj.list = true;
+    let _page = details.page;
+    // 获取暂存单列表
+    let submit = {
+      ..._page,
+      ...details.query,
+    };
+
+    delete submit.total;
+
+    const res = await getMaterialList(submit);
+    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) {
+    console.log('error :>> ', 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 () => {
+  try {
+    details.loadingObj.pageLoading = true;
+
+    await Promise.all([
+      // 车辆来源
+      getDictionaryBiz('logpm_unit').then(res => {
+        handleData('计量单位', res);
+        const { data } = res.data;
+
+        for (let i = 0; i < details.handleMaterialOption.formOptions.length; i++) {
+          const value = details.handleMaterialOption.formOptions[i];
+
+          if (value.label === '计量单位')
+            return (value.checkarr =
+              getObjType(data) === 'array'
+                ? data.map(val => {
+                    val.label = val.dictValue;
+                    val.value = val.dictKey;
+                    return val;
+                  })
+                : []);
+        }
+      }),
+      onLoad(false),
+    ]);
+
+    console.log(
+      'details.handleMaterialOption.formOptions :>> ',
+      details.handleMaterialOption.formOptions
+    );
+
+    await nextTick();
+    handleTranslationDataSeclect(details.data, details.columnList);
+    console.log('details.columnList :>> ', details.columnList);
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+initData();
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad();
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.page.current = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad();
+};
+
+/** 展开列表控件 */
+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();
+};
+
+/** 表格表头时间选择 */
+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();
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  handleSelectQuery(index, row, details.query);
+
+  onLoad();
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (size: number) => {
+  details.page.size = size;
+  onLoad();
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.current = current;
+  onLoad();
+};
+
+/** 初始化表单数据 */
+const initForm = (type: 'add' | 'edit', row: any = {}) => {
+  const _form = {};
+
+  if (type === 'edit') {
+    for (let i = 0; i < details.handleMaterialOption.formOptions.length; i++) {
+      const value = details.handleMaterialOption.formOptions[i];
+
+      _form[value.prop] =
+        value.type !== 'number' ? '' : isNumber(row[value.prop]) ? Number(row[value.prop]) : 0;
+    }
+  } else {
+    for (let i = 0; i < details.handleMaterialOption.formOptions.length; i++) {
+      const value = details.handleMaterialOption.formOptions[i];
+
+      _form[value.prop] = value.type !== 'number' ? '' : 0;
+    }
+  }
+
+  details.handleMaterialOption.form = _form;
+};
+
+/** 新增 */
+const handleAdd = () => {
+  initForm('add');
+  details.popUpShow.addMaterial = true;
+};
+
+/** 编辑 */
+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();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    })
+    .catch(() => {});
+};
+
+/** 导出 */
+const handleExport = () => {
+  let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle`;
+  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) return;
+
+      downloadXls(res.data, `车辆信息导出${dateNow()}.xlsx`);
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
+/** 批量打印 */
+const handleBatchPrint = () => {};
+</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;
+}
+
+.avue-crud {
+  position: relative;
+}
+
+// 弹窗
+:deep(.el-overlay) {
+  position: absolute;
+}
+
+:deep(.el-input-number .el-input__inner) {
+  text-align: left !important;
+}
+
+:deep(.el-overlay-dialog) {
+  position: absolute;
+}
+</style>
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
index 6514cb5c..658e80b4 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
@@ -3,14 +3,19 @@
     <div class="avue-crud">
       <div v-h5uShow="search">
         <!-- 查询模块 -->
-        <el-form :inline="true"  :model="query" class="header_search">
-          <div class="header_search_left">
-            <el-form-item label="姓名:">
+        <el-form :inline="true" :model="query" class="header_search">
+          <el-form-item label="姓名:">
             <el-input v-model="query.orderCodeNum" placeholder="请输入姓名" clearable></el-input>
           </el-form-item>
 
           <el-form-item label="手机号码:">
-            <el-input-number v-model="query.waybillNum" :min="0"  placeholder="请输入手机号码"  :controls="false"/>
+            <el-input-number
+              class="w100"
+              v-model="query.waybillNum"
+              :min="0"
+              placeholder="请输入手机号码"
+              :controls="false"
+            />
           </el-form-item>
 
           <!-- <el-form-item label="司机类型:">
@@ -25,14 +30,10 @@
             <el-input v-model="query.waybillNum" placeholder="请输入承运商" clearable />
           </el-form-item> -->
           <!-- 查询按钮 -->
-          </div>
-          <div class="header_search_right">
-         
+          <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
             <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
-         
-          </div>
- 
+          </el-form-item>
         </el-form>
       </div>
 
@@ -669,16 +670,16 @@ export default {
 :deep(.header_search .el-date-editor.el-input__wrapper) {
   height: 100% !important;
 }
-.header_search{
+.header_search {
   display: flex;
   flex-wrap: wrap;
-  .header_search_left{
-  display: flex;
-  flex: 1;
-}
-.header_search_right{
-width: auto;
-}
+  .header_search_left {
+    display: flex;
+    flex: 1;
+  }
+  .header_search_right {
+    width: auto;
+  }
 }
 
 // 标题
@@ -687,4 +688,8 @@ width: auto;
   font-weight: bold;
   color: var(--el-color-primary);
 }
+
+:deep(.el-input-number) {
+  width: 100%;
+}
 </style>
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index c69cfbd8..f266370b 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -199,15 +199,13 @@
         :isselectfun="CanOperate"
         :tableRowClassName="
           (row, rowIndex) => {
-            console.log('row :>> ', row);
-            console.log('rowIndex :>> ', rowIndex);
             if (rowIndex === 0) return 'denger';
             else return '';
           }
         "
       >
         <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '批次号'">
+          <template v-if="slotProps.scope.column.label === '车次号'">
             <el-text @click="handleGoWaybill(slotProps.scope)">{{
               slotProps.scope.row.carsNo
             }}</el-text>
@@ -906,6 +904,27 @@ const onLoad = debounce(async (params = {}) => {
     if (code !== 200) return;
     details.data = data.records;
 
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+
+      if (getObjType(value.carsLoadLineList) !== 'array') {
+        value.carsLoadLineList = [];
+        continue;
+      }
+
+      const _arr = [];
+
+      _arr.length = value.carsLoadLineList.length;
+
+      for (let j = 0; j < value.carsLoadLineList.length; j++) {
+        const item = value.carsLoadLineList[j];
+
+        _arr.splice(item.sort - 1, 1, item);
+      }
+
+      value.carsLoadLineList = _arr;
+    }
+
     // 映射下拉框值
     handleTranslationDataSeclect(details.data, details.columnList);
     details.page.total = data.total;
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index aae541ae..2ebde8e3 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -179,13 +179,13 @@
         :isselectfun="CanOperate"
       >
         <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '批次号'">
+          <template v-if="slotProps.scope.column.label === '车次号'">
             <el-text @click="handleGoWaybill(slotProps.scope)">{{
               slotProps.scope.row.carsNo
             }}</el-text>
           </template>
 
-          <template v-if="slotProps.scope.column.label === '路线'">
+          <template v-else-if="slotProps.scope.column.label === '路线'">
             <span
               v-for="(item, index) in slotProps.scope.row.carsLoadLineList"
               :key="item"
@@ -246,7 +246,7 @@
             </span>
           </template>
 
-          <template v-if="slotProps.scope.column.label === '是否直发商家'">
+          <template v-else-if="slotProps.scope.column.label === '是否直发商家'">
             <el-tag
               v-if="slotProps.scope.row.isCustomer"
               :class="slotProps.scope.row.isCustomer === '1' ? 'green' : 'red'"
@@ -255,7 +255,7 @@
           </template>
 
           <template
-            v-if="
+            v-else-if="
               slotProps.scope.column.label === '操作' &&
               Number(slotProps.scope.row.loadStatus) !== 100
             "
@@ -844,6 +844,27 @@ const onLoad = debounce(async (params = {}) => {
     if (code !== 200) return;
     details.data = data.records;
 
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+
+      if (getObjType(value.carsLoadLineList) !== 'array') {
+        value.carsLoadLineList = [];
+        continue;
+      }
+
+      const _arr = [];
+
+      _arr.length = value.carsLoadLineList.length;
+
+      for (let j = 0; j < value.carsLoadLineList.length; j++) {
+        const item = value.carsLoadLineList[j];
+
+        _arr.splice(item.sort - 1, 1, item);
+      }
+
+      value.carsLoadLineList = _arr;
+    }
+
     // 映射下拉框值
     handleTranslationDataSeclect(details.data, details.columnList);
 
@@ -1485,7 +1506,7 @@ const handleShowListOfLoadedWagons = async () => {
 /** 配载打印 */
 const handlePrint = () => {
   const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp table');
-  console.log(nodeList, 123)
+  console.log(nodeList, 123);
   print(nodeList);
 };
 
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index 66f4cc39..a949f274 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -1205,7 +1205,7 @@ const handleOrderUnLoad = async ({ row }) => {
 };
 
 /** 卸车 -- 零担 */
-const handleZeroUnLoad = async ({ row }, type) => {
+const handleZeroUnLoad = async ({ row }, type: 'view' | 'edit') => {
   if (!ChecksWhetherTheWarehouseIsSelected())
     return ElMessage.warning('多仓权限无法操作，请选择仓库');
 
@@ -1217,7 +1217,7 @@ const handleZeroUnLoad = async ({ row }, type) => {
 
     if (!details.myWarehouseData) return ElMessage.warning('请先选择一个仓库');
 
-    if (details.myWarehouseData.id !== row.finalNodeId)
+    if (type === 'edit' && details.myWarehouseData.id !== row.finalNodeId)
       return ElMessage.warning('未在目的仓, 无法卸车');
   }
 
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 63d17aaa..5cc322c4 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -916,7 +916,7 @@
             </el-button>
             <el-button
               type="primary"
-              v-if="BookingNote_edit"
+              v-if="BookingNote_edit && !query.checkUserId"
               icon="el-icon-edit"
               @click="handleEdit"
             >
@@ -1779,6 +1779,7 @@ const handleAudit = () => {
       ElMessage.success({
         message: msg,
       });
+      onLoad();
     } catch (error) {
       console.log('error :>> ', error);
     } finally {
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index 6183865f..d4a5d8eb 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -690,7 +690,9 @@ const editOrder = () => {
   }
 
   const _item = details.selectionList[0];
-  console.log('_item :>> ', _item);
+
+  if (_item.checkUserName) return ElMessage.warning('该运单已审核，无法进行改单操作');
+
   if (Number(_item.waybillType) === 1 || _item.orderNo) {
     $store.commit('DEL_ONCE_TAG', '/distribution/inventory/CreateOrder');