From 4dd2e6c3d2f4dcab6d680ef4f81cc1ef6ee93c08 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 7 Sep 2023 18:01:30 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicdata/brand/basicClient.vue     | 74 +++++++++++++++-
 .../delivery/distributionStockArticle.vue     |  4 +-
 .../distributionStockArticleDetails.vue       | 13 +--
 .../inventory/distrilbutionBillLading.vue     |  6 +-
 .../inventory/distrilbutionBillLadingList.vue |  6 +-
 .../inventory/distrilbutionBillLadingView.vue | 87 +++++++++++++++++++
 .../distributionStockupDetailsSelf.vue        | 36 ++++++++
 .../stockup/distributionStockupDiscuss.vue    | 36 ++++----
 .../stockup/distributionStockupMarket.vue     | 16 ++--
 .../stockup/distributionStockupSelf.vue       | 16 ++--
 .../warehouseWarehousingEntry.vue             |  5 +-
 11 files changed, 248 insertions(+), 51 deletions(-)

diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index ea5a83aa..4e5baf54 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -345,6 +345,7 @@ import { getSelect, getLazyTree, getLazyList, getLazyTreeAll } from '@/api/base/
 import { getToken } from '@/utils/auth';
 import globalc from '@/api/basicdata/globalc';
 import { Base64 } from 'js-base64';
