订单详情页面新增查询

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -78,7 +78,7 @@
             </el-row>
             <el-row :gutter="24" class="rows">
                 <el-col :xl="7" :lg="7" :md="8" :sm="24">
-                    <span style="padding-left: 10%">配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>
+                    <span>配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>
                 </el-col>
                 <el-col :xl="7" :lg="7" :md="8" :sm="24">
                     <span>商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}}/总库存品数：{{statistics.cinventoryTotal}} </span>
@@ -87,7 +87,7 @@
                     <span>市配总车次：{{statistics.marketNub}}/总包件数：{{statistics.marketTotal}}/总库存品数：{{statistics.minventoryTotal}} </span>
                 </el-col>
             </el-row>
-            <el-row style="margin-top: 30px">
+            <el-row>
                 <div class="avue-crud__header">
                     <!-- 头部左侧按钮模块 -->
                     <div class="avue-crud__left" style="margin-top: 20px">

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -79,7 +79,7 @@
           </span>
         </el-col>
       </el-row>
-      <el-row style="margin-top: 30px">
+      <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left" style="margin-top: 20px">

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -68,19 +68,16 @@
           </el-form-item>
         </el-form>
       </el-row>
-      <el-row :gutter="24" class="rows">
+      <el-row>
         <!--        <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
         <!--          <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
         <!--        </el-col>-->
-        <el-col :xl="10" :lg="7" :md="8" :sm="24">
-          <span
-            >市配总车次：{{ statistics.marketNub }}/总包件数：{{
+          <div
+            >市配总车次：{{ statistics.vehiclesNub }}/总包件数：{{
               statistics.marketTotal
-            }}/总库存品数：{{ statistics.minventoryTotal }}</span
-          >
-        </el-col>
+            }}/总库存品数：{{ statistics.minventoryTotal }}/市配订单总数：{{ statistics.marketNub }}</div>
       </el-row>
-      <el-row style="margin-top: 30px">
+      <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left" style="margin-top: 20px">
@@ -1082,6 +1079,7 @@ export default {
       getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
         res => {
           this.statistics = res.data.data;
+          console.log('this.statistics :>> ', this.statistics);
         }
       );
       // getDetail(row.id).then(res => {

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -1,19 +1,6 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
-        <!-- 查询模块 -->
-<!--        <el-form :inline="true" :model="query">-->
-<!--          <el-form-item label="状态:">-->
-<!--            <el-input v-model="query.conditions" placeholder="请输入状态"></el-input>-->
-<!--          </el-form-item>-->
-<!--          &lt;!&ndash; 查询按钮 &ndash;&gt;-->
-<!--          <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>
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
@@ -25,7 +12,6 @@
           <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="el-icon-search" @click="searchHide" circle></el-button>
           </div>
         </div>
       </el-row>

src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue

@@ -1,6 +1,35 @@
 <template>
   <basic-container>
     <div class="avue-crud">
+      <el-row   v-if="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+       <el-form :inline="true" :model="query" @submit.native.prevent>
+         <el-form-item label="货物仓库:">
+           <el-input v-model="query.warehouseName" @keyup.enter="searchChange" clearable placeholder="请输入货物仓库"></el-input>
+         </el-form-item>
+         <el-form-item label="订单自编码:">
+           <el-input v-model="query.orderCode" @keyup.enter="searchChange" clearable placeholder="请输入订单自编码"></el-input>
+         </el-form-item>
+         <el-form-item label="包件编码:">
+           <el-input v-model="query.orderPackageCode" @keyup.enter="searchChange" clearable placeholder="请输入包件编码"></el-input>
+         </el-form-item>
+         <el-form-item label="上架类型:">
+          <el-select v-model="query.bindingType" class="m-2" placeholder="请选择上架类型" clearable @change="searchChange">
+            <el-option label="上架" value="1"/>
+            <el-option label="下架" value="2"/>
+          </el-select>
+         </el-form-item>
+         <el-form-item label="操作员:">
+           <el-input v-model="query.createUserName" @keyup.enter="searchChange" clearable 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>
+
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
@@ -8,6 +37,7 @@
           <!-- 头部右侧按钮模块 -->
           <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>
       </el-row>
@@ -555,7 +585,7 @@ export default {
       // 是否展示弹框
       box: false,
       // 是否显示查询
-      search: true,
+      search: false,
       // 加载中
       loading: true,
       // 是否为查看模式
@@ -686,9 +716,21 @@ export default {
     searchChange() {
       this.onLoad(this.page);
     },
+    // 开启搜索模块
+    searchHide(){
+      this.search = !this.search
+    },
     showdrawer(value) {
       this.drawerShow = value;
     },
+    /**
+     * 清空搜索表单, 并重新请求数据
+     */
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
     /**
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList

src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

@@ -4,16 +4,16 @@
     <div class="avue-crud">
       <el-row   v-if="!search" style="padding:6px 18px">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
+        <!-- <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
             <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <!-- 查询按钮 -->
-          <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-form> -->
       </el-row>
       <el-row>
         <div class="avue-crud__header">
@@ -26,7 +26,7 @@
           <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="el-icon-search" @click="searchHide" circle></el-button>
+            <!-- <el-button icon="el-icon-search" @click="searchHide" circle></el-button> -->
           </div>
         </div>
       </el-row>

src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@@ -103,7 +103,7 @@
             <!--            <el-form-item label="物流单号" prop="trainNumber">-->
             <el-form-item label="物流运单号">
               <el-input
-                v-model="form.LogisticsWaybillNumber"
+                v-model="form.trainNumber"
                 clearable
                 placeholder="请输入物流运单号"
               />
@@ -1207,16 +1207,16 @@ export default {
      */
     async getWareHoust(page, params = {}) {
       let a = await getListUser();
-      let b = await getDept(a.data.data.deptId);
-      // console.log("aaa",a);
-      // console.log("bbb",b);
-      //查询全部仓库
+      let {data} = a.data
       let sl = {};
-      if (b.data.data.deptCategory == '4') {
-        sl.department = b.data.data.id;
+      if(!!data[0]){
+        let b = await getDept(a.data.data[0].deptId);
+        //查询全部仓库
+        if (b.data.data.deptCategory == '4') {
+          sl.department = b.data.data.id;
+        }
       }
       let li = await getListCopy(page.currentPage, page.pageSize, sl);
-      // console.log("li>>>>",li.data.data);
       this.store = [];
       li.data.data.records.forEach(i => {
         let st = {