解决冲突

src/App.vue

@@ -117,11 +117,16 @@ export default {
     }
   },
   mounted() {
-    if (!this.getLocalStorage() && document.URL.indexOf("SupplierLogin")==-1) {
+    if (!this.getLocalStorage() && document.URL.indexOf("SupplierLogin")==-1&& document.URL.indexOf("clientConfirm")==-1) {
       this.$router.push({
         path: '/login'
       })
     }else{
+      if(document.URL.indexOf("clientConfirm")!=-1){
+          localStorage.openMode=0
+      }else{
+        
+      }
       this.timekeeper()
       this.listeneruser()
     }

src/assets/utils/travelFeature2.js

@@ -2,7 +2,7 @@ let travelFeatureTwo = {
   HotelInit: function (index, data) { // 酒店初始化
     let list = [];
     for (let item of data[index].HotelArray) {
-      if (item.HotelName && item.HotelName !== '' && item.HotelName!="温馨的家") {
+      if (item.HotelName && item.HotelName !== '' && item.HotelName!="温馨的家" &&item.HotelName!="机场附近酒店") {
         let obj = {
           name: '',
           description: '',

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -19,8 +19,8 @@
     ._bg__ ._bg_green:hover{
         color:rgb(66, 182, 132);
     }
-    ._bg_red{color: #E95252;}
-    ._bg_green{color: #2BB87C}
+    .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+    .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
 
     .page_CompanyAccDetail .el-dialog__wrapper input{border: none !important;background-color: transparent !important;padding: 0 2px !important; text-align: center}
     .page_CompanyAccDetail .el-dialog--center .el-dialog__body{
@@ -178,10 +178,10 @@
                     </td>
                     <td> {{ item.BName }} </td>
                     <!-- <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
                     </td> -->
                     <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
                     </td>
                     <td>
                         <p v-if="item.CostTypeList&&item.CostTypeList.length"> <span v-for="(i,o) in item.CostTypeList">{{ i }} </span> </p>

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -13,14 +13,14 @@
         cursor: pointer;
         text-decoration: underline;
     }
-    ._bg__ ._bg_red:hover{
+    ._bg__ .CAcc_bg_red:hover{
         color: rgb(230, 97, 97);
     }
-    ._bg__ ._bg_green:hover{
+    ._bg__ .CAcc_bg_green:hover{
         color:rgb(66, 182, 132);
     }
-    .page_CompanyAccDetail ._bg_red{color: #E95252;}
-    .page_CompanyAccDetail ._bg_green{color: #2BB87C}
+    .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+    .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
     ._addChuNa_tit{color: gray;margin-bottom: 10px;}
     ._addChuNa_tit span{ color:#333333}
 </style>
@@ -159,9 +159,9 @@
                       <input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
                     </td>
                     <td>{{ item.BName }}</td>
-                    <!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
+                    <!-- <td><span class="cursorpointer" :class="item.Type==1?'CAcc_bg_green':'CAcc_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
                      <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
                     </td>
                     <td>
                         <p>{{item.CostTypeName}}</p>

src/components/FinancialModule/accDetail/PayAccDetail.vue

@@ -19,8 +19,8 @@
   ._bg__ ._bg_green:hover{
     color:rgb(66, 182, 132);
   }
-  ._bg_red{color: #E95252;}
-  ._bg_green{color: #2BB87C}
+  .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+  .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
 
   .page_CompanyAccDetail .el-dialog__wrapper input{border: none !important;background-color: transparent !important;padding: 0 2px !important; text-align: center}
   .page_CompanyAccDetail .el-dialog--center .el-dialog__body{
@@ -125,7 +125,7 @@
           </td>
           <td> {{ item.BName }} </td>
           <td>
-            <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
+            <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
           </td>
           <td>
             <p v-if="item.CostTypeList&&item.CostTypeList.length"> <span v-for="(i,o) in item.CostTypeList">{{ i }} </span> </p>

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -19,8 +19,8 @@
     ._bg__ ._bg_green:hover{
         color:rgb(66, 182, 132);
     }
-    ._bg_red{color: #E95252;}
-    ._bg_green{color: #2BB87C}
+    .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+    .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
     ._addChuNa_tit{color: gray;margin-bottom: 10px;}
     ._addChuNa_tit span{ color:#333333}
     .page_CompanyAccDetail .singeRowTable tr td{
@@ -159,7 +159,7 @@
                     <!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
                     
                     <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
                     </td>
                     <td>
                         <p>{{item.CostTypeName}}</p>

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -19,8 +19,8 @@
     ._bg__ ._bg_green:hover{
         color:rgb(66, 182, 132);
     }
-    ._bg_red{color: #E95252;}
-    ._bg_green{color: #2BB87C}
+    .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+    .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
     ._addChuNa_tit{color: gray;margin-bottom: 10px;}
     ._addChuNa_tit span{ color:#333333}
 </style>
@@ -161,7 +161,7 @@
                         <span class="cursorpointer" :class=" item.Type == 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
                     </td> -->
                      <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
                     </td>
                     <td>
                         <p> {{ item.CostTypeName }} </p>

src/components/FinancialModule/addFinancialDocuments.vue

@@ -321,7 +321,7 @@
                                 <el-input v-model="da.UnitPrice"  type="text" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
                             </td>
                             <td height="26px">
-                                <el-select  filterable  v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
+                                <el-select  filterable :disabled="detailCurrDis" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
                                     <el-option v-for='item in coinGetList'
                                         :label='item.Name'
                                         :value='item.ID'
@@ -360,7 +360,7 @@
                             <el-input v-model="detailList.UnitPrice" type="text" @keyup.native="checkPrice(detailList,'UnitPrice',true)"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
                         </td>
                         <td>
-                            <el-select  filterable  v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
+                            <el-select  filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
                                 <el-option v-for='item in coinGetList'
                                     :label='item.Name'
                                     :value='item.ID'
@@ -538,6 +538,7 @@ import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
 export default {
     data(){
         return{
+            detailCurrDis:false,
             Description:"",
             msg:{
               FrID:0,
@@ -831,7 +832,11 @@ export default {
             e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
         },
         AddFinancial(z){  //保存
-            
+            // if(this.orderObj&&this.orderObj.CurrencyId){
+            //     this.msg.detailList=[];
+            //     this.msg.detailList.push(this.detailList);
+            // }
+             
             if(z){
                 this.msg.Status = 0;
             }else{
@@ -888,6 +893,8 @@ export default {
           this.loading = true;
           this.msg.Description=this.Description;
             this.apipost('Financial_post_Set',this.msg,res=>{
+                console.log("res",res);
+                console.log("this.msg",this.msg);
                 if(res.data.resultCode==1){
                   //清除旅客名单数据
                   sessionStorage.removeItem("saveGuestInfo");
@@ -1042,6 +1049,7 @@ export default {
                     this.$forceUpdate();
                 }
             })
+            console.log("this.detailList.Rate",this.detailList.Rate)
             this.Calculation(t,index+1)
         },
         financeinfo_post_GetClientTypeList(){  // 获取对象类型
@@ -1139,7 +1147,6 @@ export default {
             this.apipost('Financial_post_GetCostTypeList',{ID:id}, res => {
                 if(res.data.resultCode == 1) {
                     this.GetCostTypeList = res.data.data;
-                    console.log(this.GetCostTypeList,'type');
                     if(type){
                         this.msg.detailList.forEach(x=>{
                             this.GetCostTypeList.forEach(y=>{
@@ -1159,6 +1166,7 @@ export default {
             this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID}, res => {
                 if(res.data.resultCode == 1) {
                     this.coinGetList = res.data.data;
+                    console.log("this.coinGetList 522555",this.coinGetList )
                 }
             }, err => {})
         },
@@ -1172,9 +1180,9 @@ export default {
             // })
             // TCID.split(0,TCID.length-1)
             this.apipost('Financial_post_Get',{ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
-                // console.log(this.orderObj.TCIDList)
+                
                 if(res.data.resultCode == 1) {
-                    console.log("res.data",res.data)
+                    // console.log("res.data",res.data)
                     let data= res.data.data;
                     this.editTemplateId=data.TemplateId;
                     this.getCompany();
@@ -1235,6 +1243,7 @@ export default {
                         this.msg.OrderID = this.orderObj.OrderID?this.orderObj.OrderID:0;
                         this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
                         this.msg.TCID = this.orderObj.TCID?this.orderObj.TCID:0;
+                        this.financeinfo_post_GetList(this.msg.TCID);
                         this.msg.TCIDList = this.orderObj.TCIDList?this.orderObj.TCIDList:[];
                         this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
@@ -1245,7 +1254,17 @@ export default {
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
                             this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }
+                        if(this.orderObj.CurrencyId){
+                            this.detailList.CurrencyId=Number(this.orderObj.CurrencyId);
+                            this.detailCurrDis=true;
+                            this.detailList.CostTypeId=this.orderObj.CostType?this.orderObj.CostType: '';
+                            this.getRate(this.detailList.CostTypeId,this.detailList.CurrencyId,1)  
+                            this.addList(1);
+
+                    }
+                        
                     }
+                    
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
                             x.Url = x.Content;
@@ -1346,7 +1365,6 @@ export default {
                                 this.companyList = data;
                             }
                         }
-                        console.log('this.companyList', this.companyList)
                     }, err => {})
                  
                 }
@@ -1432,7 +1450,7 @@ export default {
                 var gjzd = guojizhongduan==''?'':'国际中段:'+guojizhongduan;
                 var sj = shuijin==''?'':'税金:'+shuijin;
                 var sc = shengcang==''?'':'升舱:'+shengcang;
-                this.Description= gj+' '+gn+' '+gjzd+ ' '+ sj+' '+sc
+                this.Description= gj+`\n`+gn+`\n`+gjzd+`\n`+sj+`\n`+sc
             }
         }
     },
@@ -1440,7 +1458,7 @@ export default {
         var that=this;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
         this.isFrompassenger = this.orderObj.isFromPassenger;
-        //  console.log(this.$route.query.orderObj)
+        
         if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
@@ -1451,6 +1469,7 @@ export default {
           }
           
         }
+         
     },
     mounted(){
         let userInfo = this.getLocalStorage();
@@ -1476,14 +1495,14 @@ export default {
             this.msg.FrID = this.$route.query.FrID;
             this.Financial_post_Get(this.$route.query.FrID,0);
         }else{
+            let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
+            this.financeinfo_post_GetList(TCID);
             this.msg.TemplateId = this.$route.query.id;
             this.Financial_post_GetCostTypeList(this.$route.query.id);
             this.BillName = userInfo.GroupName;
             this.BillSonName = this.$route.query.Name;
             this.FinancialFlowTemplate_post_GetProcessList(this.$route.query.id);
             this.Financial_post_Get(0,parseInt(this.$route.query.id));
-            let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
-            this.financeinfo_post_GetList(TCID);
         }
         if(this.$route.query.Conditon){
             this.returnCode = this.$route.query.Conditon;

src/components/Hotel/HotelWorkList.vue

+<template>
+  <div>
+    <div class="query-box" style="border-bottom: none;">
+      <ul>
+        <li>
+          <span>
+            <em>时间</em>
+            <el-date-picker v-model="msg.YearMonthStr" type="month" value-format="yyyy-MM" placeholder="选择月">
+            </el-date-picker>
+          </span>
+        </li>
+        <li>
+          <input type="button" class="normalBtn" value="查询" @click="getList()" />
+          <!-- <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" /> -->
+        </li>
+      </ul>
+    </div>
+    <div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;">
+      <span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span> 
+      <span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">暂定</span>
+      <span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">未操作</span> 
+    </div>
+    <el-table :data="dataList" style="width:100%" border v-loading='loading' height="700">
+      <el-table-column fixed label="酒店名称" min-width="180">
+        <template slot-scope="scope">
+          <div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.Hotel)">
+            {{scope.row.HotelName}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="150">
+        <template slot-scope="scope">
+          <template v-if="scope.row.DayList[index].IsHaveStock==0">
+            <div style="background-color: #000!important;width:100%;height:100%;"></div>
+          </template>
+          <template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
+            <div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">{{childItem.BookGroup}}</div>
+            <div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1">{{childItem.BookGroup}}</div>
+            <div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'" v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="noDataNotice" v-if="dataList.length==0">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        //查询条件
+        msg: {
+          YearMonthStr: "",
+          CountryId: 651, //只查询日本
+        },
+        defaultSelectValue: 0,
+        dataList: [],
+        loading: false,
+      };
+    },
+    methods: {
+      GotoHotel(HotelId) {
+        this.$router.push({
+          path: "HotelManagement",
+          query: {
+            ID: HotelId,
+            tab: "酒店查询",
+            blank: 'y',
+          }
+        });
+      },
+      getList() {
+        this.loading = true;
+        this.dataList = [];
+        if (this.msg.YearMonthStr == "") {
+          this.msg.YearMonthStr = new Date().Format("yyyy-MM");
+        }
+        this.apipost("hotel_post_GetHotelWorkListService", this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data;
+              //console.log("this.dataList", this.dataList);
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+
+    },
+    mounted() {
+      this.msg.YearMonthStr = new Date().Format("yyyy-MM");
+      this.getList();
+    },
+  };
+
+</script>
+
+<style>
+
+</style>

src/components/Hotel/roomReservationsDetails.vue

@@ -279,6 +279,9 @@
               <!-- 金额总计 -->
               <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
                 {{subItem.TotalPrice}}
+                <template v-if="subItem.NewTotalPrice">
+                  <br /><span style="color:red;">{{subItem.NewTotalPrice}}</span>
+                </template>
               </td>
               <!-- 付款方式 -->
               <td v-if="childIndex==0" :rowspan="6">
@@ -286,7 +289,8 @@
                   <tr>
                     <td width="70" style="text-align:right;">币种：</td>
                     <td>
-                      <el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel' style="display:none;">
+                      <el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel'
+                        @change="calculationPrice(subItem)">
                         <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                         <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name"
                           :value="item.ID">
@@ -346,6 +350,7 @@
                         <el-option label='实物抵扣' :value='3'></el-option>
                         <el-option label='预付' :value='4'></el-option>
                         <el-option label='预付款抵扣' :value='5'></el-option>
+                        <el-option label='领队导游垫付' :value='10'></el-option>
                       </el-select>
                     </td>
                   </tr>
@@ -365,6 +370,7 @@
                         <el-option label='预付' :value='4'></el-option>
                         <el-option label='预付款抵扣' :value='5'></el-option>
                         <el-option label='公司合团支付' :value='6'></el-option>
+                        <el-option label='领队导游垫付' :value='10'></el-option>
                       </el-select>
                     </td>
                   </tr>
@@ -754,6 +760,18 @@
       },
       calculationPrice(obj) {
         let totalPrice = 0;
+        //获取当前选中的对象
+        let currentObj = {};
+        if (obj.CurrencyId != 0) {
+          currentObj = this.allCurrencyList.find(item => {
+            return item.ID === obj.CurrencyId; //筛选出匹配数据
+          });
+        }
+        
+        //日元
+        let jpaObj = this.allCurrencyList.find(item => {
+          return item.ID === 3; //筛选出匹配数据
+        });
         obj.OrderDetailsList.forEach((item, index) => {
           var tempPrice = 0;
           var coefficient = 1;
@@ -771,6 +789,27 @@
         })
         totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
         obj.TotalPrice = totalPrice.toFixed(2);
+        if (currentObj && currentObj.ID > 0) {
+          //人民币
+          if (currentObj.ID == 1) {
+            obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice * jpaObj.PayRate).toFixed(2);
+          }
+          //日元
+          else if (currentObj.ID == 3) {
+            obj.NewTotalPrice = "";
+          } else {
+            if(currentObj.CurrentRate>1)
+            {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
+            }
+            else
+            {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
+            }
+          }
+        } else {
+          obj.NewTotalPrice = "";
+        }
         this.$forceUpdate();
       },
       getHotelList(obj) {
@@ -818,7 +857,7 @@
         }
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
-            subItem.OrderDetailsList.forEach(y => {
+            subItem.OrderDetailsList.forEach((y, sIndex) => {
               if (y.HouseTypeCount) {
                 y.HouseTypeCount = parseFloat(y.HouseTypeCount);
               } else {
@@ -837,10 +876,13 @@
               if (y.BookNum == "") {
                 y.BookNum = 0;
               }
-              if (y.RebateRatio == "") {
+              if (!this.$commonUtils.isNumber(y.RebateRatio)) {
                 y.RebateRatio = 0;
               }
             })
+            if (!this.$commonUtils.isNumber(subItem.TotalPrice)) {
+              subItem.TotalPrice = 0;
+            }
           });
         })
         this.loading = true;
@@ -879,10 +921,13 @@
               if (y.BookNum == "") {
                 y.BookNum = 0;
               }
-              if (y.RebateRatio == "") {
+              if (!this.$commonUtils.isNumber(y.RebateRatio)) {
                 y.RebateRatio = 0;
               }
             })
+            if (!this.$commonUtils.isNumber(subItem.TotalPrice)) {
+              subItem.TotalPrice = 0;
+            }
           });
         })
         let mag = {

src/components/Restaurant/RestaurantSalesBoard.vue

@@ -210,9 +210,18 @@
             </el-select>
           </span>
         </li>
+        <li >
+          <span>
+            <em>类型</em>
+            <el-select v-model="msg.QStatus" :placeholder="$t('pub.pleaseSel')" filterable>
+              <el-option  :key="0" label="地接餐厅订单" :value="0"></el-option>
+              <el-option  :key="1" label="行程餐厅" :value="1"></el-option>
+            </el-select>
+          </span>
+        </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
-          <button class="normalBtn" type="button" @click="DownLoadDinnerSalesBoard()" >下载</button>
+          <button class="normalBtn" type="button" @click="DownLoadDinnerSalesBoard()">下载</button>
         </li>
       </ul>
     </div>
@@ -267,7 +276,8 @@
           Year: 0,
           Month: 0,
           DiningID: 0,
-          loading: false
+          QStatus:0,
+          loading: false,
         },
         //餐厅列表
         DinnerList: [],
@@ -347,7 +357,7 @@
         var that = this;
         this.msg.Year = this.currentYear;
         this.msg.Month = this.currentMonth;
-        this.DayData=[];
+        this.DayData = [];
         this.apipost(
           "order_post_GetDinnerMonthStatistics",
           this.msg,
@@ -363,7 +373,7 @@
                 d.getMonth() + 1,
                 d.getDate()
               );
-              dayItem.dayValue=[];
+              dayItem.dayValue = [];
               for (var j = 0; j < this.DayData.length; j++) {
                 if (this.DayData[j].Day == myDate) {
                   dayItem.dayValue = this.DayData[j].SubList;
@@ -381,7 +391,9 @@
       //获取酒店列表
       GetDinnerList() {
         this.apipost(
-          "dining_post_GetList", {QCountry:651},
+          "dining_post_GetList", {
+            QCountry: 651
+          },
           res => {
             if (res.data.resultCode == 1) {
               this.DinnerList = res.data.data;

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -118,9 +118,24 @@
               </td>
               <td v-if="childIndex==0" :rowspan="3">
                 {{subItem.TotalPrice}}
+                <template v-if="subItem.NewTotalPrice">
+                  <br /><span style="color:red;">{{subItem.NewTotalPrice}}</span>
+                </template>
               </td>
               <td v-if="childIndex==0" :rowspan="3">
                 <table class="dinnerTable">
+                  <tr>
+                    <td width="70" style="text-align:right;">币种：</td>
+                    <td>
+                      <el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel'
+                        @change="calculationPrice(subItem)">
+                        <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                        <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name"
+                          :value="item.ID">
+                        </el-option>
+                      </el-select>
+                    </td>
+                  </tr>
                   <tr>
                     <td width="60" style="text-align:right;">
                       付款方式：
@@ -197,6 +212,7 @@
         CurrentUserInfo: {},
         //是否禁用按钮
         IsDisabled: false,
+        allCurrencyList: [],
       };
     },
     methods: {
@@ -278,10 +294,52 @@
       },
       calculationPrice(obj) {
         let totalPrice = 0;
-        obj.DiningPriceList.forEach(item => {
-          totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
+        //获取当前选中的对象
+        let currentObj = {};
+        if (obj.CurrencyId != 0) {
+          currentObj = this.allCurrencyList.find(item => {
+            return item.ID === obj.CurrencyId; //筛选出匹配数据
+          });
+        }
+        
+        //日元
+        let jpaObj = this.allCurrencyList.find(item => {
+          return item.ID === 3; //筛选出匹配数据
+        });
+        obj.DiningPriceList.forEach((item, index) => {
+          var tempPrice = 0;
+          var coefficient = 1;
+          totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice / 100);
+          totalPrice += tempPrice;
         })
         obj.TotalPrice = totalPrice.toFixed(2);
+        if (currentObj && currentObj.ID > 0) {
+          //人民币
+          if (currentObj.ID == 1) {
+            obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice * jpaObj.PayRate).toFixed(2);
+          }
+          //日元
+          else if (currentObj.ID == 3) {
+            obj.NewTotalPrice = "";
+          } else {
+            if(currentObj.CurrentRate>1)
+            {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
+            }
+            else
+            {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
+            }
+          }
+        } else {
+          obj.NewTotalPrice = "";
+        }
+        this.$forceUpdate();
+        // let totalPrice = 0;
+        // obj.DiningPriceList.forEach(item => {
+        //   totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
+        // })
+        // obj.TotalPrice = totalPrice.toFixed(2);
       },
       saveList(type) {
         this.IsDisabled = true;
@@ -356,6 +414,11 @@
       this.TCNUM = this.$route.query.TCNUM;
       this.GuestNum = this.$route.query.GuestNum;
       this.getList();
+      this.apipost("financeinfo_post_GetList", {}, res => {
+        if (res.data.resultCode === 1) {
+          this.allCurrencyList = res.data.data;
+        }
+      }, err => {});
     }
   };
 

src/components/SalesModule/productQueryOne.vue

@@ -283,8 +283,8 @@
               <el-input v-model='addMsg.ChirdNoNeedBedNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
                 @input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童不占床");'></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="4" v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'">
+          </el-col> -->
+          <!-- <el-col :span="4" v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'">
             <el-form-item label="儿童占床" prop="ChirdNeedBedNum">
               <el-input v-model='addMsg.ChirdNeedBedNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')"
                 @input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNeedBedNum","儿童占床");'></el-input>

src/components/Ticketing/TicketManager.vue

@@ -1676,7 +1676,9 @@
                 </div>
               </el-col>
               <el-col :span="8">
-                <div class="TCID_cont" style="padding-top:5px;">PNR：{{item.PNR}}</div>
+                <div class="TCID_cont" style="padding-top:5px;">PNR：{{item.PNR}}
+                  <template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
+                </div>
               </el-col>
             </el-row>
           </li>

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -867,7 +867,7 @@
               </el-col>
               <el-col :span="8">
                 <div class="TCID_cont">
-                  PNR：{{item.PNR}}
+                  PNR：{{item.PNR}} <template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
                 </div>
               </el-col>
             </el-row>

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -850,7 +850,7 @@
               </el-col>
               <el-col :span="10">
                 <div class="TCID_cont">
-                  PNR：{{item.PNR}}
+                  PNR：{{item.PNR}}<template v-if="item.MidpiecePNR">&nbsp;&nbsp;中段PNR:{{item.MidpiecePNR}}</template>
                 </div>
               </el-col>
             </el-row>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -649,6 +649,7 @@
                           <th width="70" style="text-align:center;">机票数量</th>
                           <th width="70" style="text-align:center;">价格</th>
                           <th width="130" style="text-align:center;">PNR</th>
+                          <th width="130" style="text-align:center;">中段PNR</th>
                           <th width="100" style="text-align:center;">票务</th>
                         </tr>
                         <tr v-for="subItem in item.TicketList">
@@ -656,6 +657,7 @@
                           <td style="text-align:center;">{{subItem.TicketNum}}</td>
                           <td style="text-align:center;">{{subItem.TicketPrice}}</td>
                           <td style="text-align:center;">{{subItem.PNR}}</td>
+                          <td style="text-align:center;">{{subItem.MidpiecePNR}}</td>
                           <td style="text-align:center;">{{subItem.TicketCreateByName}}</td>
                         </tr>
                       </table>

src/components/VisaCenter/addVisaNew.vue

@@ -261,7 +261,7 @@
                             <el-input  v-else v-model="item.Duty" type="text" size=mini class="w230" maxlength="50" ></el-input>
                         </el-form-item>
                         <el-form-item :label="$t('hotel.hotel_remark')">
-                            <el-input  v-model="item.Remarks" type="textarea" size=mini class="w230" maxlength="1000"></el-input>
+                            <el-input style="height:30px"  v-model="item.Remarks" type="textarea" size=mini class="w230" maxlength="1000"></el-input>
                         </el-form-item>
                         <el-form-item :label="$t('visaT.student')">
                             <el-checkbox  v-model="item.IsHightSchool" :true-label='1' :false-label='2'></el-checkbox>
@@ -269,6 +269,20 @@
                         <el-form-item :label="$t('system.table_rank')" prop="Sort">
                             <el-input  v-model="item.Sort" @keyup.native="checkInteger(item,'Sort')" type="text" size=mini class="w230" maxlength="6" :placeholder="$t('visaT.qtxrank')"></el-input>
                         </el-form-item>
+                        <el-form-item label="在职证明" prop="IncumbencyCertificationType">
+                             <el-select v-model="item.IncumbencyCertificationType" placeholder="请选择">
+                                <el-option label="已确认为真" :value="1"></el-option>
+                                <el-option label="已确认为假" :value="2"></el-option>
+                                <el-option label="无法确认" :value="3"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label=" 银行流水" prop="AccountStatementType">
+                            <el-select v-model="item.IncumbencyCertificationType" placeholder="请选择">
+                                <el-option label="已确认为真" :value="1"></el-option>
+                                <el-option label="已确认为假" :value="2"></el-option>
+                                <el-option label="无法确认" :value="3"></el-option>
+                            </el-select>
+                        </el-form-item>
                     </div>
                     <div class="_Ec_Box clearfix">
                         <template v-for="(Ec,Eci) in item.EconomicCapabilityS">
@@ -387,7 +401,9 @@ export default {
                 EconomicCapabilityS:[],
                 TimeOver:false,
                 OrderId:'',
-                Sort:0
+                Sort:0,
+                IncumbencyCertificationType:1,
+                AccountStatementType:1,
             },
             rules:{
                 OrderId:[

src/components/commonPage/commonHotelInfo.vue

@@ -78,7 +78,7 @@
                 </template>
             </td>
             <td>
-              <span v-if="hotelSubItem.HotelName!='温馨的家'">
+              <span v-if="hotelSubItem.HotelName!='温馨的家' &&hotelSubItem.HotelName!='机场附近酒店'"> 
                 <template v-if="hotelSubItem.OPState==1">
                   <a style="color:green">OP-指定</a>
                 </template>
@@ -88,7 +88,7 @@
               </span>
             </td>
             <td>
-              <span v-if="hotelSubItem.HotelName!='温馨的家'">
+              <span v-if="hotelSubItem.HotelName!='温馨的家'&&hotelSubItem.HotelName!='机场附近酒店'">
                 <template v-if="hotelSubItem.DMCState==1">
                   <a style="color:green">地接-OK</a>
                 </template>

src/components/commonPage/fiveday.vue

@@ -138,7 +138,7 @@
             suffix = "或同級"
           }
         } else {
-          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家') {
+          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
             if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/commonPage/fourday.vue

@@ -136,7 +136,7 @@ export default {
           suffix = "或同級"
         }
       }else{
-        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
+        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'&& this.day.jiu2[0].name!='机场附近酒店'){
                if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/commonPage/oneday.vue

@@ -109,7 +109,7 @@
             suffix = "或同級"
           }
         } else {
-          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家') {
+          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家'&& this.day.jiu2[0].name!='机场附近酒店') {
             if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/commonPage/threeday.vue

@@ -176,7 +176,7 @@ export default {
           suffix = "或同級"
         }
       }else{
-        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
+        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'&& this.day.jiu2[0].name!='机场附近酒店'){
                if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/commonPage/twoday.vue

@@ -103,7 +103,7 @@ export default {
           suffix = "或同級"
         }
       }else{
-        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
+        if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'&& this.day.jiu2[0].name!='机场附近酒店'){
           if (this.day.jiu2[0].status == 1) {
               suffix = "【保证入住】"
             } else {

src/components/confirmationOrderDownLoad.vue

@@ -698,7 +698,6 @@
         this.apipost('survey_post_GetSurveyWeiXinShare', {
           TCID: this.$route.query.tcid
         }, res => {
-          console.log("生成二维码",res.data);
           if (res.data.resultCode == 1) {
             this.WeiXinShareImgSrc=res.data.data;
           }