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

src/components/FinancialModule/BasicDocuments.vue

@@ -704,26 +704,20 @@
                               <th>账户分类</th>
                               <th>付款方式</th>
                               <th>账户</th>
-                              <!-- <th width="100px">账户余额</th> -->
                               <th>金额</th>
                               <th width="70">币种</th>
                               <th width="150px">汇率</th>
-                              <!-- <th>手续费</th> -->
                               <th width="100px">总金额</th>
-                              <!-- <th>操作</th> -->
                             </tr>
                             <template v-for="(i,index) in payMsgList">
                                 <tr v-if="!i.show" @click="payMsgListShow(i, index)">
                                     <td>{{i.AccName}}</td>
                                     <td>{{i.Name}}</td>
                                     <td>{{i.Account}}</td>
-                                    <!-- <td>{{item.balance}}</td> -->
                                     <td>{{moneyFormat(i.OriginalMoney)}}</td>
                                     <td>{{i.CurrenName}}</td>
                                     <td>{{i.Rate}}</td>
-                                    <!-- <td>{{item.Fee}}</td> -->
                                     <td>{{moneyFormat(i.allMoney)}}</td>
-                                    <!-- <td></td> -->
                                 </tr>
                                 <tr v-else @keyup.enter="addList(2,index)">
                                     <td>
@@ -754,7 +748,7 @@
                                         </el-select>
                                     </td>
                                     <td>
-                                        <el-input v-model="i.OriginalMoney" @change="Calculation(1,index)" @blur="addList(2,index)" placeholder="请输入金额" type="number"  class=" _border_b_1"></el-input>
+                                        <el-input v-model="i.OriginalMoney" @change="Calculation(1,index)" @blur="addList(2,index)" @keyup.native="checkPrice(payMsgList[index],'OriginalMoney', true)" placeholder="请输入金额" type="text"  class=" _border_b_1"></el-input>
                                     </td>
                                     <td>
                                         <p>{{i.CurrenName}}</p>
@@ -795,7 +789,7 @@
                               </td>
                               <!-- <td>{{payMsg.balance}}</td> -->
                               <td>
-                                <el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" @keyup.native="checkPrice(payMsg,'OriginalMoney')" placeholder="请输入金额" type="number"  class=" _border_b_1"></el-input>
+                                <el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" @keyup.native="checkPrice(payMsg,'OriginalMoney', true)" placeholder="请输入金额" type="text"  class=" _border_b_1"></el-input>
                               </td>
                               <td>
                                 <p>{{payMsg.CurrenName}}</p>
@@ -1015,27 +1009,21 @@
                                     <tr>
                                         <th>账户分类</th>
                                         <th>付款方式</th>
-                                        <th>账户</th>
-                                        <!-- <th width="100px">账户余额</th> -->
+                                        <th>账户</th> 
                                         <th>金额</th>
                                         <th width="70">币种</th>
-                                        <th width="150px">汇率</th>
-                                        <!-- <th>手续费</th> -->
-                                        <th width="100px">总金额</th>
-                                        <!-- <th>操作</th> -->
+                                        <th width="150px">汇率</th> 
+                                        <th width="100px">总金额</th> 
                                     </tr>
                                     <template v-for="(i,index) in payMsgList">
                                         <tr v-if="!i.show" @click="payMsgListShow(i, index)">
                                             <td>{{i.AccName}}</td>
                                             <td>{{i.Name}}</td>
-                                            <td>{{i.Account}}</td>
-                                            <!-- <td>{{item.balance}}</td> -->
+                                            <td>{{i.Account}}</td> 
                                             <td>{{moneyFormat(i.OriginalMoney)}}</td>
                                             <td>{{i.CurrenName}}</td>
-                                            <td>{{i.Rate}}</td>
-                                            <!-- <td>{{item.Fee}}</td> -->
-                                            <td>{{moneyFormat(i.allMoney)}}</td>
-                                            <!-- <td></td> -->
+                                            <td>{{i.Rate}}</td> 
+                                            <td>{{moneyFormat(i.allMoney)}}</td> 
                                         </tr>
                                         <tr v-else @keyup.enter="addList(2,index)">
                                             <td>