+import dayjs from 'dayjs';
 
 
 export default {
@@ -389,7 +390,7 @@ export default {
         {
           prop: 'clientTypeName',
           label: '客户类型',
-          type: 2,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -400,7 +401,7 @@ export default {
         {
           prop: 'typeServiceName',
           label: '服务类型',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -628,6 +629,70 @@ export default {
     }
   },
   methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log("123123123",index, row);
+      if(row.prop ==='clientTypeName'){
+        this.query['clientType'] = index;
+      }else{
+        this.query[row.prop] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+
+
+
     handleCommand(command,row){
       console.log(command,row)
       switch (Number(command)) {
@@ -807,6 +872,11 @@ export default {
       getDictionaryBiz('client_type').then(res => {
         // console.log("字典》》》",res);
         this.clientType = res.data.data;
+        this.$functions.checkcColumnList("clientTypeName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
       });
       //字典
       getDictionaryBiz('basic_freight_type').then(res => {
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 4539c951..e7303461 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -6,10 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" clearable  ></el-input>
           </el-form-item>
           <el-form-item label="运单">
-            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" clearable />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index c9eb2fc9..64b4271a 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -726,8 +726,11 @@ export default {
     '$route.query.id': {
       handler(newVal, oldVal) {
         // console.log(newVal, oldVal);
-        this.onLoad(this.page);
-        this.onLoadOwn(this.page);
+        if(!!this.$route.query.id){
+          this.onLoad(this.page);
+          this.onLoadOwn(this.page);
+        }
+
       },
       deep: true,
       immediate: true,
@@ -1367,7 +1370,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      this.query.id = this.$route.query.id;
+      this.query.ids = this.$route.query.id;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         // this.page.total = data.total;
@@ -1377,10 +1380,10 @@ export default {
       });
     },
     onLoadOwn(page, params = {}) {
-      this.loading = true;
+      // this.loading = true;
       this.dataMaterial = false;
       params = {
-        stockArticleId: this.$route.query.id,
+        stockArticleIds: this.$route.query.id,
       };
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then(
         res => {
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 6505dedd..97ec06c4 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -2319,7 +2319,7 @@ export default {
       }
     },
     selectionChangeStock(list) {
-      console.log('执行了啦啦啦', list);
+      // console.log('执行了啦啦啦', list);
       this.selectionListStock = list;
     },
     selectionClear() {
@@ -2345,7 +2345,7 @@ export default {
 
     onLoad(page, params = {}) {
       this.loading = true;
-      params.id = this.$route.query.id;
+      params.ids = this.$route.query.id;
       this.orderAdd = false;
       getListOne(page.currentPage, page.pageSize, params).then(res => {
         const data = res.data.data;
@@ -2396,7 +2396,7 @@ export default {
     //包件信息
     onLoadOwn(page, params = {}) {
       this.loading = true;
-      this.query.stockArticleId = this.$route.query.id;
+      this.query.stockArticleIds = this.$route.query.id;
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         console.log('包件信息>>>>', res.data.data);
         const dataList = res.data.data;
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index 590b1324..83edf040 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -105,8 +105,8 @@
           <template #default="slotProps">
 <!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
             <el-text size="small" text @click="handleLike(slotProps.scope)">查看</el-text>
-            <el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 20">签收</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-text>
+            <el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 30">签收</el-text>
+            <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)" v-if="slotProps.scope.row.conditions < 20">编辑提货信息</el-text>
 <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
 
           </template>
@@ -856,7 +856,7 @@ export default {
         for(let a = 0;a < clientType.length;a++){
           // console.log("进来了",clientType[a].dictKey , costListName[i]);
           if(clientType[a].dictKey == costListName[i]){
-            console.log("进来了",clientType[a].dictKey , costListName[i]);
+            // console.log("进来了",clientType[a].dictKey , costListName[i]);
             let zhi = costList[costListName[i]];
             if(!zhi){
               this.pan = true;
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 7fa36266..de5153a7 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -153,6 +153,49 @@ export default {
       columnListarrs:{
         //入库明细
       ordoption:[
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '客户车次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'sendWarehouseName',
+          label: '始发仓',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderCode',
           label: '订单自编号',
@@ -164,6 +207,7 @@ export default {
           sortable: true,
           head: false,
         },
+
         {
           prop: 'descriptionGoods',
           label: '货物名称',
@@ -352,6 +396,49 @@ export default {
         //   checkarr: [],
         //   fixed: true,
         // },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '客户车次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'orderPackageCode',
           label: '包条码',
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index d41ca065..538b162b 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -599,6 +599,10 @@ export default {
         //配送类型
         this.distributionType = res.data.data;
       });
+      // 费用类型字典
+      getDictionaryBiz('delivery_cost').then(res => {
+        this.clientType = res.data.data;
+      });
       // console.log("配送方式123", this.deliveryWayList);
       getDictionaryBiz('delivery_way').then(res => {
         //配送方式
@@ -832,6 +836,38 @@ export default {
       let a = await billStockList(page.currentPage, page.pageSize, { id: this.$route.query.id });
       this.data3 = a.data.data.records;
       console.log("自提任务》》》》》》",this.data3);
+      console.log("费用类型lll",this.clientType);
+      this.data3.forEach(i =>{
+        if(!!i.list){
+          i.collectFee = 0;
+          i.storageFee = 0;
+          i.transport = 0;
+          i.forklift = 0;
+          i.otherFee = 0;
+          i.list.forEach(a =>{
+            const { cost, money } = a; // 对象解构，获取a对象的cost和money属性
+            switch (cost) {
+              case '1': // 到付
+                i.collectFee = money ? parseInt(money) : 0;
+                break;
+              case '2': // 仓储费用
+                i.storageFee = money ? parseInt(money) : 0;
+                break;
+              case '3': // 搬运费
+                console.log("0=-0-=");
+                i.transport = money ? parseInt(money) : 0;
+                break;
+              case '4': // 叉车费
+                i.forklift = money ? parseInt(money) : 0;
+                break;
+              case '5': // 其他增值费
+                i.otherFee = money ? parseInt(money) : 0;
+                break;
+            }
+          })
+        }
+      });
+
 
       // if (!!this.data3 && this.data3.length > 0) {
       //   this.data3.forEach(i => {
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index 5a5ab14b..8a125284 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -355,14 +355,14 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-            {
-              label: '未指派',
-              value: '1',
-            },
-            {
-              label: '已指派',
-              value: '2',
-            },
+            // {
+            //   label: '未指派',
+            //   value: '1',
+            // },
+            // {
+            //   label: '已指派',
+            //   value: '2',
+            // },
           ],
           fixed: false,
           sortable: true,
@@ -893,17 +893,17 @@ export default {
           return item
         });
       });
-      getDictionaryBiz('stock_allocation').then(res => {
-        this.stockAllocation = res.data.data;
-        this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
-          item.value = item.dictKey
-          item.label = item.dictValue
-          return item
-        });
-      })
+      // getDictionaryBiz('stock_allocation').then(res => {
+      //   this.stockAllocation = res.data.data;
+      //   this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+      //     item.value = item.dictKey
+      //     item.label = item.dictValue
+      //     return item
+      //   });
+      // })
       getDictionaryBiz('stock_assign_status').then(res => { //指派
-        // console.log("8908098080",res.data.data);
-        this.distributionType = res.data.data;
+        console.log("8908098080",res.data.data);
+        // this.distributionType = res.data.data;
         this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr =res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 508ccf01..1f8d26d9 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -831,14 +831,14 @@ export default {
           return item
         });
       });
-      getDictionaryBiz('stock_allocation').then(res => {
-        this.stockAllocation = res.data.data;
-        this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
-          item.value = item.dictKey
-          item.label = item.dictValue
-          return item
-        });
-      });
+      // getDictionaryBiz('stock_allocation').then(res => {
+      //   this.stockAllocation = res.data.data;
+      //   this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+      //     item.value = item.dictKey
+      //     item.label = item.dictValue
+      //     return item
+      //   });
+      // });
       this.onLoad(this.page);
     },
     searchHide () {
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 028ef25c..67989128 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -837,14 +837,14 @@ export default {
           return item
         });
       });
-      getDictionaryBiz('stock_allocation').then(res => {
-        this.stockAllocation = res.data.data;
-        this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
-          item.value = item.dictKey
-          item.label = item.dictValue
-          return item
-        });
-      });
+      // getDictionaryBiz('stock_allocation').then(res => {
+      //   this.stockAllocation = res.data.data;
+      //   this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+      //     item.value = item.dictKey
+      //     item.label = item.dictValue
+      //     return item
+      //   });
+      // });
       this.onLoad(this.page);
     },
     searchHide () {
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
index 16747380..88065123 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
@@ -50,6 +50,7 @@
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleViewAdd(slotProps.scope)">查看</el-text>
             <el-text type="primary" text icon="el-icon-edit" v-if="slotProps.scope.row.conditions != '3'" @click="handleEditOwn(slotProps.scope)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-edit" v-if="slotProps.scope.row.conditions != '3'" @click="handleEnter(slotProps.scope)">入库</el-text>
 
             <el-dropdown>
               <el-text  type="primary" text >
@@ -63,9 +64,9 @@
                   <el-dropdown-item>
                     <el-text @click="handleDrawer(slotProps.scope)">物品清单</el-text>
                   </el-dropdown-item>
-                  <el-dropdown-item v-if="slotProps.scope.row.conditions != '3'">
+                 <!-- <el-dropdown-item v-if="slotProps.scope.row.conditions != '3'">
                     <el-text @click="handleEnter(slotProps.scope)">入库</el-text>
-                  </el-dropdown-item>
+                  </el-dropdown-item>-->
                 </el-dropdown-menu>
               </template>
             </el-dropdown>

From 205ced7fa2d04f0efd080b9ce3d12f075d856a25 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 7 Sep 2023 21:42:40 +0800
Subject: [PATCH 2/6] =?UTF-8?q?1.=E4=BA=8C=E7=BB=B4=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicdataGoodsAllocation.js |   9 ++
 src/api/basicdata/basicdataGoodsShelf.js      |  18 +--
 src/api/basicdata/basicdataTray.js            |  28 +++-
 .../BasicdataGoodsAllocation.vue              |  30 +++-
 .../goodsShelf/basicdataGoodsShelf.vue        | 142 +++++++++++-------
 .../warehouse/tray/basicdataTray.vue          | 130 +++++++++++-----
 6 files changed, 255 insertions(+), 102 deletions(-)

diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js
index 62b5a3a4..2d50e59f 100644
--- a/src/api/basicdata/basicdataGoodsAllocation.js
+++ b/src/api/basicdata/basicdataGoodsAllocation.js
@@ -49,6 +49,15 @@ export const enable = (ids) => {
     }
   })
 }
+export const downAllocation = (ids) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 export const shelf = (ids) => {
   return request({
     url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',
diff --git a/src/api/basicdata/basicdataGoodsShelf.js b/src/api/basicdata/basicdataGoodsShelf.js
index 968b074f..3fb2c3ef 100644
--- a/src/api/basicdata/basicdataGoodsShelf.js
+++ b/src/api/basicdata/basicdataGoodsShelf.js
@@ -87,15 +87,15 @@ export const getShowTemplate = (row) => {
   })
 }
 
-export const getPrintTemplate = (ids) => {
-  return request({
-    url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate',
-    method: 'get',
-    params:{
-      ids
-    }
-  })
-}
+// export const getPrintTemplate = (ids) => {
+//   return request({
+//     url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate',
+//     method: 'get',
+//     params:{
+//       ids
+//     }
+//   })
+// }
 
 export const getQRCodeImg = (qrCode) => {
   return request({
diff --git a/src/api/basicdata/basicdataTray.js b/src/api/basicdata/basicdataTray.js
index 2a387ca7..6ee67a91 100644
--- a/src/api/basicdata/basicdataTray.js
+++ b/src/api/basicdata/basicdataTray.js
@@ -102,13 +102,32 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/logpm-basicdata/Tray/remove',
+    url: '/api/logpm-basicdata/tray/remove',
     method: 'post',
     params: {
       ids,
     }
   })
 }
+export const disable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/tray/disable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+export const addable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/tray/addable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
 
 export const add = (row) => {
   return request({
@@ -132,4 +151,11 @@ export const vacant = (row) => {
     data: row
   })
 }
+export const vacants = (row) => {
+  return request({
+    url: '/api/logpm-basicdata/tray/vacants',
+    method: 'post',
+    data: row
+  })
+}
 
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 170c7cd4..d84f7176 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -31,6 +31,11 @@
                    plain
                    @click="handleEnable">启 用
         </el-button>
+        <el-button type="danger"
+                   icon="el-icon-delete"
+                   plain
+                   @click="downAllocation">一 键 下 架
+        </el-button>
 <!--        <el-button type="warning"-->
 <!--                   plain-->
 <!--                   icon="el-icon-download"-->
@@ -78,7 +83,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove,getPrintTemplate,shelf,disable,enable} from "@/api/basicdata/basicdataGoodsAllocation";
+  import {getList, getDetail, add, update, remove,getPrintTemplate,shelf,disable,enable,downAllocation} from "@/api/basicdata/basicdataGoodsAllocation";
   import option from "@/option/basicdata/basicdataGoodsAllocation";
   import {mapGetters} from "vuex";
   import {exportBlob} from "@/api/common";
@@ -88,6 +93,7 @@
   import NProgress from 'nprogress';
   import 'nprogress/nprogress.css';
   import {getLodop} from "@/utils/LodopFuncs";
+  import { addlayer } from '@/api/basicdata/basicdataGoodsShelf';
 
   export default {
     data() {
@@ -332,6 +338,28 @@
             this.$refs.crud.toggleSelection();
           });
       },
+      downAllocation() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择库位下架?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            downAllocation(this.ids).then((response) => {
+
+              this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: response.data.msg
+              });
+            })
+          })
+
+      },
       //批量打印数据处理代码
       printTemplate() {
         let that=this;
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index d50e3c5d..e0faca26 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -219,7 +219,7 @@
           <template #footer>
           <span  class="dialog-footer">
             <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitAdd">增 加</el-button>
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitred">减 少</el-button>
+<!--            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitred">减 少</el-button>-->
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
           </template>
@@ -259,20 +259,25 @@
       <el-dialog
         title="二维码"
         :visible.sync="dialogVisible"
-        width="30%"
+        width="600px"
         v-model="dialogVisible">
         <div >
-          <div v-for="(item,index) in qrCodeObj">
-            <el-row>
-              <el-col :span="24" >
-                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
-              </el-col>
-            </el-row>
-          </div>
+          <!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
+          <!--          <el-divider></el-divider>-->
+
+          <!--          <el-row>-->
+          <!--            <el-col :span="24" >-->
+          <!--              <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>-->
+          <!--            </el-col>-->
+          <!--          </el-row>-->
+          <!--        </div>-->
+          <!--startprint1-->
+          <div v-html="html"></div>
+          <!--endprint1-->
         </div>
         <span slot="footer" class="dialog-footer">
 <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-         <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
           <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
@@ -293,13 +298,13 @@
                    @size-change="allsizeChange"
                    @on-load="allonLoad">
 
-<!--          <template #menu-left>-->
-<!--            <el-button type="warning"-->
-<!--                       plain-->
-<!--                       icon="el-icon-camera"-->
-<!--                       @click="handleqr">查看二维码-->
-<!--            </el-button>-->
-<!--          </template>-->
+          <template #menu-left>
+            <el-button type="warning"
+                       plain
+                       icon="el-icon-camera"
+                       @click="handleqr">查看二维码
+            </el-button>
+          </template>
           <template #menu="{size,row,index}">
             <el-button type="primary" text icon="el-icon-view"  v-if="row.enableStatus ==1" @click="losses(row,2)">禁 用</el-button>
 <!--            <el-button type="primary" text icon="el-icon-view"  v-if="row.allocationStatus !=='1'" @click="Offshelf(row)">一 键 下 架</el-button>-->
@@ -314,8 +319,8 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,getPrintTemplate,addAllocation,disable,enable,addlayer } from "@/api/basicdata/basicdataGoodsShelf";
-import {getList as allgetList,update as allupdate} from "@/api/basicdata/basicdataGoodsAllocation";
+import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,addAllocation,disable,enable,addlayer } from "@/api/basicdata/basicdataGoodsShelf";
+import {getList as allgetList,update as allupdate,getPrintTemplate} from "@/api/basicdata/basicdataGoodsAllocation";
 import option from "@/option/basicdata/basicdataGoodsShelf";
 import { mapGetters } from "vuex";
 import {  getGoodsAreaNodeList } from '@/api/basicdata/basicdataGoodsArea';
@@ -483,6 +488,7 @@ export default {
       selectionList: [],
       //货位 选择行
       allselectionList: [],
+      html: null, // 页面包条码内容
       alloption: {
         height:'auto',
         calcHeight: 30,
@@ -492,7 +498,7 @@ export default {
         border: true,
         index: true,
         viewBtn: true,
-        selection: false,
+        selection: true,
         editBtn:false,
         delBtn:false,
         addBtn:false,
@@ -763,6 +769,30 @@ export default {
         this.templateData = data;
       })
     },
+    handleqr(){
+      if (this.allselectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+
+      let checkcode=[]
+      this.allselectionList.map(item=>{
+        checkcode.push(item.id)
+        // checkcode.push(item.orderPackageCode)
+      })
+
+      let qr=checkcode.join(',');
+      console.log(qr);
+      getPrintTemplate(qr).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+
+      });
+      this.dialogVisible = true;
+
+    },
     // 格式化数据，递归将空的children置为undefined
     formatCascaderData(data){
       console.log("------------>",data);
@@ -1076,45 +1106,45 @@ export default {
         });
     },
     //结合模板生成二维码
-    viewQrCode(){
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      let idInfo =this.ids.split(",");
-      this.dialogVisible = true;
-      this.qrCodeObj = [];
-      console.log(">>>>>>>>>>>",this.selectionList);
-      this.selectionList.forEach((item,index)=>{
-        idInfo.forEach(async id=>{
-          if (id===item.id){
-            let params = {};
-            if (item.qrCode){
-              getShowTemplate(Object.assign(params,item)).then(res=>{
-                console.log("@@@@@@@@@@@@@",res.data);
-                let url = window.URL.createObjectURL(res.data);
-                // 获取返回参数中的需要的值data
-                console.log("@@@@@@@@@@@@@",url);
-
-                this.qrCodeObj.push(url);
-              })
-            }else {
-              console.log("参数异常:"+item.qrCode);
-              this.$message({
-                type: "error",
-                message: "参数异常!"+item.qrCode
-              });
-            }
-          }
-        })
-
-      })
-    },
+    // viewQrCode(){
+    //   if (this.selectionList.length === 0) {
+    //     this.$message.warning("请选择至少一条数据");
+    //     return;
+    //   }
+    //   let idInfo =this.ids.split(",");
+    //   this.dialogVisible = true;
+    //   this.qrCodeObj = [];
+    //   console.log(">>>>>>>>>>>",this.selectionList);
+    //   this.selectionList.forEach((item,index)=>{
+    //     idInfo.forEach(async id=>{
+    //       if (id===item.id){
+    //         let params = {};
+    //         if (item.qrCode){
+    //           getShowTemplate(Object.assign(params,item)).then(res=>{
+    //             console.log("@@@@@@@@@@@@@",res.data);
+    //             let url = window.URL.createObjectURL(res.data);
+    //             // 获取返回参数中的需要的值data
+    //             console.log("@@@@@@@@@@@@@",url);
+    //
+    //             this.qrCodeObj.push(url);
+    //           })
+    //         }else {
+    //           console.log("参数异常:"+item.qrCode);
+    //           this.$message({
+    //             type: "error",
+    //             message: "参数异常!"+item.qrCode
+    //           });
+    //         }
+    //       }
+    //     })
+    //
+    //   })
+    // },
     printTemplate(){
       let LODOP = getLodop();
       console.log("this.ids>>>>>",this.ids);
-      console.log("this.ids>>>>>",this.selectionList);
-      if (this.selectionList.length === 0){
+      console.log("this.ids>>>>>",this.allselectionList);
+      if (this.allselectionList.length === 0){
         this.$message.warning("请选择至少一条数据");
         return;
       }
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index bd8fd53c..34ef9a38 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -36,12 +36,32 @@
                    icon="el-icon-camera"
                    @click="handleqr">查看二维码
         </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-camera"
+                   @click="lossess">报 损
+        </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-camera"
+                   @click="disable">禁 用
+        </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-camera"
+                   @click="addable">启 用
+        </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-camera"
+                   @click="vacants">一 键 空 置
+        </el-button>
       </template>
       <template #menu="{size,row,index}">
-        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报  损</el-button>
-        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)">一 键 空 置</el-button>
-        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)">禁 用</el-button>
-        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)">启 用</el-button>
+<!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报  损</el-button>-->
+<!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)">一 键 空 置</el-button>-->
+<!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)">禁 用</el-button>-->
+<!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)">启 用</el-button>-->
         <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="Details(row)">在 托 详 情</el-button>
         <el-button type="primary" text icon="el-icon-view" @click="historys(row)">历 史 记 录</el-button>
       </template>
@@ -93,7 +113,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove,vacant,getPrintTemplate} from "@/api/basicdata/basicdataTray";
+  import {getList, getDetail, add, update, remove,vacant,getPrintTemplate,disable,addable,vacants} from "@/api/basicdata/basicdataTray";
   import option from "@/option/basicdata/basicdataTray";
   import {mapGetters} from "vuex";
   import {exportBlob} from "@/api/common";
