Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

 src/views/backgroundConfig/memberManage/index.vue

@@ -20,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">
@@ -237,14 +237,15 @@
    // 编辑部门
    editDepartmentClick(command, data) {
      console.log(command, data)
      this.departmentConfig.visible = true
      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: "",