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

src/assets/common/lang/H/h-invoicesManager.js

 export const obj = {
-  qbfapiao: '全部发票'
+  qbfapiao: '全部发票',
+  wfqide: '我发起的',
+  dwspide: '待我审批的',
+  wspide: '我审批的',
+  wzfeide: '我作废的',
+  bbhuide: '被驳回的',
+  csgwode: '抄送给我的',
+  shenpi: '审批',
+  tonggei: '通过',
+  jujue: '拒绝',
+  bohui: '驳回',
+  qrenhan: '确认函',
+  gongji: '共计',
+  tdqdi: '条，当前第',
+  tiao: '条。',
+  shwanbi: '审核完毕',
+  yi: '已',
+  fpkjsqdan: '发票开具申请单',
+  bumen: '部门',
+  sqren: '申请人',
+  kjjine: '开具金额',
+  dzjine: '到账金额',
+  dzyinhang: '到账银行',
+  sqriqi: '申请日期',
+  dzriqi: '到账日期',
+  tuanhao: '团号',
+  ddanhao: '订单号',
+  cwdanju: '财务单据',
+  zanwu: '暂无',
+  kjneirong: '开具内容',
+  shuihao: '税号',
+  khuhang: '开户行',
+  shuihao2: '税号：',
+  qsrshuihao: '请输入税号',
+  sfxianshi: '是否显示',
+  yjshzqbyjxqtcz: '一键审核中请不要进行其他操作。',
 }
 export default obj;
\ No newline at end of file

src/assets/common/lang/zh.js

@@ -1745,4 +1745,4 @@ export const visaT = {
   v_Othervisas:'其他'
 }
 import invoicesManager from './H/h-invoicesManager'
-export const invoices = invoicesManager
+export const ios = invoicesManager
\ No newline at end of file

src/assets/css/cssReset.css