@@ -232,6 +252,19 @@
         this.damagedform = row
         this.damagedBox = true
       },
+      lossess(){
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择一条数据");
+          return;
+        }
+        if (this.selectionList.length > 1) {
+          this.$message.warning("只能选一条数据");
+          return;
+        }
+        console.log("this.selectionList>>>>>>",this.selectionList);
+         this.damagedform.id = this.selectionList[0].id
+         this.damagedBox = true
+      },
       vacant(row){
         this.$confirm('确认空置？')
           .then(_ => {
@@ -250,44 +283,71 @@
           .catch(_ => {
           });
       },
-      disable(row){
-        this.$confirm('确认禁用？')
-          .then(_ => {
-            row.disableType =2
-            update(row).then(() => {
-              this.onLoad(this.page);
-              this.$message({
-                type: "success",
-                message: "操作成功!"
-              });
-            }, error => {
-              loading();
-              console.log(error);
-            });
+      vacants(){
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据空置?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            console.log("this.selectionList>>>>>>>>>>>>>>>>>>",this.selectionList);
+            const newList = this.selectionList.map(item => item.palletCode);
+            return vacants(newList);
           })
-          .catch(_ => {
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
           });
       },
-      addable(row){
-        this.$confirm('确认启用？')
-          .then(_ => {
-            row.disableType =1
-            update(row).then(() => {
-              this.onLoad(this.page);
-              this.$message({
-                type: "success",
-                message: "操作成功!"
-              });
-            }, error => {
-              loading();
-              console.log(error);
+      disable(){
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据禁用?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return disable(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
             });
+          });
+      },
+      addable(){
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据启用?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return addable(this.ids);
           })
-          .catch(_ => {
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
           });
       },
       //批量打印数据处理代码
-      //批量打印数据处理代码
       printTemplate() {
         let that=this;
         this.selectionList.map(item=>{

From 73efe066680c537b694d34a16e967ed5b10ad4aa Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Fri, 8 Sep 2023 09:50:55 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicClientAccount.js       |  21 +
 src/router/views/index.js                     |  23 +
 src/views/basicdata/brand/basicClient.vue     |  65 ++-
 .../basicdata/brand/basicClientAccount.vue    | 458 ++++++++++++++++++
 .../brand/basicdataTripartiteMall.vue         |   2 +-
 5 files changed, 566 insertions(+), 3 deletions(-)
 create mode 100644 src/api/basicdata/basicClientAccount.js
 create mode 100644 src/views/basicdata/brand/basicClientAccount.vue

diff --git a/src/api/basicdata/basicClientAccount.js b/src/api/basicdata/basicClientAccount.js
new file mode 100644
index 00000000..f8ddb2ce
--- /dev/null
+++ b/src/api/basicdata/basicClientAccount.js
@@ -0,0 +1,21 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataClientAccount/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataClientAccount/submit',
+    method: 'post',
+    data: row
+  })
+}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 27bc74f9..aa5e83f1 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -925,7 +925,30 @@ export default [
         component: () => import('@/views/basicdata/team/basicdataTeamStaff.vue'),
       },
     ],
+    
   },
+
+
+  {
+    path: '/basicdata/brand/basicClientAccount',
+    component: Layout,
+    redirect: '/basicdata/brand/basicClient',
+    children: [
+      {
+        path: '/basicdata/brand/basicClientAccount',
+        name: '客户账号列表',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          id: route.query.id
+        }),
+        component: () => import('@/views/basicdata/brand/basicClientAccount.vue'),
+      },
+    ],
+    
+  },
+
   // {
   //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
   //   component: Layout,
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index ea5a83aa..d1393a6b 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -126,6 +126,9 @@
                     <el-dropdown-item command="6">
                       <el-text>三方商城</el-text>
                     </el-dropdown-item>