@@ -1066,7 +1054,7 @@
                                                 </el-select>
                                             </td>
                                             <td>
-                                                <el-input v-model="i.OriginalMoney" @change="Calculation(1,index)" @blur="addList(2,index)" placeholder="请输入金额" type="number"  class=" _border_b_1"></el-input>
+                                                <el-input v-model="i.OriginalMoney" @change="Calculation(1,index)" @blur="addList(2,index)" placeholder="请输入金额" type="text"  class=" _border_b_1"></el-input>
                                             </td>
                                             <td>
                                                 <p>{{i.CurrenName}}</p>
@@ -1107,7 +1095,7 @@
                                         </td>
                                         <!-- <td>{{payMsg.balance}}</td> -->
                                         <td>
-                                            <el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" placeholder="请输入金额" type="number"  class=" _border_b_1"></el-input>
+                                            <el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" placeholder="请输入金额" type="text"  class=" _border_b_1"></el-input>
                                         </td>
                                         <td>
                                             <p>{{payMsg.CurrenName}}</p>
@@ -1609,7 +1597,7 @@ export default {
             this.payMsgList[index].show = true
         }
     },
-    addList: function (type, index) {
+    addList: function (type, index) { 
         if (type) {
             if (this.payMsgList[index].AccountId==='') return
             if (this.payMsgList[index].Type==='') return
@@ -1868,9 +1856,7 @@ export default {
                         newmoney=`${newmoney}1`;
                     }  
                 }
-                
-                this.payMsgList[index].allMoney = Math.round( newmoney* 100) / 100 / 100;
-                                    
+                this.payMsgList[index].allMoney = Math.round( newmoney* 100) / 100 / 100; 
             } else {
                 this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee);
                 this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate);

src/components/FinancialModule/addFinancialDocuments.vue

@@ -442,38 +442,6 @@
                                 :key='item.DepartmentID'>
                             </el-option>
                         </el-select></span></p>
-                        <!-- <p class="_TCIDAndTCNUMList">
-                            <span>
-                                团队编号：
-                            </span>
-                            <template v-if="msg.TCIDList&&msg.TCIDList.length>0">
-                                <p class="_TCIDAndTCNUMList_item"><span v-for="(i,ix) in msg.TCIDList" class="_jump_page _font_bold" @click="jumpPage('productQuery',i,1)">{{i}} <span v-if="ix!=msg.TCIDList.length-1">,</br></span></span></p>
-                            </template>
-                            <template v-else>
-                                <span>无</span>
-                            </template>
-                        </p>
-                        <p v-if="msg.TCIDAndTCNUMList.length==1" @click="jumpPage('TeamBalancePayment',msg.TCIDAndTCNUMList,5)" class="_jump_page _font_bold">团队收支</p>
-                        <p v-if="msg.TCIDAndTCNUMList.length>1" @click="jumpPage('TeamBalancePayment',msg.TCIDAndTCNUMList,6)" class="_jump_page _font_bold">团队收支</p>
-                        <template v-if="GetDetail.FrID==0">
-                            <p v-if="orderObj.OrderSource==9&&orderObj.SourceID>0">国内票务：<span class="_jump_page _font_bold" @click="jumpPage('SettlementOrder',orderObj,2)">{{orderObj.SourceID}}</span></p>
-                            <p v-if="orderObj.OrderSource==10&&orderObj.SourceID>0">签证：<span class="_jump_page _font_bold" @click="jumpPage('VisaProductCopy',orderObj,3)">{{orderObj.SourceID}}</span></p>
-                            <p v-if="OrderSource==4&&orderObj.SourceID>0" class="_TCIDAndTCNUMList">
-                                <span>机票收支：</span>
-                                <span class="_TCIDAndTCNUMList_item">
-                                    <span v-for="(i,ix) in orderObj.TCIDAndTCNUMList" class="_jump_page _font_bold _font_bold" @click="jumpPage('FinancialOrder',orderObj,4)">{{i.TCNUM}}（{{orderObj.SourceID}}）
-                                        <span v-if="ix!=orderObj.TCIDAndTCNUMList.length-1">,</br></span>
-                                    </span>
-                                </span>
-                                <p class="_TCIDAndTCNUMList_item">
-                                    <template v-for="(i,ix) in orderObj.TCIDAndTCNUMList">
-                                        <span  class="_jump_page _font_bold" @click="jumpPage('FinancialOrder',orderObj,4)">{{i.TCNUM}}（{{orderObj.SourceID}}） </span>
-                                        <span v-if="ix!=orderObj.TCIDAndTCNUMList.length-1"></br></span>
-                                    </template>
-                                </p>
-                            </p>
-                            <p v-if="orderObj.OrderSource==4&&orderObj.SourceID>0" @click="jumpPage('FinancialOrder',orderObj.SourceID,4)" class="_jump_page _font_bold">机票收支</p>
-                        </template> -->
                         <template v-if="GetDetail.FrID!=0">
                             <p v-if="GetDetail.OrderSource==9&&GetDetail.SourceID>0">{{$t("fnc.gnpiaowu")}}：<span class="_jump_page _font_bold" @click="jumpPage('SettlementOrder',GetDetail,2)">{{GetDetail.SourceID}}</span></p>
                             <p v-if="GetDetail.OrderSource==10&&GetDetail.SourceID>0">{{$t('active.cl_qianzheng')}}：<span class="_jump_page _font_bold" @click="jumpPage('VisaProductCopy',GetDetail,3)">{{GetDetail.SourceID}}</span></p>