@@ -48,6 +48,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
 .colorccc{color: #ccc!important;}
 .colorE95252{color: #E95252!important;}
 .cursorpointer{cursor: pointer;}
+.text-decoration{text-decoration: underline;}
 .fbold{font-weight: bold!important}
 .fwnormal{font-weight: normal!important}
 .fnormal{font-style: normal;}

src/components/Details.vue

@@ -63,7 +63,7 @@
 				<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> 
-        <div class="frame-box">
+        <div class="frame-box" ref="frameBox" name="frameBox">
           <router-view></router-view>
         </div>
       </div>

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -32,7 +32,7 @@
       <li :class="active==3?'_active':''" v-else>挂账单</li>
     </ul>
     <ul class="_conten">
-      <li v-for="(item,index) in GetList">
+      <li v-for="(item,index) in GetList" v-if="item.IsShow === 1">
         <div class="_left">
           <span class="_Icon">{{item.Name.substring(0,1)}}</span>
           <div>
@@ -125,7 +125,7 @@
         let newList = [];
         if (this.templateID) {
           this.templateID.forEach(x=>{
-            this.GetList.forEach(y=>{
+            this.payList.forEach(y=>{
               if(x === y.Id) {
                 newList.push(y)
               }
@@ -133,7 +133,6 @@
           })
           this.GetList = newList
         }
-        
       },
       Financial_post_GetList(){ //获取
         this.apipost('Financial_post_GetList',{},res=>{
@@ -174,7 +173,7 @@
       this.showTab = this.$route.query.Type?this.$route.query.Type:0;
       if(this.showTab==1){
         this.GetList = this.collectList;
-      } else if(this.showTab==1){
+      } else if(this.showTab==3){
         this.GetList = this.GZList;
       }else{
         this.GetList = this.payList;

src/components/FinancialModule/FinancialDocuments.vue

@@ -112,12 +112,12 @@
     <div class="page_fnDm" @keyup.enter="resetPageIndex(),getPageList()">
         <ul class="_nav clearfix">
             <!-- <li :class="active==5?'_active':''" @click="active=5,msg.Conditon=5,getPageList()">全部</li> -->
-            <li :class="active==1?'_active':''" @click="active=1, msg.Conditon=1, BOSSBtn = false, getPageList()">我发起的</li>
-            <li :class="active==3?'_active':''" @click="active=3, msg.Conditon=3, getPageList()">待我审批的</li>
-            <li :class="active==2?'_active':''" @click="active=2, msg.Conditon=2, BOSSBtn = false, getPageList()" >我审批的</li>
-            <li :class="active==6?'_active':''" @click="active=6, msg.Conditon=6, BOSSBtn = false, getPageList()">我作废的</li>
-            <li :class="active==7?'_active':''" @click="active=7, msg.Conditon=7, BOSSBtn = false, getPageList()">被驳回的</li>
-            <li :class="active==4?'_active':''" @click="active=4, msg.Conditon=4, BOSSBtn = false, getPageList()">抄送给我的</li>
+            <li :class="active==1?'_active':''" @click="active=1, msg.Conditon=1, BOSSBtn = false, getPageList()">{{$t('ios.wfqide')}}</li>
+            <li :class="active==3?'_active':''" @click="active=3, msg.Conditon=3, getPageList()">{{$t('ios.dwspide')}}</li>
+            <li :class="active==2?'_active':''" @click="active=2, msg.Conditon=2, BOSSBtn = false, getPageList()" >{{$t('ios.wspide')}}</li>
+            <li :class="active==6?'_active':''" @click="active=6, msg.Conditon=6, BOSSBtn = false, getPageList()">{{$t('ios.wzfeide')}}</li>
+            <li :class="active==7?'_active':''" @click="active=7, msg.Conditon=7, BOSSBtn = false, getPageList()">{{$t('ios.bbhuide')}}</li>
+            <li :class="active==4?'_active':''" @click="active=4, msg.Conditon=4, BOSSBtn = false, getPageList()">{{$t('ios.csgwode')}}</li>
         </ul>
         <div class="query-box">
             <ul class="clearfix">
@@ -384,7 +384,7 @@
                     <button class="normalBtn"  @click="method5()">{{$t('visa.v_daochu')}}</button>
                     <button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
                     <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1)" v-if="msg.Conditon === 3 && !userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
-                    <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick">审批</button>
+                    <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick">{{$t('ios.shenpi')}}</button>
                 </li>
             </ul>
         </div>
@@ -497,7 +497,7 @@
                         </template>
                         <template v-if='item.Type===4'>
                         <span class="_color_gar">{{$t('fnc.no')}}</span> 
-                        </template>                        
+                        </template>
                     </td>
                     <td valign="middle">
                         <img class="_head_img" :src="item.EmPhoto" alt="">
@@ -634,8 +634,8 @@
                 </el-form>
                 <el-form>
                     <div style="    text-align: center;">
-                        <el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
-                        <el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
+                        <el-radio v-model="AuditOrRefundMsg.Status" label="5">{{$t('ios.tonggei')}}</el-radio>
+                        <el-radio v-model="AuditOrRefundMsg.Status" label="3">{{$t('ios.bohui')}}</el-radio>
                     </div>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
@@ -644,8 +644,8 @@
                 </div>
             </template>
             <template v-else>
-                <p class="boss_btn">共计 {{checkList.length}} 条，当前第 <span>{{bossLen}}</span> 条。</p>
-                <p class="boss_btn_tips">一键审核中请不要进行其他操作。</p>
+                <p class="boss_btn">{{$t('ios.gongji')}} {{checkList.length}} {{$t('ios.tdqdi')}} <span>{{bossLen}}</span> {{$t('ios.tiao')}}</p>
+                <p class="boss_btn_tips">{{$t('ios.yjshzqbyjxqtcz')}}</p>
             </template>
         </el-dialog>
     </div>
@@ -850,7 +850,7 @@ export default {
                 this.BOSSDialogText = false;
                 this.BOSSDialog = false;
                 this.checkList = [];
-                this.$message.success('审核完毕');
+                this.$message.success(this.$t('ios.shwanbi'));
                 this.loading = false;
                 this.getPageList(1)
             }
@@ -1018,7 +1018,7 @@ export default {
             }).catch(() => {
                 this.$message({
                     type: 'info',
-                    message: '已' + this.$t('pub.cancelBtn')
+                    message: this.$t('ios.yi') + this.$t('pub.cancelBtn')
                 });
             });
         },

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -351,6 +351,7 @@
                             <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
                             <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
                             <td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
+                            <td v-if="GetDetail.TemplateId === 42" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
                         </tr>
                     </table>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
@@ -397,36 +398,6 @@
                     <span slot="reference" style="text-decoration: underline;cursor:  pointer;" @click="Financial_post_GetFinancLogList()">单据操作日志</span>
                     </el-popover>
                   </div>
-                        <!-- <p class="_TCIDAndTCNUMList">
-                            <span>
-                                团队编号：
-                            </span>
-                            <template v-if="GetDetail.TCIDAndTCNUMList.length>0">
-                                <p class="_TCIDAndTCNUMList_item">
-                                    <span v-for="(i,ix) in GetDetail.TCIDAndTCNUMList" class="_jump_page _font_bold" @click="jumpPage('productQuery',i.TCID,1)">
-                                        {{i.TCNUM}}（{{i.TCID}}）
-                                        <span v-if="ix!=GetDetail.TCIDAndTCNUMList.length-1"></br></span>
-                                    </span>
-                                </p>
-                            </template>
-                            <template v-else>
-                                <span>无</span>
-                            </template>
-                        </p>
-                        <p v-if="GetDetail.TCIDAndTCNUMList.length==1" @click="jumpPage('TeamBalancePayment',GetDetail.TCIDAndTCNUMList,5)" class="_jump_page _font_bold">团队收支</p>
-                        <p v-if="GetDetail.TCIDAndTCNUMList.length>1" @click="jumpPage('TeamBalancePayment',GetDetail.TCIDAndTCNUMList,6)" class="_jump_page _font_bold">团队收支</p>
-                        <p v-if="OrderSource==9&&GetDetail.SourceID>0">国内票务：<span class="_jump_page _font_bold" @click="jumpPage('SettlementOrder',GetDetail,2)">{{GetDetail.SourceID}}</span></p>
-                        <p v-if="OrderSource==10&&GetDetail.SourceID>0">签证：<span class="_jump_page _font_bold" @click="jumpPage('VisaProductCopy',GetDetail,3)">{{GetDetail.SourceID}}</span></p>
-                        <p v-if="OrderSource==4&&GetDetail.SourceID>0" class="_TCIDAndTCNUMList">
-                            <span>机票收支：</span>
-                            <span class="_TCIDAndTCNUMList_item">
-                                <template v-for="(i,ix) in GetDetail.TCIDAndTCNUMList">
-                                    <span  class="_jump_page _font_bold" @click="jumpPage('FinancialOrder',GetDetail,4)">{{i.TCNUM}}（{{GetDetail.SourceID}}）</span>
-                                    <span v-if="ix!=GetDetail.TCIDAndTCNUMList.length-1"></br></span>
-                                </template>
-                            </span>
-                        </p>
-                        <p class="_jump_page _font_bold" @click="jumpPage('RegistrationList',GetDetail,7)">报名清单</p> -->
                     </div>
                 </div>
                 <my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon"  :color="colorSon"></my-HB-Bill>
@@ -955,6 +926,12 @@ export default {
                 window.open(routeData.href, "_blank");
             }
         },
+        jumpPlanPage(path, id){
+            this.$router.push({
+                name: path,
+                query: { id: id, isUpdate: false, blank: 'y'}
+            })
+        },
         jumpPage(path,id,type){
             if(type==1){
                 // let routeData = this.$router.resolve({

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1021,8 +1021,14 @@ export default {
                 if(x.ID == i){
                     if (t>=0) {
                         this.msg.detailList[t].CostTypeName = x.Name;
+                        if (x.ID === 56) {
+                            this.msg.detailList[t].Remark = `地接费领取自动生成：${this.orderObj.TCNUMS}`;
+                        }
                     }else{
                         this.detailList.CostTypeName = x.Name;
+                        if (x.ID === 56) {
+                            this.detailList.Remark = `地接费领取自动生成：${this.orderObj.TCNUMS}`;
+                        }
                     }
                 }
             })

src/components/FinancialModule/addFinancialProcess.vue

@@ -326,6 +326,10 @@
 					<el-radio v-model="addMsg.IsUploadPic" :label="0">{{$t('fnc.buqiyong')}}</el-radio>
 					<el-radio v-model="addMsg.IsUploadPic" :label="1">{{$t('fnc.qiyong')}}</el-radio>
 				</el-form-item>
+				<el-form-item :label="$t('ios.sfxianshi')">
+					<el-radio v-model="addMsg.IsShow" :label="1">{{$t('pub.yes')}}</el-radio>
+					<el-radio v-model="addMsg.IsShow" :label="2">{{$t('pub.no')}}</el-radio>
+				</el-form-item>
 				<el-form-item :label="$t('fnc.syfeiyong')" v-if="addMsg.TemplateType==8" class="_treeselect">
 					<!-- <el-select  filterable multiple v-model='CostIdS' class="w200" @change="disabledOption2">
 						<el-option label='通用' value='0' key='0'></el-option>
@@ -517,6 +521,7 @@ export default {
 					AuditList:[],
 					AuditUserList:[],
 				},
+				IsShow: 1,
 			},
 			AuditUserList:{
 				EmName:'',
@@ -713,6 +718,7 @@ export default {
 					this.addMsg.DescribeInfo = data.DescribeInfo;
 					this.addMsg.TempLateClass = data.TempLateClass;
 					this.addMsg.IsUploadPic = data.IsUploadPic;
+					this.addMsg.IsShow = data.IsShow;
 					if (data.list && data.list[0] !== -1) {
             this.accListMsg = data.list;
           }

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -79,7 +79,7 @@
         </td>
       </tr>
       <tr>
-        <td>平台ID</td>
+        <td>订单号</td>
         <td colspan="3" class="w600 text-align-left">
           {{msg.OrderId}}
         </td>

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -46,7 +46,7 @@
 </style>
 <template>
   <div class="page_iisMgdetail" v-loading="loading">
-    <p>发票开具申请单</p>
+    <p>{{$t('ios.fpkjsqdan')}}</p>
     <table
       data-v-ca5157c2
       border="1"
@@ -54,106 +54,106 @@
       style="border-collapse: collapse;"
     >
       <tr>
-        <td width="130">部门</td>
+        <td width="130">{{$t('ios.bumen')}}</td>
         <td>{{detail.deptName}}</td>
-        <td width="130">申请人</td>
+        <td width="130">{{$t('ios.sqren')}}</td>
         <td>{{detail.CreateBy}}</td>
       </tr>
       <tr>
-        <td>开具金额</td>
+        <td>{{$t('ios.kjjine')}}</td>
         <td>
           {{detail.ApplyMoney}}
         </td>
-        <td>到账金额</td>
+        <td>{{$t('ios.dzjine')}}</td>
         <td @click="goSaleFinacial" class="cursorpointer">
           {{orderList.moneyStr}}
         </td>
       </tr>
       <tr class="page_iisMgadd_bank">
-        <td>到账银行</td>
+        <td>{{$t('ios.dzyinhang')}}</td>
         <td colspan="3" class="_bank_td">
           {{orderList. AccountNumber}}
         </td>
       </tr>
       <tr>
-        <td>申请日期</td>
+        <td>{{$t('ios.sqriqi')}}</td>
         <td>
           {{detail.CreateDateStr}}
         </td>
-        <td>到账日期</td>
+        <td>{{$t('ios.dzriqi')}}</td>
         <td>
           {{orderList.TradeDateStr}}
         </td>
       </tr>
       <tr>
-        <td>团号</td>
+        <td>{{$t('ios.tuanhao')}}</td>
         <td colspan="3" class="w600 text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
           {{detail.TCNUM}}({{detail.TCID}})
         </td>
       </tr>
       <tr>
-        <td>订单号</td>
+        <td>{{$t('ios.ddanhao')}}</td>
         <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
           <span @click="goUrlO(detail.OrderId)">{{detail.OrderId}}</span> 
         </td>
       </tr>
       <tr>
-        <td>财务单据</td>
+        <td>{{$t('ios.cwdanju')}}</td>
         <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
           <template v-for="item in orderList.FrIDs">
             <span @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)">{{item}}</span> 
           </template>
-          <span v-if="orderList.FrIDs && orderList.FrIDs.length<1">暂无</span>
+          <span v-if="orderList.FrIDs && orderList.FrIDs.length<1">{{$t('ios.zanwu')}}</span>
         </td>
       </tr>
       <tr>
-        <td rowspan="6">开具内容</td>
-        <td>公司名称</td>
+        <td rowspan="6">{{$t('ios.kjneirong')}}</td>
+        <td>{{$t('admin.admin_company')}}</td>
         <td colspan="2" class="font-weight">
           {{detail.CompanyName}}
         </td>
       </tr>
       <tr>
-        <td>税号</td>
+        <td>{{$t('ios.shuihao')}}</td>
         <td colspan="2" class="font-weight">
           {{detail.DutyParagraph}}
         </td>
       </tr>
       <tr>
-        <td>地址</td>
+        <td>{{$t('admin.admin_address')}}</td>
         <td colspan="2">
           {{detail.Address}}
         </td>
       </tr>
       <tr>
-        <td>电话</td>
+        <td>{{$t('hotel.table_tel')}}</td>
         <td colspan="2">
           {{detail.CompanyPhone}}
         </td>
       </tr>
       <tr>
-        <td>开户行</td>
+        <td>{{$t('ios.khuhang')}}</td>
         <td colspan="2">
           {{detail.OpeningBank}}
         </td>
       </tr>
       <tr>
-        <td>账号</td>
+        <td>{{$t('system.table_acc')}}</td>
         <td colspan="2">
           {{detail.BankNo}}
         </td>
       </tr>
       <tr>
-        <td>备注</td>
+        <td>{{$t('hotel.hotel_remark')}}</td>
         <td colspan="3">
           {{detail.Remarks}}
         </td>
       </tr>
     </table>
-    <el-dialog title="提示信息" width="400px" :visible.sync="dialogFormVisible2" center :before-close="closeChangeMachie" >
+    <el-dialog :title="$t('pub.hintMsg')" width="400px" :visible.sync="dialogFormVisible2" center :before-close="closeChangeMachie" >
       <el-form label-width="110px">
-        <el-form-item label="税号：">
-          <el-input class="" v-model="msg.InvoiceNo" placeholder="请输入税号"></el-input>
+        <el-form-item :label="$t('ios.shuihao2')">
+          <el-input class="" v-model="msg.InvoiceNo" :placeholder="$t('ios.qsrshuihao')"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" >
@@ -163,12 +163,12 @@
     </el-dialog>
     <div style="padding:20px 0">
       <el-row v-if="detail.InvoiceNo">
-        税号：{{detail.InvoiceNo}}
+        {{$t('ios.shuihao2')}}{{detail.InvoiceNo}}
       </el-row>
     </div>
     <div class="iis_save" v-if="!noDetail && detail.InvoiceApplyState===1">
-      <button class="normalBtn" @click="dialogFormVisible2 = true">通过</button>
-      <button class="hollowFixedBtn" @click="dialogFormVisible = true">拒绝</button>
+      <button class="normalBtn" @click="dialogFormVisible2 = true">{{$t('ios.tonggei')}}</button>
+      <button class="hollowFixedBtn" @click="dialogFormVisible = true">{{$t('ios.jujue')}}</button>
     </div>
     <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && EmployeeId === detail.CreateBy && EmployeeId === 1">
       <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>

src/components/Hotel/roomReservations.vue

@@ -28,7 +28,7 @@
         </li>
       </ul>
     </div>
-    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
+    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'>
         <tr>
           <th width="w100">序号</th>
@@ -208,6 +208,7 @@
         thLengthTitle: [],
         list: [],
         colspanTotal: 0,
+        boxHeight: 0,
       }
     },
     methods: {
@@ -306,6 +307,7 @@
                 y.colNum = 9 + y.CommonReport.newHotel.length;
               })
             })
+            this.$forceUpdate()
           } else {
             this.loading = false
             this.$message.error(res.data.message)
@@ -333,6 +335,11 @@
       } else {
         this.msg.StartDate = nowDate;
       }
