wuguojie пре 1 година
родитељ
комит
a6a3058918
2 измењених фајлова са 31 додато и 28 уклоњено
  1. 29 22
      src/components/DialogSetDeptLeader/index.vue
  2. 2 6
      src/views/personnel/memberManagement.vue

+ 29 - 22
src/components/DialogSetDeptLeader/index.vue

@@ -67,7 +67,7 @@
                 style="margin-bottom: 15px"
               >
                 <p style="margin: 0">{{ item.name }}</p>
-                <p style="margin: 0">{{ item.id }}</p>
+                <p style="margin: 0">{{ item.mobile }}</p>
               </el-radio>
             </div>
           </el-radio-group>
@@ -197,7 +197,9 @@ function treeClick(node: any) {
 function submit(){
 
   if(props.title=='设置负责人'){
+      console.log(111)
     if(userId.value){
+        console.log(222)
      const obj = options.value.find(a => a.value === userId.value)
       api.institutionApi.setDeptLeader({
         deptId:props.deptIds,
@@ -214,17 +216,18 @@ function submit(){
 
 
     }else{
-      let flag={}
-     userList.value.some((item:any)=>{
-
-         if( item.id==treeReId.value){
-          flag={...item}
-          return true
-         }
-         return false
-
-      })
-
+        console.log(333)
+     //  let flag={}
+     // userList.value.some((item:any)=>{
+     //
+     //     if( item.mobile==treeReId.value){
+     //      flag={...item}
+     //      return true
+     //     }
+     //     return false
+     //
+     //  })
+      let flag = userList.value.find(a => a.userId == treeReId.value)
       api.institutionApi.setDeptLeader({
         deptId:props.deptIds,
         leaderId:flag.userId
@@ -237,7 +240,9 @@ function submit(){
       // emits('closeDialog',flag)
     }
   }else{
+      console.log(444)
     if(userId.value){
+        console.log(555)
      const obj=options.value.map((item:any)=>{
         if(item.value==userId.value){
           return {
@@ -250,16 +255,18 @@ function submit(){
 
       emits('closeDialog',obj[0])
     }else{
-      let flag={}
-      userList.value.some((item:any)=>{
-
-         if( item.id==treeReId.value){
-          flag={...item}
-          return true
-         }
-         return false
-
-      })
+        console.log(666)
+      // let flag={}
+      // userList.value.some((item:any)=>{
+      //
+      //    if( item.mobile==treeReId.value){
+      //     flag={...item}
+      //     return true
+      //    }
+      //    return false
+      //
+      // })
+        let flag = userList.value.find(a => a.userId == treeReId.value)
       emits('closeDialog',flag)
     }
   }

+ 2 - 6
src/views/personnel/memberManagement.vue

@@ -103,8 +103,6 @@
           <el-dropdown placement="bottom-start">
             <span class="el-dropdown-link"> 更 多 </span>
             <template #dropdown>
-
-
                 <el-dropdown-item v-on:click="changeDept(scope)"
                   >变更机构</el-dropdown-item
                 >
@@ -113,8 +111,6 @@
                   >资源转移</el-dropdown-item
                 >
                 <el-dropdown-item v-on:click="delUser(scope)">删除</el-dropdown-item>
-
-
             </template>
           </el-dropdown>
         </template>
@@ -140,7 +136,7 @@
           </div>
         </el-col>
       </el-row>
-      <p style="margin-left: 50px">工号:{{ transferInfo.userId }}</p>
+      <p style="margin-left: 50px">工号:{{ transferInfo.workNumber }}</p>
       <p style="margin-left: 50px">所在机构:{{ transferInfo.deptName }}</p>
       <p style="margin-left: 50px">需要转移的资源</p>
       <el-table :data="[{}]" style="width: 100%">
@@ -388,7 +384,7 @@ const columns = [
   { prop: "name", label: "姓名" },
   { prop: "mobile", label: "手机号" },
   { prop: "deptName", label: "所属机构" },
-  { prop: "userId", label: "工号" },
+  { prop: "workNumber", label: "工号" },
   { prop: "roleName", label: "角色" },
   { prop: "status", label: "状态",
   formatter: (row: any, column: any, cellValue: any) => {