+                    <el-dropdown-item command="7">
+                      <el-text>开通账号</el-text>
+                    </el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
               </el-dropdown>
@@ -313,6 +316,36 @@
           </span>
         </template>
       </el-dialog>
+
+
+      <!-- 账号绑定弹出框页面
+      1、显示登录账号
+      2、显示账号的名称 -->
+      <el-dialog title="开通账号" v-model="openAcountStatus">
+
+        <el-form :disabled="view" ref="openAcountorm" :model="openAcountform" :rules="openAcountrules" label-width="120px">
+
+          <el-form-item label="姓名" prop="linkman" >
+            <el-input v-model="openAcountform.name" placeholder="请输入联系人" maxlength="20" style="width: 100%" />
+          </el-form-item>
+
+          <el-form-item label="账号" prop="linkman" >
+            <el-input v-model="openAcountform.phone" placeholder="请输入电话" type="number" maxlength="11" style="width: 100%" />
+          </el-form-item>
+          <el-form-item label="密码" >
+            <span style="color: red;">默认系统初始化密码</span>
+          </el-form-item>
+        </el-form>
+
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="openAcountStatus = false">取 消</el-button>
+          </span>
+        </template>
+
+      </el-dialog>
+
       <el-drawer
         title="子表操作"
         append-to-body
