1

src/components/FinancialModule/addFinancialDocuments.vue

@@ -190,14 +190,14 @@
                         <el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43  && msg.TemplateId!==48'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
                         <el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43  && msg.TemplateId!==48'>{{$t('fnc.djxnzhanghu')}}</el-radio>
                         <el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43  && msg.TemplateId!==48'>{{$t('fnc.szxiangdi')}}</el-radio>
-                        
+
                     </el-radio-group>
                 </div> -->
                 <div class="rb_top_row _r_mb5 ceshi">
                     <p >{{$t('fnc.fkduixiang')}}：
                         <el-select v-if='msg.TemplateId===90||msg.TemplateId===91' filterable  v-model='msg.IsPublic' placeholder="付款类型"  @change="IsPublicChange" class="w135 _border_b_1">
                             <el-option label="虚拟账户" :value='10' :key='10' v-if='msg.TemplateId===90||msg.TemplateId===91'></el-option>
-                        
+
                         </el-select>
                         <el-select v-else filterable  v-model='msg.IsPublic' placeholder="付款类型"  @change="IsPublicChange" class="w135 _border_b_1">
                             <el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
@@ -209,8 +209,8 @@
                             <el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37  && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
                             <el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37  && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
                             <el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62 || msg.TemplateId===120'></el-option>
-                            <el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67||msg.TemplateId===74||msg.TemplateId===119'></el-option>                    
-                            <el-option label="电商结算" :value='11' :key='11' v-if='msg.TemplateId===121'></el-option>                    
+                            <el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67||msg.TemplateId===74||msg.TemplateId===119'></el-option>
+                            <el-option label="电商结算" :value='11' :key='11' v-if='msg.TemplateId===121'></el-option>
                         </el-select>
                         <el-select v-if="!showDisable"  filterable  v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
                             <el-option v-for='item in ClientTypeList'
@@ -377,7 +377,7 @@
                         <td>
                             <el-input v-model="detailList.UnitPrice" type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(detailList,'UnitPrice',true)"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
                         </td>
-                        <td>  
+                        <td>
                             <el-select  filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
                                 <el-option v-for='item in coinGetList'
                                     :label='item.Name'
@@ -388,7 +388,7 @@
                         </td>
                         <td>
                             <span v-if="detailList.yTotalPrice && detailList.yTotalPrice!=''">{{detailList.yTotalPrice.toFixed(2)}}</span>
-                            <span v-else>{{detailList.yTotalPrice}}</span>    
+                            <span v-else>{{detailList.yTotalPrice}}</span>
                         </td>
                         <!--  @blur="addList(1)" @change="Calculation(1)"  -->
                         <td><el-input v-model="detailList.Rate" type="text" :disabled="true" class="w80 _border_b_1"></el-input></td>
