提交相关代码

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

@@ -4007,7 +4007,9 @@ a {
 
                 console.log(chosenList, '<===== chosenList')
                 // console.log(parentId)
-                this.addForm.deptIds = [...new Set(chosenList.map(item => item.parentId))].filter(item => item != 0);
+                // this.addForm.deptIds = [...new Set(chosenList.map(item => item.parentId))].filter(item => item != 0);
+                this.addForm.deptIds = chosenList.filter(item => !item.isUser).map(item => item.id);
+                console.log(this.addForm.deptIds)
                 this.chooseParticipVisible = false;
             },
 
@@ -5443,6 +5445,7 @@ a {
                                 return;
                             }
                         }
+
                         this.addLoading = true;
                         let formData = new FormData();
                         formData.append("name", this.addForm.name);

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

@@ -367,7 +367,7 @@
         </el-dialog>
 
         <!-- 新增部门 -->
-        <el-dialog :title="depTitle" :visible.sync="departmentVisible" width="500px" >
+        <el-dialog :title="depTitle" :visible.sync="departmentVisible" width="600px" >
             <el-form ref="depForm" :model="depForm" :rules="depRules" label-width="130px">
                 <el-form-item :label="$t('departmentname')" prop="name">
                     <el-input v-model="depForm.name" :placeholder="$t('peaseenterthe')" clearable style="width: 100%" v-if="user.userNameNeedTranslate != '1'"></el-input>
@@ -382,7 +382,7 @@
                           <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
                         </el-option>
                     </el-select>
-                    <selectCat :size="'medium'" :filterable="true" :clearable="true" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.managerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
+                    <selectCat :size="'medium'" :filterable="true" :clearable="true" :widthStr="'300'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.managerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
 
                 <!-- 其他负责人 --> 
@@ -393,14 +393,14 @@
                           <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
                         </el-option>
                     </el-select>
-                    <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>
+                    <selectCat :subject="users" :subjectId="depForm.otherManagerIds" :size="'medium'" :filterable="true" :widthStr="'300'" :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">
                     <el-select v-model="depForm.reportAuditUserid" v-if="user.userNameNeedTranslate != '1'" filterable  clearable  :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%">
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
-                    <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.reportAuditUserid" :distinction="'5'" @selectCal="selectCal"></selectCat>
+                    <selectCat :size="'medium'" :widthStr="'300'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.reportAuditUserid" :distinction="'5'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
                 <!-- 是否推送到SAP -->
                 <el-form-item :label="$t('tuiSongZhiSap')" prop="pushToSap" v-if="user.companyId==3092">