增加服务

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

@@ -451,7 +451,7 @@
                               <span style="float: right; color: #8492a6; font-size: 13px">{{item.departmentName}}</span>
                           </el-option>
                       </el-select>
-                      <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.managerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
+                      <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="insertForm.superiorId" :distinction="'6'" @selectCal="selectCal"></selectCat>
                   </el-form-item>
                   <el-form-item :label="$t('jiao-se')" prop="roleId" v-if="roleNameFlg != $t('role.superAdministrator')">
                       <el-select v-model="insertForm.roleId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%">
@@ -3554,6 +3554,8 @@ export default {
       } else if(obj.distinction == '23') {
         console.log(obj, '返回qwe')
         this.transferActive.takeoverId = obj.id
+      } else if (obj.distinction == '6') {
+        this.insertForm.superiorId = obj.id;
       }
     },
     // 企业微信可见范围设置

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -5404,7 +5404,8 @@
                                     extraField2: list.report[i].extraField2,
                                     extraField3: list.report[i].extraField3,
                                     workContentList: list.report[i].workContentList,
-                                    filteredRespList: filteredRespList
+                                    filteredRespList: filteredRespList,
+                                    serviceList: report[i].serviceList
                                 })
                                 if (list.report[i].state >= 2) {
                                     this.canEdit = true;
@@ -7347,7 +7348,7 @@
                                 formData.append('extraField3', this.workForm.domains[i].extraField3);
                             }
                             //依斯贝的服务Id
-                            if (this.user.companyId == this.yisibeiCompId || this.user.companyId == 10) {
+                            if (this.user.companyId == this.yisibeiCompId) {
                                 formData.append('sapServiceId', this.workForm.domains[i].sapServiceId);
                             }
                         }

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

@@ -130,7 +130,8 @@
                                                         <span>角色：{{item.extraField1? roleList.filter(r=>r.value == item.extraField1)[0].label:''}}</span>
                                                     <span style="margin-left:10px;">工作职责：{{ item.extraField2? item.extraField2Name:''}}</span>
                                                     <span style="margin-left:10px;">工作内容：{{ item.extraField3? item.extraField3Name:''}}</span></p>
-                                <p v-if="item.taskId != null">{{$t('other.task')}}：{{item.taskName}}</p>
+                                <p v-if="item.taskId != null">{{$t('other.task')}}：{{item.taskName}}
+                                    <span style="margin-left:10px;" v-if="user.companyId==3092">-- 服务：{{ item.sapServiceName }}</span></p>
                                 <p v-if="item.groupId">
                                     <span>{{$t('other.taskGroup')}}：{{item.groupName}}</span>
                                     <!-- 阶段 -->