src/components/Hotel/roomReservationsDetails.vue

@@ -156,7 +156,7 @@
                   </tr>
                   <tr>
                     <td colspan="2">
-                      <span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">暂无手配费</span>
+                      <span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">无手配费</span>
                       <span v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</span>
                     </td>
                   </tr>

src/components/LeaderManagement/leaderPayHotelDetail.vue

@@ -18,8 +18,8 @@
         <th>备注</th> 
       </tr>
      <template v-for='(item,index) in dataList'>
-        <!-- <template v-for="(subItem,subIndex) in item.ScenicStatisticsList"> -->
-          <tr v-for="(childItem,childIndex) in item.ReimburseList.ReimburseDetailsList">
+        <template v-if="item.ReimburseList && item.ReimburseList.length">
+          <tr v-for="(childItem,childIndex) in item.ReimburseList.ReimburseDetailsList" >
             <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">{{item.CheckInDateStr}}</td>
             <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
               {{item.HotelName}}
@@ -52,7 +52,11 @@
               {{item.ReimburseList.Remarks}}
             </td> 
           </tr>
-        <!-- </template> -->
+          </template>
+          <tr v-else>
+            <td  colspan="9">暂无数据</td>
+          </tr>
+       
       </template>
     </table>
     

src/components/LeaderManagement/leaderPerformance.vue

@@ -326,6 +326,7 @@
               <el-option label="年榜" :value='3'></el-option>
               <el-option label="总榜" :value='1'></el-option>
               <el-option label="人均" :value='4'></el-option>
+              <el-option label="回佣人均" :value='5'></el-option>
               </el-option>
             </el-select>
           </span>
@@ -364,6 +365,10 @@
               人均
               <i></i>
             </li>
+            <li :class="msg.Type==5?'Day_active':''" @click="msg.Type=5,getStatis()">
+              回佣人均
+              <i></i>
+            </li>
           </ul>
           <div class="ChampionsLeague clearfix">
             <div class="championList" v-for="item in yajun" :key="item.subCode">
@@ -490,7 +495,7 @@
           QMonthStr: this.msg.MonthStr,
           ShoppingID:this.msg.ShoppingID
         };
-        if(msg.Type==4)
+        if(msg.Type==4||msg.Type==5)
         {
           msg.QMonthStr=this.msg.Year+","+this.msg.Month;
         }
@@ -516,7 +521,6 @@
           err => {}
         );
       },
