修改

src/pages/activity/payment.vue

@@ -300,8 +300,8 @@
           <q-btn label="新增收款" color="accent q-px-md" size="sm" style="font-weight:400 !important;"
             @click="goShoukuan(1)" />
         </div>
-        <div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
-          <span class="Pay_Line" style="background-color:#02C499;"></span>活动收入
+        <div class="pay_TopTitle" style="margin:30px 0 15px 20px;font-size:12px;">
+          <span class="Pay_Line" style="background-color:#02C499;"></span>其他收入
         </div>
         <table class="payTable">
           <tr>
@@ -314,12 +314,12 @@
             <th width='180'>审核状态</th>
             <th width="200">当前审核人</th>
           </tr>
-          <tr v-if="dataList && dataList.FiniceReciveList==0">
+          <tr v-if="dataList && dataList.OtherFiniceReciveList==0">
             <td :colspan="8" align="center">暂无数据</td>
           </tr>
-          <tr v-for="(item,index) in dataList.FiniceReciveList" :key="index">
+          <tr v-for="(item,index) in dataList.OtherFiniceReciveList" :key="index">
             <td>
-              <span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
+              <span class="finince_Order">{{item.FrID}}</span>
             </td>
             <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
             <td style="text-align:left;">
@@ -351,8 +351,8 @@
             </td>
           </tr>
         </table>
-        <div class="pay_TopTitle" style="margin:30px 0 15px 20px;font-size:12px;">
-          <span class="Pay_Line" style="background-color:#02C499;"></span>其他收入
+        <div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
+          <span class="Pay_Line" style="background-color:#02C499;"></span>活动收入
         </div>
         <table class="payTable">
           <tr>
@@ -365,12 +365,12 @@
             <th width='180'>审核状态</th>
             <th width="200">当前审核人</th>
           </tr>
-          <tr v-if="dataList && dataList.OtherFiniceReciveList==0">
+          <tr v-if="dataList && dataList.FiniceReciveList==0">
             <td :colspan="8" align="center">暂无数据</td>
           </tr>
-          <tr v-for="(item,index) in dataList.OtherFiniceReciveList" :key="index">
+          <tr v-for="(item,index) in dataList.FiniceReciveList" :key="index">
             <td>
-              <span class="finince_Order">{{item.FrID}}</span>
+              <span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
             </td>
             <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
             <td style="text-align:left;">
@@ -408,8 +408,9 @@
           <q-btn label="新增付款" color="accent q-px-md" size="sm" style="font-weight:400 !important;"
             @click="goShoukuan(2)" />
         </div>
+
         <div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
-          <span class="Pay_Line" style="background-color:#02C499;"></span>活动支出
+          <span class="Pay_Line" style="background-color:#F28C1D;"></span>其他支出
         </div>
         <table class="payTable">
           <tr>
@@ -422,25 +423,25 @@
             <th width='180'>审核状态</th>
             <th width="200">当前审核人</th>
           </tr>
-          <tr v-if="dataList && dataList.FinicePayList==0">
+          <tr v-if="dataList && dataList.OtherFinicePayList==0">
             <td :colspan="8" align="center">暂无数据</td>
           </tr>
-          <tr v-for="(item,index) in dataList.FinicePayList" :key="index">
+          <tr v-for="(item,index) in dataList.OtherFinicePayList" :key="index">
             <td>
               <span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
             </td>
             <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
             <td style="text-align:left;">
               <div v-for="childItem in item.TradeWayList">
-                支付方式：{{childItem.Alias}}<span class="TB_Rate"> 币种：{{childItem.CurrencyName}}</span>
-                <span class="Team_Coins orangeStyle">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
+                支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
+                <span class="Team_Coins orangeStyle">-{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
                 <span class="TB_Rate" style="margin-left:10px;">汇率：{{childItem.Rate}}</span>
               </div>
             </td>
             <td>
               <div class="financeYing">
-                应收：{{item.Money}}<br />
-                实收：{{item.PayMoney}}
+                应付：{{item.Money}}<br />
+                实付：{{item.PayMoney}}
               </div>
             </td>
             <td>{{item.TradeDate}}</td>
@@ -460,7 +461,7 @@
           </tr>
         </table>
         <div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
-          <span class="Pay_Line" style="background-color:#F28C1D;"></span>其他支出
+          <span class="Pay_Line" style="background-color:#02C499;"></span>活动支出
         </div>
         <table class="payTable">
           <tr>
@@ -473,25 +474,25 @@
             <th width='180'>审核状态</th>
             <th width="200">当前审核人</th>
           </tr>
-          <tr v-if="dataList && dataList.OtherFinicePayList==0">
+          <tr v-if="dataList && dataList.FinicePayList==0">
             <td :colspan="8" align="center">暂无数据</td>
           </tr>
-          <tr v-for="(item,index) in dataList.OtherFinicePayList" :key="index">
+          <tr v-for="(item,index) in dataList.FinicePayList" :key="index">
             <td>
               <span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
             </td>
             <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
             <td style="text-align:left;">
               <div v-for="childItem in item.TradeWayList">
-                支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
-                <span class="Team_Coins orangeStyle">-{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
+                支付方式：{{childItem.Alias}}<span class="TB_Rate"> 币种：{{childItem.CurrencyName}}</span>
+                <span class="Team_Coins orangeStyle">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
                 <span class="TB_Rate" style="margin-left:10px;">汇率：{{childItem.Rate}}</span>
               </div>
             </td>
             <td>
               <div class="financeYing">
-                应付：{{item.Money}}<br />
-                实付：{{item.PayMoney}}
+                应收：{{item.Money}}<br />
+                实收：{{item.PayMoney}}
               </div>
             </td>
             <td>{{item.TradeDate}}</td>
@@ -520,7 +521,7 @@
     data() {
       return {
         dataList: {
-          ClassInfo:{}
+          ClassInfo: {}
         }, //数据
         msg: {
           Id: 0,
@@ -536,17 +537,17 @@
     methods: {
       getData() {
         this.loading = true;
-            this.apipostDS("/api/Education/GetActivityBalanceSheet",this.msg,(res)=>{
+        this.apipostDS("/api/Education/GetActivityBalanceSheet", this.msg, (res) => {
           this.loading = false
-                if(res.data.resultCode===1){
+          if (res.data.resultCode === 1) {
             this.dataList = res.data.data;
-                      console.log(500,this.dataList)
+            console.log(500, this.dataList)
           }
         })
       },
       //减法 得实收
       getShiShou(num1, num2) {
-        if (num1!=='' && num2!=='') {
+        if (num1 !== '' && num2 !== '') {
           return parseInt(num1) - parseInt(num2);
         } else {
           return 0;
@@ -573,8 +574,8 @@
           // Obj: {},
           // SourceID: 0,
           // TCIDList: TCIDARR,
-          OtherType:41,
-          ReFinanceId :this.msg.Id
+          OtherType: 41,
+          ReFinanceId: this.msg.Id
         }
         this.$router.push({
           path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
@@ -590,9 +591,9 @@
         });
 
       },
-       goBack(){
+      goBack() {
         this.$router.go(-1)
-      }  ,
+      },
     }
   }