From c3f036f46ad4a44ff3e6c1a6db0e7d12166241f4 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 10 Oct 2024 18:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=8D=95=E5=8A=9F=E8=83=BD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/delivery/SeparateTheListInfo.vue           | 9 ++++-----
 .../inventory/delivery/distributionStockArticle.vue      | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
index 4568f470..ecb0a24a 100644
--- a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
+++ b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
@@ -365,13 +365,12 @@ const onLoad = () => {
     }
   });
 };
-const view = row => {
+const view = async row => {
   dialogVisible.value = true;
   gieInfo(row);
-  setTimeout(() => {
-    const _node = document.querySelector('.TCtableNode');
-    setNodeHeight(_node, '', true);
-  }, 500);
+  await nextTick();
+  const _node = document.querySelector('.TCtableNode');
+  setNodeHeight(_node, '', true);
 };
 const gieInfo = row => {
   let data = {
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 0f23c3f5..6536ace3 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -157,7 +157,7 @@
             <el-text @click="handleView(slotProps.scope)"> 查看 </el-text>
             <el-text @click="handleCallDeliveryOwn(slotProps.scope)"> 修改客户信息 </el-text>
             <el-text @click="handleGoLogs(slotProps.scope)"> 日志 </el-text>
-            <!-- <el-text v-if="slotProps.scope.row.isZero ==0" @click="Splittheorder(slotProps.scope.row)"> 拆单 </el-text> -->
+            <el-text   v-if="slotProps.scope.row.isZero ==0 && permissionList.distributionStockList_unpack" @click="Splittheorder(slotProps.scope.row)"> 拆单 </el-text>
           </template>
         </template>
       </tablecmt>
@@ -685,12 +685,13 @@ export default {
   computed: {
     ...mapGetters(['permission']),
     permissionList() {
+      console.log(this.permission,'this.permission');
       return {
         addBtn: this.validData(this.permission.basicdataBrandCategory_add, false),
         viewBtn: this.validData(this.permission.basicdataBrandCategory_view, false),
         delBtn: this.validData(this.permission.basicdataBrandCategory_delete, false),
         editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false),
-        Modifyreceivingunit: this.validData(this.permission.Modifyreceiving_unit, false),
+        distributionStockList_unpack: this.validData(this.permission.distributionStockList_unpack, false),
       };
     },
     ids() {