修改旅客名单跳转财务单据

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1355,8 +1355,6 @@ export default {
                 });
             }
             if(guojiSessions.shuijinArr.length>0){
-                detailList.CostTypeId = 80,
-                detailList.Number=guojiSessions.shuijinArr.length
                 this.msg.detailList.push({
                     ID:0,
                     UnitPrice:'',
@@ -1374,6 +1372,26 @@ export default {
                     show:false,
                 });
             }
+            if(this.orderObj!=null&&this.orderObj.OrderSource===4&&this.isFrompassenger){
+                let guojiSessions =  JSON.parse(window.sessionStorage.getItem("guoji"));
+                let guoji='',guonei='',guojizhongduan='',shuijin='',shengcang='';
+                guojiSessions.guojiArr.forEach(x=>{
+                    guoji+=x+' '
+                })
+                guojiSessions.guoneiArr.forEach(x=>{
+                    guonei+=x+' '
+                })
+                guojiSessions.gjzdArr.forEach(x=>{
+                    guojizhongduan+=x+' '
+                })
+                guojiSessions.shuijinArr.forEach(x=>{
+                    shuijin+=x+' '
+                })
+                guojiSessions.shengcangArr.forEach(x=>{
+                    shengcang+=x+' '
+                })
+                this.Description='国际机票:'+guoji+' '+'国内航段:'+guonei+' '+'国际中断:'+guojizhongduan+' '+'税金:'+shuijin+' '+'升舱:'+shengcang
+            }
         }
     },created(){
         var that=this;
@@ -1389,26 +1407,6 @@ export default {
               that.Description+=item.GuestName+" ";
           })
         }
-        if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger){
-            let guojiSessions =  JSON.parse(window.sessionStorage.getItem("guoji"));
-            let guoji='',guonei='',guojizhongduan='',shuijin='',shengcang='';
-            guojiSessions.guojiArr.forEach(x=>{
-                guoji+=x+' '
-            })
-            guojiSessions.guoneiArr.forEach(x=>{
-                guonei+=x+' '
-            })
-            guojiSessions.gjzdArr.forEach(x=>{
-                guojizhongduan+=x+' '
-            })
-            guojiSessions.shuijinArr.forEach(x=>{
-                shuijin+=x+' '
-            })
-            guojiSessions.shengcangArr.forEach(x=>{
-                shengcang+=x+' '
-            })
-            that.Description='国际机票:'+guoji+' '+'国内航段:'+guonei+' '+'国际中断:'+guojizhongduan+' '+'税金:'+shuijin+' '+'升舱:'+shengcang
-        }
     },mounted(){
         let userInfo = this.getLocalStorage();
         this.department = userInfo.DepartName;

src/components/Ticketing/PassengerList.vue

@@ -124,11 +124,11 @@
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
-        <th>国际机票</th>
-        <th>国内机票</th>
-        <th>国际中断</th>
-        <th>税金</th>
-        <th>升舱</th>
+        <th v-if="isShowGuoji">国际机票 <input type="checkbox" @change="checkAllbox(checkdGuoji,'guoji')" v-model="checkdGuoji"/></th>
+        <th v-if="isShowGuoji">国内机票 <input type="checkbox" @change="checkAllbox(checkedGuonei,'guonei')" v-model="checkedGuonei"/></th>
+        <th v-if="isShowGuoji">国际中断 <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')" v-model="checkedGJzd"/></th>
+        <th v-if="isShowGuoji">税金 <input type="checkbox" @change="checkAllbox(checkedshuijin,'shuijin')" v-model="checkedshuijin"/></th>
+        <th v-if="isShowGuoji">升舱 <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')" v-model="checkedsc"/></th>
         <th>旅客姓名</th>
         <th>身份证</th>
         <th>英文姓</th>
@@ -141,19 +141,19 @@
         <th>客人联系方式</th>
       </tr>
       <tr v-for="(item,index) in QueryMsg.dataList">
-        <td>
+        <td v-if="isShowGuoji">
             <input v-model="item.guoji" type="checkbox"/>
         </td>
-        <td>
+        <td v-if="isShowGuoji">
             <input v-model="item.guonei" type="checkbox"/>
         </td>
-        <td>
+        <td v-if="isShowGuoji">
             <input v-model="item.gjzd" type="checkbox"/>
         </td>
-        <td>
+        <td v-if="isShowGuoji">
             <input v-model="item.shuijin" type="checkbox"/>
         </td>
-        <td>
+        <td v-if="isShowGuoji">
             <input v-model="item.shengcang" type="checkbox"/>
         </td>
         <td>{{item.GuestName}}</td>
@@ -289,6 +289,11 @@
           shuijinArr:[],
           shengcangArr:[]
         },
+        checkdGuoji:false,
+        checkedGuonei:false,
+        checkedGJzd:false,
+        checkedshuijin:false,
+        checkedsc:false,
       };
     },
     methods: {
@@ -476,14 +481,13 @@
             this.jipiaoObj.shengcangArr.push(x.GuestName);
           }
         })
-        console.log(this.jipiaoObj,'jipiaoObj');
         sessionStorage.setItem("guoji",JSON.stringify(this.jipiaoObj));
 
         let orderObj = {
           OrderID: 0,
-          OrderSource: 10,
+          OrderSource: 4,
           Obj: {},
-          SourceID: 0,
+          SourceID: this.$route.query.SourceID,
           TCIDList: [],
           isFromPassenger:true,
         }
@@ -491,12 +495,23 @@
           name: 'ChoiceAddFinancialDocuments',
           query:{
             "Type": 2,
-            "companyID": '',
             "path": "",
             'blank': 'y',
             'orderObj': JSON.stringify(orderObj)
           }
         });
+      },
+      //设置全选
+      checkAllbox(x,y){
+        if(x){
+          this.QueryMsg.dataList.forEach(x=>{
+              x[y]=true
+          })
+        }else{
+          this.QueryMsg.dataList.forEach(x=>{
+              x[y]=false
+          })
+        }
       }
     },
     mounted() {

src/components/Ticketing/TicketManager.vue

@@ -1529,7 +1529,7 @@
                         </span>
                       </div>
                     </li>
-                    <li v-else>
+                    <li v-else-if="item.FinalPayment!=''">
                       <div @click="goCustomList('PassengerList',item,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
                         <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
                           <span>尾</span>
@@ -2520,9 +2520,11 @@
         this.$router.push({
           name: path,
           query: {
-            "id": obj,
             blank: 'y',
             isFromTk:true,
+            SourceID: obj.ID,
+            TCIDList: obj.TCIDList,
+            companyIDList: obj.OutBranchIdList,
             tab: title
           }
         })