+      let width = window.innerWidth - 50
+      let height = window.innerHeight - 65 - 164
+      console.log(height)
+      this.boxHeight = height;
+      this.offsetwidth = width
       this.getList()
       this.getLineTeamList()
     },

src/components/Hotel/roomReservationsDetails.vue

@@ -4,11 +4,10 @@
       <ul>
         <li>
           <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
         </li>
       </ul>
     </div>
-    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
+    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}" class="ownScrollbarStyle" ref="ownScrollbarStyle">
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
         <tr>
           <th class="fz14" colspan="8">团队信息</th>
@@ -40,7 +39,7 @@
           <th width="80">操作</th>
         </tr>
         <template v-for="(item,index) in list">
-          <tr v-for="(subItem,subIndex) in item.HotelOrderList">
+          <tr v-for="(subItem,subIndex) in item.HotelOrderList" v-loading="loading">
             <td :rowspan="item.HotelOrderList.length" v-if="subIndex==0">
               <div class="w100">{{item.UseTimeStr}}</div>
             </td>
@@ -97,6 +96,12 @@
                     <span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
                   </el-option>
                 </el-select>
+                <p style="padding-top: 5px;">
+                  <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
+                </p>
+                <el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
+                  <el-button size="small" type="danger" @click='getItem(index, subIndex)'>{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
+                </el-upload>
               </div>
             </td>
             <td>
@@ -210,6 +215,9 @@
         </template>
       </table>
     </div>
+    <div>
+
+    </div>
   </div>
 </template>
 <script>
@@ -231,9 +239,33 @@
         CreateByName: '',
         //点击项
         ClickItem: {},
+        offsetwidth: 0,
+        parentEle: '',
+        checkedIndex: '',
+        checkedsubIndex: '',
+        loading: false,
+        boxHeight: 0,
       }
     },
     methods: {
+      getItem (index, subIndex) {
+        this.checkedIndex = index
+        this.checkedsubIndex = subIndex
+      },
+      uploadFileBtnS (file) { //手配书上传
+        let that = this
+        let newArr = []
+        newArr.push(file.file)
+        let path = '/Upload/Temporary/'
+        this.$message.info('上传中...')
+        this.UploadSelfFileT(path, newArr, x => {
+          this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = this.domainManager().ViittoFileUrl + x.data.FilePath
+          this.$message.success(x.data.Message)
+          let newlist = JSON.parse(JSON.stringify(this.list))
+          this.list = newlist
+          this.$forceUpdate()
+        })
+      },
       //添加酒店
       AddHotel(item, subIndex) {
         var subItem = JSON.parse(JSON.stringify(item.HotelOrderList[subIndex]));
@@ -318,17 +350,18 @@
         })
       },
       getList() {
+        this.loading = true
         this.apipost('dmcstatistics_get_GetHotelStaticsDetail', {
           TCIDs: this.$route.query.id,
           NewCombinationNum: this.$route.query.NewCombinationNum
         }, res => {
           if (res.data.resultCode == 1) {
-            this.list = res.data.data.HotelOrderListReport;
+            let list = res.data.data.HotelOrderListReport;
             this.CreateBy = res.data.data.CreateBy;
             this.CreateByPhoto = res.data.data.CreateByPhoto;
             this.CreateByAccount = res.data.data.CreateByAccount;
-            if (this.list != null && this.list.length > 0) {
-              this.list.forEach(item => {
+            if (list != null && list.length > 0) {
+              list.forEach(item => {
                 item.HotelOrderList.forEach(subItem => {
                   subItem.hotelList.push({
                     Name: subItem.NewHotelName,
@@ -351,10 +384,13 @@
                   }
                 })
               });
+              this.list = list;
+              this.$forceUpdate()
             }
           } else {
             this.$message.error(res.data.message);
           }
+          this.loading = false
         }, err => {})
       },
       calculationPrice(obj) {
@@ -418,11 +454,13 @@
             })
           });
         })
