From 215a44a14dd2d65072a6502f930a4ee69382eebb Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Thu, 23 Jan 2025 09:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goodsManagement/goodsList.vue |  4 +++-
 src/views/operation/hand.vue            |  2 +-
 src/views/system/user.vue               | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/goodsManagement/goodsList.vue b/src/views/goodsManagement/goodsList.vue
index eb4f1cc..055a8cf 100644
--- a/src/views/goodsManagement/goodsList.vue
+++ b/src/views/goodsManagement/goodsList.vue
@@ -615,7 +615,9 @@ export default {
       }
       getDetailLog(query).then(res => {
         if (res.data.code == 200) {
-          this.logData = res.data.data
+          this.logData = res.data.data.records
+          console.log(111111,res.data.data.records)
+          this.logPage.total = res.data.data.total
         }
       })
     },
diff --git a/src/views/operation/hand.vue b/src/views/operation/hand.vue
index e1ddee5..931205b 100644
--- a/src/views/operation/hand.vue
+++ b/src/views/operation/hand.vue
@@ -53,7 +53,7 @@
         </div>
       </template>
       <template slot-scope="scope" slot="menuLeft">
-        <el-button type="primary" size="small" @click="addOperation">需求提报</el-button>
+        <el-button type="primary" size="small" @click="addOperation"  v-show="permission.handAdd">需求提报</el-button>
         <el-button type="primary" size="small" @click="allExportReport">批量导出报告</el-button>
         <!-- <el-button size="small" @click="clickInvoice">开具发票</el-button>
         <el-button size="small" @click="clickPrint">打印</el-button> -->
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 7cd4025..824cc46 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -753,14 +753,14 @@ export default {
       row.deptId = func.join(row.deptId);
       row.roleId = func.join(row.roleId);
       row.postId = func.join(row.postId);
-      // if (row.deptId.split(',').length > 1) {
-      //   this.$message({
-      //     type: "error",
-      //     message: "所属部门只能选择一个！"
-      //   });
-      //   loading();
-      //   return false
-      // }
+      if (row.deptId.split(',').length > 1) {
+        this.$message({
+          type: "error",
+          message: "所属部门只能选择一个！"
+        });
+        loading();
+        return false
+      }
       update(row).then(() => {
         this.initFlag = false;
         this.onLoad(this.page);