111

src/components/FinancialModule/BasicDocuments.vue

@@ -303,6 +303,7 @@
         <p class="_tit">{{GetDetail.FinanceName}} <span style="color: red;" v-if="GetDetail.Status==4">已作废</span></p>
         <div class="_conten">
             <template v-if="!otherTable">
+                <!-- 付款 -->
                 <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4  && showModel">
                     <my-Bill :ID="FrID" :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
                 </template>
@@ -2259,6 +2260,7 @@ export default {
                     }
                     this.chongJudge(data)
                     this.GetDetail = data;
+                    
                     this.showModel = true
                     this.FrID = data.FrID
                     this.ChongDiMsg.Types = ''

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -326,6 +326,7 @@
         </div>
 </template>
 <script>
+import { connect } from 'net';
 export default {
     props:["ID","width","color","isPrintPage","name","OrderSource"],  //接收参数 ID width color
     data(){
@@ -398,10 +399,36 @@ export default {
                     data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
                     data.AuditSteps.reverse()
                     this.GetDetail = data;
-                    console.log(this.GetDetail)
                     this.loading=false
                     this.$set(this.$data,"GetDetail",data);
-                    console.log(this.GetDetail)
+                    console.log("sdfsaoifsjapof ",this.GetDetail)
+                    let status=false;
+                    if(this.GetDetail.DetailList && this.GetDetail.DetailList.length>0 && this.GetDetail.TCIDList.length>0){
+                       this.GetDetail.DetailList.forEach(item=>{
+                           if(item.CostTypeName=="地接费（领取）"){
+                             status=true;
+                           }
+                       }) 
+                      if(status){
+                        this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{
+                            if(res.data.resultCode==1){
+                                console.log("res",res);
+                                if(res.data.data.length>0){
+                                  this.GetDetail.DetailList[0].Remark="刷卡:"
+                                  res.data.data.forEach(item=>{
+                                    this.GetDetail.DetailList[0].Remark+=`${item.Name}，`;
+                                    console.log("this.GetDetail.DetailList[0].Remark",this.GetDetail.DetailList[0].Remark)
+                                  })
+                                } 
+                                
+                            }else{
+                                this.Error(res.data.message)
+                            }
+                        },err=>{})
+                       
+
+                      }
+                    }
                 }
             }, err => {})
         },