+        this.loading = true
         this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.getList();
             this.Success(res.data.message);
           } else {
+            this.loading = false
             this.Error(res.data.message);
           }
         }, err => {})
@@ -465,8 +503,26 @@
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;
+      let width = window.innerWidth - 50
+      let height = window.innerHeight - 65 -55
+      console.log(height)
+      this.boxHeight = height;
+      this.offsetwidth = width
       this.getList();
     },
+    watch: {
+      // list:{
+      //   handler: function(val, oldVal) {
+      //     this.$nextTick(function(){
+      //       let ele = this.$parent.$refs.frameBox
+      //       this.parentEle = ele;
+      //       console.log(ele.scrollHeight > ele.height)
+      //       console.log(ele.teamReimbursement)
+      //     });
+      //   },
+      //   deep: true
+      // }
+    }
   }
 
 </script>

src/components/LeaderManagement/leaderPay.vue

@@ -37,8 +37,10 @@
             <td width="80">用车方式</td>
             <td width="150">实际信息</td>
             <td width="150">总金额</td>
+            <td width="150">实际金额</td>
+            <td width="150">付款方式</td>
             <td width="300">备注</td>
-            <td>凭证</td>
+            <td width="300">凭证</td>
           </tr>
           <tr v-for='(item,index) in list.BusList'>
             <td>{{item.PlanDateStr}}</td>
@@ -61,6 +63,14 @@
             <td>
               {{busTotalPrice(item.ReimburseList.ReimburseDetailsList)}}
             </td>
+<!--            添加实际金额和付款方式-->
+            <td class="jdtd" valign="middle">
+              {{item.CostPrice*(Number(item.TransferNum)+1)+item.HighSpeedPrice}}
+            </td>
+            <td class="jdtd" valign="middle">
+              {{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
+            </td>
+
             <td class="jdtd" valign="middle">
               {{item.Remarks}}
             </td>
@@ -83,6 +93,8 @@
           <td width="150">房间类型/数量</td>
           <td width="150">实际信息</td>
           <td width="80">总金额</td>
+          <td width="80">实际金额</td>
+          <td width="80">付款方式</td>
           <td width="300">备注</td>
           <td>凭证</td>
         </tr>
@@ -109,9 +121,19 @@
                 </div>
               </template>
             </td>
+
             <td>
               {{hotelTotalPrice(item.ReimburseList.ReimburseDetailsList)}}
             </td>
+
+            <td class="jdtd" valign="middle">
+              {{HotelPrice(item)}}
+            </td>
+            <td class="jdtd" valign="middle">
+              {{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
+
+            </td>
+
             <td class="jdtd" valign="middle">
               {{item.ReimburseList.Remarks}}
             </td>
@@ -136,6 +158,8 @@
             <td width="150">用餐人数</td>
             <td width="150">实际信息</td>
             <td width="80">总金额</td>
+            <td width="80">实际金额</td>
+            <td width="80">付款方式</td>
             <td width="300">备注</td>
             <td>凭证</td>
           </tr>
@@ -171,6 +195,13 @@
                   {{diningTotalPrice(subItem.ReimburseList.ReimburseDetailsList)}}
                 </div>
               </td>
+              <td class="jdtd" valign="middle">
+                {{calculationPrice(item)}}
+              </td>
+              <td class="jdtd" valign="middle">
+                {{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
+
+              </td>
               <td class="jdtd" valign="middle">
                 {{titem.Remarks}}
               </td>
@@ -195,6 +226,8 @@
             <td width="150">门票类别</td>
             <td width="150">实际信息</td>
             <td width="80">总金额</td>
+            <td width="80">实际金额</td>
+            <td width="80">付款方式</td>
             <td width="300">备注</td>
             <td>凭证</td>
           </tr>
@@ -232,6 +265,12 @@
                   {{diningTotalPrice(subItem.ReimburseList.ReimburseDetailsList)}}
                 </div>
               </td>
+              <td class="jdtd" valign="middle">
+                {{ScenicspotPrice(item)}}
+              </td>
+              <td class="jdtd" valign="middle">
+                {{item.PayType !=null && item.PayType !='' ? (item.PayType== 1? '现付' :(item.PayType ==2 ? '签单' :(item.PayType == 4 ? '预付' :(item.item.PayType ==5 ?'实物抵扣' :'')))):''}}
+              </td>
               <td>
                 <template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
                   {{sitem.Remarks}}
@@ -515,6 +554,7 @@
         })
         return totalPrice
       },
+
       hotelTotalPrice(obj) {
         let totalPrice = 0
         obj.forEach(x => {
@@ -597,6 +637,7 @@
         if (str == 3)
           return '晚餐'
       },
+
       getNav() {
         this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
           TCIDs: this.$route.query.id
@@ -610,7 +651,7 @@
       },
       getList() {
         this.loading = true
-        this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
+          this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.loading = false;
             this.isShow = true;
@@ -636,7 +677,7 @@
             url: this.domainManager().ViittoFileUrl + x.data.FilePath
           })
         });
-      },      
+      },
       goUrl(path, title) {
         this.$router.push({
           name: path,
@@ -647,6 +688,36 @@
           }
         })
       },
+
+      // 酒店
+      HotelPrice(obj) {
+        let totalPrice = 0;
+        obj.OrderDetailsList.forEach(item => {
+          totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
+        })
+        obj.TotalPrice = totalPrice.toFixed(2);
+        return obj.TotalPrice;
+      },
+      // 餐饮
+      calculationPrice(obj){
+        // let totalPrice = 0;
+        // obj.DiningSummaryList.forEach(item => {
+        //   totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
+        // })
+        // obj.TotalPrice = totalPrice.toFixed(2);
+        // return obj.TotalPrice
+      },
+      // 景点
+      ScenicspotPrice(obj) {
+        // let totalPrice = 0;
+        // obj.TicketPriceList.forEach(item => {
+        //   totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
+        // })
+        // obj.TotalPrice = totalPrice.toFixed(2);
+        // return obj.TotalPrice
+      },
+
+
     },
     mounted() {
       this.isUpdate = this.$route.query.isUpdate;

src/components/Restaurant/bookDinnerStatistics.vue

@@ -27,7 +27,7 @@
         </li>
       </ul>
     </div>
-    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
+    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
       <table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe" v-loading='loading'>
         <tr>
           <th width="50">序号</th>
@@ -175,6 +175,7 @@
         thLengthTitle: [],
         list: [],
         colspanTotal: 0,
+        boxHeight: 0,
       }
     },
     methods: {
@@ -283,6 +284,7 @@
                 }
               });
             });
+            this.$forceUpdate()
           } else {
             this.$message.error(res.data.message);
           }
@@ -298,6 +300,11 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
+      let width = window.innerWidth - 50
+      let height = window.innerHeight - 65 - 164
+      console.log(height)
+      this.boxHeight = height;
+      this.offsetwidth = width
       this.getList()
     },
   }

src/components/SalesModule/Lowpricemanagement.vue

