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

src/components/Details.vue

@@ -59,7 +59,7 @@
         <analogIFrame :key="i" :type='item.type' v-model="item.history" :curIndex='i' :refer='item.refer' v-show="tabs.indexOf(currentTag)==i" :componentTemp='item.comp' v-for="(item,i) in tabs" v-if='item.comp' :path='item.path' :name='item.name'></analogIFrame>
 			</div>
       <div class="flexParent" v-if="openMode==0">
-        <a :href='blankUrl' ref='blankLink' target="_blank" style="display:none">1</a>
+        <a :href='blankUrl' id='blankLink' target="_blank" style="display:none">1</a>
 				<div class="resource-ttop" style="font-family:PingFangSC-Semibold" v-if="rootName!=''">
 					{{rootName}}<i class="iconfont icon-weibiaoti102"></i>{{parentName}}<i class="iconfont icon-weibiaoti102"></i><span class="active">{{currentName}}</span>
         </div> 
@@ -882,10 +882,10 @@ export default {
 
           next()
         }else if(that.openMode==0 && to.query.blank && to.query.blank=='y'){
-          
-          that.$refs.blankLink.href=`http://${window.location.host}/#${to.fullPath}`
+          let dom = document.querySelector("#blankLink")
+          dom.href=`http://${window.location.host}/#${to.fullPath}`
           //console.log(that.$refs.blankLink.click())
-          that.$refs.blankLink.click()
+          dom.click()
         }else{
           next()
         }

src/components/DomesticModule/OrderDetails.vue

@@ -58,7 +58,7 @@
             </div>
             <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
                 <tr>
-                    <th>订单号</th>
+                    <th>编号</th>
                     <th>人数</th>
                     <th>应收金额</th>
                     <th>成本</th>
@@ -72,7 +72,7 @@
                     <!-- <th>操作</th> -->
                 </tr>
                 <tr v-for="(item,index) in DataList.list" :key="index">
-                    <td>{{item.OrderID}}</td>
+                    <td>{{item.ID}}</td>
                     <td class="_hover">
                         <el-popover
                             placement="bottom"

src/components/DomesticModule/OrderToday.vue

@@ -5,7 +5,7 @@
     <div  class='flexOne page_OrderToday'>
         <div class='query-box'>
 			<ul>
-                <li>
+                <!-- <li>
                     <span>
                         <em>期数</em>
                         <el-date-picker
@@ -16,6 +16,18 @@
                             placeholder="选择日期">
                         </el-date-picker>
                     </span>
+                </li> -->
+              <li>
+                    <span>
+                        <em>制单日期</em>
+                        <el-date-picker  
+                            class="h34"
+                            v-model="transactionDate"
+                            @change="timeAdd()"
+                            type="daterange"
+                            value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                    </span>
                 </li>   
                 <li>
                    <span>
@@ -68,21 +80,21 @@
                 </div>
                 <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
                     <tr>
-                        <th>期数</th>
+                        <th>编号</th>
                         <th>人数</th>
                         <th>金额</th>
                         <th>成本</th>
                         <th>利润</th>
                         <th>客户名称</th>
                         <th>行程时间</th>
-                        <th>航空公司</th>
-                        <th>航班</th>
-                        <th>航段</th>
+                        <th>航空公司 — 航班 — 航段</th>
+                        <th></th>
+                        <th></th>
                         <th>操作人</th>
                         <th>操作</th>
                     </tr>
                     <tr v-for="(item,index) in DataList.list">
-                        <td>{{item.Term}}</td>
+                        <td>{{item.ID}}</td>
                         <td class="_hover">
                            <el-popover
                                 placement="bottom"
@@ -222,7 +234,7 @@
             </el-row>
             <el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">                    
                     <el-row>
-                        <el-col :span="6" :gutter="35" >  
+                        <!-- <el-col :span="6" :gutter="35" >  
                             <el-form-item label="期数" prop="TermDate">
                                 <el-date-picker
                                     v-model="addMsg.TermDate"
@@ -233,7 +245,7 @@
                                     placeholder="选择日期">
                                 </el-date-picker>
                             </el-form-item>
-                        </el-col>
+                        </el-col> -->
                         <el-col :span="6" :gutter="35" >  
                             <el-form-item label="出票日期" prop="OutTicketDate">
                                 <el-date-picker