-
       //获取工作类型(值获取领兼地和导游)
       getWorkType() {
         this.apipost(

src/components/LeaderManagement/leaderReimbursement.vue

@@ -125,7 +125,7 @@
       </tr>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="15">
+        <td colspan="16">
           <span v-for="item in TotalNav.busPrice">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span>
         </td>
       </tr>
@@ -222,7 +222,8 @@
             <td style="white-space:nowrap; ">
               <p class="cursorpointer text-decoration"
                 @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
-                {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
+                <!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}} -->
+                 {{moneyFormat(childItem.UnitPrice)}}
               </p>
             </td>
             <td style="white-space:nowrap; ">
@@ -307,7 +308,7 @@
               <span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"
                   :style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
 
-              <div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">暂无手配费</div>
+              <div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">无手配费</div>
               <div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</div>
 
             </td>
@@ -375,7 +376,8 @@
             <td>
               <p class="cursorpointer text-decoration"
                 @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
-                {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
+                {{ moneyFormat(childItem.PeoplePrice) }}
+                 <!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} -->
               </p>
             </td>
             <td>
@@ -447,7 +449,8 @@
             <td>
               <p class="cursorpointer text-decoration"
                 @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
-                {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
+                <!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} -->
+                  {{ moneyFormat(childItem.PeoplePrice)}}
               </p>
             </td>
             <td>

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -4,12 +4,13 @@
       <ul>
         <li>
           <template v-if="IsOperation != 1">
-            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" :disabled="IsDisabled" />
+            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" :disabled="IsDisabled" />
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
-            <input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+            <input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存"
+              @click="saveList(1)" />
           </template>
         </li>
       </ul>
@@ -193,7 +194,9 @@
         loading: false,
         IsOperation: '',
         //当前登录人信息
-        CurrentUserInfo:{},
+        CurrentUserInfo: {},
+        //是否禁用按钮
+        IsDisabled: false,
       };
     },
     methods: {
@@ -281,6 +284,7 @@
         obj.TotalPrice = totalPrice.toFixed(2);
       },
       saveList(type) {
+        this.IsDisabled = true;
         if (type == 0) {
           this.list.forEach(item => {
             item.DiningSummaryList.forEach(insideItem => {
@@ -313,7 +317,9 @@
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);
             this.getList();
+            this.IsDisabled = false;
           } else {
+            this.IsDisabled = false;
             this.$message.error(res.data.message);
           }
         }, err => {})

src/components/SalesModule/investigationDetail.vue

@@ -18,14 +18,12 @@
         <template v-else-if="item.SurveyType === 2"> 
           <template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'">
             <span>{{r.OptionsName}}</span>
-          </template>
-          <!-- <el-radio v-for="(r, i) in item.SurveyOptionsList" v-model="item.lable" :label="r.ID" disabled="disabled" :key="i"></el-radio> -->
+          </template> 
         </template>
         <template v-else-if="item.SurveyType === 3">
           <template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'">
             <span>{{r.OptionsName}}</span>
           </template>
-          <!-- <el-checkbox  v-for="(r, i) in item.SurveyOptionsList" v-model="item.ckeckList" :label="r.ID" disabled="disabled" :key="i">{{r.OptionsName}}</el-checkbox > -->
         </template>
         <template v-else-if="item.SurveyType === 4"> 
           <span>{{item.TextContent}}</span> 

src/components/SalesModule/investigationList.vue

@@ -39,8 +39,9 @@
                 type="primary"
                 icon="iconfont icon-sousuo"
                 circle
-                @click="dialogTitle = '游客问券', showID = item.ID, DiaoChaShow = true"
+                @click="dialogTitle = '游客问券', openPage(item)"
               ></el-button>
+              <!-- showID = item.ID, DiaoChaShow = true -->
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="查看游记" placement="top">
               <el-button
@@ -74,6 +75,7 @@
       :before-close="closeDialog">
       <YouJi :ID="showID"/>
     </el-dialog>
+    <a href="" id="blankLink" target="_blank" style="display:none">1</a>
   </div>
 </template>
 <script>
@@ -98,6 +100,12 @@ export default {
       OrderID = this.$route.query.OrderId;
     this.getList(TCID, OrderID);
   },methods: {
+    openPage: function (obj){
+      console.log(obj)
+      let dom = document.querySelector("#blankLink");
+      dom.href = "http://activity.oytour.com/html/invesDetails2.html" + '?ID=' + obj.ID + '&name=' + encodeURI(obj.GuestName) + '&MobilePhone=' + obj.CustomerPhone
+      dom.click();
+    },
     closeDialog: function () {
       this.DiaoChaShow = false;
       this.YouJiShow = false;

src/components/Ticketing/TicketManager.vue

@@ -1646,8 +1646,10 @@
                     </el-tooltip>
                     <el-tooltip class="item" effect="dark" content="已出中段" placement="top-start"
                       v-show="item.TicketState==0">
-                      <el-button type="primary" class="iconfont icon-zhongzhuan" @click="UpdateTicketState(item.ID,2)">
+                      <el-button type="primary" class="iconfont icon-zhongzhuan" @click="ZhongDuanPNR = true, ZhongDuanID= item.ID">
                       </el-button>
+                      <!-- <el-button type="primary" class="iconfont icon-zhongzhuan" @click="UpdateTicketState(item.ID,2)">
+                      </el-button> -->
                     </el-tooltip>
                     <el-tooltip class="item" effect="dark" content="出票完成" placement="top-start"
                       v-show="item.TicketState!=1">
@@ -2149,7 +2151,17 @@
       </div>
 
     </el-form>
-
+    <el-dialog custom-class="w400" :title="importFileTitle" :visible.sync="ZhongDuanPNR" center>
+      <el-form label-width="110px">
+        <el-form-item label="中段PNR">
+          <el-input v-model="MidpiecePNR"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="dialogFormVisible=false">{{$t('pub.cancelBtn')}}</button>
+          <button class="normalBtn" type="primary" @click="UpdateTicketState(ZhongDuanID, 2)">{{$t('pub.sureBtn')}}</button>
+      </div>
+    </el-dialog>
     <el-dialog custom-class="w700" :title="importFileTitle" :visible.sync="outerVisible" center>
       <el-upload v-if="uploadDoc" ref="ticketUpload" drag class="upload-demo" :action="getImportFileUrl()"
         :on-success="handleAvatarSuccess">
@@ -2186,6 +2198,9 @@
         }
       }
       return {
+        MidpiecePNR: '',
+        ZhongDuanID: 0,
+        ZhongDuanPNR: false,
         outerVisible1: false,
         //导入文件弹窗标题
         importFileTitle: "批量导入",
@@ -2857,7 +2872,8 @@
         this.apipost(
           "AirTicket_get_UpdateTicketState", {
             ID: ID,
-            TicketState: TicketState
+            TicketState: TicketState,
+            MidpiecePNR: this.MidpiecePNR
           },
           res => {
             if (res.data.resultCode == 1) {
@@ -2866,6 +2882,7 @@
             } else {
               this.Warning(res.data.message);
             }
+            this.ZhongDuanPNR=false
           },
           err => {}
         );

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -4,8 +4,8 @@
       <ul>
         <li>
           <template v-if="IsOperation !=1">
-            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" :disabled="IsDisabled" />
+            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" :disabled="IsDisabled" />
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
@@ -161,6 +161,8 @@
         IsOperation: '',
         //当前登录人信息
         CurrentUserInfo:{},
+        //是否禁用按钮
+        IsDisabled:false,
       }
     },
     methods: {
@@ -213,6 +215,7 @@
         }, err => {})
       },
       saveList(type) {
+        this.IsDisabled=true;
         if (type == 0) {
           this.DataList.forEach(item => {
             item.ScenicStatisticsList.forEach(insideItem => {
@@ -247,10 +250,13 @@
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);
             this.getList();
+            this.IsDisabled=false;
           } else {
+            this.IsDisabled=false;
             this.$message.error(res.data.message);
           }
         }, err => {})
+
       },
     },
     mounted() {