调整提交

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

@@ -276,14 +276,24 @@
                             <el-table-column prop="executorName" :label="$t('zhi-hang-ren')" width="100" >
                                 <template slot-scope="scope">
                                     <span v-if="user.userNameNeedTranslate != '1'">
-                                        {{scope.row.executorName == null?$t('dai-fen-pei'):scope.row.executorName}}
+                                        <!-- {{scope.row.executorName == null?$t('dai-fen-pei'):scope.row.executorName}} -->
+                                        <span v-if="scope.row.executorName == null">{{$t('dai-fen-pei')}}</span>
+                                        <span v-else>
+                                            <span v-for="(item, index) in scope.row.executorName" :key="index">
+                                                {{item}}
+                                                <span v-if="index < scope.row.executorName.length - 1">,</span>
+                                            </span>
+                                        </span>
                                     </span>
                                     <span v-if="user.userNameNeedTranslate == '1'">
                                         <span v-if="scope.row.executorName == null">
                                             {{$t('dai-fen-pei')}}
                                         </span>
                                         <span v-else>
-                                            <ww-open-data type='userName' :openid='scope.row.executorName'></ww-open-data>
+                                            <span v-for="(item, index) in scope.row.executorName" :key="index">
+                                                <ww-open-data type='userName' :openid='item'></ww-open-data>
+                                                <span v-if="index < scope.row.executorName.length - 1">,</span>
+                                            </span>
                                         </span>
                                     </span>
                                 </template>
@@ -919,7 +929,10 @@
             <el-form ref="formIncharger" :model="groupForm" :rules="rules" style="margin-top:10px;">
                     <el-form-item prop="taskGpIncharge">
                         <el-select v-if="user.userNameNeedTranslate != 1" v-model="groupForm.inchargerId" :placeholder="$t('defaultText.pleaseChoose')" style="width:100%;" clearable filterable>
-                            <el-option v-for="item in joinMembList" :key="item.id" :value="item.id" :label="item.name"></el-option>
+                            <el-option v-for="item in joinMembList" :key="item.id" :value="item.id" :label="item.name">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
+                            </el-option>
                         </el-select>
                         <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" @selectCal="selectCal" :subject="joinMembList" :subjectId="groupForm.inchargerId" :clearable="true" :distinction="'2'"></selectCat>
                     </el-form-item>
@@ -2272,7 +2285,15 @@
                 this.http.post('/task/list',{projectId: this.curProjectId, viewId: this.selectedGroup.id, order: this.order, isDesc: this.isDesc},
                 res => {
                     if (res.code == "ok") {
+                        // this.taskDataList = res.data;
+                        // console.log(this.taskDataList, '任务视图的列表')
+                        for(var i in res.data) {
+                            if(res.data[i].executorName != null) {
+                                res.data[i].executorName = res.data[i].executorName.split(',')
+                            }
+                        }
                         this.taskDataList = res.data;
+                        console.log(this.taskDataList, '任务视图的列表')
                         this.taskDataList.forEach(t=>{
                             t.isFinish = t.taskStatus==1?true:false;
                         });

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

@@ -269,7 +269,7 @@
                     <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :subject="option" :radios="false" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
                 </el-form-item>
             </el-form>
-            <div slot="footer" class="dialog-footer">
+            <div slot="footer" class="dialog-footer"> 
                 <el-button @click="handleSelectionZzjgshow = false">{{ $t('btn.cancel') }}</el-button>
                 <el-button type="primary" @click="handleSelectionZzjgbtn2">{{ $t('btn.determine') }}</el-button>
             </div>
@@ -300,14 +300,20 @@
                 <!-- 主要负责人 -->
                 <el-form-item :label="$t('Principalpersoninharge')" prop="managerId">
                     <el-select v-model="depForm.managerId" 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-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
+                          <span style="float: left">{{ item.name }}</span>
+                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
+                        </el-option>
                     </el-select>
                 </el-form-item>
 
                 <!-- 其他负责人 -->
                 <el-form-item :label="$t('responsiblepersons')" prop="managerId">
                     <el-select v-model="depForm.otherManagerIds" filterable  clearable multiple style="width: 100%" :placeholder="$t('defaultText.pleaseChoose')" >
-                        <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                        <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
+                          <span style="float: left">{{ item.name }}</span>
+                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
+                        </el-option>
                     </el-select>
                 </el-form-item>
                 <!-- 直属领导 -->