cost.vue

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

@@ -28,7 +28,7 @@
             type="month" 
             ></el-date-picker>
 
-            <el-radio-group v-model="radio" @change="getEchart" style="margin-left:10px;"  size="small">
+            <el-radio-group v-model="radio" @change="getEchart" style="margin-left:10px;"  size="small" :disabled="radioLoading">
                 <el-radio-button :label="$t('other.project')"></el-radio-button>
                 <el-radio-button :label="$t('zhu-xiang-mu')" v-if="user.timeType.mainProjectState"></el-radio-button>
                 <el-radio-button :label="$t('projectclassification')"></el-radio-button>
@@ -61,7 +61,7 @@
         <!-- <div id="clearfix" :style="'width:'+widthHtval+'px;position: relative; height:'+containerHeight+'px;'">
              <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="clearfix" :class="radio == $t('ren-yuan') ? 'ryuans' : ''" :style="'overflow-x: auto;width:100%;padding-bottom: 100px; position: relative; height:'+containerHeight+'px;'" v-loading="radioLoading">
             <div id="container" :style="'height:'+(containerHeight - 20)+'px;width:100%'"></div>
             <div class="poss">
                 <el-pagination
@@ -227,7 +227,8 @@
                 customId: '',
                 customName: '',
                 customList: [],
-                departmentList: []
+                departmentList: [],
+                radioLoading: false
             };
         },
         methods: {
@@ -399,7 +400,6 @@
                 }
                 this.http.post(url, param,
                     res => {
-                        this.listLoading = false;
                         if (res.code == "ok") {
                             this.exportDialog = false;
                             var aTag = document.createElement('a');
@@ -414,7 +414,6 @@
                         }
                     },
                     error => {
-                        this.listLoading = false;
                         this.$message({
                             message: error,
                             type: "error"
@@ -461,7 +460,6 @@
             },
             //获取人员成本统计列表
             getUserCostList() {
-                this.listLoading = true;
                 // console.log(this.port.project.userCost, '获取人员成本统计列表')
                 // console.log(this.user.timeType.fixMonthcost)
                 // console.log(Boolean(this.dateRange))
@@ -479,7 +477,7 @@
                     endDate: endDateNum
                 },
                 res => {
-                    this.listLoading = false;
+                    this.radioLoading = false
                     var _this = this;
                     this.hasReportUserList = [];
                     if (res.code == "ok") {
@@ -521,7 +519,7 @@
                     }
                 },
                 error => {
-                    this.listLoading = false;
+                    this.radioLoading = false
                     this.$message({
                         message: error + '外面',
                         type: "error"
@@ -790,7 +788,7 @@
             // 脱离出来的方法
             jieliu() {
                 sessionStorage.radio = this.radio;
-                
+                this.radioLoading = true
                 var param = {};
                 if (this.dateRange != null) {
                     param = {
@@ -824,9 +822,11 @@
                     param.fieldName = this.theCustomListPlant
                     // console.log(param, '要传的数据')
                 }
+                
                 this.http.post(url, param,
                 res => {
                     if (res.code == "ok") {
+                        this.radioLoading = false
                         let alltime = 0
                         if(this.radio==this.$t('other.project') || this.radio == this.$t('zhu-xiang-mu') || this.radio==this.$t('projectclassification')){
                             for(let i in res.data.costList){
@@ -872,6 +872,7 @@
                             this.jieliu_echarts()
                         }
                     } else {
+                        this.radioLoading = false
                         this.$message({
                             message: res.msg,
                             type: "error"
@@ -879,6 +880,7 @@
                     }
                 },
                 error => {
+                    this.radioLoading = false
                     this.$message({
                         message: error,
                         type: "error"

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1131,7 +1131,7 @@
                 <el-tree :data="deptMembData" show-checkbox :props="defaultProps" node-key="id"
                     ref="chooseMembTree" @check-change="onTreeItemChange" :default-checked-keys="workForm.userId"
                     highlight-current :filter-node-method="filterNode">
-                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                    <span class="custom-tree-node" slot-scope="{ node }">
                         <span v-if="user.userNameNeedTranslate == '1'">
                             <span v-if="node.data.children">
                                 <ww-open-data type='departmentName' :openid='node.label'></ww-open-data>