修改领队用款计划，新增发票申请上传附件、修改创建财务单据数据自动填充等问题...

package.json

@@ -5,7 +5,7 @@
   "author": "VIITTO",
   "private": true,
   "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "dev": "node --max-old-space-size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
     "lint": "eslint --ext .js,.vue src",
     "serve": "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",

src/assets/utils/commonUtils.js

@@ -139,7 +139,7 @@ var commonUtils = {
     // 小数点前进行转化
     for (var i = part[0].length - 1; i >= 0; i--) {
       if (part[0].length > 10) {
-        alertWarning("位数过大，无法计算");
+        // alertWarning("位数过大，无法计算");
         return "";
       } // 若数量超过拾亿单位，提示
       let tmpnewchar = "";
@@ -219,7 +219,7 @@ var commonUtils = {
     // 小数点之后进行转化
     if (Num.indexOf(".") != -1) {
       if (part[1].length > 2) {
-        alertWarning("小数点之后只能保留两位,系统将自动截段");
+        // alertWarning("小数点之后只能保留两位,系统将自动截段");
         part[1] = part[1].substr(0, 2);
       }
       for (var i = 0; i < part[1].length; i++) {

src/components/FinancialModule/BasicDocuments.vue

@@ -282,6 +282,7 @@
                         <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
                         <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,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 === 43" @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">
@@ -1336,6 +1337,12 @@ export default {
             this.loading = false;
           },null)
         },
+        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/FinancialDocuments.vue

@@ -383,7 +383,7 @@
                     <button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
                     <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" @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">{{$t('ios.shenpi')}}</button>
                 </li>
             </ul>

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -351,7 +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>
+                            <td v-if="GetDetail.TemplateId === 43" @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">

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -112,7 +112,7 @@
                     <th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th>
                     <th rowspan="2">{{$t('fnc.a_hkrfkduixiang')}}</th>
                     <th rowspan="2">{{$t('fnc.a_hkfkshijian')}}</th>
-                    <th>{{$t('fnc.jylshuihao')}}</th>
+                    <!-- <th>{{$t('fnc.jylshuihao')}}</th> -->
                     <th colspan="3">{{$t('fnc.waibi')}}（{{TypeName}}）</th>
                     <th rowspan="2">{{$t('fnc.a_dhuanlv')}}</th>
                     <th colspan="3">{{$t('fnc.a_rminbi')}}</th>
@@ -135,7 +135,7 @@
                     <td></td>
                     <td> {{ moneyFormat(StartMoney) }} </td>
                 </tr>
-                <tr v-for=" ( item , index ) in DataList ">
+                <tr v-for=" ( item , index ) in DataList " v-if=" item.Type !== 4">
                     <td> {{ item.BName }} </td>
                     <td>
                         <span class="cursorpointer" :class=" item.Type == 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
@@ -526,12 +526,12 @@ export default {
                                 endRStartMoney = endStartMoney + x.OriginalMoney;
                                 endStartMoney = endStartMoney + x.Money;
                                 x.enRSMoney = endRStartMoney;
-                                x.enSMoney = endRStartMoney;
+                                x.enSMoney = endStartMoney;
                             }else if(x.Type==2){
                                 endRStartMoney = endStartMoney - x.OriginalMoney;
                                 endStartMoney = endStartMoney - x.Money;
                                 x.enRSMoney = endRStartMoney;
-                                x.enSMoney = endRStartMoney;
+                                x.enSMoney = endStartMoney;
                             }
                         });
                         this.endStartMoney = endStartMoney;

src/components/FinancialModule/invoicesManager.vue

@@ -173,7 +173,7 @@
             <span>{{item.DpreadPrice - item.ApplyTotalPrice}}</span>
             <span v-if="(item.DpreadPrice - item.ApplyTotalPrice) < 0" class="_zhuihui" @click="zhuihui(item.OrderId)">追</span>
           </td>
-          <td>{{item.InvoiceApplyList[0].CreateDate}}</td>
+          <td>{{item.InvoiceApplyList[0].CreateDate.replace('T', ' ')}}</td>
           <td>
             <span v-if="item.InvoiceApplyList[0].InvoiceApplyState === 1" class="status_Application">申请中</span>
             <span v-else-if="item.InvoiceApplyList[0].InvoiceApplyState === 2" class="status_Cancle">已取消</span>
@@ -192,7 +192,7 @@
           </td>
         </tr>
         <tr v-for="(item2, index2) in item.InvoiceApplyList" :key="index2" v-if="index2!==0">
-          <td>{{item2.CreateDate}}</td>
+          <td>{{item2.CreateDate.replace('T', ' ')}}</td>
           <td>
             <span v-if="item2.InvoiceApplyState === 1" class="status_Application">申请中</span>
             <span v-else-if="item2.InvoiceApplyState === 2" class="status_Cancle">已取消</span>

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -10,6 +10,12 @@
   text-align: center;
   padding-bottom: 15px;
 }