+<template>
+  <div class="flexOne">
+    <div class="query-box">
+      <ul>
+        <li>
+          <span><em>{{$t('admin.admin_status')}}</em>
+            <el-select v-model='msg.ApplyState' :placeholder="$t('pub.unlimitedSel')">
+              <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
+              <el-option label="审核中" value='0'></el-option>
+              <el-option label="通过" value='1'></el-option>
+              <el-option label="拒绝" value='2'></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <input type="button" class="hollowFixedBtn" @click="getList()" :value="$t('pub.searchBtn')" />
+        </li>
+      </ul>
+    </div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <th width="100">申请人</th>
+        <th width="150">申请时间</th>
+        <th width="200">订单号</th>
+        <th>订单原单价</th>
+        <th>申请单价</th>
+        <th>申请状态</th>
+        <th>审核理由</th>
+        <th>申请理由</th>
+        <th width="200">操作</th>
+      </tr>
+      <tr v-for="(item,index) in dataList">
+        <td>{{item.CreateByStr}}</td>
+        <td>{{item.CreateDate}}</td>
+        <td>{{item.OrderId}}</td>
+        <td>{{item.OrderUnitPrice}}</td>
+        <td>{{item.ApplyPrice}}</td>
+        <td>{{item.ApplyState == 0 ? '审核中' : (item.ApplyState == 1 ? '通过' : (item.ApplyState == 2 ? '拒绝' : ''))}}</td>
+        <td>{{item.Reasons}}</td>
+        <td>{{item.ApplyReason}}</td>
+        <td>
+          <el-row>
+            <button class="normalBtn" type="primary" @click="outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons">同意</button>
+            <button class="hollowFixedBtn" @click="outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason">拒绝</button>
+          </el-row>
+        </td>
+      </tr>
+    </table>
+
+    <el-dialog custom-class='w450' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
+      <el-form  :rules="rules" ref="addMsg" label-width="100px">
+        <el-form-item :label="$t('system.label_info')" prop="Description">
+          <el-input maxlength='250' class='w217' type="textarea" v-model="addMsg.Reasons"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
+        &nbsp;
+        <button class="normalBtn" type="primary" @click="submitForm()">{{$t('pub.sureBtn')}}</button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        switchValue: '1',
+        dialogTitle: '',
+        outerVisible: false,
+        versions: [],
+        dataList: [],
+        msg: {
+          pageIndex: 1,
+          pageSize: 15,
+          ApplyState: '-1',
+        },
+
+        addMsg: {
+          Reasons: '',
+          ApplyState:"",
+          ID:''
+        },
+        rules: {
+          Name: [{
+            required: true,
+            message: this.$t('system.ph_name'),
+            trigger: 'blur'
+          }],
+          Status: [{
+            required: false,
+            message: '',
+            trigger: 'change'
+          }],
+          Description: [{
+            required: false,
+            message: this.$t('adm.adm_qsrmiaoshu'),
+            trigger: 'change'
+          }],
+
+        },
+        verSionMsg: {
+          Status: 0
+        },
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      getList() { //获取列表数据
+        this.apipost("lessprice_get_GetLesspriceOrderPageList", this.msg, res => {
+          if (res.data.resultCode == 1) {
+            this.dataList = res.data.data.pageData;
+          }
+        }, err => {})
+      },
+
+      getVersion() { //获取版本信息
+        this.apipost('admin_get_SysVersionsGetList', this.verSionMsg, res => {
+          this.versions = res.data.data;
+        }, err => {})
+      },
+      closeChangeMachie(done) {  //  转交窗口关闭
+        done();
+      },
+      submitForm(){
+        console.log(this.addMsg.Description)
+        this.apipost("lessprice_post_UpdateLesspriceOrder", this.addMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.$message.success(res.data.message)
+            this.outerVisible = false;
+            this.addMsg.Reasons = '';
+            this.getList()
+          }
+          else {
+            this.$message.error(res.data.message)
+            this.outerVisible = false;
+            this.addMsg.Reasons = '';
+          }
+        }, err => {})
+      }
+    },
+
+  }
+</script>

src/components/SalesModule/groupTourOrder.vue

@@ -722,6 +722,18 @@
     font-size:20px;
     cursor: pointer;
   }
+  /* 添加窗口 */
+  .branding_buttom {
+    position: absolute;
+    left: 0px;
+    bottom: 0px;
+    width: 100%;
+    height: 250px;
+    background-color: #ffffff;
+    border-top: 3px solid #38425d;
+  }
+
+
 </style>
 
 <template>
@@ -841,7 +853,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="成交单价" prop="Unit_Price">
-                 <el-select v-model='addMsg.Unit_Price' 
+                 <el-select v-model='addMsg.Unit_Price'
                 filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
                 <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
                 </el-option>
@@ -969,7 +981,7 @@
                     <el-form-item label="单房差">
                         <el-input v-model='addMsg_form.SingleRoomPrice'  :disabled="true"></el-input>
                     </el-form-item>
-                   
+
                     <el-form-item label="儿童占床增收">
                         <el-input v-model='addMsg_form.ChildNeedPrice'  :disabled="true"></el-input>
                     </el-form-item>
@@ -1235,6 +1247,42 @@
         </el-row>
       </el-form>
     </div>
+    <!--    申请优惠-->
+    <div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
+         style="height: 150px;min-height:200px;">
+      <p>申请优惠
+        <span class="fr" >
+					 <input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()"/>
+					 <input type="button" class="normalBtn" value="保存" @click="Preservation()"/>
+				</span>
+      </p>
+      <el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item>
+              <em style="font-size: 12px !important;color: #606266;line-height: 34px">订单当前单价</em>
+              <em style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;" class='w150'>{{SOMsg.OrderUnitPrice}}</em>
+
+              <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
+              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input>
+
+              <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >审核人</em>
+              <el-select  placeholder="请选择" v-model="SOMsg.UpdateBy">
+                <el-option v-for="(item,index) in SuperiorPeople" :label='(item.EmName)'  :value='(item.EmployeeId)' :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="申请理由" style="margin-left: 58px;">
+              <el-input v-model='SOMsg.ApplyReason' type='textarea' maxlength='1000' style="width: 60%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+
+
+
     <div class="groupTourOrderSearch">
       <ul>
         <li><span><em>线路</em>
@@ -1437,7 +1485,7 @@
             </p>
           </div>
         </el-col>
-        
+
         <el-col :span="4" class="groupTourOrder_count_col">
           <div class="groupTourOrder_count_item">
             <div>
@@ -1705,6 +1753,7 @@
                     </div>
                     <!-- item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0) -->
                     <div v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)' @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
+                    <div @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice  = item.unit_Price'>申请优惠</div>
                     <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')"
                          @click='deleteItem(item)'>取消
                     </div>
@@ -2098,7 +2147,18 @@
         subInfo: {
           CreateBy: '',
           OrderId: 0
-        }
+        },
+        // 申请优惠的弹窗
+        SpecialOffer:false,
+        SOMsg:{
+          OrderId:'',
+          ApplyPrice:0,
+          ApplyReason:'',
+          UpdateBy:'',
+          OrderUnitPrice:0
+        },
+        SuperiorPeople:[],
+
 
       }
     },
@@ -2574,7 +2634,7 @@
             if (res.data.resultCode == 1) {
               this.IsUnion = res.data.data.IsUnion
               this.isAllowUpdate = res.data.data.IsUpdatePlatOrder
-              this.addObj = res.data.data.modelPrice         
+              this.addObj = res.data.data.modelPrice
               let x = res.data.data.model;
 
               this.addObj.OrderId=x.OrderId;
@@ -2600,7 +2660,7 @@
               this.addMsg.BabyNum = x.BabyNum.toString()
               this.IsChildrenTour = x.IsChildrenTour
               this.IsBirdDiscount = x.IsBirdDiscount
-              
+
               this.stratPrice = res.data.data.modelPrice.GoAddPrice
 
               if (this.stratPrice == 0) {
@@ -2667,7 +2727,7 @@
               this.Unit_PriceList.push(obj);
           }
           }, err => {})
