2022.9.26

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

@@ -58,7 +58,18 @@
              <div id="container" :style="'height:'+containerHeight+'px;width:100%'"></div>
         </div> -->
         <div id="clearfix" :class="radio == $t('ren-yuan') ? 'ryuans' : ''" :style="'overflow-x: auto;width:100%;padding-bottom: 100px; position: relative; height:'+containerHeight+'px;'">
-             <div id="container" :style="'height:'+containerHeight+'px;width:100%'"></div>
+            <div id="container" :style="'height:'+containerHeight+'px;width:100%'"></div>
+            <div class="poss">
+                <el-pagination
+                  @size-change="echartsSizeChange"
+                  @current-change="echartsCurrentChange"
+                  :current-page="page"
+                  :page-sizes="[50]"
+                  :page-size="50"
+                  layout="total, sizes, prev, pager, next"
+                  :total="total">
+                </el-pagination>
+            </div>
         </div>
         <!-- <div>
              <div id="container" :style="'height:'+containerHeight+'px;width:100%'"></div>
@@ -154,6 +165,9 @@
     export default {
         data() {
             return {
+                page: 1,
+                size: 50,
+                total: 0,
                 personnelValue: '',
                 personnelAll: [],
                 yAxisValue: localStorage.yAxisValue?localStorage.yAxisValue:0,
@@ -592,6 +606,7 @@
                 var totalHours = 0.0;
                 if (list.length > 0) {
                     var num = list.length==0?0:list[0].project.length;
+                    console.log('for 1');
                     for(var i in list) {
                         xList.push(list[i].name);
                         var pro = list[i].project;
@@ -601,12 +616,15 @@
                             }
                         }
                     }
+                    console.log('for 2');
                     for(var i in array) {
                         yList.push(array[i]);
                         var dataList = [];
+                        console.log('for 2 1');
                         for(var j in list) {
                             var project = list[j].project , num = 0;
                             if(project.length != 0) {
+                                console.log('for 2 1 1');
                                 for(var k in project) {
                                     if(project[k].project == array[i]) {
                                         let item = {
@@ -657,6 +675,7 @@
                     myChart.resize({
                         width: this.widthHtval
                     })
+                    console.log('设置宽度');
                     // 设置宽度
                     _this.myChart = myChart;
                     var option = { 
@@ -741,6 +760,7 @@
                         }],
                         series: series,
                     };
+                    console.log('setoption');
                     myChart.setOption(option,{notMerge:true});
             },
             yanjiu() {
@@ -1313,6 +1333,12 @@
         right: 10px;
         top: 0;
     }
+    .poss {
+        position: fixed;
+        bottom: 4px;
+        right: 1%;
+        box-sizing: border-box;
+    }
 </style>
 
 <style lang="scss">

fhKeeper/formulahousekeeper/timesheet_h5/src/views/exaLeave/exaLeave.vue

@@ -15,11 +15,19 @@
                 <div class="item_text">
                     <div class="text_list">
                         <div class="text_left">申请人</div>
-                        <div class="text_right">{{item.ownerName}}</div>
+                        <div class="text_right">
+                            {{item.ownerName}}
+                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.ownerName'></ww-open-data></span>
+                            <span v-else>{{item.ownerName}}</span>
+                        </div>
                     </div>
                     <div class="text_list">
                         <div class="text_left">所在部门</div>
-                        <div class="text_right">{{item.dept}}</div>
+                        <div class="text_right">
+                            {{item.dept}}
+                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='item.dept'></ww-open-data></span>
+                            <span v-else>{{item.dept}}</span>
+                        </div>
                     </div>
                     <div class="text_list">
                         <div class="text_left">请假类型</div>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/view/index.vue

@@ -11,6 +11,17 @@
             </van-popup>
             <van-skeleton  :v-if="report.length!=0" v-for="(item,index) in report" title avatar :row="3" :loading="false" :key="index">
                 <van-panel class="one_report" :title="item.name" :status="statusTxt[item.state]">
+                    <template #header>
+                        <div class="van-cell van-panel__header">
+                            <div class="van-cell__title">
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item.name'></ww-open-data></span>
+                                <span v-else>{{item.name}}</span>
+                            </div>
+                            <div class="van-cell__value van-panel__header-value">
+                                <span>{{statusTxt[item.state]}}</span>
+                            </div>
+                        </div>
+                    </template>
                     <div class="form_text">
                         <span style="margin-right:20px;margin-left:5px;font-size:14px;">
                             总填报：
@@ -22,14 +33,23 @@
                             <span v-if="item1.state==0">
                             <span v-if="item1.isDeptAudit==0">
                                 <span v-if="item1.projectAuditState==0">
-                                    待项目审核人<span v-if="item1.projectAuditorName != null">({{item1.projectAuditorName}})</span>审核
+                                    待项目审核人<span v-if="item1.projectAuditorName != null">(
+                                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item1.projectAuditorName'></ww-open-data></span>
+                                        <span v-else>{{item1.projectAuditorName}}</span>
+                                    )</span>审核
                                 </span>
                                 <span style="color:#32CD32;" v-else-if="item1.projectAuditState==1">
-                                    项目审核人<span v-if="item1.projectAuditorName != null">({{item1.projectAuditorName}})</span>审核通过
+                                    项目审核人<span v-if="item1.projectAuditorName != null">(
+                                        <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item1.projectAuditorName'></ww-open-data></span>
+                                        <span v-else>{{item1.projectAuditorName}}</span>
+                                    )</span>审核通过
                                 </span>
                             </span>
                             <span v-else-if="item1.isDeptAudit==1">
-                                {{('待'+item1.auditDeptName+'审核')}}
+                                待
+                                <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName' :openid='item1.auditDeptName'></ww-open-data></span>
+                                <span v-else>{{item1.auditDeptName}}</span>
+                                审核
                             </span>
                             </span>
                             <span v-else>