@@ -700,7 +700,7 @@ export default {
         },
         IsPublicChange(val){
         this.showDisable=false;
-            
+
           this.msg.ClientType = '';
           this.msg.ClientID = '';
           this.msg.AccountNumber = '';
@@ -907,6 +907,12 @@ export default {
             this.msg.emList = this.chosenPeople;
             if(this.orderObj){
               this.msg.VisaIds = this.orderObj.VisaIds?this.orderObj.VisaIds:'';
+              //从电商过来的参数处理
+              this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
+              this.msg.OtherType = this.orderObj.OtherType?this.orderObj.OtherType:0;
+              this.msg.ReFinanceId = this.orderObj.ReFinanceId?this.orderObj.ReFinanceId:0;
+              this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2?this.orderObj.ReFinanceId2:0;
+              this.msg.ECOrderList = this.orderObj.ECOrderList?this.orderObj.ECOrderList:[];
             }
             // 2019-12-3 18:29:31 新增费用类型判断
             let riqi = false
@@ -938,12 +944,12 @@ export default {
             }
             // 判断付款金额与最大金额
             if(Number(this.maxmoneyData)>0 && (Number(this.allPriceTocalc) > Number(this.maxmoneyData))){
-                
+
                 this.maxmoneyTips=true;
                 return;
             }
           //旅客名单数据组装
-          if(!this.$route.query.edit){ 
+          if(!this.$route.query.edit){
                 this.msg.Type = this.$route.query.Type
             }
           if(this.orderObj!=null&&this.orderObj.OrderSource===10){
@@ -961,8 +967,8 @@ export default {
           }
           this.loading = true;
           this.msg.Description=this.Description;
-          
-        
+
+
         // 财务收据
         if(this.czmsg && this.czmsg.ReFinanceId2){
             this.msg.ReFinanceId2=this.czmsg.ReFinanceId2;
@@ -1027,7 +1033,7 @@ export default {
             if(list.yTotalPrice && list.yTotalPrice!=''){
                 list.yTotalPrice=list.yTotalPrice.toFixed(2)
             }
-            
+
             if(list.CostTypeId=='')return
             if(list.Number=='')return
             if(list.UnitPrice=='')return
@@ -1051,7 +1057,7 @@ export default {
             this.allPrice = allPrice;
             this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
             this.allPriceTocalc =Math.round(this.allPrice* 100) / 100
-            
+
             this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
             this.detailList = {
                 ID:0,
@@ -1151,11 +1157,11 @@ export default {
                                 this.msg.detailList[index].currenName = x.Name;
                             }
                         }
-                        
+
                         this.$forceUpdate();
                     }
                 })
-            
+
             this.Calculation(t,index+1)
         },
         financeinfo_post_GetClientTypeList(){  // 获取对象类型
@@ -1283,12 +1289,12 @@ export default {
                     let data= res.data.data;
                     this.editTemplateId=data.TemplateId;
                     this.getCompany();
-                    
+
                     data.IsLeader = 1;
                     this.msg = JSON.parse(JSON.stringify(data));
                     this.msg.ClientType = this.msg.ClientType==0?'':this.msg.ClientType;
                     this.msg.ClientID = this.msg.ClientID==0?'':this.msg.ClientID;
-                    
+
                     if (id || id === 0) {
                         // if (!this.orderObj) {
                         //     this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
@@ -1324,11 +1330,11 @@ export default {
                         num = Math.round(num* 100) / 100;
                         x.bTotalPrice = num;
                         x.Money = Math.round(x.Money* 100) / 100;
-                        
+
                         x.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(x.yTotalPrice* 100) / 100);
                         x.bTotalPriceTo = this.$commonUtils.addCommas(num);
                         x.OriginalMoney = Math.round(x.OriginalMoney* 100) / 100;
-                        x.show = false; 
+                        x.show = false;
                         this.coinGetList.forEach(y=>{
                             if(y.ID==x.CurrencyId){
                                 x.currenName = y.Name;
@@ -1340,7 +1346,7 @@ export default {
                     this.allPrice = allPrice;
                     this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
                     this.allPriceTocalc =Math.round(this.allPrice* 100) / 100
-                    
+
                     this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
                     this.BillName = data.CompanyName;
                     this.BillSonName = data.FinanceName;
@@ -1353,11 +1359,11 @@ export default {
                          this.Description=this.GetDetail.Description;
                     }
                     if(this.orderObj){
-                        
+
                         this.msg.OrderID = this.orderObj.OrderID?this.orderObj.OrderID:0;
                         this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
                         this.msg.TCID = this.orderObj.TCID?this.orderObj.TCID:0;
-                        
+
                         this.msg.TCIDList = this.orderObj.TCIDList?this.orderObj.TCIDList:[];
                         this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
@@ -1380,13 +1386,13 @@ export default {
                             this.detailList.CurrencyId=Number(this.orderObj.CurrencyId);
                             this.detailCurrDis=true;
                             this.detailList.CostTypeId=this.orderObj.CostType?this.orderObj.CostType: '';
-                            this.getRate(this.detailList.CostTypeId,this.detailList.CurrencyId,1)  
+                            this.getRate(this.detailList.CostTypeId,this.detailList.CurrencyId,1)
                             this.addList(1);
 
                     }
-                        
+
                     }
-                    
+
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
                             x.Url = x.Content;
@@ -1442,7 +1448,7 @@ export default {
         getCompany(){ //公司
             this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
               let data = res.data.data;
-                let Status=false;              
+                let Status=false;
               if(this.$route.query.companyID!=='-1' && this.$route.query.companyID!==undefined){
                   Status=true;
                 data.forEach(x=>{
@@ -1450,7 +1456,7 @@ export default {
                 })
               }
               if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length>0) {
-                  Status=true;                  
+                  Status=true;
                 this.orderObj.companyIDList.forEach(x=>{
                   data.forEach(y=>{
                     if (y.disabled === false){
@@ -1465,10 +1471,10 @@ export default {
                 if(!Status){
                     let id=0;
                     if(this.$route.query.id){
-                        id=this.$route.query.id;  
+                        id=this.$route.query.id;
                     }else{
                         id=this.editTemplateId;
-                        
+
                     }
                     this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', {ID:id}, res => {
                         if (res.data.resultCode == 1) {
@@ -1492,12 +1498,12 @@ export default {
                                         }
                                     })
                                 })
-                               
+
                                 this.companyList = data;
                             }
                         }
                     }, err => {})
-                 
+
                 }
             }, err => {})
         },
@@ -1617,7 +1623,7 @@ export default {
                 that.Description+=item.GuestName+" ";
             })
           }
-          
+
         }
         if (this.orderObj && this.orderObj.OtherType) {
             this.ZhuiJiaTK = true
@@ -1628,7 +1634,7 @@ export default {
             }
         }, err => {})
     },
-    
+
     mounted(){
         // 付款单新增或修改  获取最大金额
         if((this.$route.query.type && this.$route.query.type==2) || (this.$route.query.Type && this.$route.query.Type==2)){
@@ -1677,8 +1683,8 @@ export default {
         if(this.$route.query.Conditon){
             this.returnCode = this.$route.query.Conditon;
         }
-        
-        
+
+
         // this.admin_get_DepartmentGetList();
 
     },components: {

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -236,7 +236,7 @@
                             <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
                             <td height="26px">
                                 <el-input v-model="da.UnitPrice"  type="text" @keyup.native="checkPrice(da,'UnitPrice',true)"  @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
-                            </td>  
+                            </td>
                             <td height="26px">
                                 <span  class="w80">{{da.currenName}}</span>
                             </td>
@@ -399,7 +399,7 @@
                 <div class="_remark">
                     <p>{{$t('system.label_info')}}</p>
                     <textarea v-model="Description">
-                        
+
                     </textarea>
                 </div>
                 <div class="" >
@@ -752,7 +752,7 @@ export default {
               this.picIsShow= true;
               // this.hideFlashMan = true;
             }else{
-                if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){ 
+                if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
                     this.previewPDF(i.Url)
                 }else{
                     window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url)
@@ -807,7 +807,7 @@ export default {
                     zhifu = OcrStr.match(/商家可扫码退款或查询交易.\d+/);
                     let barcode=x.data.Barcode;
                     if(wechat==null&&zhifu==null&&barcode==""){
-                          return;  
+                          return;
                     }
                     if(zhifu==null&&wechat!=null&&wechat.length>0&&wechat[wechat.length-1].length>20){
                         this.setCode = wechat[wechat.length-1].replace('商户单号','');
@@ -840,7 +840,7 @@ export default {
                 // this.msg.detailList.forEach(x=>{ //2019-02-01注释：页面手续费只需要计算一次，多个费用说明，重复计算  BY:W
                 //     allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
                 // })
-                 this.msg.detailList.forEach(x=>{ 
+                 this.msg.detailList.forEach(x=>{
                     allPrice = allPrice+parseFloat(x.bTotalPrice);
                 })
                 allPrice =allPrice-parseFloat(this.msg.Fee);
@@ -853,11 +853,11 @@ export default {
                 let f = parseFloat(this.msg.OriginalFee);
                 this.msg.Fee = Math.round((r*f) * 100) / 100;
                 let allPrice = 0;
-                
+
                 // this.msg.detailList.forEach(x=>{  //2019-02-01注释：页面手续费只需要计算一次，多个费用说明，重复计算  BY:W
                 //     allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
                 // });
-                 this.msg.detailList.forEach(x=>{  
+                 this.msg.detailList.forEach(x=>{
                     allPrice = allPrice+parseFloat(x.bTotalPrice);
                 })
                  allPrice =allPrice-parseFloat(this.msg.Fee);
@@ -927,7 +927,7 @@ export default {
               }
             }
           }, err => {})
-            
+
         },
         BankAccount_post_GetPlatformList(i){  //获取平台账户
             let msg = {
@@ -1052,17 +1052,18 @@ export default {
             e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
         },
         AddFinancial(z){  //保存
+          console.log(this.orderObj)
             if(this.Handmsg!=null){
                 this.msg.ReFinanceId=this.Handmsg.ReFinanceId;
                 if(this.Handmsg.TCNUM){
                     this.msg.TCNUM=this.Handmsg.TCNUM
                 }
-                
+
             }
             if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
                 let tipguestInfo = JSON.parse(sessionStorage.getItem("TipGuestList"));
                 this.msg.TipGuestList=tipguestInfo;
-                
+
             }
             this.msg.Description=this.Description;
             if(z){
@@ -1081,7 +1082,7 @@ export default {
             // if(this.msg.IsHave==0&&this.chosenPeople.length==0)return this.$message.error('请选择下一步审核人')
             if(this.msg.BankId=='')return this.$message.error(this.$t('rule.qxzskzhanghao'));
             if(!this.msg.RB_Depart_Id)return this.$message.error(this.$t('rule.qxzzdbumen'));
-            if(!this.$route.query.edit){ 
+            if(!this.$route.query.edit){
                 this.msg.Type = this.$route.query.Type
             }
             delete this.msg.DetailList;
@@ -1094,6 +1095,12 @@ export default {
             this.msg.emList = this.chosenPeople;
             if(this.orderObj){
               this.msg.VisaIds = this.orderObj.VisaIds?this.orderObj.VisaIds:'';
+              //从电商过来的参数处理
+              this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
+              this.msg.OtherType = this.orderObj.OtherType?this.orderObj.OtherType:0;
+              this.msg.ReFinanceId = this.orderObj.ReFinanceId?this.orderObj.ReFinanceId:0;
+              this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2?this.orderObj.ReFinanceId2:0;
+              this.msg.ECOrderList = this.orderObj.ECOrderList?this.orderObj.ECOrderList:[];
             }
           this.msg.detailList.forEach(x=>{
             delete x.rate;
@@ -1108,11 +1115,11 @@ export default {
                         cancelButtonText: this.$t('fnc.nothanks'),
                         type: 'warning'
                         }).then(() => {
-                         this.$router.push({name:'addReceivablesDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,'InPay':this.$route.query.InPay,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}});      
+                         this.$router.push({name:'addReceivablesDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,'InPay':this.$route.query.InPay,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}});
                         }).catch(() => {
-                         this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type,'InPay':this.$route.query.InPay}}) ;    
+                         this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type,'InPay':this.$route.query.InPay}}) ;
                     });
-                    
+
                 }else{
                   this.resultCode = res.data.resultCode;
                   this.$message.error(res.data.message);
@@ -1299,7 +1306,7 @@ export default {
                 }
             }
             this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee);
-            
+
             this.$forceUpdate();
         },
         shouxufeiJiSuan: function (){
@@ -1422,7 +1429,7 @@ export default {
                         this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
 
                         this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType:0;
-                        
+
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo")) && !JSON.parse(sessionStorage.getItem("TipGuestList"))){
                             this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }
@@ -1435,7 +1442,7 @@ export default {
                                 })
                                 this.msg.Description = Description
                             }
-                            
+
                         }
                     }
 
@@ -1523,15 +1530,15 @@ export default {
                                         }
                                     })
                                 })
-                               
-                                this.companyList = data;   
+
+                                this.companyList = data;
                             }
                         }
-                        
+
                     }, err => {})
-                 
+
                 }
-                
+
             }, err => {})
         },
     },
@@ -1541,7 +1548,7 @@ export default {
         this.platformAccount = this.$route.query.platformAccount?this.$route.query.platformAccount:0;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
         this.Handmsg = this.$route.query.Handmsg?JSON.parse(this.$route.query.Handmsg):null;
-        
+
         if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("TipGuestList"));
@@ -1550,7 +1557,7 @@ export default {
                 that.Description+=item.GuestName+" ";
             })
           }
-          
+
         }
     },
   mounted(){