From 89ba5e50781c8f859b986d88809b101e7e8efbe4 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 31 Aug 2023 15:44:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BB=9F=E8=AE=A1=E8=B4=A7=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionParcelList.js    |  8 ++--
 .../basicdata/team/basicdataTeamGroup.vue     |  2 -
 .../goodsArea/basicdataGoodsArea.vue          | 40 ++++++++++++++++---
 .../parcelList/distributionParcelList.vue     | 20 +++++-----
 4 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/option/distribution/distributionParcelList.js b/src/option/distribution/distributionParcelList.js
index 175df1bd..7f2a89e0 100644
--- a/src/option/distribution/distributionParcelList.js
+++ b/src/option/distribution/distributionParcelList.js
@@ -120,10 +120,10 @@ export default {
       label: "上架状态",
       prop: "orderPackageGroundingStatusName",
     },
-    {
-      label: "货位信息",
-      prop: "allocationMsg",
-    },
+    // {
+    //   label: "货位信息",
+    //   prop: "allocationMsg",
+    // },
     {
       label: "数量",
       prop: "quantity",
diff --git a/src/views/basicdata/team/basicdataTeamGroup.vue b/src/views/basicdata/team/basicdataTeamGroup.vue
index fb53bb6f..3eb2dfe0 100644
--- a/src/views/basicdata/team/basicdataTeamGroup.vue
+++ b/src/views/basicdata/team/basicdataTeamGroup.vue
@@ -359,7 +359,6 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (!this.form.id) {
-            console.log(">><><<>",this.form);
             this.form.groupType = this.form.groupTypes.join(',');
 
             add(this.form).then(() => {
@@ -371,7 +370,6 @@ export default {
               });
             });
           } else {
-            console.log("修改《《《《",this.form);
             this.form.groupType = this.form.groupTypes.join(',');
             update(this.form).then(() => {
               this.box = false;
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 136d2798..d45a6cec 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -83,7 +83,7 @@
             <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%">
@@ -245,11 +245,41 @@ export default {
           head: false,
         },
         {
-          prop: 'areaTypeName',
-          label: '货区类型',
-          type: 2,
+          prop: 'cargoNub',
+          label: '总货位',
+          type: 1,
           values: '',
-          width: '200',
+          width: '100',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'employNub',
+          label: '使用货位',
+          type: 1,
+          values: '',
+          width: '100',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'unusedNub',
+          label: '可用货位',
+          type: 1,
+          values: '',
+          width: '100',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'disableNub',
+          label: '禁用货位',
+          type: 1,
+          values: '',
+          width: '100',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index b427af28..68c8b9bc 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -217,16 +217,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'allocationMsg',
-          label: '货位信息',
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'allocationMsg',
+        //   label: '货位信息',
+        //   type: 1,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'quantity',
           label: '数量',