财务统计数据修改

src/views/finance/assetsRealFundStat.vue

@@ -298,6 +298,7 @@ export default {
             this.getAssetsSate();
         },
         getAssetsSate() {
+            let loadingInstance = this.$loading({ fullscreen: true });
             if (this.selectDate) {
                 this.listQuery.startTime = this.selectDate[0] + ' 00:00:00';
                 this.listQuery.endTime = this.selectDate[1] + ' 23:59:59';
@@ -309,6 +310,7 @@ export default {
             this.$api.financeClaim.getAssetsSate(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
+                    loadingInstance.close();
                     if (this.listQuery.startTime !== null && this.listQuery.endTime !== null && res.data.records.length > 0) {
                         this.exportStatus = false;
                     } else {

src/views/finance/fundClaim.vue

@@ -1209,18 +1209,22 @@ export default {
       this.getList()
     },
     getList() {
+      let loadingInstance = this.$loading({ fullscreen: true });
       this.listQuery.notFinished = true
       this.claimOrders = []
       this.$api.financeRealFund.claimList(Object.assign({}, this.listQuery)).then((res) => {
         if (res.code === 200) {
+          loadingInstance.close();
           this.pageData = res.data
         }
       })
     },
 
     getMyMajorOrder() {
+      let loadingInstance = this.$loading({ fullscreen: true });
       this.$api.majorProduction.waitingClaim(Object.assign({}, this.majorListQuery)).then((res) => {
         if (res.code === 200) {
+          loadingInstance.close();
           this.myMajorPageData = res.data
         }
       })

src/views/finance/fundList.vue

@@ -421,9 +421,11 @@ export default {
 
     },
     getList() {
-      this.loading = true;
+      let loadingInstance = this.$loading({ fullscreen: true });
+
       this.$api.financeRealFund.list(Object.assign({}, this.listQuery)).then(res => {
         if (res.code === 200) {
+          loadingInstance.close();
           this.pageData = res.data;
         }
       })
@@ -610,15 +612,14 @@ export default {
     },
 
     getList1(){
-      this.loading = true;
+      let loadingInstance = this.$loading({ fullscreen: true });
+
       this.$api.financeClaim.claimPage(Object.assign({}, this.listQuery1)).then(res => {
         if (res.code === 200) {
+          loadingInstance.close();
           this.pageData1 = res.data;
         }
       })
-      setTimeout(() => {
-        this.loading = false;
-      }, 500);
     },
     searchList1() {
       // 重置分页

src/views/finance/fundWarning.vue

@@ -406,8 +406,11 @@ export default {
     },
 
     getOverdueMajor() {
+      let loadingInstance = this.$loading({ fullscreen: true });
+
       this.$api.financeRealFund.overdueMajor(this.listQuery1).then(res => {
         if (res.code === 200) {
+          loadingInstance.close();
           this.overdueMajor = res.data;
         }
       })

src/views/finance/invoiceCheck.vue

@@ -785,8 +785,11 @@ export default {
       this.getList3()
     },
     getList1() {
+      let loadingInstance = this.$loading({ fullscreen: true });
+
       this.$api.financeInvoice.list(Object.assign({}, this.listQuery1)).then(res=>{
         if (res.code ===200){
+          loadingInstance.close();
             this.pageData1 = res.data;
         }
       })
@@ -798,8 +801,11 @@ export default {
         );
     },
     getList2() {
+      let loadingInstance = this.$loading({ fullscreen: true });
+
       this.$api.financeInvoice.list(Object.assign({}, this.listQuery2)).then(res=>{
         if (res.code ===200){
+          loadingInstance.close();
             this.pageData2 = res.data;
         }
       })
@@ -811,8 +817,11 @@ export default {
         );
     },
     getList3() {
+      let loadingInstance = this.$loading({ fullscreen: true });
+
       this.$api.financeInvoice.list(Object.assign({}, this.listQuery3)).then(res=>{
         if (res.code ===200){
+          loadingInstance.close();
             this.pageData3 = res.data;
         }
       })

src/views/finance/personalRealFundStat.vue

@@ -149,12 +149,14 @@
                     }
                 }]
             },
-        claimDate: '',
+        claimDate: [],
         paymentDate:'',
         listQuery1: {
           page: 1,
           size: 1000,
           descs: 'id',
+          startTime:'',
+          endTime:''
         },
         personalStat:{
           records:[]
@@ -162,6 +164,8 @@
       }
     },
     created() {
+      this.claimDate.push(this.getDefaultStartDate());
+      this.claimDate.push(this.getDefaultEndDate());
         this.getPersonalStat();
     },
     methods: {
@@ -170,10 +174,29 @@
       
       },
 
+      getDefaultStartDate() {
+      let currentDate = new Date();
+      let currentYear = currentDate.getFullYear();
+      var currentMonth = String(currentDate.getMonth()).padStart(2, "0");
+      if (currentMonth=='00'){
+        currentYear = currentYear-1;
+        currentMonth = 12
+      }
+      return currentYear + '-' + currentMonth + '-' + '23'
+    },
+
+    getDefaultEndDate() {
+      const currentDate = new Date();
+      const currentYear = currentDate.getFullYear();
+      var currentMonth = String(currentDate.getMonth() + 1).padStart(2, "0");
+      return currentYear + '-' + currentMonth + '-' + '22'
+    },
+
+
         
     resetSearch1() {
       this.$router.push({ query: {} });
-      this.claimDate = '';
+      this.claimDate = [this.getDefaultStartDate(), this.getDefaultEndDate()];
       this.paymentDate= '';
       this.listQuery1 = {
         current: 1,
@@ -203,8 +226,14 @@
     },
 
       getPersonalStat(){
+        let loadingInstance = this.$loading({ fullscreen: true });
+        if (this.claimDate) {
+          this.listQuery1.startTime = this.claimDate[0] + ' 00:00:00';
+          this.listQuery1.endTime = this.claimDate[1] + ' 23:59:59';
+        }
         this.$api.financeClaim.getPersonalStat(this.listQuery1).then(res=>{
           if (res.code === 200){
+            loadingInstance.close();
               this.personalStat = res.data;
           }
         })

src/views/finance/realFundStat.vue

@@ -180,13 +180,15 @@
                     }
                 }]
             },
-        claimDate: '',
+        claimDate: [],
         paymentDate: '',
         listQuery1: {
           page: 1,
           size: 1000,
           descs: 'id',
-          keyword:null
+          keyword:null,
+          startDate: '',
+          endDate: '',
         },
         majorStat:{
           records:[]
@@ -194,6 +196,8 @@
       }
     },
     created() {
+      this.claimDate.push(this.getDefaultStartDate());
+      this.claimDate.push(this.getDefaultEndDate());
         this.getMajorStat();
     },
     methods: {
@@ -202,10 +206,29 @@
       
       },
 
+      getDefaultStartDate() {
+      let currentDate = new Date();
+      let currentYear = currentDate.getFullYear();
+      var currentMonth = String(currentDate.getMonth()).padStart(2, "0");
+      if (currentMonth=='00'){
+        currentYear = currentYear-1;
+        currentMonth = 12
+      }
+      return currentYear + '-' + currentMonth + '-' + '23'
+    },
+
+    getDefaultEndDate() {
+      const currentDate = new Date();
+      const currentYear = currentDate.getFullYear();
+      var currentMonth = String(currentDate.getMonth() + 1).padStart(2, "0");
+      return currentYear + '-' + currentMonth + '-' + '22'
+    },
+
+
         
     resetSearch1() {
       this.$router.push({ query: {} });
-      this.claimDate = '';
+      this.claimDate = [this.getDefaultStartDate(), this.getDefaultEndDate()];
       this.paymentDate = '',
       this.listQuery1 = {
         current: 1,
@@ -235,8 +258,15 @@
     },
 
       getMajorStat(){
+        let loadingInstance = this.$loading({ fullscreen: true });
+
+        if (this.claimDate) {
+          this.listQuery1.startDate = this.claimDate[0] + ' 00:00:00';
+          this.listQuery1.endDate = this.claimDate[1] + ' 23:59:59';
+        }
         this.$api.financeClaim.getMajorStat(this.listQuery1).then(res=>{
           if (res.code === 200){
+            loadingInstance.close();
               this.majorStat = res.data;
           }
         })

src/views/finance/settleAssets.vue

@@ -440,6 +440,8 @@ export default {
             this.assetsMarketSettleProd()
         },
         assetsEvaluatorSettleProd() {
+            let loadingInstance = this.$loading({ fullscreen: true });
+
             if (this.findDate) {
                 this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
                 this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
@@ -450,11 +452,14 @@ export default {
                 }
             this.$api.financeRealFund.assetsEvaluatorSettleProd(this.listQuery1).then(res => {
                 if (res.code === 200) {
+                    loadingInstance.close();
                     this.evaluatorProd = res.data;
                 }
             })
         },
         assetsMarketSettleProd() {
+            let loadingInstance = this.$loading({ fullscreen: true });
+
             if (this.findDate1) {
                 this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
                 this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
@@ -465,6 +470,7 @@ export default {
                 }
             this.$api.financeRealFund.assetsMarketSettleProd(this.listQuery2).then(res => {
                 if (res.code === 200) {
+                    loadingInstance.close();
                     this.marketProd = res.data;
                 }
             })

src/views/finance/settleMajor.vue

@@ -446,6 +446,8 @@ export default {
     },
 
     majorEvaluatorSettleProd() {
+      let loadingInstance = this.$loading({ fullscreen: true });
+
       if (this.findDate) {
         this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
         this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
@@ -456,11 +458,14 @@ export default {
         }
       this.$api.financeRealFund.majorEvaluatorSettleProd(this.listQuery1).then(res => {
         if (res.code === 200) {
+          loadingInstance.close();
           this.evaluatorProd = res.data;
         }
       })
     },
     majorMarketSettleProd() {
+      let loadingInstance = this.$loading({ fullscreen: true });
+
       if (this.findDate1) {
         this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
         this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
@@ -471,6 +476,7 @@ export default {
         }
       this.$api.financeRealFund.majorMarketSettleProd(this.listQuery2).then(res => {
         if (res.code === 200) {
+          loadingInstance.close();
           this.marketProd = res.data;
         }
       })