1、优化产品结构树以及设备结构树、列表右键菜单重复右键后出现window菜单问题 2、优化产品结构树节点删除后的loading展示时机 3、优化产品以...

zhaowei

10 小时以前 f2d1b5615b05c002ec63db4df7164c9ed3ecc4a3

 src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue

@@ -19,7 +19,8 @@

      <a-tab-pane :key="2" tab="分配用户">
        <UserPermissionTransfer ref="userPermissionTransferRef" :currentTreeNodeInfo="currentTreeNodeInfo"
                                :dataSource="allUsersList" :isAssignSonNode="isAssignSonNode"/>
                                :dataSource="allUsersList" :isAssignSonNode="isAssignSonNode"
                                @setAdminDisabled="setAdminDisabled"/>
      </a-tab-pane>
    </a-tabs>
  </a-modal>
@@ -29,7 +30,6 @@
  import dncApi from '@/api/dnc'
  import DepartPermissionTransfer from './DepartPermissionTransfer'
  import UserPermissionTransfer from './UserPermissionTransfer'
  import { queryProductionTreeList } from '@/api/api'

  export default {
    name: 'AssignPermissionModal',
@@ -80,10 +80,13 @@

      // 调用接口获取所有车间列表
      getAllDepartmentsListByApi() {
        this.allTreeKeys = []
        queryProductionTreeList()
        this.allTreeKeys = this.allDepartmentsList = []
        this.$nextTick(() => {
          this.$refs.departPermissionTransferRef.targetKeys = this.$refs.departPermissionTransferRef.dataSource = []
          this.$refs.departPermissionTransferRef.spinning = true
        })
        dncApi.getAllDepartmentsListApi()
          .then(res => {
            console.log('res-------------------', res)
            if (res.success) {
              this.allDepartmentsList = res.result
              this.generateList(this.allDepartmentsList)
@@ -114,20 +117,28 @@

      // 调用接口获取所有用户列表
      getAllUsersListByApi() {
        this.$nextTick(() => {
          this.allUsersList = []
          this.$refs.userPermissionTransferRef.spinning = true
        })
        dncApi.getAllUsersListApi()
          .then(res => {
            if (res.success) {
              this.allUsersList = res.result.records.map(item => {
                return {
                  ...item,
                  disabled: item.username === 'admin'
                }
              })
              this.allUsersList = res.result
              this.$nextTick(() => this.$refs.userPermissionTransferRef.getHasPermissionUserByApi())
            }
          })
      },

      setAdminDisabled() {
        this.allUsersList = this.allUsersList.map(item => {
          return {
            ...item,
            disabled: item.username === 'admin'
          }
        })
      },

      handleModalClose() {
        this.visible = false
        this.hasLoadedDataTabKeyArray = []