@@ -598,7 +631,13 @@ export default {
           { required: true, message: '请上传合同文件', trigger: 'blur' }
         ]
       },
-      bianji: false
+      bianji: false,
+
+      openAcountStatus:false,//开通账号弹出框状态
+      openAcountform:{
+        name:"",
+        phone:""
+      }
     };
   },
   created() {
@@ -649,6 +688,9 @@ export default {
         case 6:
         this.handleMall(row)
           break;
+        case 7:
+        this.openAcount(row)
+          break;
       }
     },
     //远程校验
@@ -692,6 +734,26 @@ export default {
       console.log(val);
     },
 
+    /**
+     * 开通账号
+     */
+    openAcount(row) {
+
+
+      // this.openAcountform.name = row.linkman;
+      // this.openAcountform.phone = row.phone;
+      // this.openAcountStatus = true;
+
+      this.$router.push({
+        path: '/basicdata/brand/basicClientAccount',
+        query: {
+          id: row.id,
+          name: '商场 - ' + row.clientName
+        }
+      });
+
+    },
+
     //
     handleMall(row) {
       // console.log('>>>', row);
@@ -706,7 +768,6 @@ export default {
     },
     //打开文件
     downloadLink(row) {
-      console.log('>>>>>', row);
       window.open('http://192.168.10.100:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(row.leaseAccessories)));
     },
     //控制控货
diff --git a/src/views/basicdata/brand/basicClientAccount.vue b/src/views/basicdata/brand/basicClientAccount.vue
new file mode 100644
index 00000000..6b046d0e
--- /dev/null
+++ b/src/views/basicdata/brand/basicClientAccount.vue
@@ -0,0 +1,458 @@
+<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.account" placeholder="请输入账号"></el-input>
+            </el-form-item>
+  <!--          <el-form-item label="状态:">-->
+  <!--            <el-input v-model="query.condition" 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">
+            <!-- 头部左侧按钮模块 -->
+            <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>
+        </el-row>
+        <el-row>
+          <!-- 列表模块 -->
+          <tablecmt
+            :columnList="columnList"
+            :tableData="data"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="slotProps">
+              
+              <!-- <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text> -->
+                <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
+            </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-dialog title="创建账号" v-model="openAcountStatus">
+
+           <el-form :disabled="view" ref="openAcountorm" :model="openAcountform" :rules="openAcountrules" label-width="120px">
+
+          <el-form-item label="姓名" prop="openAcountform.name" >
+            <el-input v-model="openAcountform.name" placeholder="请输入联系人" maxlength="20" style="width: 100%" />
+          </el-form-item>
+
+          <el-form-item label="账号" prop="openAcountform.phone" >
+            <el-input v-model="openAcountform.phone" placeholder="请输入电话" type="number" maxlength="11" style="width: 100%" />
+          </el-form-item>
+          <el-form-item label="密码" >
+            <span style="color: red;">默认系统初始化密码</span>
+          </el-form-item>
+          </el-form>
+
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('openAcountorm')">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="openAcountStatus = false">取 消</el-button>
+          </span>
+        </template>
+
+      </el-dialog>
+
+
+      </div>
+    </basic-container>
+  </template>
+  
+  <script>
+  import { getList,add } from "@/api/basicdata/basicClientAccount";
+  import { mapGetters } from "vuex";
+  
+  export default {
+    
+    data () {
+      return {
+        columnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true,
+          },
+          {
+            prop: 'phone',
+            label: '账号',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'name',
+            label: '姓名',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+        
+         
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true,
+          },
+        ],
+        optionProps:{
+          value: 'id',
+          label: 'cName',
+          children: 'childrenList',    //子元素字段名
+          emitPath : false,
+          checkStrictly:true,
+          expandTrigger: 'hover'    //设置鼠标悬浮展开，如果点击展开的话，会出现点击父节点后选择器直接关闭，不能选择子节点了
+        },
+        cascaderKey : 1,//防止搜索选项清空数据后出现报错,在加载级联选择器数据的时候+1
+        height: 0,
+        // 弹框标题
+        title: '',
+        costCorrelationId: '',
+        // 是否展示弹框
+        box: false,
+        openAcountStatus:false,//开通账号弹出框状态
+      openAcountform:{
+        name:"",
+        phone:""
+      },
+        // 是否展示抽屉
+        drawer: false,
+        // 抽屉方向
+        direction: 'rtl',
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          currentPage: 1,
+          pageSize: 30,
+          total: 40
+        },
+        // 表单数据
+        form: {},
+        pan: false,
+        // 选择行
+        selectionList: [],
+        // 表单列表
+        data: [],
+        optioner:[],
+        optionsr:[],
+        optionser:[],
+        rules: {
+        //   province: [
+        //     { required: true, message: '请选择地址', trigger: 'blur' },
+        //     // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        //   ],
+        //   brand: [
+        //     { required: true, message: '请选择品牌', trigger: 'change' }
+        //   ],
+        //   freightMark : [
+        //     { required: true, message: '请选择费用类型', trigger: 'blur' }
+        //   ],
+        //   cost: [
+        //     { required: true, message: '请输入费用', trigger: 'blur' }
+        //   ],
+        //   warehousingTimeStatus: [
+        //     { required: true, message: '请选择时间段', trigger: 'change' }
+        //   ],
+        //   warehousingTimeCharge: [
+        //     { required: true, message: '请选择时间段费用', trigger: 'blur' }
+        //   ],
+        //   goalGranary: [
+        //     { required: true, message: '请选择末端仓', trigger: 'blur' }
+        //   ],
+        },
+      }
+    },
+    watch: {
+      
+    },
+    created() {
+       
+    },
+    mounted () {
+      this.init();
+  
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      ids () {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      //关闭浮层
+      hideCascaderInp(){
+        this.$refs.cascaderRef.value.togglePopperVisible(false)
+  
+      },
+      handleDrawerClose(){
+        this.costCorrelationId = '';
+        this.drawer = false;
+      },
+      handleDrawer(row) {
+        this.costCorrelationId = row.id;
+        this.drawer = true;
+      },
+      textWarebox(e,index) {
+        console.log(e,index)
+        this.costWraeList[index] = e;
+      },
+      textbox(e,index) {
+        console.log(e,index)
+        this.costList[index] = e;
+      },
+      handleCheckedCities(value) {
+        console.log(value);
+        if(value.length < 1){
+          this.costWraeList = [];
+        }
+          this.wareType.forEach(i =>{
+            if(value.includes(i.dictValue)){
+              // console.log(i);
+              i.pitch = true;
+              // this.$set(i,'pitch',false);
+              this.costWraeListName = value;
+            }else{
+              i.pitch = false;
+              this.costWraeList[i] = null;
+              i.remark = null;
+            }
+          });
+      },
+      handleCheckedCitiesChange(value) {
+    
+
+
+      },
+      remoteMethod(query){
+    
+      },
+      remoteMethodBin(query){
+   
+      },
+      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 (from) {
+        this.$refs[from].validate(async (valid) => {
+          if (valid) {
+            this.openAcountform.clientId=this.$route.query.id;
+            add(this.openAcountform).then(() => {
+              this.openAcountStatus = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+            });
+          }
+        })
+  
+      },
+      handleAdd () {
+
+        this.openAcountStatus = true;
+  
+      },
+      handleEdit (row) {
+       
+ 
+      },
+      handleView (row) {
+      
+  
+      },
+      handleDelete () {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        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 = [];
+      },
+      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;
+
+        this.query.clientId=  this.$route.query.id;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.clientType.forEach(it =>{
+            data.records.forEach(i =>{
+              if(parseInt( it.dictKey ) == parseInt(i.freightMark)){
+                i.freightMark = it.dictValue
+              }
+              if(i.freightMark == '-1'){
+                i.freightMark = '无'
+              }
+            })
+          })
+    
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+    };
+  </script>
+  <style>
+  .ca .el-radio__inner {
+    top: -18px;
+    left: -19px;
+    border-radius: 0;
+    border: 0;
+    width: 170px;
+    height: 34px;
+    background-color: transparent;
+    cursor: pointer;
+    box-sizing: border-box;
+    position: absolute;
+  }
+  
+  .ca .el-radio__input.is-checked .el-radio__inner {
+    background: transparent;
+  }
+  
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/basicdata/brand/basicdataTripartiteMall.vue b/src/views/basicdata/brand/basicdataTripartiteMall.vue
index 470b0e20..73115466 100644
--- a/src/views/basicdata/brand/basicdataTripartiteMall.vue
+++ b/src/views/basicdata/brand/basicdataTripartiteMall.vue
@@ -270,7 +270,7 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
-       this.query.client = this.$route.query.id;
+       this.query.clientId = this.$route.query.id;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;

From 13e1a080dbcf20fde68e1662f22c709650d29c7b Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 8 Sep 2023 11:15:00 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockup/distributionStockup.vue           | 56 +++++++++----------
 .../stockup/distributionStockupDiscuss.vue    | 28 +++++-----
 .../stockup/distributionStockupMarket.vue     | 24 ++++----
 .../stockup/distributionStockupSelf.vue       | 28 +++++-----
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index fc790c6d..a60ac896 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -95,16 +95,16 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" :label-width="formLabelWidth">
-            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
-              <el-option
-                v-for="item in loaderData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="装卸班组" :label-width="formLabelWidth">-->
+<!--            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">-->
+<!--              <el-option-->
+<!--                v-for="item in loaderData"-->
+<!--                :key="item.dictKey"-->
+<!--                :label="item.dictValue"-->
+<!--                :value="item.dictKey">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
             <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
               <el-option
@@ -316,14 +316,14 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-            {
-              label: '未指派',
-              value: '1',
-            },
-            {
-              label: '已指派',
-              value: '2',
-            },
+            // {
+            //   label: '未指派',
+            //   value: '1',
+            // },
+            // {
+            //   label: '已指派',
+            //   value: '2',
+            // },
           ],
           fixed: false,
           sortable: true,
