Merge remote-tracking branch 'origin/master'

朱佳吉

2024-05-09 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45

 src/components/view/person-manage.vue

@@ -35,6 +35,15 @@
      padding: 20px;
   }
</style>
<style>
  .el-upload--text{
    width: 100%;
    height: 100%;
    display: flex;
    align-items: center;
    justify-content: center;
  }
</style>

<template>
   <div class="person_manage">
@@ -97,6 +106,7 @@
                     order: 'asc'
                  }
               },
          row: 2,
               isIndex: true,
               showSelect: false,
               select: false,
@@ -137,7 +147,7 @@
                     select: []
                  }
               },
          cascaderField:{
          /* cascaderField:{
            departId:{
              tree:[]
            },
@@ -147,9 +157,9 @@
              label:'name',
              checkStrictly: true
            }
          },
               requiredAdd:['account','name','state','roleId','password','departId'],
               requiredUp:['account','name','state','roleId','departId'],
          }, */
               requiredAdd:['account','name','state','roleId','password'],
               requiredUp:['account','name','state','roleId'],
          addUpload:['pictureUrl','signatureUrl'],
          addUploadConfig:{
            accept:'.png, .jpg, .jpeg, .gif',
@@ -195,10 +205,10 @@
            this.$refs.ValueTable.openAddDia(this.$api.user.addUser);
         },
      selectTreeList(){
        this.$axios.get(this.$api.department.selectDepartment).then(res => {
       /* this.$axios.get(this.$api.department.selectDepartment).then(res => {
          this.componentData.cascaderField.departId.tree = this.handleTree(res.data[0].children)
          this.$refs.ValueTable.selectList()
            })
            }) */
        this.$refs.ValueTable.selectList()
      },
      handleTree(arr){
        arr.forEach(a => {