@@ -386,10 +398,12 @@ export default {
                 FlightNo:'',
                 ClientName:'',
                 ParentId:0,
-                Term:new Date().Format("yyyy-MM-dd"),
+                Term:'',
+                sDate:'',
+                eDate:''
             },
             addMsg:{
-                TermDate:new Date().Format("yyyy-MM-dd"),
+                TermDate:'',
                 ID:0,
                 OutTicketDate:new Date().Format("yyyy-MM-dd"),
                 TravelTime:'',
@@ -449,6 +463,7 @@ export default {
                 airlineList:[],
                 AirportNameList:[],
             },
+            transactionDate:[],
             airlineList:[],
             AirportNameList:[],             
             DataList:[],
@@ -470,7 +485,7 @@ export default {
             dialogFormVisible:false,
             formLabelWidth: '120px',
             goPath:'',
-            TermDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'),
+            TermDate:'',
             rules: {//表单必填验证
                 ClientName: [
                     { required: true, message: '请填写客户名称', trigger: 'blur' }
@@ -489,14 +504,9 @@ export default {
                 ],
                 OutTicketDate: [
                     { required: true, message: '请输选出票日期', trigger: 'change' }
-                ],
-                TermDate: [
-                    { required: true, message: '请输选择期数', trigger: 'change' }
                 ]
             }
         }
-    },created(){
-        
     },mounted(){
         this.getList();
         this.getAirlineList();
@@ -515,6 +525,15 @@ export default {
                 if(pi) return
                 this.addMsg.FlightList.splice(i,1);
             }            
+        },
+         timeAdd(){  // 日期格式      
+            if(!this.transactionDate){
+                this.msg.sDate = '';
+                this.msg.eDate = '';
+                return 
+            }            
+            this.msg.sDate = this.transactionDate[0];
+            this.msg.eDate = this.transactionDate[1];
         },
         compare(property){
             return function(a,b){
@@ -542,7 +561,10 @@ export default {
             }
         },
         jiesuan(){
-            this.apipost('Domestic_Ticket_post_CheckBiLL',{TermDate:this.TermDate},r=>{
+            if(!this.TermDate){
+                return this.$message.error('请选择结算日期');
+            }
+            this.apipost('Domestic_Ticket_post_CheckBiLL',{TermDate:this.TermDate,sDate:this.msg.sDate,eDate:this.msg.eDate},r=>{
                 if(r.data.resultCode==1){
                     this.$router.push({name:this.goPath,query:{'Term':this.TermDate,'blank':'y'}});
                     this.getList();
@@ -663,7 +685,7 @@ export default {
         },
         initAddMsg(){  // 取消修改、新增
             this.addMsg ={
-                TermDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'),
+                TermDate:'',
                 ID:this.addMsg.ID,
                 OutTicketDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'),
                 TravelTime:'',
@@ -704,7 +726,7 @@ export default {
                     }
                 ],
                 Num:0,
-                Term:new Date().Format("yyyy-MM-dd"),
+                Term:'',
                 FlightList:[
                     {
                         ID:0,
@@ -731,9 +753,6 @@ export default {
             if(this.msg.AirlineId==''){
                 this.msg.AirlineId=0;
             }
-            if(this.msg.Term){
-                this.msg.Term = this.msg.Term.replace(/-/g,'');
-            }
             this.loading = true
             this.apipost('Domestic_Ticket_post_GetPageList',this.msg,res=>{
                  if(res.data.resultCode==1){
@@ -745,6 +764,7 @@ export default {
                         this.noData =true;   
                     }
                     this.DataList = data;
+                    console.log(this.DataList,'dataList');
                     this.loading = false;
                     if(!t){
                         this.msg.OrderID='';
@@ -776,7 +796,7 @@ export default {
         },
         initAddMsg(){//初始化添加、修改数据
             let newMsg = {
-                TermDate:new Date().Format("yyyy-MM-dd"),
+                TermDate:'',
                 OrderID:0,
                 OutTicketDate:new Date().Format("yyyy-MM-dd"),
                 TravelTime:'',
@@ -816,7 +836,7 @@ export default {
                         profit:''
                     }
                 ],
-                Term:new Date().Format("yyyy-MM-dd"),
+                Term:'',
                 FlightList:[
                     {
                         ID:0,

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -201,31 +201,31 @@
         <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
           <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
           <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;    width: 100%;">
-            <!--template v-if="BillType===2">
+          <template>
                 <tr >
                   <th height="34px">账户分类</th>
                   <th height="34px">付款方式</th>
                   <th height="34px">账户</th>
-                &lt;!&ndash; <th width="100px">账户余额</th> &ndash;&gt;
+                  <!-- <th width="100px">账户余额</th> -->
                   <th height="34px">金额</th>
                   <th height="34px" width="70">币种</th>
                   <th height="34px" width="50px">汇率</th>
-                &lt;!&ndash; <th>手续费</th> &ndash;&gt;
+                  <!-- <th>手续费</th> -->
                   <th height="34px" width="100px">总金额</th>
-                &lt;!&ndash; <th>操作</th> &ndash;&gt;
+                  <!-- <th>操作</th> -->
                 </tr>
                 <template v-for="(item,index) in payMsgList">
                   <tr v-if="!item.show" @click="payMsgList[index].show=true">
                     <td height="34px">{{item.AccName}}</td>
                     <td height="34px">{{item.Name}}</td>
                     <td height="34px">{{item.Account}}</td>
-                  &lt;!&ndash; <td>{{item.balance}}</td> &ndash;&gt;
+                    <!-- <td>{{item.balance}}</td> -->
                     <td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>
                     <td height="34px">{{item.CurrenName}}</td>
                     <td height="34px">{{item.Rate}}</td>
-                  &lt;!&ndash; <td>{{item.Fee}}</td> &ndash;&gt;
+                    <!-- <td>{{item.Fee}}</td> -->
                     <td height="34px">{{moneyFormat(item.allMoney)}}</td>
-                  &lt;!&ndash; <td></td> &ndash;&gt;
+                    <!-- <td></td> -->
                   </tr>
                   <tr v-else class="_show_class">
                     <td>
@@ -306,7 +306,7 @@
                   </td>
                   <td>{{moneyFormat(payMsg.allMoney)}}</td>
                 </tr>
-            </template>-->
+              </template>
               <tr>
                   <td height="34px">总金额</td>
                   <td height="34px" colspan="7">

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -158,7 +158,7 @@
         <el-dialog custom-class='w750 height="34px"' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
           <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
           <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;    width: 100%;">
-              <template v-if="BillType===2">
+              <template>
                 <tr >
                   <th height="34px">账户分类</th>
                   <th height="34px">付款方式</th>

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -156,7 +156,7 @@
       <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
         <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
         <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;">
-          <template v-if="BillType == 1">
+          <template>
             <tr >
               <th height="34px">账户分类</th>
               <th height="34px">付款方式</th>

src/components/confirmationOrderDownLoad.vue

@@ -9,7 +9,7 @@
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
     <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" />
-    <input type="button" style="width: auto !important;display:none" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
+    <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
     <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
     <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
     <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
@@ -942,6 +942,8 @@
           isShowVisa:this.vshowH?1:0,
           //isPc是否PC下载
           isPc: isPc,
+          //模板参数
+          templateId:5,
         };
         this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
            this.pdfLoading = false

src/components/dmc/manager/dmcTotalTable.vue

@@ -145,9 +145,6 @@
               </td>
               <td>
                 <div class="fz16 fbold">
-                  <!--{{item.ResultReport.MakeInvoice=='0'?"x":"O"}}
-						<span style="color: #4BCA81;">√</span>-->
-                  <!--√：X :o 含义定义-->
                   <span style="color: #4BCA81;" v-if="item.ResultReport.MakeInvoice==1">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.MakeInvoice=='-1'?"x":"O"}}</span>
                 </div>
@@ -233,7 +230,7 @@
                 <div class="link">
                   <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
                   <div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
-                  <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
+                  <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
                 </div>
               </td>
             </tr>

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -14,6 +14,11 @@
           <div>{{item.ckTitle}}</div>
         </div>
       </div>
+      <div>
+        <el-radio-group v-model="FeatureData.TemplateId">
+          <el-radio-button v-for="item in templateColorArray" :label="item.text" :key="item.id" :value="item.id"></el-radio-button>
+        </el-radio-group>
+      </div>
       <div>注：幻灯片（图片至少为两张，图片尺寸应该控制在960*500，如果超出系统将自动裁剪显示）</div>
       <div class="ScraList">九宫格（请尽量保持图片高清，系统将根据你的图片数量自动缩放图片大小，最多9张图片）</div>
       <div class="TFContent">
@@ -248,6 +253,23 @@
             TypeState: 5
           }
         ], //tab数组
+        templateColorArray:[
+          {
+            id: 1,
+            color: 'yellow',
+            text: '黄色'
+          },
+          {
+            id: 2,
+            color: 'pink',
+            text: '粉色'
+          },
+          {
+            id: 3,
+            color: 'blue',
+            text: '蓝色'
+          },
+        ],
         travelsList: [],
         del_show: true,
         //折叠展开

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -139,6 +139,7 @@
           Subtitle: "",
           LineName: "",
           DayList: [],
+          TemplateId: 1,
           IsSave: false //是否保存
         },
         //线路行程
@@ -584,6 +585,7 @@
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;
                   this.FeatureData.FeatureType = tempData.Feature.FeatureType;
                   this.FeatureData.FeatureImg = tempData.Feature.FeatureImg;
+                  this.FeatureData.TemplateId = tempData.Feature.TemplateId;
                   this.FeatureData.FeatureContent = tempData.Feature.FeatureContent;
                   //图片列表
                   this.FeatureData.fileList = tempData.Feature.FeatureImgList;

src/router/config.js

@@ -1011,6 +1011,13 @@ export default {
                 title: '机票列表'
               },
             }, {
+              path: '/individualTicket',  //散客机票
+              name: 'individualTicket',
+              component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
+              meta: {
+                title: '散客机票'
+              },
+            },{
               path: '/PassengerList', //旅客名单
               name: 'PassengerList',
               component: resolve => require(['@/components/Ticketing/PassengerList'], resolve),