From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style

---
 src/views/backgroundConfig/memberManage/index.vue |  130 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 106 insertions(+), 24 deletions(-)

diff --git a/src/views/backgroundConfig/memberManage/index.vue b/src/views/backgroundConfig/memberManage/index.vue
index 676c6cf..99113b7 100644
--- a/src/views/backgroundConfig/memberManage/index.vue
+++ b/src/views/backgroundConfig/memberManage/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="memeber-manage">
-    <div class="left"></div>
+    <div class="left">
+      <TreeLeft @editDepartmentClick="editDepartmentClick" />
+    </div>
     <div class="right">
       <SearchCommonView
         ref="searchCommonView"
@@ -18,7 +20,7 @@
           :login-control="true"
           :operates-list="operatesList"
         />
-        <PagerView class="page" />
+        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
       </div>
       <TableCommonView ref="tableListRef" :table-list="tableList">
         <template slot="tableButton">
@@ -38,18 +40,24 @@
     </div>
 
     <!-- 鏂板缓/缂栬緫 -->
-    <AddContractManageDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+    <AddMemberManageDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+    <!-- 缂栬緫閮ㄩ棬 -->
+    <EditDepartmentDialog v-if="departmentConfig.visible" :edit-department-config="departmentConfig" />
   </div>
 </template>
 
 <script>
-import AddContractManageDialog from "@/views/sales/contractManage/AddContractManageDialog"
+import AddMemberManageDialog from "@/views/backgroundConfig/memberManage/AddMemberManageDialog"
+import TreeLeft from "@/views/backgroundConfig/memberManage/TreeLeft"
+import EditDepartmentDialog from "@/views/backgroundConfig/memberManage/EditDepartmentDialog"
 
 export default {
   name: "MemberManage",
   props: {},
   components: {
-    AddContractManageDialog
+    AddMemberManageDialog,
+    TreeLeft,
+    EditDepartmentDialog
   },
   computed: {
     searchCommonHeight() {
@@ -82,6 +90,11 @@
         visible: false,
         title: "鏂板缓",
         infomation: {}
+      },
+      departmentConfig: {
+        visible: false,
+        title: "缂栬緫閮ㄩ棬",
+        infomation: {}
       }
     }
   },
@@ -106,7 +119,7 @@
           }
         ],
         tableColumn: [
-          { label: "濮撳悕", prop: "name", min: 120 },
+          { label: "濮撳悕", prop: "name", sortable: true, min: 120 },
           { label: "璐﹀彿", prop: "account", min: 90 },
           { label: "閮ㄩ棬", prop: "department" },
           { label: "瑙掕壊鏉冮檺", prop: "rolePermssion", min: 100 },
@@ -127,15 +140,40 @@
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
       this.editConfig.infomation = {
-        customName: "",
-        documentNumber: "ZDYBD01-3",
-        owner: "",
-        contractStatus: "",
-        salesQuotation: "",
-        approvalWorkflow: "",
-        approvalSteps: "",
-        approvalPerson: "",
-        approvalOpinion: ""
+        account: "",
+        isAdmin: "",
+        password: "",
+        passwordConfirm: "",
+        name: "",
+        realName: "",
+        department: "",
+        state: "",
+        phone: "",
+        telephone: "",
+        email: "",
+        wechat: "",
+        approvalDelegation: "",
+        miniProgram: "",
+        dingtalk: "",
+        approvalPrincipal: "",
+        positionLevel: "",
+        notes: "",
+        employeeDate: "",
+        avatar: "",
+        cloudHome: "",
+        determine: "",
+        rolePermssion: "",
+        dataScope: "",
+        role1: "",
+        role2: "",
+        role3: "",
+        role4: "",
+        role5: "",
+        role6: "",
+        role7: "",
+        role8: "",
+        other1: "",
+        other2: ""
       }
     },
     // 缂栬緫
@@ -144,15 +182,40 @@
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
       this.editConfig.infomation = {
-        customName: "",
-        documentNumber: "TKD20230521-12",
-        owner: "",
-        contractStatus: "",
-        salesQuotation: "",
-        approvalWorkflow: "",
-        approvalSteps: "",
-        approvalPerson: "",
-        approvalOpinion: ""
+        account: "",
+        isAdmin: "",
+        password: "",
+        passwordConfirm: "",
+        name: "",
+        realName: "",
+        department: "",
+        state: "",
+        phone: "",
+        telephone: "",
+        email: "",
+        wechat: "",
+        approvalDelegation: "",
+        miniProgram: "",
+        dingtalk: "",
+        approvalPrincipal: "",
+        positionLevel: "",
+        notes: "",
+        employeeDate: "",
+        avatar: "",
+        cloudHome: "",
+        determine: "",
+        rolePermssion: "",
+        dataScope: "",
+        role1: "",
+        role2: "",
+        role3: "",
+        role4: "",
+        role5: "",
+        role6: "",
+        role7: "",
+        role8: "",
+        other1: "",
+        other2: ""
       }
     },
     // 鍚敤
@@ -170,6 +233,25 @@
     // 鍒犻櫎
     deleteClick(row) {
       console.log(row)
+    },
+    // 缂栬緫閮ㄩ棬
+    editDepartmentClick(command, data) {
+      console.log(command, data)
+      if (command === "edit") {
+        this.departmentConfig.visible = true
+        this.departmentConfig.infomation = {
+          departmentName: data.label,
+          departmentNumber: data.id,
+          notes: ""
+        }
+      } else if (command === "add") {
+        this.departmentConfig.visible = true
+        this.departmentConfig.infomation = {
+          departmentName: "",
+          departmentNumber: "",
+          notes: ""
+        }
+      }
     }
   }
 }

--
Gitblit v1.8.0