From 1d1f1762f8aade7b4485f8d075817da39726c2e0 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 2 Dec 2024 10:13:54 +0800
Subject: [PATCH] sc

---
 src/views/Basic/GeneralSet/index.vue | 3 +++
 src/views/Basic/User/index.vue       | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/Basic/GeneralSet/index.vue b/src/views/Basic/GeneralSet/index.vue
index 10a5564..2a92f2c 100644
--- a/src/views/Basic/GeneralSet/index.vue
+++ b/src/views/Basic/GeneralSet/index.vue
@@ -7,6 +7,9 @@
       <!-- <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
         <BSSalerComission v-if="tabIndex == 10" />
       </el-tab-pane> -->
+      <!-- <el-tab-pane label="微信机器人" :name="20">
+        <BSSalerComission v-if="tabIndex == 20" />
+      </el-tab-pane> -->
     </el-tabs>
   </div>
 </template>
diff --git a/src/views/Basic/User/index.vue b/src/views/Basic/User/index.vue
index f9d221a..aa3dc5e 100644
--- a/src/views/Basic/User/index.vue
+++ b/src/views/Basic/User/index.vue
@@ -51,6 +51,7 @@
         <el-table-column label="部门" key="deptName" prop="deptName" width="100" />
         <el-table-column label="手机号码" prop="mobile" width="120" />
         <el-table-column label="微信号" prop="wxAlias" min-width="80" />
+        <el-table-column label="钉钉号" prop="dingUserId" min-width="80" />
         <el-table-column label="在职状态" key="hireStatus" width="120">
           <template #default="scope">
             <el-switch
@@ -82,7 +83,7 @@
         </el-table-column>
         <el-table-column label="入职日期" prop="hireDate" width="120" :formatter="dateFormatter" />
         <el-table-column label="离职日期" prop="" width="120" :formatter="dateFormatter" />
-        <el-table-column label="操作" width="180">
+        <el-table-column label="操作" width="180" fixed="right">
           <template #default="scope">
             <el-button
               type="primary"