调整项目报表的样式

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

@@ -65,7 +65,7 @@
   <div class="contents" v-if="allWrong">
     <div class="headine headConCon" ref="headine" :style="'width:'+(windowWidth - 400)+'px'">
       <h3 ref="headHe" style="padding-left: 10px;float:left;width:15%">{{shuz[ins]}}</h3>
-      <div class="headScreen" :style="ins == 9 ? 'width:60%' : 'width:72%'">
+      <div class="headScreen" :style="ins == 9 || ins == 21 ? 'width:60%' : 'width:72%'">
       <!-- 客户项目利润表的筛选 -->  
         <template v-if="ins == 4">
           <el-select v-model="customerId" :placeholder="$t('pleaseelectcustomers')" clearable filterable size="small" @change="selcts(4)" style="margin-right:20px">
@@ -193,7 +193,7 @@
           </el-select>
       </div>
       <!-- <p :style="ins == 9 ? 'float: right;margin-right: 25px;width:20%' : 'float: right;margin-right: 25px;width:10%'" > -->
-      <p :style="`${ins == 9 ? 'width:20%' : ins == 14 ? 'width: 20%' : 'width: 10%'}`" class="tableRightBtn">
+      <p :style="`${ins == 9 || ins == 14 || ins == 21 ? 'width: 20%' : 'width: 10%'}`" class="tableRightBtn">
         <el-button type="primary" @click="exportExcel" size="mini">{{ $t('reporderived') }}</el-button>
         <el-button type="primary" @click="fillAll" size="mini" v-if="ins == 14">全部补足</el-button>
         <el-button type="primary" @click="exportExcelByQuarter" size="mini" v-if="ins == 9 && user.companyId == 876">{{ $t('an-ji-du-dao-chu') }}</el-button>
@@ -1177,10 +1177,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>