diff --git a/src/option/waybill/ChangeOrder.js b/src/option/waybill/ChangeOrder.js
index ea19d241..616e59b7 100644
--- a/src/option/waybill/ChangeOrder.js
+++ b/src/option/waybill/ChangeOrder.js
@@ -187,16 +187,16 @@ export const columnList = [
   //   fixed: false,
   //   sortable: true,
   // },
-  {
-    prop: '',
-    label: '操作',
-    type: 6,
-    values: '',
-    width: '200',
-    checkarr: [],
-    fixed: 'right',
-    sortable: false,
-  },
+  // {
+  //   prop: '',
+  //   label: '操作',
+  //   type: 6,
+  //   values: '',
+  //   width: '200',
+  //   checkarr: [],
+  //   fixed: 'right',
+  //   sortable: false,
+  // },
 ];
 
 export const viewColumnList = [
diff --git a/src/views/basicdata/vehicle/basicdataVehicle2.vue b/src/views/basicdata/vehicle/basicdataVehicle2.vue
index 89753a2e..2df02119 100644
--- a/src/views/basicdata/vehicle/basicdataVehicle2.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicle2.vue
@@ -1,883 +1,372 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="details.loadingObj.pageLoading">
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
-          <el-form-item label="车牌号:">
-            <el-input v-model="query.vehicleNub" placeholder="请输入车牌号"></el-input>
-          </el-form-item>
-          <el-form-item label="车辆来源:">
-            <el-select v-model="query.vehicleSource" clearable placeholder="请选择车辆来源">
-              <el-option
-                v-for="item in vehicleSourceData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey">
-              </el-option>
+        <el-form :inline="true" :model="query" class="header_search">
+          <el-form-item label="有效状态">
+            <el-select class="w100" v-model="query.value" clearable placeholder="有效状态">
+              <el-option label="有效" value="item.value" />
+              <el-option label="作废" value="item.value" />
             </el-select>
+          </el-form-item>
 
+          <el-form-item label="运单号:" class="el-times">
+            <el-input v-model="query.stockupArea" clearable placeholder="请输入运单号"></el-input>
           </el-form-item>
-          <el-form-item label="挂车类型:">
-            <el-select v-model="query.trailerType" clearable placeholder="请选择挂车类型">
-              <el-option
-                v-for="item in trailerTypeData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey">
-              </el-option>
-            </el-select>
+          <el-form-item label="制单时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
           </el-form-item>
-          <el-form-item label="车辆类型:">
-            <el-select v-model="query.vehicleModel" clearable placeholder="请选择车辆类型">
-              <el-option
-                v-for="item in vehicleModelData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey">
-              </el-option>
-            </el-select>
+
+          <el-form-item label="创建时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
           </el-form-item>
-          <el-form-item label="付款方式:">
-            <el-select v-model="query.paymentMethod" clearable placeholder="请选择付款方式">
-              <el-option
-                v-for="item in paymentMethodData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey">
-              </el-option>
-            </el-select>
+
+          <el-form-item label="送货时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="签收时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
           </el-form-item>
           <!-- 查询按钮 -->
-          <el-form-item>
+          <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-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
           </el-form-item>
         </el-form>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
+      </div>
+
+      <!-- 控件模块 -->
+      <div class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left"></div>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="Search" @click="searchHide" circle></el-button>
         </div>
-      </el-row>
-      <el-row>
-        <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
-          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-          <el-table-column v-if="option.index" label="序号" type="index" width="80" align="center">
-          </el-table-column>
-          <template v-for="(item,index) in option.column">
-            <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             align="center"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
-            </el-table-column>
+      </div>
+
+      <!-- 列表模块 -->
+      <tablecmt
+        :columnList="details.columnList"
+        :tableData="data"
+        :loading="loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text
+              v-if="Number(slotProps.scope.row.abnormalStatus) === 0"
+              @click="handleAnException(slotProps.scope)"
+            >
+              处理
+            </el-text>
           </template>
-          <!-- 操作栏模块 -->
-          <el-table-column prop="menu" label="操作" :width="220" align="center">
-            <template #="{row}">
-              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
-          <!-- 分页模块 -->
-          <el-pagination align="right"
-                         background
-                         @size-change="sizeChange"
-                         @current-change="currentChange"
-                         :current-page="page.currentPage"
-                         :page-sizes="[30, 50,80, 120]"
-                         :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page.total">
-          </el-pagination>
-        </div>
-      </el-row>
-      <!-- 表单模块 -->
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
-        <el-form :disabled="view" ref="form"  :rules="validatorRules"  :model="form" label-width="80px">
-
-
-          <!-- 表单字段 -->
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车牌号" prop="vehicleNub">
-                <el-input v-model="form.vehicleNub" placeholder="请输入车牌号"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆来源" prop="vehicleSource">
-                <el-select v-model="form.vehicleSource" clearable placeholder="请选择车辆来源" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in vehicleSourceData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="是否车头" prop="isHead">
-                <el-select v-model="form.isHead" clearable placeholder="请选择是否车头" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in isHeadData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="挂车类型" prop="trailerType">
-<!--                <el-input v-model="form.trailerType" placeholder="请输入挂车类型;1-独享,2-共享"/>-->
-                <el-select v-model="form.trailerType" clearable placeholder="请选择挂车类型" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in trailerTypeData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车辆类型" prop="vehicleModel">
-                <el-select v-model="form.vehicleModel" clearable placeholder="请选择车辆类型" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in vehicleModelData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车厢类型" prop="carType">
-                <el-select v-model="form.carType" clearable placeholder="请选择车厢类型" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in carTypeData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车长" prop="vehicleCommander">
-                <el-input v-model="form.vehicleCommander" placeholder="请输入车长;单位（M）"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="外廓高" prop="vehicleHeight">
-                <el-input v-model="form.vehicleHeight" placeholder="请输入外廓高"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="付款方式" prop="paymentMethod">
-                <el-select v-model="form.paymentMethod" clearable placeholder="请选择付款方式" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in paymentMethodData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="核定体积" prop="approvedVolume">
-                <el-input v-model="form.approvedVolume" placeholder="请输入核定体积"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车牌颜色" prop="licensePlateColor">
-                <el-select v-model="form.licensePlateColor" clearable placeholder="请选择车牌颜色" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in licensePlateColorData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车身颜色" prop="vehicleColor">
-                <el-select v-model="form.vehicleColor" clearable placeholder="请选择车身颜色" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in vehicleColorData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="能源类型" prop="energyType">
-                <el-select v-model="form.energyType" clearable placeholder="请选择能源类型" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in energyTypeData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车牌类型" prop="licensePlateType">
-                <el-select v-model="form.licensePlateType" clearable placeholder="请选择车牌类型" style="position: absolute;right: 0px;width: 100%">
-                  <el-option
-                    v-for="item in licensePlateTypeData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="备注" prop="notes">
-                <el-input v-model="form.notes" placeholder="请输入备注"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆所属人" prop="vehicleOwner">
-                <el-input v-model="form.vehicleOwner" placeholder="请输入车辆所属人"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="品牌型号" prop="vehicleBrand">
-                <el-input v-model="form.vehicleBrand" placeholder="请输入品牌型号"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆代号" prop="vehicleCode">
-                <el-input v-model="form.vehicleCode" placeholder="请输入车辆代号"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="发动机型号" prop="engineCode">
-                <el-input v-model="form.engineCode" placeholder="请输入发动机型号"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆总质量" prop="vehicleQuality">
-                <el-input v-model="form.vehicleQuality" placeholder="请输入车辆总质量;单位（T）"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="整备质量" prop="curbWeight">
-                <el-input v-model="form.curbWeight" placeholder="请输入整备质量;单位（T）"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="载荷质量" prop="loadMass">
-                <el-input v-model="form.loadMass" placeholder="请输入载荷质量;单位（T）"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="外廓宽" prop="outerWidth">
-                <el-input v-model="form.outerWidth" placeholder="请输入外廓宽;单位（M）"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="到期时间" prop="expirationTime">
-                <el-input v-model="form.expirationTime" placeholder="请输入到期时间"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="道路运输证号" prop="roadTransport">
-                <el-input v-model="form.roadTransport" placeholder="请输入道路运输证号"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="经营许可证号" prop="businessLicense">
-                <el-input v-model="form.businessLicense" placeholder="请输入经营许可证号"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车辆所属单位" prop="vehicleUnit">
-                <el-input v-model="form.vehicleUnit" placeholder="请输入车辆所属单位"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆所属单位电话" prop="vehicleUnitPhone">
-                <el-input v-model="form.vehicleUnitPhone" placeholder="请输入车辆所属单位电话"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车辆所属人手机号" prop="vehicleOwnerPhone">
-                <el-input v-model="form.vehicleOwnerPhone" placeholder="请输入车辆所属人手机号"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆所属人身份证号" prop="vehicleOwnerCard">
-                <el-input v-model="form.vehicleOwnerCard" placeholder="请输入车辆所属人身份证号"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车辆年审时间" prop="reviewTime">
-                <el-input v-model="form.reviewTime" placeholder="请输入车辆年审时间"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆年审有效期" prop="reviewValidity">
-                <el-input v-model="form.reviewValidity" placeholder="请输入车辆年审有效期"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车辆保险开始时间" prop="insuranceStartTime">
-                <el-input v-model="form.insuranceStartTime" placeholder="请输入车辆保险开始时间"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆保险结束时间" prop="insuranceEndTime">
-                <el-input v-model="form.insuranceEndTime" placeholder="请输入车辆保险结束时间"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="有无车身广告" prop="bodyAdvertising">
-                <el-input v-model="form.bodyAdvertising" placeholder="请选择有无车身广告"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车身广告跟新时间" prop="advertisementsNewTimes">
-                <el-input v-model="form.advertisementsNewTimes" placeholder="请输入车身广告跟新时间"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车辆挂靠公司" prop="vehicleParkingCompany">
-                <el-input v-model="form.vehicleParkingCompany" placeholder="请输入车辆挂靠公司"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否有GPS" prop="withGps">
-                <el-input v-model="form.withGps" placeholder="请输入是否有GPS;1-没有,2-有"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="GPS服务商" prop="gpsServiceProvider">
-                <el-input v-model="form.gpsServiceProvider" placeholder="请输入GPS服务商"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="GPS型号" prop="gpsModel">
-                <el-input v-model="form.gpsModel" placeholder="请输入GPS型号"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="承运商" prop="carrierId">
-                <el-input v-model="form.carrierId" placeholder="请输入关联承运商Id"/>
-              </el-form-item>
-
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="车辆照片(最新)" prop="vehiclePhoto">
-                <el-input v-model="form.vehiclePhoto" placeholder="请输入车辆照片(最新)"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="行驶证正面照片" prop="drivingLicensePhoto">
-                <el-input v-model="form.drivingLicensePhoto" placeholder="请输入行驶证正面照片"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="行驶证照片反面" prop="drivingLicensePhotoBack">
-                <el-input v-model="form.drivingLicensePhotoBack" placeholder="请输入行驶证照片反面"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车尾照片" prop="vehicleRearPhoto">
-                <el-input v-model="form.vehicleRearPhoto" placeholder="请输入车尾照片"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="道路运输照片" prop="roadTransportPhoto">
-                <el-input v-model="form.roadTransportPhoto" placeholder="请输入道路运输照片"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="人车合影照片" prop="vehiclePeoplePhoto">
-                <el-input v-model="form.vehiclePeoplePhoto" placeholder="请输入人车合影照片"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="保险卡照片" prop="insuranceCardPhoto">
-                <el-input v-model="form.insuranceCardPhoto" placeholder="请输入保险卡照片"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="许可证照片" prop="licensePhoto">
-                <el-input v-model="form.licensePhoto" placeholder="请输入许可证照片"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="保险卡照片" prop="insuranceCardPhoto">
-                <el-input v-model="form.insuranceCardPhoto" placeholder="请输入保险卡照片"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-
-        </el-form>
-        <!-- 表单按钮 -->
-        <template #footer>
-          <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
-            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
-          </span>
         </template>
-      </el-dialog>
+      </tablecmt>
+
+      <!-- 分页模块 -->
+      <div class="flex-c-sb">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.currentPage"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
     </div>
   </basic-container>
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    v-model="details.columnList"
+  ></edittablehead>
 </template>
 
-<script>
-import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicdataVehicle";
-import option from "@/option/basicdata/basicdataVehicle2";
-import { mapGetters } from "vuex";
+<script setup lang="ts">
+import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+import { mapGetters } from 'vuex';
+/** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { getList as carrierData } from '@/api/basicdata/basicdataCarrier';
-
-export default {
-  data () {
-    return {
-      height: 0,
-      // 弹框标题
-      title: '',
-      // 是否展示弹框
-      box: false,
-      // 是否显示查询
-      search: true,
-      // 加载中
-      loading: true,
-      // 是否为查看模式
-      view: false,
-      // 查询信息
-      query: {},
-      // 分页信息
-      page: {
-        currentPage: 1,
-        pageSize: 30,
-        total: 40
+import {
+  downloadXls,
+  setNodeHeight,
+  getHtmls,
+  deepClone,
+  handleClearTableQuery,
+  debounce,
+  handleSelectQuery,
+  handleInputQuery,
+} from '@/utils/util';
+import { columnList } from '@/option/distribution/abnormalList';
+import { useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+
+// 获取路由实例
+const $router = useRouter();
+
+const details = reactive<any>({
+  /** 是否开启搜索 */
+  search: true,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
       },
