签收管理字段调整、搜索添加

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -312,7 +312,16 @@
             checkarr: [],
             fixed: false,
             sortable: true
-
+          },
+          {
+            prop: 'deliveryListLoadingStatusName',
+            label: '装车状态',
+            type: 3,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
           },
           {
             prop: 'customersNumber',

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -323,6 +323,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'deliveryListLoadingStatusName',
+          label: '装车状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true
+        },
         {
           prop: 'customersNumber',
           label: '配送客户数',

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -35,18 +35,21 @@
             </el-row>
             <el-divider>作业时间</el-divider>
             <el-row :gutter="24" class="rows">
-                <el-col :xl="7" :lg="7" :md="8" :sm="24">
+                <el-col :xl="6" :lg="7" :md="8" :sm="24">
                     <span>创建时间：{{deliverydata.createTime}} </span>
                 </el-col>
                 <!--        <el-col :xl="7" :lg="7" :md="8" :sm="24">-->
                 <!--          <span>备货时间：{{deliverydata.leadTime}} </span>-->
                 <!--        </el-col>    -->
-                <el-col :xl="7" :lg="7" :md="8" :sm="24">
+                <el-col :xl="6" :lg="7" :md="8" :sm="24">
                     <span>出库时间：{{deliverydata.outboundDate}} </span>
                 </el-col>
-                <el-col :xl="7" :lg="7" :md="8" :sm="24">
+                <el-col :xl="6" :lg="7" :md="8" :sm="24">
                     <span>装车时间：{{deliverydata.loadingTime}} </span>
                 </el-col>
+                <el-col :xl="6" :lg="7" :md="8" :sm="24">
+                    <span>配送时间：{{deliverydata.taskTime}} </span>
+                </el-col>
             </el-row>
             <el-divider>配送情况</el-divider>
             <el-row :gutter="24" class="rows">
@@ -128,20 +131,23 @@
                               style="width: 100%"
                               :border="option.border"
                     >
-                        <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+<!--                        align="center"-->
+                        <el-table-column type="expand" v-if="option.expand" ></el-table-column>
                         <template v-for="(item,index) in option.column">
                             <!-- table字段 -->
                             <el-table-column v-if="item.hide!==true"
                                              :prop="item.prop"
                                              :label="item.label"
                                              :show-overflow-tooltip="true"
-                                             :align="center"
                                              :width="item.width"
                                              :key="index">
+<!--                                :align="center"-->
+
                             </el-table-column>
                         </template>
                         <!-- 操作栏模块 -->
-                        <el-table-column prop="menu" label="操作" :width="250" align="center">
+<!--                        align="center"-->
+                        <el-table-column prop="menu" label="操作" :width="250" >
                             <template #="{row}">
                                 <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看
                                 </el-button>
@@ -173,16 +179,18 @@
                               style="width: 100%"
                               :border="option.border"
                     >
-                        <el-table-column type="expand" v-if="ordoption.expand" align="center"></el-table-column>
+<!--                        align="center"-->
+                        <el-table-column type="expand" v-if="ordoption.expand" ></el-table-column>
                         <template v-for="(item,index) in ordoption.column">
                             <!-- table字段 -->
                             <el-table-column v-if="item.hide!==true"
                                              :prop="item.prop"
                                              :label="item.label"
                                              :show-overflow-tooltip="true"
-                                             :align="center"
                                              :width="item.width"
                                              :key="index">
+<!--                                                                             :align="center"
+-->
                             </el-table-column>
                         </template>
                     </el-table>
@@ -197,16 +205,19 @@
                               style="width: 100%"
                               :border="option.border"
                     >
-                        <el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column>
+<!--                        align="center"-->center
+
+                        <el-table-column type="expand" v-if="wrapoption.expand" ></el-table-column>
                         <template v-for="(item,index) in wrapoption.column">
                             <!-- table字段 -->
                             <el-table-column v-if="item.hide!==true"
                                              :prop="item.prop"
                                              :label="item.label"
                                              :show-overflow-tooltip="true"
-                                             :align="center"
                                              :width="item.width"
                                              :key="index">
+<!--                                :align="center"-->
+
                             </el-table-column>
                         </template>
                     </el-table>
@@ -244,9 +255,10 @@
                                              :prop="item.prop"
                                              :label="item.label"
                                              :show-overflow-tooltip="true"
-                                             :align="center"
                                              :width="item.width"
                                              :key="index">
+<!--                                :align="center"-->
+
                             </el-table-column>
                         </template>
                         <!-- 操作栏模块 -->
@@ -316,22 +328,23 @@
                           :height="height"
                           style="width: 100%"
                           :border="option.border">
-                    <el-table-column type="expand" v-if="option.expand" :align="center"></el-table-column>
+                    <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
                     <template v-for="(item,index) in wrapoption.column">
                         <!-- table字段 -->
                         <el-table-column v-if="item.hide!==true"
                                          :prop="item.prop"
                                          :label="item.label"
                                          :show-overflow-tooltip="true"
-                                         :align="center"
                                          :width="item.width"
                                          :key="index">
+<!--                            :align="center"-->
+
                         </el-table-column>
                     </template>
                 </el-table>
                 <div class="avue-crud__pagination" style="width:100%">
                     <!-- 分页模块 -->
-                    <el-pagination :align="center"
+                    <el-pagination
                                    background
                                    @size-change="wsizeChange"
                                    @current-change="wcurrentChange"
@@ -340,6 +353,7 @@
                                    :page-size="wpage.pageSize"
                                    layout="total, sizes, prev, pager, next, jumper"
                                    :total="wpage.total">
+<!--                        :align="center"-->
                     </el-pagination>
                 </div>
                 <!-- 表单按钮 -->
@@ -1075,7 +1089,9 @@
       '$route.data': {
         handler(newVal, oldVal) {
           console.log(newVal, oldVal);
-          this.fetchData();
+          if (this.$router.data){
+            this.fetchData();
+          }
           this.onLoad(this.page);
         },
         deep: true,

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -300,7 +300,16 @@ export default {
           ],
           fixed: false,
           sortable: true,
-
+        },
+        {
+          prop: 'deliveryListLoadingStatusName',
+          label: '装车状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true
         },
         {
           prop: 'customersNumber',

src/views/distribution/signfor/distributionSignfor.vue

@@ -1,6 +1,79 @@
 <template>
   <basic-container>
     <div class="avue-crud">
+      <el-row :hidden="!search" style="padding: 6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="配送车次:">
+            <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
+          </el-form-item>
+          <el-form-item label="订单编号:">
+            <el-input v-model="query.stockArticleId" placeholder="请输入订单自编号"></el-input>
+          </el-form-item>
+<!--          <el-form-item label="商城名称:">-->
+<!--            <el-input v-model="query.mallName" placeholder="请输入商城名称"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="门店名称:">-->
+<!--            <el-input v-model="query.storeName" placeholder="请输入门店名称"></el-input>-->
+<!--          </el-form-item>-->
+          <el-form-item label="客户名称:">
+            <el-input v-model="query.consignee" placeholder="请输入客户名称"></el-input>
+          </el-form-item>
+          <el-form-item label="客户电话:">
+            <el-input v-model="query.deliveryPhone" placeholder="请输入客户电话"></el-input>
+          </el-form-item>
+          <el-form-item label="业务类型:">
+            <el-select v-model="query.businessType" placeholder="请选择业务类型">
+              <el-option
+                      :key="'1'"
+                      :value="'商配'">商配
+              </el-option>
+              <el-option
+                      :key="'2'"
+                      :value="'市配'">市配
+              </el-option>
+            </el-select>
+            <!--            <el-input v-model="query.deliveryType" placeholder="请选择业务类型"></el-input>-->
+          </el-form-item>
+          <el-form-item label="配送司机:">
+<!--            <el-select v-model="query.deliveryType" placeholder="请选择业务类型">-->
+<!--            </el-select>-->
+            <el-select
+                    v-model="query.deliveryDriverName"
+                    multiple
+                    filterable
+                    placeholder="请输入司机名称"
+                    :loading="loading">
+              <el-option
+                      v-for="item in driverData"
+                      :key="item.dictKey"
+                      :label="item.dictValue"
+                      :value="item.dictValue">
+              </el-option>
+            </el-select>
+            <!--            <el-input v-model="query.deliveryType" placeholder="请选择业务类型"></el-input>-->
+          </el-form-item>
+<!--          <el-form-item label="司机签收状态:">-->
+<!--            <el-select v-model="query.driverSigning" placeholder="请选择业务类型">-->
+<!--              <el-option-->
+<!--                      :value="1">未签收-->
+<!--              </el-option>-->
+<!--              <el-option-->
+<!--                      :value="2">已签收-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--            &lt;!&ndash;            <el-input v-model="query.querySigningStatus" placeholder="请选择签收状态"></el-input>&ndash;&gt;-->
+<!--          </el-form-item>-->
+          <!--                        <el-form-item label="顾客姓名:">-->
+          <!--                            <el-input v-model="query.customerName" placeholder="请输入服务类型"></el-input>-->
+          <!--                        </el-form-item>-->
+          <!-- 查询按钮 -->
+          <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>
+          </el-form-item>
+        </el-form>
+      </el-row>
       <!-- <tablecmt
       :columnList="columnList"
       :tableData="tableData"
@@ -158,6 +231,9 @@ import option from '@/option/distribution/distributionSignfor';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
+import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
+
+import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
 export default {
 
   data() {
@@ -184,8 +260,8 @@ export default {
         //   head: false,
         // },
         {
-          prop: 'consignee',
+          prop: 'trainNumber',
-          label: '收货人',
+          label: '配送车次',
           type: 2,
           values: '',
           width: '150',
@@ -195,67 +271,67 @@ export default {
           head: false,
         },
         {
-          prop: 'deliveryPhone',
+          prop: 'stockArticleId',
-          label: '收货电话',
+          label: '订单自编号',
           type: 2,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
+          head: false,
         },
         {
-          prop: 'deliveryAddress',
+          prop: 'warehouseName',
-          label: '收货地址',
+          label: '配送仓库',
           type: 2,
           values: '',
-          width: '300',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
+          head: false,
         },
         {
-          prop: 'deliveryType',
+          prop: 'consignee',
-          label: '业务类型',
+          label: '客户名称',
-          type: 3,
+          type: 2,
           values: '',
           width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
+          head: false,
         },
         {
-          prop: 'trainNumber',
+          prop: 'deliveryPhone',
-          label: '配送车次',
+          label: '客户电话',
           type: 2,
           values: '',
-          width: '150',
+          width: '180',
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: false,
         },
         {
-          prop: 'stockArticleId',
+          prop: 'deliveryAddress',
-          label: '订单自编号',
+          label: '客户地址',
           type: 2,
           values: '',
-          width: '150',
+          width: '300',
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: false,
         },
         {
-          prop: 'warehouseName',
+          prop: 'deliveryType',
-          label: '配送仓库',
+          label: '业务类型',
-          type: 2,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: false,
         },
         {
           prop: 'reservationNum',
@@ -419,6 +495,7 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      driverData: [],
     };
   },
   mounted() {
@@ -428,6 +505,7 @@ export default {
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
+    this.getMasterDriverData();
     let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
     let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
     let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
@@ -529,6 +607,25 @@ export default {
       }
 
     },
+    //查询司机信息
+    getMasterDriverData() {
+      return new Promise((rv, rev) => {
+        getDriverList(1, 10, '').then(res => {
+          const data = res.data.data;
+          let po = [];
+          data.records.forEach(item=>{
+            let a = {
+              dictKey: item.id,
+              dictValue: item.name
+            };
+            po.push(a);
+          })
+          this.driverData = po;
+          console.log('===============>', res.data.data);
+          rv(res.data.data.records);
+        });
+      });
+    },
     selectionsc(value) {
       console.log(value);
     },
@@ -606,6 +703,17 @@ export default {
       this.search = !this.search;
     },
     searchChange() {
+      if (this.query.businessType) {
+        let businessType = this.query.businessType;
+        switch (businessType) {
+          case '商配':
+            this.query.deliveryType = '1';
+            break;
+          case '市配':
+            this.query.deliveryType = '2';
+            break;
+        }
+      }
       this.onLoad(this.page);
     },
     searchReset() {

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -853,6 +853,7 @@
           this.goodsAreaData = fo;
         });
       },
+
       //查询司机信息
       getMasterDriverData() {
         return new Promise((rv, rev) => {