@@ -369,16 +369,16 @@ export default {
           fixed: false,
           sortable: true,
         },*/
-        {
-          prop: 'loaderName',
-          label: '装卸班组',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'loaderName',
+        //   label: '装卸班组',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index 8a125284..632f4fc5 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -177,8 +177,8 @@
           <el-form-item label="备货区" prop="stockupArea">
             <el-input v-model="form.stockupArea" placeholder="请输入备货区"/>
           </el-form-item>
-          <el-form-item label="指派状态;1-未指派、2-已指派" prop="assignStatus">
-            <el-select v-model="form.assignStatus" clearable placeholder="请选择指派状态;1-未指派、2-已指派">
+          <el-form-item label="指派状态" prop="assignStatus">
+            <el-select v-model="form.assignStatus" clearable placeholder="请选择指派状态">
               <el-option
                 v-for="item in assignStatusData"
                 :key="item.dictKey"
@@ -210,7 +210,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" prop="loader">
+          <!--<el-form-item label="装卸班组" prop="loader">
             <el-select v-model="form.loader" clearable placeholder="请选择装卸班组">
               <el-option
                 v-for="item in loaderData"
@@ -219,7 +219,7 @@
                 :value="item.dictKey">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="确认完成备货时间" prop="fixTime">
             <el-date-picker v-model="form.fixTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择确认完成备货时间"></el-date-picker>
           </el-form-item>
@@ -408,16 +408,16 @@ export default {
           fixed: false,
           sortable: true,
         },*/
-        {
-          prop: 'loaderName',
-          label: '装卸班组',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'loaderName',
+        //   label: '装卸班组',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 1f8d26d9..0a0d4945 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -107,7 +107,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" :label-width="formLabelWidth">
+          <!--<el-form-item label="装卸班组" :label-width="formLabelWidth">
             <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
               <el-option
                 v-for="item in loaderData"
@@ -116,7 +116,7 @@
                 :value="item.dictKey">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
             <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
               <el-option
@@ -401,16 +401,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'loaderName',
-          label: '装卸班组',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'loaderName',
+        //   label: '装卸班组',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 67989128..ee544f12 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -107,16 +107,16 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" :label-width="formLabelWidth">
-            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
-              <el-option
-                v-for="item in loaderData"
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="装卸班组" :label-width="formLabelWidth">-->
+<!--            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">-->
+<!--              <el-option-->
+<!--                v-for="item in loaderData"-->
+<!--                :key="item.dictKey"-->
+<!--                :label="item.dictValue"-->
+<!--                :value="item.dictKey">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
             <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
               <el-option
@@ -192,7 +192,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" prop="loader">
+          <!--<el-form-item label="装卸班组" prop="loader">
             <el-select v-model="form.loader" clearable placeholder="请选择装卸班组">
               <el-option
                 v-for="item in loaderData"
@@ -201,7 +201,7 @@
                 :value="item.dictKey">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="确认完成备货时间" prop="fixTime">
             <el-date-picker v-model="form.fixTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择确认完成备货时间"></el-date-picker>
           </el-form-item>
@@ -401,7 +401,7 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
+        /*{
           prop: 'loaderName',
           label: '装卸班组',
           type: 2,
@@ -410,7 +410,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        },
+        },*/
         {
           prop: 'fixTime',
           label: '确认完成备货时间',

From 123b367372636a9ee4259edb8d8c1d352d0b5593 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Fri, 8 Sep 2023 17:58:28 +0800
Subject: [PATCH 5/6] =?UTF-8?q?1.=E5=8A=A0=E5=85=A5=E5=8C=85=E6=9D=A1?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/tray/basicdataTray.vue          |  2 +-
 .../warehouse/tray/basicdataTrayedt.vue       | 47 ++++++++++++-
 .../warehouse/tray/basicdataTrayhistory.vue   | 46 ++++++++++++-
 .../warehouseStock/warehouseStock.vue         | 67 ++++++++++++++++---
 4 files changed, 147 insertions(+), 15 deletions(-)

diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index 34ef9a38..e4436119 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -292,7 +292,7 @@
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(() => {
+        }) .then(() => {
             console.log("this.selectionList>>>>>>>>>>>>>>>>>>",this.selectionList);
             const newList = this.selectionList.map(item => item.palletCode);
             return vacants(newList);
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 9add2718..9828b0ae 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -279,6 +279,18 @@ export default {
         border: true,
         selection: true,
         column: [
+          {
+            label: "服务号",
+            prop: "serviceNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "运单号",
+            prop: "waybillNumber",
+            search: true,
+            width:"100px"
+          },
           {
             label: "包条码",
             prop: "orderPackageCode",
@@ -328,11 +340,42 @@ export default {
             width:"100px"
           },
           {
-            label: "运单号",
-            prop: "waybillNumber",
+            label: "包件状态",
+            prop: "orderPackageStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件冻结状态",
+            prop: "orderPackageFreezeStatusName",
             search: true,
             width:"100px"
           },
+          {
+            label: "包件上架状态",
+            prop: "orderPackageGroundingStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件备货状态",
+            prop: "orderPackageStockupStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件预约状态",
+            prop: "orderPackageReservationStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件装车状态",
+            prop: "orderPackageLoadingStatusName",
+            search: true,
+            width:"100px"
+          },
+
           // {
           //   label: "托盘码",
           //   prop: "pallet",
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
index 82460be1..30afccb1 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
@@ -299,6 +299,18 @@ export default {
         border: true,
         selection: true,
         column: [
+          {
+            label: "服务号",
+            prop: "serviceNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "运单号",
+            prop: "waybillNumber",
+            search: true,
+            width:"100px"
+          },
           {
             label: "包条码",
             prop: "orderPackageCode",
@@ -348,8 +360,38 @@ export default {
             width:"100px"
           },
           {
-            label: "运单号",
-            prop: "waybillNumber",
+            label: "包件状态",
+            prop: "orderPackageStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件冻结状态",
+            prop: "orderPackageFreezeStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件上架状态",
+            prop: "orderPackageGroundingStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件备货状态",
+            prop: "orderPackageStockupStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件预约状态",
+            prop: "orderPackageReservationStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件装车状态",
+            prop: "orderPackageLoadingStatusName",
             search: true,
             width:"100px"
           },
diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue
index 25a39be3..3872242c 100644
--- a/src/views/warehouse/warehouseStock/warehouseStock.vue
+++ b/src/views/warehouse/warehouseStock/warehouseStock.vue
@@ -79,6 +79,26 @@ export default {
           sortable: false,
           head: false,
         },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderCode',
           label: '订单自编码',
@@ -170,18 +190,44 @@ export default {
           sortable: true,
         },
         {
-          prop: 'warehouseEntryTimeEnd',
-          label: '入库时间',
-          type: 2,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
+          label: "包件状态",
+          prop: "orderPackageStatusName",
+          search: true,
+          width:"100px"
         },
         {
-          prop: 'waybillNumber',
-          label: '运单号',
+          label: "包件冻结状态",
+          prop: "orderPackageFreezeStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件上架状态",
+          prop: "orderPackageGroundingStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件备货状态",
+          prop: "orderPackageStockupStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件预约状态",
+          prop: "orderPackageReservationStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件装车状态",
+          prop: "orderPackageLoadingStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          prop: 'warehouseEntryTimeEnd',
+          label: '入库时间',
           type: 2,
           values: '',
           width: '180',
@@ -189,6 +235,7 @@ export default {
           fixed: false,
           sortable: true,
         },
+
         {
           prop: 'operatorName',
           label: '操作员',

From e55aea531e8de0f04bab0d277daeb586d1a47a23 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 8 Sep 2023 17:59:45 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionStockup.js       |  4 +
 .../distributionStockArticleDetails.vue       |  7 +-
 .../distributionStockupDetailsSelf.vue        | 81 +++++++++++++++++++
 .../stockup/distributionStockupSelf.vue       |  2 +-
 4 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/src/option/distribution/distributionStockup.js b/src/option/distribution/distributionStockup.js
index 40f5ef02..ce3fff11 100644
--- a/src/option/distribution/distributionStockup.js
+++ b/src/option/distribution/distributionStockup.js
@@ -724,6 +724,10 @@ export default {
       label: "备货区",
       prop: "stockupArea",
     },
+    {
+      label: "操作",
+      prop: "stockupArea",
+    },
   ],
   columnBasic: [ //基本信息
     {
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 64b4271a..4abe52c3 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -1370,11 +1370,14 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      console.log("执行了查询零零零零");
       this.query.ids = this.$route.query.id;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getDetail(this.$route.query.id).then(res => {
+        console.log("返回的数据》》》》",res.data.data);
         const data = res.data.data;
         // this.page.total = data.total;
-        this.data = data.records;
+        this.data[0]= data;
+
         this.loading = false;
         this.selectionClear();
       });
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index 538b162b..c6e70461 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -225,6 +225,7 @@
               <el-table-column prop="menu" label="操作" :width="220" align="center">
                 <template #="{ row }">
                   <el-button type="primary" text icon="el-icon-view" v-if=" row.stockupStatusName== '待备货' " @click="handleStockUp(row,'2')">备货</el-button>
+                  <el-button type="primary" text icon="el-icon-view"  @click="handleQRCode(row)">查看包条码</el-button>
                   <!--              <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>-->
@@ -248,6 +249,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="库存品" name="enter">
+            <el-button type="primary" text icon="el-icon-view" >批量打印</el-button>
             <el-table
               ref="table"
               v-loading="loading"
@@ -278,6 +280,14 @@
                 </el-table-column>
               </template>
               <!-- 操作栏模块 -->
+              <el-table-column prop="menu" label="操作" :width="220" align="center">
+                <template #="{ row }">
+                  <el-button type="primary" text icon="el-icon-view" v-if=" row.stockupStatusName== '已备货' " >明细</el-button>
+                  <!--              <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>
             <div class="avue-crud__pagination" style="width: 100%">
               <!-- 分页模块 -->
@@ -312,6 +322,25 @@
           </el-pagination>
         </div>
       </el-row>-->
+      <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
+        <div>
+          <div v-html="html"></div>
+
+          <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </span>
+      </el-dialog>
       <el-dialog v-model="dialogHand" title="系统备货">
         <el-form :model="form">
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
@@ -381,10 +410,14 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getStockDetail } from '@/api/distribution/distributionStock';
+import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
+import { getLodop } from '@/utils/LodopFuncs';
 
 export default {
   data() {
     return {
+      html: null, // 页面包条码内容
+      dialogVisible: false, //二维码控制
       height: 0,
       activeName: 'reservation',
       // 弹框标题
@@ -489,6 +522,54 @@ export default {
     },
   },
   methods: {
+    //打印
+    printTemplate() {
+      let LODOP = getLodop();
+      console.log("LODOP>>>>>",LODOP);
+      // console.log("this.ids>>>>>",this.selectionList);
+      // if (this.selectionList.length === 0){
+      //   this.$message.warning("请选择至少一条数据");
+      //   return;
+      // }
+      getStockTemplate({ id: this.materialQRCode.id }).then(res => {
+        console.log('返回的数据', res.data.data);
+        let templateData = res.data.data;
+        // let templateData = "res.data.data";
+        // console.log(templateData);
+        LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
+        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+        LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
+        // // 设置打印整宽且不变形
+        LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
+        // // 设置打印后自动关闭
+        LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
+        // // data就是一段html文本
+        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
+        // LODOP.PREVIEW(); //预览(预览打印无脚标)
+        LODOP.PRINT(); //直接打印
+
+      });
+    },
+    //查看包条码
+    handleQRCode(row) {
+      // this.title = '查看'
+      // this.view = true;
+      // this.box = true;
+      this.materialQRCode = row;
+
+      let qr = {
+        ids: row.id,
+      };
+      showOrderPackgeCode(qr).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+
+      });
+
+      this.dialogVisible = true;
+    },
     //选择
     getForklift(row,ty){
       switch (ty){
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index ee544f12..9b233e44 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -65,7 +65,7 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)" v-if="slotProps.scope.row.stockupStatus != '40'">编辑</el-text>
             <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
 <!--            <el-text type="primary" text icon="el-icon-edit" @click="handleEditPrint(slotProps.scope)">打印</el-text>-->
           </template>