-      // 表单数据
-      form: {},
-      // 选择行
-      selectionList: [],
-      //车辆来源
-      vehicleSourceData:[],
-      //挂车类型
-      trailerTypeData:[],
-      //车辆类型
-      vehicleModelData:[],
-      //付款方式
-      paymentMethodData:[],
-      //是否车头
-      isHeadData:[],
-      //车厢类型
-      carTypeData:[],
-      //车牌颜色
-      licensePlateColorData:[],
-      //车身颜色
-      vehicleColorData:[],
-      //车牌类型
-      licensePlateTypeData:[],
-      //能源类型
-      energyTypeData:[],
-      // 表单配置
-      option: option,
-      // 表单列表
-      data: [],
-      //检验
-      validatorRules: {
-        vehicleNub: [
-          { required: true, message: '请输入车牌号!',trigger: 'blur'}
-        ],
-
+    },
+    {
+      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,
   },
-  mounted () {
-    this.init();
-    //查询字典
-    this.queryDictionary();
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    pageNum: 1,
+    pageSize: 30,
+    total: 0,
   },
-  computed: {
-    ...mapGetters(["permission"]),
-    ids () {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    }
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 图片预览 */
+    abnormalVisited: false,
   },
-  methods: {
-    queryDictionary() {
-      getDictionaryBiz('basic_vehicle_source').then(res => {
-        this.vehicleSourceData = res.data.data;
-      });
-      getDictionaryBiz('basic_trailer_type').then(res => {
-        this.trailerTypeData = res.data.data;
-      });
-      getDictionaryBiz('basic_driving_type').then(res => {
-        this.drivingTypeData = res.data.data;
-      });
-      getDictionaryBiz('basic_vehicle_model').then(res => {
-        this.vehicleModelData = res.data.data;
-      });
-      getDictionaryBiz('basicdata_vehicle_paymentmethod').then(res => {
-        this.paymentMethodData = res.data.data;
-      });
-      getDictionaryBiz('yes_no').then(res => {
-        this.isHeadData = res.data.data;
-      });
-      getDictionaryBiz('basic_plate_type').then(res => {
-        this.licensePlateTypeData = res.data.data;
-      });
-      getDictionaryBiz('basic_vehicle_color').then(res => {
-        this.vehicleColorData = res.data.data;
-      });
-
-      getDictionaryBiz('basic_energy_type').then(res => {
-        this.energyTypeData = res.data.data;
-      });
-      getDictionaryBiz('basic_car_type').then(res => {
-        this.carTypeData = res.data.data;
-        this.onLoad(this.page);
-      });
-
-    },
-    init () {
-      this.height = this.setPx(document.body.clientHeight - 340);
-    },
-    searchHide () {
-      this.search = !this.search;
-    },
-    searchChange () {
-      this.onLoad(this.page);
-    },
-    searchReset () {
-      this.query = {};
-      this.page.currentPage = 1;
-      this.onLoad(this.page);
-    },
-    handleSubmit () {
-      this.$refs.form.validate(valid=>{
-        if (valid) {
-      if (!this.form.id) {
-        add(this.form).then(() => {
-          this.box = false;
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        });
-      } else {
-        update(this.form).then(() => {
-          this.box = false;
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        })
-      }
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
-    },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
-    },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
-      getDetail(row.id).then(res => {
-        this.form = res.data.data;
-      });
-    },
-    handleView (row) {
-      this.title = '查看'
-      this.view = true;
-      this.box = true;
-      getDetail(row.id).then(res => {
-        this.form = res.data.data;
-      });
-    },
-    handleDelete () {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 查看 */
+    view: false,
+  },
+});
+
+const { search, query, shortcuts, stockupDate, data, loadingObj, selectionList, drawerShow, page } =
+  toRefs(details);
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
+
+onMounted(() => {
+  const timer = setTimeout(() => {
+    details.listNode = document.querySelector('.maboxhi');
+    details.listNode.style.transition = 'all .5s ease-out';
+    clearTimeout(timer);
+  }, 100);
+});
+
+/** 请求页面数据 */
+const onLoad = debounce(async (page?: any, params = {}) => {
+  try {
+    details.loadingObj.list = true;
+    let _page = details.page;
+    if (page) _page = page;
+    // 获取暂存单列表
+    const res = await postFindPageList({ ..._page, ...details.query, ...params });
+    console.log('res :>> ', res);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.data = data.records;
+
+    const valueArr = details.columnList.filter(val => val.type === 3);
+
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+
+      for (let index = 0; index < valueArr.length; index++) {
+        const item = valueArr[index];
+        const label = item.prop.replace('Name', '');
+        value[item.prop] =
+          (item.checkarr.find(val => Number(val.value) === Number(value[label])) || {}).label ||
+          value[label];
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.selectionClear();
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        });
-    },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        });
-    },
-    beforeClose (done) {
-      done()
-      this.form = {};
-      this.view = false;
-    },
-    selectionChange (list) {
-      this.selectionList = list;
-    },
-    selectionClear () {
-      this.selectionList = [];
-      this.$refs.table.clearSelection();
-    },
-    currentChange (currentPage) {
-      this.page.currentPage = currentPage;
-      this.onLoad(this.page);
-    },
-    sizeChange (pageSize) {
-      this.page.pageSize = pageSize;
-      this.onLoad(this.page);
-    },
-    onLoad (page, params = {}) {
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        for (let i = 0; i < data.records.length; i++) {
-          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.vehicleSourceData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].vehicleSource == this.vehicleSourceData[j].dictKey){
-              data.records[i].vehicleSource=this.vehicleSourceData[j].dictValue;
-            }
-          }
-          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.trailerTypeData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].trailerType == this.trailerTypeData[j].dictKey){
-              data.records[i].trailerType=this.trailerTypeData[j].dictValue;
-            }
-          }
-
-          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.paymentMethodData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].paymentMethod == this.paymentMethodData[j].dictKey){
-              data.records[i].paymentMethod=this.paymentMethodData[j].dictValue;
-            }
-          }
-          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.vehicleModelData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].vehicleModel == this.vehicleModelData[j].dictKey){
-              data.records[i].vehicleModel=this.vehicleModelData[j].dictValue;
-            }
-          }
-
-          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.isHeadData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].isHead == this.isHeadData[j].dictKey){
-              data.records[i].isHead=this.isHeadData[j].dictValue;
-            }
-          }
-          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.carTypeData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].carType == this.carTypeData[j].dictKey){
-              data.records[i].carType=this.carTypeData[j].dictValue;
-            }
-          }
-          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.licensePlateColorData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].licensePlateColor == this.licensePlateColorData[j].dictKey){
-              data.records[i].licensePlateColor=this.licensePlateColorData[j].dictValue;
-            }
-          }
-          // eslint-disable-next-line no-empty
-          for (let j = 0; j < this.vehicleColorData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].vehicleColor == this.vehicleColorData[j].dictKey){
-              data.records[i].vehicleColor=this.vehicleColorData[j].dictValue;
-            }
-          }
-          for (let j = 0; j < this.licensePlateTypeData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].licensePlateType == this.licensePlateTypeData[j].dictKey){
-              data.records[i].licensePlateType=this.licensePlateTypeData[j].dictValue;
-            }
-          }
-          for (let j = 0; j < this.energyTypeData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].energyType == this.energyTypeData[j].dictKey){
-              data.records[i].energyType=this.energyTypeData[j].dictValue;
-            }
-          }
-
-        }
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
     }
