Переглянути джерело

还原项目项目耗用进度表负责组长调整

Lijy 1 рік тому
батько
коміт
5ee2575ac9

+ 3 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -1143,8 +1143,7 @@
               <el-table-column align="center"  label="负责组长" width="100">
                 <template slot-scope="scope">
                   <div class="participatingEmployee">
-                    <!-- <div v-for="(item,index) in scope.row.teamLeader" :key="index"> -->
-                    <div v-for="(item,index) in scope.row.userProgress" :key="index">
+                    <div v-for="(item,index) in scope.row.teamLeader" :key="index">
                       <span v-if="user.userNameNeedTranslate == '1'">
                         <ww-open-data type='userName' :openid='item.name'></ww-open-data> 
                       </span>
@@ -1162,10 +1161,10 @@
                     <div v-for="(item,index) in scope.row.userProgress" :key="index">
                       <span v-if="user.userNameNeedTranslate == '1'">
                         <ww-open-data type='userName' :openid='item.userName'></ww-open-data> 
-                        {{item.progress}}
+                        {{item.progress}}%
                       </span>
                       <span v-if="user.userNameNeedTranslate != '1'">
-                        {{item.userName}} {{item.progress}}
+                        {{item.userName}} {{item.progress}}%
                       </span>
                       <!-- {{item.userName}} {{item.progress}}% -->
                       <span v-if="index < scope.row.userProgress.length - 1">,</span>