no message

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -123,12 +123,10 @@
         if(this.active==1){
           // 手配费 收款单参数Handmsg
           if(this.$route.query.Handmsg){
-            console.log('-----', '11111111')
             this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
           }
           // 财务收据
           else if(this.$route.query.czmsg){
-            console.log('-----', '222222')
             let Handmsg=this.$route.query.czmsg;
             this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
 
@@ -178,12 +176,46 @@
           // 付款单参数czmsg
           // 领队报账  预付款冲抵  返款制单
           if(this.$route.query.czmsg){
-            console.log('-----', '')
             this.$router.push({ name: path,query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
 
           }else{
-            console.log('22222222222-----', '')
-            this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
+            
+            // crm自动登陆传过来的参数
+            if(this.crmOrderObj){
+              this.$router.push({ 
+                name: path,
+                query:{
+                  "id":id,
+                  "Name":Name,
+                  "Type":Type,
+                  "crmOrderObj":JSON.stringify(this.crmOrderObj),
+                  "orderObj":this.orderObj,
+                  'path':this.$route.query.path,
+                  'IsUploadPic':IsUploadPic,
+                  'Cmd':this.$route.query.Cmd,
+                  'companyID':this.$route.query.companyID,
+                  blank:'y',
+                  tab:'新增付款单'
+                }
+              })
+            }else{
+              this.$router.push({ 
+                name: path,
+                query:{
+                  "id":id,
+                  "Name":Name,
+                  "Type":Type,
+                  "orderObj":this.orderObj,
+                  'path':this.$route.query.path,
+                  'IsUploadPic':IsUploadPic,
+                  'Cmd':this.$route.query.Cmd,
+                  'companyID':this.$route.query.companyID,
+                  blank:'y',
+                  tab:'新增付款单'
+                }
+              })
+            }
+            
           }
         }else if(this.active==4){
           this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})

src/components/FinancialModule/addFinancialDocuments.vue

@@ -693,6 +693,7 @@ export default {
             czmsg:{},
             czmsgState:false,
             maxmoneyTips:false,
+            crmOrderObj:{}
         }
     },
     methods:{
@@ -918,6 +919,13 @@ export default {
               this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2?this.orderObj.ReFinanceId2:0;
               this.msg.ECOrderList = this.orderObj.ECOrderList?this.orderObj.ECOrderList:[];
             }
+            // crm自动登陆传过来的参数
+            if(this.crmOrderObj){
+                this.msg.OtherType = this.crmOrderObj.OtherType
+                this.msg.ReFinanceId = this.crmOrderObj.ReFinanceId
+                this.msg.ReFinanceId2 = this.crmOrderObj.ReFinanceId2
+                this.msg.GuestId = this.crmOrderObj.GuestId
+            }
             // 2019-12-3 18:29:31 新增费用类型判断
             let riqi = false
             this.msg.detailList.forEach(x=>{
@@ -1619,7 +1627,12 @@ export default {
     },
     created(){
         var that=this;
-        this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
+        // crm自动登陆传过来的参数
+        if(this.$route.query.crmOrderObj){
+            this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj);
+        }else{
+            this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
+        }
         this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
         let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
         if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1316,12 +1316,6 @@
           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;
-        });
-        this.msg.OrderTradeWay = this.tradeWay;
-        this.msg.PlatformAccountId = this.platformAccount;
-        this.loading = true;
         // crm自动登陆传过来的参数
         if(this.crmOrderObj){
           this.msg.OtherType = this.crmOrderObj.OtherType
@@ -1329,6 +1323,12 @@
           this.msg.ReFinanceId2 = this.crmOrderObj.ReFinanceId2
           this.msg.GuestId = this.crmOrderObj.GuestId
         }
+        this.msg.detailList.forEach(x => {
+          delete x.rate;
+        });
+        this.msg.OrderTradeWay = this.tradeWay;
+        this.msg.PlatformAccountId = this.platformAccount;
+        this.loading = true;
         this.apipost('Financial_post_Set', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {