1

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

@@ -117,6 +117,13 @@
             <el-option label="已核销" :value="1" ></el-option>
           </el-select>
         </template>
+
+        <template v-if="ins == 24">
+          <el-radio-group v-model="tabPosition">
+            <el-radio-button label="0">表格</el-radio-button>
+            <el-radio-button label="1">柱状图</el-radio-button>
+          </el-radio-group>
+        </template>
           
         <!-- 按部门/项目筛选 -->
         <!-- <el-select v-if="ins == 10" v-model="departmentOrProject" placeholder="请选择" size="small" @change="selcts(10)" style="margin-left:10px;width:120px">
@@ -1161,7 +1168,7 @@
             </el-table>
 
             <!-- 分组耗用进度表 -->
-            <el-table  v-if="ins == 24" :key="24" border :data="isbeCustomReport.consumptionSchedule" highlight-current-row v-loading="listLoading" :height="(+tableHeight - 0) - 1" style="width: 100%;" :span-method="objectSpanMethod">
+            <el-table  v-if="ins == 24 && this.tabPosition==0" :key="24" border :data="isbeCustomReport.consumptionSchedule" highlight-current-row v-loading="listLoading" :height="(+tableHeight - 0) - 1" style="width: 100%;" :span-method="objectSpanMethod">
               <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" min-width="200"></el-table-column>
               <el-table-column align="center" prop="department_name" :label="$t('fuZeBuMen')" min-width="150">
                 <template slot-scope="scope">
@@ -1314,7 +1321,7 @@
               <el-table-column align="center" prop="onTimePercent" :label="$t('anShiWanChengShuai')" min-width="150"></el-table-column>
             </el-table>
         <!--工具条-->
-        <el-col :span="24" class="toolbar" v-if="ins != 6 && ins != 20 && ins != 21">
+        <el-col :span="24" class="toolbar" v-if="ins != 6 && ins != 20 && ins != 21 && this.tabPosition==0">
           <el-pagination
                 v-if="ins == 12"
                 @size-change="groupSizeChange"
@@ -1861,6 +1868,7 @@ export default {
       writeOffOperationVisable: false,
       writeOffOperationTransitionData: {},
       writeOffStatus: '',
+      tabPosition:"0"
     };
   },
   computed: {},
@@ -2619,6 +2627,7 @@ export default {
       this.outputValueTitle = []
       this.userId = null
       this.selUserList = this.userList
+      this.tabPosition="0"
       this.getList();
     },
     stateKeySel(){