From 2f2db9ecbd90a8ea1d95ec17145b98c462a21a49 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Thu, 7 Sep 2023 14:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=8C=85=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/warehouseUpdownGoodsLog.js  |  23 +
 .../goodsShelf/basicdataGoodsShelfView.vue    |  78 ++-
 src/views/distribution/reservation/atlas1.vue |  12 +-
 .../updownGoods/warehouseUpdownGoodsLog.vue   | 639 +++++++++++++-----
 4 files changed, 535 insertions(+), 217 deletions(-)

diff --git a/src/api/warehouse/warehouseUpdownGoodsLog.js b/src/api/warehouse/warehouseUpdownGoodsLog.js
index b107151b..15f807ef 100644
--- a/src/api/warehouse/warehouseUpdownGoodsLog.js
+++ b/src/api/warehouse/warehouseUpdownGoodsLog.js
@@ -12,6 +12,29 @@ export const getpage = (current, size, params) => {
   })
 }
 
+export const getinventorypage = (current, size, params) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/inventorypage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+export const gettruckloadpage = (current, size, params) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/truckloadpage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/detail',
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index d336e472..fc3adea4 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -551,10 +551,10 @@ async function searchbuts() {
 
       break;
     case 3:
-      url = 'selectWrap';
+      url = 'wrap';
       data = {
         // warehouseId: details.arrlist[details.checkindex]?.id || '',
-        orderCode: details.inputtxts,
+        orderPackageCode: details.inputtxts,
         // serviceNumber: details.inputtxts,
         current: details.currentPage,
         size: details.pageSize,
@@ -721,7 +721,7 @@ const showupt = value => {
           label: '服务号',
           type: 1,
           values: '',
-          width: '240',
+          width: '150',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -811,7 +811,7 @@ const showupt = value => {
           label: '服务号',
           type: 1,
           values: '',
-          width: '240',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -874,14 +874,25 @@ const showupt = value => {
           checkarr: [],
           fixed: true,
         },
+        {
+          prop: 'orderPackageCode',
+          label: '包条码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'serviceNumber',
           label: '服务号',
           type: 1,
           values: '',
-          width: '240',
+          width: '150',
           checkarr: [],
-          fixed: true,
+          fixed: false,
           sortable: true,
           head: false,
         },
@@ -912,7 +923,7 @@ const showupt = value => {
           label: '顾客电话',
           type: 1,
           values: '',
-          width: '260',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -958,7 +969,7 @@ const showupt = value => {
           label: '服务号',
           type: 1,
           values: '',
-          width: '240',
+          width: '150',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1037,7 +1048,7 @@ const showupt = value => {
           label: '物料名称',
           type: 1,
           values: '',
-          width: '200',
+          width: '150',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1048,7 +1059,7 @@ const showupt = value => {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '170',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1059,7 +1070,7 @@ const showupt = value => {
           label: 'SKU',
           type: 1,
           values: '',
-          width: '170',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1076,6 +1087,17 @@ const showupt = value => {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'residueNumber',
+          label: '在库数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'enterNum',
           label: '上架数',
@@ -1494,7 +1516,7 @@ const showdown = async value => {
           label: '服务号',
           type: 1,
           values: '',
-          width: '240',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1569,9 +1591,9 @@ const showdown = async value => {
           head: false,
         },
         {
-          prop: 'enterNum',
-          label: '下架数',
-          type: 10,
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -1580,19 +1602,19 @@ const showdown = async value => {
           head: false,
         },
         {
-          prop: 'descriptionGoods',
-          label: '物料名称',
-          type: 1,
+          prop: 'enterNum',
+          label: '下架数',
+          type: 10,
           values: '',
           width: '150',
           checkarr: [],
-          fixed: false,
+          fixed: true,
           sortable: true,
           head: false,
         },
         {
-          prop: 'customerName',
-          label: '顾客名字',
+          prop: 'num',
+          label: '货位剩余数',
           type: 1,
           values: '',
           width: '150',
@@ -1625,7 +1647,7 @@ const showdown = async value => {
         },
         {
           prop: 'cargoUnit',
-          label: '单位',
+          label: '物料单位',
           type: 1,
           values: '',
           width: '150',
@@ -1663,7 +1685,7 @@ const showdown = async value => {
           label: '服务号',
           type: 1,
           values: '',
-          width: '240',
+          width: '150',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1748,8 +1770,8 @@ const addhuoj = async scope => {
       data.upShelfOrderList = [scope.row];
       break;
     case 3:
-      url = 'upSelectWrap';
-      data.upShelfOrderList = [scope.row];
+      url = 'upPackage';
+      data.upShelfPackageList = [scope.row];
       break;
     case 4:
       url = 'upTray';
@@ -1801,8 +1823,8 @@ async function allup() {
       data.upShelfOrderList = details.checkselectchangearr;
       break;
     case 3:
-      url = 'upSelectWrap';
-      data.upShelfOrderList = details.checkselectchangearr;
+      url = 'upPackage';
+      data.upShelfPackageList = details.checkselectchangearr;
       break;
     case 4:
       url = 'upTray';
@@ -1832,7 +1854,7 @@ async function allup() {
     console.log(response.data);
     proxy.$message({
       type: 'success',
-      message: '上架成功!',
+      message: response.data.msg,
     });
     searchbuts()
     // details.tablistarr = response.data.data.records;
diff --git a/src/views/distribution/reservation/atlas1.vue b/src/views/distribution/reservation/atlas1.vue
index 42035294..dc34661b 100644
--- a/src/views/distribution/reservation/atlas1.vue
+++ b/src/views/distribution/reservation/atlas1.vue
@@ -9,7 +9,9 @@
           <el-scrollbar>
             <div class="mbx">
               <el-text v-for="item in datalists" class="mx-1 txbx" type="primary"
-                >{{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里</el-text
+                >
+                {{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里({{item.items.handQuantity}}件)
+                </el-text
               >
             </div>
           </el-scrollbar>
@@ -109,7 +111,7 @@ function init(data) {
         details.mapLoc.setCenter([result.geocodes[0].location.lng, result.geocodes[0].location.lat])
         geocodess.push({
           pontion: result.geocodes[0].location,
-          content: item.customerName + '--' + item.customerAddress + '--' + item.customerTelephone,
+          content: item.customerName + '--' + item.customerAddress+'' + '--' + item.customerTelephone,
           items: item,
         });
         if (index + 1 == data.length) {
@@ -132,7 +134,7 @@ function maker(geocodess) {
     });
     marker.setMap(details.mapLoc);
     marker.setLabel({
-      offset: new AMap.Pixel(0, -30), //设置文本标注偏移量
+      offset: new AMap.Pixel(0, -5), //设置文本标注偏移量
       content: `<div class='info'>${item.content}</div>`, //设置文本标注内容
       direction: 'top', //设置文本标注方位
     });
@@ -156,6 +158,7 @@ function Driving(geocodess) {
           // console.log(result.routes[0]);
           item.time=formatSeconds(result.routes[0].time)
           item.distance=result.routes[0].distance/1000
+          // item.distance=result.routes[0].distance/1000
           details.datalists.push(item)
         } else {
           console.log('获取驾车数据失败：'+ result)
@@ -205,6 +208,8 @@ const { datalists } = toRefs(details);
     .mbx {
       display: flex;
       flex-direction: column;
+      align-items: flex-start;
+
     }
   }
 }
@@ -214,5 +219,6 @@ const { datalists } = toRefs(details);
 .txbx {
   padding: 5px 0px;
   box-sizing: border-box;
+  width: 100%;
 }
 </style>
diff --git a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
index 6d88afba..856a6536 100644
--- a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
+++ b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
@@ -1,42 +1,121 @@
 <template>
   <basic-container>
     <div class="avue-crud">
+      <el-tabs type="border-card">
+        <el-tab-pane label="订制品">
+          <el-row>
+            <!-- 列表模块 -->
+            <tablecmt
+              :columnList="columnList"
+              :tableData="data"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <!--          <template #default="slotProps">-->
+              <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
+              <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
+              <!--          </template>-->
+            </tablecmt>
+          </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-tab-pane>
+        <el-tab-pane label="库存品">
+          <el-row>
+            <!-- 列表模块 -->
+            <tablecmt
+              :columnList="columnList1"
+              :tableData="data1"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <!--          <template #default="slotProps">-->
+              <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
+              <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
+              <!--          </template>-->
+            </tablecmt>
+          </el-row>
+          <el-row>
+            <div class="avue-crud__pagination" style="width: 100%">
+              <!-- 分页模块 -->
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange1"
+                @current-change="currentChange1"
+                :current-page="page1.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page1.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page1.total"
+              >
+              </el-pagination>
+            </div>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="零担订单">
+          <el-row>
+            <!-- 列表模块 -->
+            <tablecmt
+              :columnList="columnList2"
+              :tableData="data2"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <!--          <template #default="slotProps">-->
+              <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
+              <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
+              <!--          </template>-->
+            </tablecmt>
+          </el-row>
+          <el-row>
+            <div class="avue-crud__pagination" style="width: 100%">
+              <!-- 分页模块 -->
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange2"
+                @current-change="currentChange2"
+                :current-page="page2.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page2.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page2.total"
+              >
+              </el-pagination>
+            </div>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
 
-      <el-row>
-        <!-- 列表模块 -->
-        <tablecmt
-          :columnList="columnList"
-          :tableData="data"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-<!--          <template #default="slotProps">-->
-<!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
-<!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
-<!--          </template>-->
-        </tablecmt>
-      </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>
       <!-- 表单模块 -->
-
     </div>
   </basic-container>
   <edittablehead
@@ -48,12 +127,12 @@
 </template>
 
 <script>
-import {  getDetail, getpage, update, remove } from "@/api/warehouse/warehouseUpdownGoodsLog";
-import option from "@/option/warehouse/warehouseUpdownGoodsLog";
-import { mapGetters } from "vuex";
+import { getDetail, getpage, update, remove,getinventorypage,gettruckloadpage } from '@/api/warehouse/warehouseUpdownGoodsLog';
+import option from '@/option/warehouse/warehouseUpdownGoodsLog';
+import { mapGetters } from 'vuex';
 
 export default {
-  data () {
+  data() {
     return {
       columnList: [
         // {
@@ -68,7 +147,7 @@ export default {
         {
           prop: 'warehouseName',
           label: '货物仓库',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -79,7 +158,7 @@ export default {
         {
           prop: 'orderCode',
           label: '订单自编码',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -89,19 +168,125 @@ export default {
         {
           prop: 'orderPackageCode',
           label: '包件编码',
-          type: 2,
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+
+        {
+          prop: 'bindingType',
+          label: '上架类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [
+            { label: '上架', value: 1 },
+            { label: '下架', value: 2 },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'areaTitle',
+          label: '货区',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'shelfTitle',
+          label: '货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'allocationTitle',
+          label: '货位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'createUserName',
+          label: '操作员',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'palletCode',
+          label: '托盘码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'logWarehouseName',
+          label: '记录仓库',
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: '',
+        //   label: '操作',
+        //   type: 6,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: 'right',
+        //   hide: true,
+        // },
+        // 更多列的配置...
+      ],
+      columnList1: [
+        // {
+        //   prop: '',
+        //   label: '序号',
+        //   type: 0,
+        //   values: '',
+        //   width: 55,
+        //   checkarr: [],
+        //   fixed: true,
+        // },
         {
           prop: 'materialCode',
           label: '物料编号',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -109,9 +294,9 @@ export default {
         {
           prop: 'materialName',
           label: '物料名称',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -119,9 +304,9 @@ export default {
         {
           prop: 'sku',
           label: 'SKU',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -129,12 +314,12 @@ export default {
         {
           prop: 'bindingType',
           label: '上架类型',
-          type: 3,
+          type: 1,
           values: '',
-          width: '230',
+          width: '150',
           checkarr: [
-            {label:'上架',value:1},
-            {label:'下架',value:2}
+            { label: '上架', value: 1 },
+            { label: '下架', value: 2 },
           ],
           fixed: false,
           sortable: true,
@@ -142,9 +327,9 @@ export default {
         {
           prop: 'areaTitle',
           label: '货区',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -152,9 +337,9 @@ export default {
         {
           prop: 'shelfTitle',
           label: '货架',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -162,9 +347,9 @@ export default {
         {
           prop: 'allocationTitle',
           label: '货位',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -172,9 +357,9 @@ export default {
         {
           prop: 'createUserName',
           label: '操作员',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -182,9 +367,9 @@ export default {
         {
           prop: 'palletCode',
           label: '托盘码',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -194,7 +379,7 @@ export default {
           label: '记录仓库',
           type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -202,9 +387,9 @@ export default {
         {
           prop: 'createTime',
           label: '创建时间',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -214,13 +399,138 @@ export default {
         //   label: '操作',
         //   type: 6,
         //   values: '',
-        //   width: '230',
+        //   width: '150',
         //   checkarr: [],
         //   fixed: 'right',
         //   hide: true,
         // },
         // 更多列的配置...
       ],
+      columnList2: [
+        {
+          prop: 'orderCode',
+          label: '订单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'mallName',
+          label: '商城名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'bindingType',
+          label: '上架类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [
+            { label: '上架', value: 1 },
+            { label: '下架', value: 2 },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'areaTitle',
+          label: '货区',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'shelfTitle',
+          label: '货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'allocationTitle',
+          label: '货位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'createUserName',
+          label: '操作员',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'mallCode',
+          label: '托盘码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'logWarehouseName',
+          label: '记录仓库',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+      ],
       height: 0,
       // 弹框标题
       title: '',
@@ -238,7 +548,17 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
+      },
+      page1: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
+      },
+      page2: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -248,11 +568,15 @@ export default {
       option: option,
       // 表单列表
       data: [],
-    }
+      data1:[],
+      data2:[],
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
+    this.onLoad(this.page1, {}, 'page1');
+    this.onLoad(this.page2, {}, 'page2');
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
@@ -330,14 +654,14 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
     showdrawer(value) {
@@ -376,140 +700,83 @@ export default {
     },
     selectsc(index, row) {
       console.log(index, row);
-
     },
     timesc(index, row) {
       console.log(index, row);
-
     },
     inputsc(index, row) {
       console.log(index, row);
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
-      this.search = !this.search;
+
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      // this.$refs.table.clearSelection();
     },
-    searchChange () {
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    searchReset () {
-      this.query = {};
-      this.page.currentPage = 1;
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    handleSubmit () {
-      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: "操作成功!"
-          });
-        })
-      }
+    sizeChange1(pageSize) {
+      this.page1.pageSize = pageSize;
+      this.onLoad(this.page1, {}, 'page1');
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    currentChange1(currentPage) {
+      this.page1.currentPage = currentPage;
+      this.onLoad(this.page1, {}, 'page1');
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
-      getDetail(row.id).then(res => {
-        this.form = res.data.data;
-      });
+    sizeChange2(pageSize) {
+      this.page1.pageSize = pageSize;
+      this.onLoad(this.page2, {}, 'page2');
     },
-    handleView (row) {
-      this.title = '查看'
-      this.view = true;
-      this.box = true;
-      getDetail(row.id).then(res => {
-        this.form = res.data.data;
-      });
+    currentChange2(currentPage) {
+      this.page1.currentPage = currentPage;
+      this.onLoad(this.page2, {}, 'page2');
     },
-    handleDelete () {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
+    onLoad(page, params = {}, uname) {
+      this.loading = true;
+      if (uname=='page1') {
+        getinventorypage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          if (uname) {
+            this[uname].total = data.total;
+          }
+          this.data1 = data.records;
+          this.data1 = this.$functions.newdatas(this.columnList1, this.data1);
+          this.loading = false;
           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: "操作成功!"
-          });
+      }else if(uname=='page2'){
+        gettruckloadpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          if (uname) {
+            this[uname].total = data.total;
+          }
+          this.data2 = data.records;
+          this.data2 = this.$functions.newdatas(this.columnList2, this.data2);
+          this.loading = false;
+          this.selectionClear();
         });
+      } else {
+        getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.data = this.$functions.newdatas(this.columnList, this.data);
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
     },
-    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;
-      getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.data =this.$functions.newdatas(this.columnList,this.data)
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
+  },
 };
 </script>