-         
+
               this.getKhmdList(this.addMsg.CustomerType, obj.lineId)
               this.getDdlyList(this.addMsg.CustomerType)
             } else {
@@ -3099,7 +3159,11 @@
         this.remarksMsg.Remarks = ''
         this.remarksMsg.OrderId = '0'
         this.remarksMsg.isOrder = '1'
-      },
+        this.SpecialOffer = false
+        this.SOMsg.UpdateBy=''
+        this.SOMsg.ApplyPrice=''
+        this.SOMsg.ApplyReason=''
+    },
       clearMsg () {
         this.addMsg.OrderId = '0'
         this.addMsg.TCID = '0'
@@ -3418,7 +3482,7 @@
           'sellorder_post_GetTravelOrderList',
           this.msg,
           res => {
-            
+
             if (res.data.resultCode == 1) {
               this.loading = false
               this.total = res.data.data.count
@@ -3515,6 +3579,64 @@
       //关闭修改业务员
       closeSalseDiv () {
         this.showChangeSales = false
+      },
+      Discount(TCID){
+        this.SpecialOffer =true
+        this.apipost(
+          'lessprice_post_GetSuperiorPeople',
+          {'TCID':TCID},
+          res => {
+            if (res.data.resultCode == 1) {
+                this.SuperiorPeople = res.data.data;
+            }
+          },
+          err => {
+          }
+        )
+      },
+      //申请优惠
+      Preservation(){
+        if(this.SOMsg.ApplyPrice < 0 ){
+          this.$message.error('请填写大于等于0的金额')
+          return
+        }
+        var numReg = /^[0-9]+$/
+        var numRe = new RegExp(numReg)
+        if (!numRe.test(this.SOMsg.ApplyPrice)) {
+          this.$message.error('请输入数字')
+          return
+        }
+        if(this.SOMsg.UpdateBy =='请选择' || this.SOMsg.UpdateBy ==''){
+          this.$message.error('请选择审核人')
+          return
+        }
+        if(this.SOMsg.ApplyReason == ''){
+          this.$message.error('请填写申请理由')
+          return
+        }
+        this.apipost(
+          'lessprice_post_SetLesspriceOrder',
+          this.SOMsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.$message.success(res.data.message)
+              this.SpecialOffer =false;
+              this.SOMsg.UpdateBy=''
+              this.SOMsg.ApplyPrice=''
+              this.SOMsg.ApplyReason=''
+            }else {
+              this.$message.error(res.data.message)
+              this.SpecialOffer =false;
+              this.SOMsg.UpdateBy=''
+              this.SOMsg.ApplyPrice=''
+              this.SOMsg.ApplyReason=''
+            }
+          },
+          err => {
+
+          }
+        )
+
       }
     },
     mounted () {
@@ -3533,7 +3655,9 @@
       this.getDdztList()
       this.getJyfs()
       this.getFylx()
-    }
+    },
+
+
   }
 </script>
 

src/components/SalesModule/productQuery.vue

@@ -239,7 +239,7 @@
             </el-form-item> -->
 
              <el-form-item label="成交单价" prop="Unit_Price">
-                 <el-select v-model='addMsg.Unit_Price' 
+                 <el-select v-model='addMsg.Unit_Price'
                 filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
                 <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
                 </el-option>
@@ -1506,38 +1506,42 @@
           this.addMsg.CommissionShareMoney = '0'
         }
         this.Unit_PriceList=[];
-        this.apipost('sellorder_post_GetLessPrice', {"TCID":this.addObj.TCID}, res => {
-          this.LessMoney = res.data.data.lessMoney;
-          if  (parseFloat(this.LessMoney)>0){
-           for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
-              var obj = {
-								ID: '',
-								LessMoney: ''
+        let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
+        if(maxPeopleNum >0 ){
+          this.apipost('sellorder_post_GetLessPrice', {"TCID":this.addObj.TCID,"MaxPeopleNum" :maxPeopleNum  }, res => {
+            this.LessMoney = res.data.data.lessMoney;
+            if  (parseFloat(this.LessMoney)>0){
+              for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
+                var obj = {
+                  ID: '',
+                  LessMoney: ''
+                }
+                obj.ID = this.addMsg.Unit_Price-i*10;
+                obj.LessMoney = this.addMsg.Unit_Price-i*10;
+                this.Unit_PriceList.push(obj);
               }
-							obj.ID = this.addMsg.Unit_Price-i*10;
-							obj.LessMoney = this.addMsg.Unit_Price-i*10;
-              this.Unit_PriceList.push(obj);
+              if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
+                var obj = {
+                  ID: '',
+                  LessMoney: ''
                 }
-                	if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
-							 var obj = {
-								ID: '',
-								LessMoney: ''
+                obj.ID = this.addMsg.Unit_Price;
+                obj.LessMoney = this.addMsg.Unit_Price;
+                this.Unit_PriceList.push(obj);
               }
-							obj.ID = this.addMsg.Unit_Price;
-							obj.LessMoney = this.addMsg.Unit_Price;
-              this.Unit_PriceList.push(obj);
-							}
-          }
-          else{
+            }
+            else{
               var obj = {
-								ID: '',
-								LessMoney: ''
+                ID: '',
+                LessMoney: ''
               }
-							obj.ID = this.addMsg.Unit_Price;
+              obj.ID = this.addMsg.Unit_Price;
               obj.LessMoney = this.addMsg.Unit_Price;
-                this.Unit_PriceList.push(obj);
-          }
+              this.Unit_PriceList.push(obj);
+            }
           }, err => {})
+        }
+
       },
       getTicheng() { //提成
         let num = Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)
@@ -1640,7 +1644,9 @@
               this.addMsg.OldPeopleNum));
 
         }
-        this.getTicheng()
+        this.getTicheng();
+        this.getTypePrice()
+
       },
 
       yzBigBed2() {

src/components/busManagement/BusInfo.vue

@@ -178,6 +178,8 @@
             <th width="200">订团号</th>
             <th width="250">司机住宿</th>
             <th>泊车说明</th>
+            <th width="120">高速费用</th>
+            <th width="120">高速费用付款方式</th>
             <th width="120">使用人数</th>
             <th>成本价</th>
             <th width="120">备注</th>
@@ -286,6 +288,21 @@
                 <el-input class="w135" v-model="item.ParkExplain" placeholder="请输入说明"></el-input>
               </div>
             </td>
+            <td>
+              <div class="w150">
+                <el-input class="w135" @blur='getBusPrice(item)' v-model="item.HighSpeedPrice" placeholder="请输入费用"></el-input>
+              </div>
+            </td>
+            <td>
+              <div class="w120">
+                <el-select class='w100 sel' v-model='item.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')">
+                  <el-option label='请选择' :value='0'></el-option>
+                  <el-option label='现付' :value='1'></el-option>
+                  <el-option label='公司结算' :value='2'></el-option>
+                  <el-option label='预付' :value='3'></el-option>
+                </el-select>
+              </div>
+            </td>
             <td>
               <div class="w80">
                 <el-input class="w50" v-model="item.UseNum" @keyup.native="checkPrice(item,'UseNum')"></el-input>
