From 1417ff0cfed7eac56950bc6115fbdd66e3ff92b9 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 18 Dec 2024 16:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=93=E5=BA=93=E6=89=A9=E5=B1=95=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/warehouse/warehouse/basicdataWarehouse.vue   | 7 ++++++-
 src/views/reportforms/DeliveryDetailsVtwo.vue              | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 604f0af6..58e7dbd3 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -70,7 +70,7 @@
               <template v-if="slotProps.scope.column.label === '操作'">
                 <div class="ElBtnClass">
                   <el-text
-                    v-if="userInfo == 'admin'" 
+                    v-if="accessControl.Expand_configuration" 
                     @click="Expandconfiguration(slotProps.scope.row)"
                     >扩展配置</el-text
                   >
@@ -610,6 +610,11 @@ import dayjs from 'dayjs';
 import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
+import { useStore } from 'vuex';
+const $useStore = useStore();
+const accessControl = $useStore.getters.permission;
+console.log(accessControl.Expand_configuration,'accessControl');
+
 const dataRwo = ref({}); //当前行数据
 const props = { multiple: true };
 const options = ref([]); //职能类型
diff --git a/src/views/reportforms/DeliveryDetailsVtwo.vue b/src/views/reportforms/DeliveryDetailsVtwo.vue
index 2607ff64..a5594a98 100644
--- a/src/views/reportforms/DeliveryDetailsVtwo.vue
+++ b/src/views/reportforms/DeliveryDetailsVtwo.vue
@@ -133,7 +133,7 @@
         <!-- 列表模块 -->
         <tablecmt
           class="tableNode"
-          :columnList="columnList"
+          :columnList="details.columnList"
           :tableData="data"
           :loading="loadingObj.list"
           @inputTxt="inputsc"