提交代码

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -82,7 +82,7 @@
                                             <span v-if="user.userNameNeedTranslate == 1">
                                                 {{scope.row.omg.textOne}}
                                                 <ww-open-data v-if="user.corpwxUserid != null" type='userName' :openid='scope.row.omg.textTwo'></ww-open-data>
-                                                <dd-open-data v-if="user.dingdingUserid != null" openType='userName' :openId='scope.row.omg.textTwo'></dd-open-data>
+                                                <dt-open-data v-if="user.dingdingUserid != null" open-type='userName' :open-id='scope.row.omg.textTwo'></dt-open-data>
                                                 {{scope.row.omg.textThree}}
                                             </span>
                                         </span>

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -375,7 +375,7 @@
                           <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
                         </el-option>
                     </el-select>
-                    <selectCat :size="'medium'" :filterable="true" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1' && departmentVisible" :subject="users" :subjectId="depForm.otherManagerIds" :distinction="'4'" :clearable="true" @selectCal="selectCal"></selectCat>
+                    <selectCat :subject="users" :subjectId="depForm.otherManagerIds" :size="'medium'" :filterable="true" :widthStr="'360'" :multiSelect="true" v-if="user.userNameNeedTranslate == '1' && departmentVisible"  :distinction="'4'" :clearable="true" @selectCal="selectCal"></selectCat>
                 </el-form-item>
                 <!-- 直属领导 -->
                 <el-form-item :label="$t('leadership')" prop="reportAuditUserid" v-if="user.timeType.needDeptAudit">
@@ -3668,8 +3668,10 @@ export default {
     } ,
     // 自定义组件事件
     selectCal(obj) {
+      console.log(obj, '<=== 返回的数据')
       if(obj.distinction == '4') {
-        this.depForm.otherManagerIds = obj.id
+        let userList = obj.arrUserList || []
+        this.depForm.otherManagerIds = userList.map(item => item.id)
       } else if(obj.distinction == '3') {
         this.depForm.managerId = obj.id
       } else if(obj.distinction == '5'){