Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/invoicesManager.vue

@@ -102,7 +102,7 @@
       <el-form class="iis_info_box clearfix" label-width="110px">
         <el-row>
           <el-col :span="4" :gutter="35">
-            <el-form-item label="团号">
+            <el-form-item label="团号" v-if="msg.InvoiceApplyType!=4">
               <el-input placeholder v-model="msg.TCNUM"></el-input>
             </el-form-item>
           </el-col>
@@ -134,9 +134,10 @@
           </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item label="发票类型">
-              <el-select v-model="msg.InvoiceApplyType" filterable >
+              <el-select v-model="msg.InvoiceApplyType" filterable @change="msg.InvoiceApplyType==4?msg.TCNUM='':''">
                 <el-option :value="1" label="跟团游"></el-option>
                 <el-option :value="2" label="签证"></el-option>
+                <el-option :value="4" label="单机票"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -169,7 +170,10 @@
     </div>
     <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
       <tr>
-        <th width="180">团号</th>
+        <th width="180">
+          <!-- 团号 -->
+          出行概述
+        </th>
         <th>订单号</th>
         <th>销售</th>
         <th>客户</th>

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -146,10 +146,10 @@
       </tr>
 
       <tr>
-        <td>团号</td>
-        <td>{{msg.TCID}}</td>
+        <td v-if="msg.TCID">团号</td>
+        <td v-if="msg.TCID">{{msg.TCID}}</td>
         <td>订单号</td>
-        <td>{{msg.OrderId}}</td>
+        <td :colspan="msg.TCID?0:3">{{msg.OrderId}}</td>
       </tr>
       <tr>
         <td rowspan="6">开具内容</td>
@@ -298,6 +298,7 @@
           title: false
         },
         saveMsg: [],
+        crmOrderObj:null
       };
     },
     methods: {
@@ -422,9 +423,24 @@
               this.$message.success(res.data.message);
               let path = this.msg.InvoiceApplyType == 1 ? 'groupTourOrder' : 'VisaProductEditOrder'
               setTimeout(() => {
+                if(!this.crmOrderObj){
                   this.$router.push({
                     name: path
                   });
+                }else{
+                  let data = [
+                    {
+                        path: this.crmOrderObj.crmPath,
+                    },
+                  ];
+                    let href = this.domainManager().crmRoutingUrl +
+                    "automaticLogin?token=" +
+                    this.getLocalStorage().token +
+                    "&data=" +
+                    JSON.stringify(data);
+                    window.open(href);
+                }
+
               }, 1000);
             } else {
               this.$message.error(res.data.message);
@@ -525,6 +541,13 @@
       if (this.$route.query.InvoiceApplyType) {
         this.msg.InvoiceApplyType = this.$route.query.InvoiceApplyType;
       }
+      if(this.$route.query.crmOrderObj){
+        let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+        this.crmOrderObj = crmOrderObj
+        this.msg.OrderId = crmOrderObj.OrderId;
+        this.msg.TCID = crmOrderObj.TCID;
+        this.msg.CustomerId = crmOrderObj.customerId;
+      }
       this.getAccountList();
       this.getOrderDetail();
       this.getCustomerInvoiceList();