ソースを参照

报表查看模块,费用模块支出收入代码调整

haizhouwang 2 年 前
親
コミット
bb0034c93f

+ 1 - 1
src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -989,7 +989,7 @@ export default {
             params.entProfit[item.profitEng] = item.profit;
           });
           this.affiliationData2.forEach((item) => {
-            params.outProfit[item.profitEng] = item.profit;
+            params.outProfit[item.profitEng] = item.profit*-1;
           });
           //转化资金归属
           if (this.expendDataId) {

+ 1 - 1
src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -949,7 +949,7 @@ export default {
         obj.entProfit[item.profitEng] = item.profit;
       });
       this.affiliationData2.forEach((item) => {
-        obj.outProfit[item.profitEng] = item.profit;
+        obj.outProfit[item.profitEng] = item.profit*-1;
       });
       //转化资金归属
       this.$refs.inComeFormData.validate((valid) => {

+ 1 - 1
src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -854,7 +854,7 @@ export default {
               params.entProfit[item.profitEng] = item.profit;
             });
             this.affiliationData2.forEach((item) => {
-              params.outProfit[item.profitEng] = item.profit;
+              params.outProfit[item.profitEng] = item.profit*-1;
             });
             //转化资金归属
             let obj = {

+ 10 - 1
src/views/FinancialManagement/ExpenseManagement/ReportViewing.vue

@@ -48,7 +48,7 @@
       :showBatchDelete="false"
       :showOperation="false"
       @findPage="findPage"
-      :isshowpagination="false"
+      :isshowpagination="true"
     ></kt-common-table>
   </div>
 </template>
@@ -92,6 +92,8 @@ export default {
         return
       }
       this.showStatus = false;
+      this.pageRequest.pageNo = 1;
+      this.pageRequest.pageSize = 20;
       this.findPage();
     },
     /**
@@ -119,6 +121,13 @@ export default {
               });
             });
             this.pageResult.content = res.data.maps;
+            this.pageResult = {
+            content: res.data.maps,
+            pageNo: res.data.current,
+            pageSize: res.data.pageSize,
+            totalPages: res.data.pageNo,
+            totalSize: res.data.total,
+          };
           } else {
             this.$message.error(res.msg);
           }