@@ -473,7 +490,7 @@
           if (checkObj) {
             money = checkObj.AllDayPrice;
           }
-          obj.CostPrice = money;
+          obj.CostPrice = money + parseFloat(obj.HighSpeedPrice);
         }
       },
       AddSubItem(item) {

src/components/dmc/manager/teamReimbursement.vue

@@ -465,6 +465,14 @@
                     <span>出团公司</span>
                     {{item.OutBranchName}}
                   </p>
+                  <p>
+                    <span>领队</span>
+                    {{item.LeaderName}}
+                  </p>
+                  <p>
+                    <span>导游</span>
+                    {{item.GuideName}}
+                  </p>
                 </div>
               </td>
               <td>

src/components/leaderPay2.vue

@@ -10,7 +10,7 @@
         border: 1px solid #d1d1d1;
     }
     .leaderPayTable th{
-        background: #E6E6E6;    
+        background: #E6E6E6;
         padding:8px 0;
         color: #333;
         border: 1px solid #d1d1d1;
@@ -204,7 +204,7 @@
                 <tr v-show="totalList.SelfPayingIncomeTotalPrice>0">
                     <td>自费收入</td>
                     <td>{{moneyFormat(totalList.SelfPayingIncomeTotalPrice)}}</td>
-                </tr> 
+                </tr>
                  <tr v-show="totalList.IncomeTotalPrice>0">
                     <td>消费收入</td>
                     <td>{{moneyFormat(totalList.IncomeTotalPrice)}}</td>
@@ -253,6 +253,7 @@
                 <input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过" v-show="dataList.LeaderApply.Status==1"/>
                 <input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过" v-show="dataList.LeaderApply.Status==1"/>
                 <input type="button" class="leader2Btn" value="打印" @click="printTable()">
+                <input type="button" class="leader2Btn" value="查看详情" @click="Lookdetails()">
             </div>
         </div>
     </div>
@@ -345,7 +346,7 @@ export default {
         },
         //打印
         printTable(){
-            window.print(); 
+            window.print();
         },
         //获取总额
         getTotalMoney(){
@@ -375,10 +376,26 @@ export default {
                 }
             }, err => {})
 
-        }
+        },
+      Lookdetails(){
+          console.log(this.$route.query.id);
+          console.log(this.$route.query.NewCombinationNum);
+
+        this.$router.push({
+          name: 'leaderPay',
+          query: {
+            "id": this.$route.query.id,
+            NewCombinationNum:this.$route.query.NewCombinationNum,
+            isUpdate: true,
+            blank: 'y',
+            tab: '领队报账'
+          }
+        })
+      }
+
     },
     created() {
-    	
+
     },
     mounted() {
       this.isUpdate = this.$route.query.isUpdate;

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -793,9 +793,9 @@
           <td>
             <div class="tp_divList" v-for="(subItem,index) in item.SubList">
               <div>
-                {{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;【<span
-                  style="color:#E95252;">库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
-                <el-checkbox v-model="item.CheckList[index].CheckStatus"
+                {{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;<span v-if="subItem.UseCount>0 && item.SubList.length==1">【<span style="color:green">本团使用库存：{{subItem.UseCount}}</span>】</span>【<span
+                  style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
+                <el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
                   @change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
               </div>
             </div>

src/components/platformModule/roleManagement.vue

@@ -54,6 +54,7 @@
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
       :page-size=msg.pageSize :total=total>
     </el-pagination>
+
     <el-dialog custom-class='w450' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
         <el-form-item maxlength='50' :label="$t('adm.adm_Rolename')" prop="Name">
@@ -215,4 +216,4 @@
       }
     }
   }
-</script>
+</script>
\ No newline at end of file

src/components/systemManagement/LessPriceManagement.vue

@@ -93,6 +93,7 @@
         <tr>
           <th width="150">公司</th>
           <th width="255">线路/系列</th>
+          <th>人数</th>
           <th>所有人</th>
           <th>部门主管</th>
           <th>分公司总经理</th>
@@ -117,12 +118,19 @@
               </el-select>
             </div>
           </td>
+
           <td>
             <div v-for="subItem in item.LessPriceList" class="comLessDiv">
-                <el-input class="w80"  placeholder="少价金額" v-model="subItem.LessMoney" @keyup.native="checkPrice(subItem,'LessMoney')"> <el-button slot="append">元</el-button></el-input>
-             <el-input class="w80"  placeholder="减少提成" v-model="subItem.LessPercent" @keyup.native="checkPrice(subItem,'LessPercent')">
-                  <el-button slot="append">%</el-button>
-                </el-input>
+              <el-input class="w80"  placeholder="最大人数" v-model="subItem.MaxPeopleNum" @keyup.native="checkPrice(subItem,'MaxPeopleNum')"> <el-button slot="append">人</el-button></el-input>
+            </div>
+          </td>
+
+          <td>
+            <div v-for="subItem in item.LessPriceList" class="comLessDiv">
+              <el-input class="w80"  placeholder="少价金額" v-model="subItem.LessMoney" @keyup.native="checkPrice(subItem,'LessMoney')"> <el-button slot="append">元</el-button></el-input>
+              <el-input class="w80"  placeholder="减少提成" v-model="subItem.LessPercent" @keyup.native="checkPrice(subItem,'LessPercent')">
+                <el-button slot="append">%</el-button>
+              </el-input>
             </div>
           </td>
           <td>
@@ -280,6 +288,7 @@
           RB_Branch_Id:item.Id,
           RB_Group_Id:0,
           LineTeamList:[],
+          MaxPeopleNum:"",
         }
         item.LessPriceList.push(obj);
       }

src/router/config.js

@@ -1996,6 +1996,14 @@ export default {
                                 title: '报名统计'
                             },
                         },
+                        { // 销售 少价管理
+                            path: '/Lowpricemanagement',
+                            name: 'Lowpricemanagement',
+                            component: resolve => require(['@/components/SalesModule/Lowpricemanagement'], resolve),
+                            meta: {
+                              title: '少价管理'
+                            },
+                        },
                         { //王悦 财务 收款情况
                             path: '/enrollTotalTwo',
                             name: 'enrollTotalTwo',
@@ -3005,4 +3013,4 @@ export default {
             component: resolve => require(['@/components/leaderPay2'], resolve),
         }
     ]
-}
+}
\ No newline at end of file