+.page_iisMgdetail p.iisMgdetail_status {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+  font-size: 14px;
+}
 .page_iisMgdetail .page_iisMgadd_table {
   width: 100%;
   font-size: 14px;
@@ -31,22 +37,121 @@
 .page_iisMgdetail .cursorpointer{
   text-decoration: underline;
 }
-.imd_img_box {
+.page_iisMgdetail .imd_img_box {
   position: absolute;
   right: -400px;
   top: 0;
   width: 400px;
-  background-color: #eaeaea;
+  /* background-color: #eaeaea; */
+}
+.page_iisMgdetail .imd_img_box .querenhan,.page_iisMgdetail .bg_white{
+  background-color: white;
 }
-.imd_img_box>p{
+.page_iisMgdetail .imd_img_box .querenhan{
+  margin-top: 50px;
+}
+.page_iisMgdetail .imd_img_box .querenhan>p{
   padding: 10px 25px 15px 25px;
   font-size: 14px;
 }
+.page_iisMgdetail_red {
+  color: #FF0000;
+}
+
+.page_iisMgdetail_blue {
+  color: #0000FF;
+}
 
+.page_iisMgdetail_green {
+  color: #008000;
+}
+.page_iisMgdetail_black {
+  color: #000000;
+}
+.page_iisMgdetail ._fujian_zhankai{
+  color: white;
+  width: 64px;
+  height: 0;
+  font-size: 12px;
+  border-top: 26px solid #E95252;
+  border-right: 15px solid transparent;
+  border-left: 15px solid transparent;
+  -webkit-transform: rotate(-90deg);
+  transform: rotate(-90deg);
+  position: relative;
+  left: -18px;
+  bottom: -27px;
+}
+.page_iisMgdetail ._fujian_zhankai>span{
+  display: inline-block;
+  height: 100%;
+  width: 50%;
+  position: absolute;
+  left: 25px;
+  bottom: 15px;
+  -webkit-transform: rotate(90deg);
+  transform: rotate(90deg);
+}
+.page_iisMgdetail ._fujian_zhankai>span:nth-child(2){
+  left: 18px;
+  bottom: 3px;
+}
+.page_iisMgdetail ._fujian_box_tit{
+  display: flex;
+  justify-content:space-between;
+  font-size: 14px;
+  color: #333333;
+}
+.page_iisMgdetail ._fujian_box_tit .iconfont{
+  font-size: 14px;
+  display: inline-block;
+  margin-right: 8px;
+}
+.page_iisMgdetail ._fujian_box_tit .iconfont.icon-bangdingzhagnhuxinxi{
+  color: #E95252;
+}
+.page_iisMgdetail ._fujian_box_tit .iconfont.icon-gengduo{
+  transform:rotate(90deg);
+  font-size: 12px;
+}
+.page_iisMgdetail ._addUpload_box_btm .icon-excel{
+  text-align: center;
+  font-size: 38px;
+  color: green;
+  line-height: 75px;
+}
+.page_iisMgdetail ._wenjian{
+  padding: 15px;
+  width: 91px;
+  height: 80px;
+  border:1px solid rgba(221,221,221,1);
+  float: left;
+  cursor: pointer;
+  margin-right: 10px;
+  margin-top: 10px;
+}
+.page_iisMgdetail ._wenjian_P{
+  font-size: 30px;
+  text-align: center;
+  color: #41D2A1;
+}
+.page_iisMgdetail .el-carousel__item{
+  align-items: center;
+  justify-content: center;
+  display: flex;
+}
 </style>
 <template>
   <div class="page_iisMgdetail" v-loading="loading">
-    <p>{{$t('ios.fpkjsqdan')}}</p>
+    <p>{{$t('ios.fpkjsqdan')}} </p>
+    <p class="iisMgdetail_status">
+      <span v-if="detail.InvoiceApplyState === 1" class="page_iisMgdetail_green">申请中</span>
+      <span v-if="detail.InvoiceApplyState === 2" class="page_iisMgdetail_black">取消</span>
+      <span v-if="detail.InvoiceApplyState === 3" class="page_iisMgdetail_green">通过</span>
+      <span v-if="detail.InvoiceApplyState === 4" class="groupTourOrder_tickets_red">拒绝</span>
+      <span v-if="detail.InvoiceApplyState === 5" class="groupTourOrder_tickets_red">欠票</span>
+      <span v-if="detail.InvoiceApplyState === 6" class="page_iisMgdetail_blue">发票追回</span>
+    </p>
     <table
       data-v-ca5157c2
       border="1"
@@ -69,6 +174,16 @@
           {{orderList.moneyStr}}
         </td>
       </tr>
+      <tr>
+        <td>应收总额</td>
+        <td class="w600  font-weight cursorpointer">
+          <span @click="goUrlO(detail.OrderId)">{{detail.PreferPrice}}</span> 
+        </td>
+        <td>待收金额</td>
+        <td class="w600  font-weight cursorpointer">
+          <span @click="goUrlO(detail.OrderId)">{{detail.DueInMoney}}</span> 
+        </td>
+      </tr>
       <tr class="page_iisMgadd_bank">
         <td>{{$t('ios.dzyinhang')}}</td>
         <td colspan="3" class="_bank_td">
@@ -174,14 +289,55 @@
       <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
     </div>
     <div class="imd_img_box">
-      <p v-if="detail.ConfirmFileList && detail.ConfirmFileList.length>0">确认函</p>
-      <div style="width:100%;" v-if="detail.ConfirmFileList && detail.ConfirmFileList.length>0">
-          <el-carousel trigger="click" height="293px" width="440px" :interval="5000">
-              <el-carousel-item style="height: 293px;" v-for="(item, index) in detail.ConfirmFileList" :key="index">
-                  <img @click="showImg(item.Url)" :src="domainManager().ViittoFileUrl + item.Url" alt="" style="width: 100%;">
-              </el-carousel-item>
-          </el-carousel>
+      <div class="_fujian_box" >
+        <div v-if="detail.ApplyPics&&detail.ApplyPics.length>0">
+          <div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
+            <span>附件</span>
+            <span>></span>
+          </div>
+          <p class="_fujian_box_tit" v-if="fujianShow">
+            <span>
+              <i class="iconfont icon-bangdingzhagnhuxinxi"></i>
+              <span>附件</span>
+            </span>
+            <span class="cursorpointer" @click="fujianShow = false">收起 <i class="iconfont icon-gengduo"></i></span>
+          </p>
+          <div class="_addUpload_box" v-if="fujianShow">
+            <div style="width:100%;" v-if="FuImgList.length>0">
+              <el-carousel trigger="click" height="293px" width="440px" :interval="5000">
+                <el-carousel-item style="height: 293px;" v-for="item in FuImgList" :key="item">
+                  <img @click="showImg(item, 2)" :src="item" alt="" style="width: 100%;">
+                </el-carousel-item>
+              </el-carousel>
+            </div>
+            <div class="clearfix bg_white" v-if="detail.ApplyPics && detail.ApplyPics.length">
+              <template v-for="(file,fIndex) in detail.ApplyPics" v-if="file.Type==='1'">
+                <div class="_wenjian" @click="showUpLoadFile(file)">
+                  <p v-if="file.Type==='1'" class="_wenjian_P iconfont" :class="file.Url.substring(file.Url.lastIndexOf('.')+1,file.Url.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></p>
+                </div>
+              </template>
+            </div>
+          </div>
+        </div>
+        <div class="querenhan">
+          <p >确认函</p>
+          <div style="width:100%;" >
+            <div v-if="detail.ConfirmFileList && detail.ConfirmFileList.length>0">
+              <el-carousel trigger="click" height="293px" width="440px" :interval="5000" v-if="detail.ConfirmFileList[0].Url.indexOf('.png')!=-1 || detail.ConfirmFileList[0].Url.indexOf('.jp')!=-1">
+                  <el-carousel-item style="height: 293px;">
+                      <img @click="showImg(detail.ConfirmFileList[0].Url)" :src="domainManager().ViittoFileUrl + detail.ConfirmFileList[0].Url" alt="" style="width: 100%;">
+                  </el-carousel-item>
+              </el-carousel>
+              <div v-else>
+                <p style="padding-top: 5px;padding-left: 20px;font-size: 14px;margin-bottom: 10px;" class="cursorpointer">
+                  <a target="_blank" :href="detail.ConfirmFileList[0].Url">下载文件</a>
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
+      <!-- v-if="detail.ConfirmFileList && detail.ConfirmFileList.length>0" -->
     </div>
     <el-dialog title="提示信息" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
       <el-form label-width="110px">
@@ -218,18 +374,27 @@ export default {
       noDetail: false,
       EmployeeId: 0,
       images: [],
+      FuImgList: [],
       imageOptions:{
         navbar:false,
         title:false
       },
+      fujianShow:true,
     };
   },
   methods: {
+    showUpLoadFile(i){  // 预览上传文件
+      if(i.Url.substring(i.Url.lastIndexOf('.')+1,i.Url.length).toUpperCase()=='PDF'){
+        this.previewPDF(i.Url)
+      }else{
+        window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url)
+      }
+    },
     inited (viewer){
       this.$viewer = viewer
     },
-    showImg(src){
-      src = this.domainManager().ViittoFileUrl + src;
+    showImg(src ,t){
+      src = t ? src : this.domainManager().ViittoFileUrl + src;
       let isExsit=false
       this.images.forEach(x=>{
           if(x==src)
@@ -288,7 +453,18 @@ export default {
     getDetail: function (id) { // 获取详情
       this.apipost('InvoiceApply_get_GetDetails', {ID: id}, res=>{
         if (res.data.resultCode == 1) {
-          this.detail = res.data.data
+          let detail = res.data.data
+          console.log(detail)
+          if(detail.ApplyPics && detail.ApplyPics.length>0){
+            detail.ApplyPics.forEach(x=>{
+              console.log(x,'1111111')
+              if(x.Type==='3'){
+                this.FuImgList.push(x.Url);
+                this.images.push(x.Url)
+              }
+            })
+          }
+          this.detail = detail
           this.getOrderDetail();
         }
         this.loading = false

src/components/Hotel/roomReservationsDetails.vue

@@ -40,15 +40,18 @@
         </tr>
         <template v-for="(item,index) in list">
           <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>
+            <!-- 酒店名称 -->
             <td>
               <div class="w200 padding10">
                 <p class="link" style="word-break: normal;" :class="{'Hotel_red':subItem.HotelChangeState==3}"
                   @click="goUrlR('HotelManagement',subItem.HotelId,'酒店管理')">{{subItem.HotelName}}</p>
               </div>
             </td>
+            <!-- 机位总数/(Y/E/F) -->
             <td>
               <div class="w120">
                 <p class="link" @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
@@ -56,15 +59,18 @@
                 </p>
               </div>
             </td>
+            <!-- 占床/不占床 -->
             <td>
               <div class="w120">
                 <p class="link" @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')">
                   {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
               </div>
             </td>
+            <!-- 实际用房数 -->
             <td>
               <div class="w80">{{subItem.HouseStatistics.RealityRoomNum}}</div>
             </td>
+            <!-- 房间类型 -->
             <td>
               <div class="w150">
                 <p class="pHouseStyle" v-for="o in subItem.HouseStatistics.HouseTypeList">
@@ -72,6 +78,7 @@
                 </p>
               </div>
             </td>
+            <!-- 房间数 -->
             <td>
               <div class="w80">
                 <p class="pHouseStyle" v-for="o in subItem.HouseStatistics.HouseTypeList">
@@ -79,6 +86,7 @@
                 </p>
               </div>
             </td>
+            <!-- 房间人数 -->
             <td>
               <div class="w80">
                 <p class="pHouseStyle" v-for="o in subItem.HouseStatistics.HouseTypeList">
@@ -86,6 +94,7 @@
                 </p>
               </div>
             </td>
+            <!-- 修改酒店 -->
             <td>
               <div class="w150">
                 <el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
@@ -104,6 +113,7 @@
                 </el-upload>
               </div>
             </td>
+            <!-- 房间预定数 -->
             <td>
               <div class="w80">
                 <p class="pHouseStyle" v-for="o in subItem.OrderDetailsList">
@@ -112,6 +122,7 @@
                 </p>
               </div>
             </td>
+            <!-- 预定人数 -->
             <td>
               <div class="w80">
                 <p class="pHouseStyle" v-for="o in subItem.OrderDetailsList">
@@ -120,6 +131,7 @@
                 </p>
               </div>
             </td>
+            <!-- 尚差房间数 -->
             <td>
               <div class="w80">
                 <p class="pHouseStyle"
@@ -129,6 +141,7 @@
                 </p>
               </div>
             </td>
+            <!-- 单价/每人 -->
             <td>
               <div class="w120">
                 <p class="pHouseStyle" v-for="(o,index) in subItem.OrderDetailsList" @input="calculationPrice(subItem)">
@@ -137,6 +150,7 @@
                 </p>
               </div>
             </td>
+            <!-- 免减人数 -->
             <td>
               <div class="w80">
                 <p class="pHouseStyle" v-for="(o,index) in subItem.OrderDetailsList" @input="calculationPrice(subItem)">
@@ -145,6 +159,7 @@
                 </p>
               </div>
             </td>
+            <!-- 金额小计 -->
             <td>
               <div class="w80">
                 <p class="pHouseStyle" v-for="(o,index) in subItem.OrderDetailsList">
@@ -153,8 +168,8 @@
 
               </div>
             </td>
-            <td>
-              <!--返佣-->
+            <!--返佣-->
+            <td> 
               <div class="w80">
                 <p class="pHouseStyle link" v-for="(o,index) in subItem.OrderDetailsList"
                   @input="calculationPrice(subItem)">
@@ -163,11 +178,13 @@
                 </p>
               </div>
             </td>
+            <!-- 金额总计 -->
             <td>
               <div class="w120">
                 {{subItem.TotalPrice}}
               </div>
             </td>
+            <!-- 付款方式 -->
             <td>
               <div class="w120">
                 <el-select class='w100 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
@@ -179,22 +196,27 @@
                 </el-select>
               </div>
             </td>
+            <!-- 联系电话 -->
             <td>
               <div class="w120">{{subItem.Tel}}</div>
             </td>
+            <!-- 地址 -->
             <td>
               <div class="w200 padding10">{{subItem.Address}}</div>
             </td>
+            <!-- 备注 -->
             <td>
               <div class="w150">
                 <el-input class='w120' v-model='subItem.ReserveNo'></el-input>
               </div>
             </td>
+            <!-- 订团号 -->
             <td>
               <div class="w150">
                 <el-input type='textarea' class='w120' v-model='subItem.Remarks'></el-input>
               </div>
             </td>
+            <!-- 操作 -->
             <td>
               <div class="w200">
                 <el-button-group>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -43,12 +43,14 @@
         <td width="100">车辆号</td>
         <td width="60">用车方式</td>
         <td width="60">车费</td>
+        <td width="120">车费付款方式</td>
         <td width="80">高速公路费</td>
         <td width="120">高速费用付款方式</td>
         <td width="60">停车费</td>
         <td width="60">金额小计</td>
         <td width="60">总金额</td>
         <td width="100">备注</td>
+        <td width="60">凭证</td>
       </tr>
       <tr v-for='(item,index) in list.BusList'>
         <td>{{item.PlanDateStr}}</td>
@@ -65,18 +67,25 @@
           {{moneyFormat(item.CostPrice)}}
         </td>
         <td>
-          <span v-if="item.HighSpeedPayType === 1">现付</span>
-          <span v-if="item.HighSpeedPayType === 2">公司结算</span>
-          <span v-if="item.HighSpeedPayType === 3">预付</span>
+          <span v-if="item.PayType === 1">现付</span>
+          <span v-else-if="item.PayType === 2">公司结算</span>
+          <span v-else-if="item.PayType === 3">预付</span>
+          <span v-else>暂无</span>
         </td>
         <td>
           {{moneyFormat(item.HighSpeedPrice)}}
         </td>
+        <td>
+          <span v-if="item.HighSpeedPayType === 1">现付</span>
+          <span v-else-if="item.HighSpeedPayType === 2">公司结算</span>
+          <span v-else-if="item.HighSpeedPayType === 3">预付</span>
+          <span v-else>暂无</span>
+        </td>
         <td>
           {{moneyFormat(item.StopPrice)}}
         </td>
         <td>
-          {{moneyFormat(Number(item.CostPrice)+Number(item.HighSpeedPrice)+Number(item.StopPrice))}}
+          {{moneyFormat(Number(item.CostPrice)+Number(item.StopPrice))}}
         </td>
         <td  v-if='index==0' :rowspan='list.BusList.length'>
           {{busTotalPrice(list.BusList)}}
@@ -94,11 +103,11 @@
       </tr>
       <tr>
         <td>总金额</td>
-        <td colspan="6">
+        <td colspan="7">
           {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
         </td>
         <td>签单/预付/抵扣总金额</td>
-        <td colspan="6">
+        <td colspan="7">
           {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}}
         </td>
       </tr>
@@ -207,10 +216,11 @@
           </div>
         </td>
         <td>
-          <div v-for="subItem in outItem.HotelOrderList">
-            <span v-if="subItem.HighSpeedPayType === 1">现付</span>
-            <span v-if="subItem.HighSpeedPayType === 2">公司结算</span>
-            <span v-if="subItem.HighSpeedPayType === 3">预付</span>
+          <div v-for="subItem in outItem.HotelOrderList"> 
+            <span v-if="subItem.PayStyle === 1">现付</span>
+            <span v-else-if="subItem.PayStyle === 2">公司结算</span>
+            <span v-else-if="subItem.PayStyle === 3">预付</span>
+            <span v-else>暂无</span>
           </div>
         </td>
         <td>
@@ -306,9 +316,10 @@
         </td>
         <td>
           <div v-for="subItem in item.DiningSummaryList">
-            <span v-if="subItem.HighSpeedPayType === 1">现付</span>
-            <span v-if="subItem.HighSpeedPayType === 2">公司结算</span>
-            <span v-if="subItem.HighSpeedPayType === 3">预付</span>
+            <span v-if="subItem.PayStyle === 1">现付</span>
+            <span v-else-if="subItem.PayStyle === 2">公司结算</span>
+            <span v-else-if="subItem.PayStyle === 3">预付</span>
+            <span v-else>暂无</span>
           </div>
         </td>
         <td>
@@ -397,9 +408,10 @@
         </td>
         <td>
           <div v-for="subItem in item.ScenicStatisticsList">
-            <span v-if="subItem.HighSpeedPayType === 1">现付</span>
-            <span v-if="subItem.HighSpeedPayType === 2">公司结算</span>
-            <span v-if="subItem.HighSpeedPayType === 3">预付</span>
+            <span v-if="subItem.PayStyle === 1">现付</span>
+            <span v-else-if="subItem.PayStyle === 2">公司结算</span>
+            <span v-else-if="subItem.PayStyle === 3">预付</span>
+            <span v-else>暂无</span>
           </div>
         </td>
         <td>
@@ -425,6 +437,7 @@
         <th>预付合计</th>
         <th>团号</th>
         <th>实际领款</th>
+        <th>财务单号</th>
         <th>操作</th>
       </tr>
       <tr v-for='(item, index) in nav' >
@@ -434,6 +447,9 @@
           <p v-if="item.LeaderGetPrice>0">已领款：{{moneyFormat(item.LeaderGetPrice)}}</p>
           <el-input v-if="item.LeaderGetPrice>0 || item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.98)" class="w300" type="number" v-model="item.LeaderGetPriceT"></el-input>
         </td>
+        <td>
+          <span v-for="(subItem, subIndex) in item.FinanceIds" class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', subItem)">{{subItem}}</span>
+        </td>
         <td width="80" class="_zhidan">
           <input type="button" v-if="isUpdate=='true'" value="制单" class="normalBtn" @click="goZhiDan(item)" />
         </td>
@@ -478,6 +494,9 @@
       }
     },
     methods: {
+      goFncUrl: function (path, id) {
+        this.$router.push({ name: path,query:{"id":id,blank:'y'} })
+      },
       goHotelDetail: function (id, num, TCNUM, path) {
          this.$router.push({
           name: path,
@@ -495,6 +514,7 @@
         let totailMoney = 0
         this.nav.forEach(x=>{
           totailMoney += parseFloat(x.LeaderGetPriceT)
+          totailMoney += x.LeaderGetPrice
         })
         console.log(allMoney, totailMoney)
         if ((allMoney - totailMoney)<0) return this.$message.error('总制单金额已大于等于总金额，无法制单！')
@@ -510,7 +530,7 @@
           Money: obj.LeaderGetPriceT,
           TCNUMS: obj.TCNUMS
         }
-        let id = [42]
+        let id = [43]
         this.$router.push({
           name: 'ChoiceAddFinancialDocuments',
           query:{

src/components/SalesModule/enrollTotal.vue

@@ -301,8 +301,8 @@
               </div>
             </div>
           </td>
-          <td colspan="8" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
-            <div>
+          <td colspan="8" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;">
+            <div  @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
               <div>收款单据：</div>
               <div>
                 <span v-for="(item2,index2) in item.financeList" :key="index2">
@@ -314,7 +314,7 @@
                 <span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
               </div>
             </div>
-            <div>
+            <div  @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
               <div>付款单据：</div>
               <div>
                 <span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
@@ -330,10 +330,10 @@
               <div>发票单据：</div>
               <div>
                 <span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
-                  <span v-if="item2.invoiceApplyState===6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
                 </span>
                 <span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
               </div>

src/components/SalesModule/groupTourOrder.vue

@@ -1845,10 +1845,10 @@
               <div>发票单据：</div>
               <div>
                 <span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
-                  <span v-if="item2.invoiceApplyState===6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
                 </span>
                 <span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
               </div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1828,10 +1828,10 @@
               <div>发票单据：</div>
               <div>
                 <span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
-                  <span v-if="item2.invoiceApplyState===6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
                 </span>
                 <span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
               </div>
@@ -2073,10 +2073,10 @@
               <div>发票单据：</div>
               <div>
                 <span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
-                  <span v-if="item2.invoiceApplyState===6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
-                  <span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
                 </span>
                 <span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
               </div>

src/components/busManagement/BusInfo.vue

@@ -290,7 +290,7 @@
             </td>
             <td>
               <div class="w150">
-                <el-input class="w135" @blur='getBusPrice(item)' v-model="item.HighSpeedPrice" placeholder="请输入费用"></el-input>
+                <el-input class="w135"  v-model="item.HighSpeedPrice" placeholder="请输入费用"></el-input>
               </div>
             </td>
             <td>
@@ -326,7 +326,7 @@
             </td>
             <td>
               <div class="w80">
-                {{item.CostPrice*(Number(item.TransferNum)+1)}}
+                {{item.CostPrice*(Number(item.TransferNum)+1) + Number(item.HighSpeedPrice)}}
               </div>
             </td>
           </tr>

src/components/busManagement/busStatistics.vue

@@ -38,7 +38,7 @@
       车辆状态&nbsp;&nbsp;&nbsp;已确定:<span style="color:#4BCA81 ;">√</span>未确定:<span
         style="color: #ff6600;">O</span>未分配:<span style="color:#E95252 ;">X</span>
     </div>
-    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
+    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
       <table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
         <tr>
           <th class="w100">序号</th>
@@ -218,6 +218,7 @@
         list: [],
         colspanTotal: 0,
         isCha: 0,
+        boxHeight: 0,
       }
 
     },
@@ -398,6 +399,7 @@
                 }
               })
             })
+            this.$forceUpdate()
           } else {
             this.$message.error(res.data.message);
           }
@@ -413,6 +415,11 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
+      let width = window.innerWidth - 50
+      let height = window.innerHeight - 65 - 210
+      console.log(height)
+      this.boxHeight = height;
+      this.offsetwidth = width
       this.getList();
       this.getLineTeamList();
     },

src/plug/index.js

@@ -117,10 +117,10 @@ export default {
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
         let locationName = window.location.hostname;
-        // domainUrl = "http://192.168.2.65:8025"; //214主域名
+        domainUrl = "http://192.168.2.65:8025"; //214主域名
         // domainUrl = "http://192.168.2.214:8082"; //214主域名
         // domainUrl = "http://192.168.0.119:8082";
-        domainUrl = "http://192.168.2.106:8082";
+        // domainUrl = "http://192.168.2.106:8082";
         if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
         } else if (locationName.indexOf('viitto') !== -1) {
@@ -148,7 +148,7 @@ export default {
           //google地图图片地址
           GoogleMapImageUrl: "http://super.oytour.com",
           //上传站点
-          UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.106:8120",
+          UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
           //文件站点
           ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
           javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",