修改

src/components/FinancialModule/BasicDocuments.vue

@@ -262,8 +262,9 @@
     <div class="page_bdm" v-if="GetDetail" v-loading="loading">
         <p class="_tit">{{GetDetail.FinanceName}}</p>
         <div class="_conten">
+            {{GetDetail.Type}}
             <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
-                <my-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
+                <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
             </template>
             <template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
                 <my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
@@ -412,7 +413,7 @@
         </div>
         <div class="_tit _tit2 w890px">
             <p>
-                <span class="_text">审核流程22</span>
+                <span class="_text">审核流程</span>
                 <span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
                 <span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
             </p>
@@ -422,7 +423,7 @@
                 </div>
             </div>
         </div>
-        <!-- <template>
+        <template>
             <div class="w890px">
                 <div class="_tit _tit2 w890px _border_bottom_none">
                     <p>
@@ -431,13 +432,30 @@
                         <span class="_btn" v-else @click="tableShowTuikuan=true">展开 <i class="iconfont icon-gengduo"></i> </span>
                     </p>
                     <div v-show="tableShowTuikuan" >
-                        <table>
-
+                        <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                                <th width="250">平台单号</th>
+                                <th width="100">金额</th>
+                                <th>支付方式</th>
+                                <th>支付日期</th>
+                                <th>状态</th>
+                                <th>退款金额</th>
+                            </tr>
+                            <tr v-for="item in tuiDataList">
+                                <td>{{item.Trade_Order}}</td>
+                                <td>{{item.Money}}</td>
+                                <td>{{item.PayWayName}}</td>
+                                <td>{{item.Pay_Date}}</td>
+                                <td>{{item.PayStatus}}</td>
+                                <td>{{item.RefundMoney}}</td>
+                            </tr>
                         </table>
+                        <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" :page-size="queryMsg.pageSize"
+                            layout="total,prev, pager, next, jumper" :total="queryMsg.total"></el-pagination>
                     </div>
                 </div>
             </div>
-        </template> -->
+        </template>
 
         <div class="_process clearfix">
             <!-- <el-popover
@@ -611,7 +629,7 @@
                                     <td>{{i.allMoney}}</td>
                                 </tr>
                             </template>
-                            <tr @keyup.enter="addList()">
+                            <tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
                               <td>
                                 <el-select  filterable  v-model='payMsg.AccName'  @change="clearAccBank()" class=" _border_b_1">
                                   <el-option v-for='i in AccList'
@@ -846,7 +864,7 @@
                                             <td>{{i.allMoney}}</td>
                                         </tr>
                                     </template>
-                                    <tr @keyup.enter="addList()">
+                                    <tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
                                         <td>
                                             <el-select  filterable  v-model='payMsg.AccName'  @change="clearAccBank()" class=" _border_b_1">
                                                 <el-option v-for='i in AccList'
@@ -910,7 +928,7 @@
                                     </tr> -->
                                     <tr>
                                         <td height="50px">实付金额</td>
-                                        <td class="_allMoney" height="50px" colspan="7">{{allMoney==0?'':allMoney.toFixed(2)}}</td>
+                                        <td class="_allMoney" height="50px" colspan="7">{{allMoney==0?'':allMoney}}</td>
                                     </tr>
                                     <tr>
                                         <td>备注</td>
@@ -1197,7 +1215,17 @@ export default {
           },
           //是否显示原路退款选项
           isShowChoice:false,