+
+    details.page.total = data.total;
+  } catch (error) {
+  } finally {
+    details.loadingObj.list = false;
   }
+}, 10);
+
+onLoad();
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad(details.page);
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.stockupDate = [];
+  details.page.currentPage = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad(details.page);
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+  details.drawerShow = _flag;
+};
+
+/** 是否开启搜索区 */
+const searchHide = () => {
+  details.search = !details.search;
+
+  setNodeHeight(details.listNode, '', true);
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  handleInputQuery(index, row, details.query);
+  onLoad(details.page);
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+  onLoad(details.page);
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  handleSelectQuery(index, row, details.query);
+
+  onLoad(details.page);
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (pageSize: number) => {
+  details.page.pageSize = pageSize;
+  onLoad(details.page);
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.pageNum = current;
+  onLoad();
 };
 </script>
+
+<style scoped lang="scss">
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
+}
+
+.mt20 {
+  margin-top: 20px;
+}
+
+.fwb {
+  font-weight: bold;
+}
+</style>
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 91b9cbf2..cfefff1e 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -74,6 +74,10 @@
                   <el-option
                     v-for="val in details.options"
                     :key="val.warehouseName"
+                    :disabled="
+                      details.nodeInfoData.findIndex(value => value.nodeId === val.warehouseId) !==
+                      -1
+                    "
                     :label="val.warehouseName"
                     :value="val.warehouseId"
                   />
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index bbcc13b9..8770c7cf 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -257,13 +257,22 @@ export default {
       columnList: [
         {
           prop: '',
-          label: '序号',
+          label: '复选框',
           type: 0,
           values: '',
           width: 55,
           checkarr: [],
           fixed: true,
         },
+        {
+          prop: '',
+          label: '序号',
+          type: 12,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
         {
           prop: 'pickupBatch',
           label: '提货批次',