-        //   tableShowTuikuan:false
+          tableShowTuikuan:false,
+          queryMsg:{
+              pageIndex:1,
+              pageSize:10,
+              FinanceId:'',
+              Type:2,
+              currentPage:1,
+              total: 0,
+          },
+          tuiDataList:[],
+          currentMoney:0,
         }
     },components:{
         "my-FlowChartModule": myFlowChartModule,
@@ -1211,22 +1239,24 @@ export default {
         'my-HB-Bill':myhrBill,
     },methods:{
     payMsgListShow: function (type, index) {
-        this.payMsgList.forEach(x=>{
-            x.show = false
-        })
-        if(type.Type==1){
-            this.bankaccount_post_GetList()
-        }
-        if(type.Type==2){
-            this.BankAccount_post_GetPlatformList()
-        }
-        if(type.Type==3){
-            this.BankAccount_post_GetCashAccountList()
-        }
-        if(type.Type==4){
-            this.BankAccount_post_GetCashPoolList()
+        if(this.choiceMsg.Status==1){
+            this.payMsgList.forEach(x=>{
+                x.show = false
+            })
+            if(type.Type==1){
+                this.bankaccount_post_GetList()
+            }
+            if(type.Type==2){
+                this.BankAccount_post_GetPlatformList()
+            }
+            if(type.Type==3){
+                this.BankAccount_post_GetCashAccountList()
+            }
+            if(type.Type==4){
+                this.BankAccount_post_GetCashPoolList()
+            }
+            this.payMsgList[index].show = true
         }
-        this.payMsgList[index].show = true
     },
     addList: function (type, index) {
         if (type) {
@@ -1261,9 +1291,9 @@ export default {
         }
         let allMoney = 0
         this.payMsgList.forEach(x=>{
-            allMoney+=x.allMoney
+            allMoney+= parseFloat(x.allMoney);
         })
-        this.allMoney = allMoney;
+        this.allMoney = allMoney.toFixed(2);
     },
     Financial_post_GetFinancLogList(){  // 获取单据日志
       if(this.checkboxShow) return
@@ -1441,6 +1471,7 @@ export default {
             }
         },
         Calculation(type, index){  //  计算价格
+            console.log('aaaaaaaaaaaa');
             if (type) {
                 this.payMsgList[index].Fee = isNaN(parseFloat(this.payMsgList[index].Fee))?0:parseFloat(this.payMsgList[index].Fee);
                 this.payMsgList[index].Rate = isNaN(parseFloat(this.payMsgList[index].Rate))?0:parseFloat(this.payMsgList[index].Rate);
@@ -1457,6 +1488,8 @@ export default {
                     Rate = this.payMsg.Rate==0?1:this.payMsg.Rate,
                     Money = this.payMsg.OriginalMoney;
                 this.payMsg.allMoney = (Money*Rate)+fee;
+                console.log(this.payMsg,'payMsg');
+
             }
             // console.log(Rate+"+"+fee+"+"+Money)
         },
@@ -1646,7 +1679,6 @@ export default {
             }, err => {})
         },
         AuditOrRefund(){  // 保存
-          this.loading = true;
             let imgArr = [];
             this.uploadImgList.forEach(x=>{
                 imgArr.push(x.src);
@@ -1676,7 +1708,13 @@ export default {
             //   }
             // });
             this.AuditOrRefundMsg.TradeDetailList = this.GetDetail.TradeDetailList;
+            if(this.allMoney!=this.currentMoney){
+                this.Error('原路退款金额与单据总金额不一致');
+                return;
+            }
+            this.loading = true;
             this.apipost('Financial_post_AuditOrRefund',this.AuditOrRefundMsg,res=>{
+                this.loading = false;
                 if(res.data.resultCode==1){
                     this.$message.success(res.data.message);
                     // let _this = this;
@@ -1824,15 +1862,15 @@ export default {
                 return;
             }
             var payMsg = {
-                AccName: subItem.AccountName,
+                AccName: subItem.AccountTypeName,
                 Account: subItem.BackNo,
-                AccountId: subItem.AccountTypeId,
+                AccountId: subItem.AccountId,
                 CurrenName: "人民币",
                 CurrencyId: 1,
                 Fee: 0,
                 FinanceId: "",
                 ID: 0,
-                Name: subItem.Pay_WayName,
+                Name: subItem.BankName,
                 OriginalMoney: subItem.RefundMoney,
                 Rate: 1,
                 Type: subItem.Type,
@@ -1843,8 +1881,30 @@ export default {
                 show: false
             }
             this.payMsgList.push(payMsg);
-            this.Calculation();
+            let total = 0;
+            this.payMsgList.forEach(x=>{
+                total +=parseFloat(x.OriginalMoney);
+            })
+            this.allMoney = total.toFixed(2);
         },
+        //获取列表
+        getTuikuan(){
+            this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.queryMsg,res=>{
+                if(res.data.resultCode==1){
+                    this.tuiDataList = res.data.data.pageData;
+                    this.queryMsg.total = res.data.data.count;
+                }else{
+
+                }
+            },err=>{})
+        },
+        handleCurrentChange(val) {
+            this.queryMsg.pageIndex = val;
+            this.getTuikuan();
+        },
+        headCall: function (msg) { //回调方法，接收子组件传的参数
+            this.currentMoney = msg;
+        }
     },created(){
         if(this.$route.query.pageIndex){
             this.pageIndex = this.$route.query.pageIndex;
@@ -1855,10 +1915,12 @@ export default {
         this.userId = userInfo.EmployeeId;
         this.RB_Post_Id = userInfo.RB_Post_Id
         this.ID = this.$route.query.id;
+        this.queryMsg.FinanceId = this.$route.query.id;
         this.Financial_post_GetDetail(this.ID);
         this.financeinfo_post_GetList();
         this.BankAccount_post_GetAccountType();
         this.AccountType_post_GetList();
+        this.getTuikuan();
         if(this.$route.query.Conditon){
             this.returnCode = this.$route.query.Conditon;
         }

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -366,6 +366,7 @@ export default {
                     })
                     this.currentMoney = this.currentMoney.toFixed(2);
                     this.benMoney = this.benMoney.toFixed(2);
+                    this.$emit('headCallBack', this.currentMoney);
                     data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
                     data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
                     data.PayMoney = this.$commonUtils.addCommas(data.PayMoney.toFixed(2))