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

src/components/FinancialModule/BasicDocuments.vue

@@ -291,6 +291,11 @@
 .page_bdm .yixuanze_money{
     float: right;
 }
+.FD_yijian{
+    margin-left:20px;
+    cursor:pointer;
+    text-decoration: underline;
+}
 </style>
 
 <template>
@@ -321,7 +326,7 @@
                     <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                         <td :colspan="3">
                             {{o.TCNUM}}（{{o.TCID}}）
-                            <span v-if="GetDetail.IsShowPlanUrl === 1" style="margin-left:20px;">旅客意见/{{o.GuestSurveyNum}}份</span>
+                            <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见/{{o.GuestSurveyNum}}份</span>
                         </td>
                         <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
                         <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
@@ -2457,7 +2462,15 @@ export default {
                     blank: "y"
                 }
             });
-        }
+        },
+        goInves(path,TCID){
+            this.$router.push({
+                name: path,
+                query: {
+                    TCID:TCID,
+                }
+            });
+        },
     },created(){
         if(this.$route.query.pageIndex){
             this.pageIndex = this.$route.query.pageIndex;

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -128,8 +128,8 @@
         let newList = [];
         if (this.templateID) { 
           this.templateID.forEach(x=>{
-            this.payList.forEach(y=>{
-              if(x === y.Id) { 
+            this.GetList.forEach(y=>{
+              if(x == y.Id) { 
                 y.showYes = true
                 newList.push(JSON.parse(JSON.stringify(y)))
               } else { 
@@ -144,8 +144,7 @@
       Financial_post_GetList(){ //获取
         this.apipost('Financial_post_GetList',{},res=>{
           if(res.data.resultCode==1){
-            let data = res.data.data;
-            console.log("data",data);
+            let data = res.data.data; 
             if(data){
               data.forEach(x => {
                 // 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -365,6 +365,11 @@
         display: inline-block;
         width:90%;
     }
+    .FD_yijian{
+        margin-left:20px;
+        cursor:pointer;
+        text-decoration: underline;
+    }
 </style>
 
 <template>
@@ -385,7 +390,7 @@
                             <td :colspan="4" v-if="GetDetail.Is_Merge===1">单据号：{{o.FinanceId}}</td>
                             <td :colspan="3">
                                 {{o.TCNUM}}（{{o.TCID}}）
-                                <span v-if="GetDetail.IsShowPlanUrl === 1" style="margin-left:20px;">旅客意见/{{o.GuestSurveyNum}}份</span>
+                                <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见/{{o.GuestSurveyNum}}份</span>
                             </td>
                             <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
                             <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
@@ -963,6 +968,14 @@ export default {
             }
         });
       },
+      goInves(path,TCID){
+        this.$router.push({
+            name: path,
+            query: {
+                TCID:TCID,
+            }
+        });
+      },
     inited (viewer){
       this.$viewer = viewer
     },

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1271,6 +1271,7 @@ export default {
                         this.detailList.CostTypeId = this.orderObj.CostType?this.orderObj.CostType: '';
                         this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
                         this.detailList.Number = this.orderObj.CostType ? 1 : 0
+                        this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
@@ -1455,7 +1456,7 @@ export default {
                 })
                 var gj = guoji==''?'':'国际机票:'+guoji;
                 var gn = guonei==''?'':'国内航段:'+guonei;
-                var gjzd = guojizhongduan==''?'':'国际中断:'+guojizhongduan;
+                var gjzd = guojizhongduan==''?'':'国际中段:'+guojizhongduan;
                 var sj = shuijin==''?'':'税金:'+shuijin;
                 var sc = shengcang==''?'':'升舱:'+shengcang;
                 this.Description= gj+' '+gn+' '+gjzd+ ' '+ sj+' '+sc

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1394,6 +1394,7 @@ export default {
                         this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
                         this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
+                        this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
@@ -1495,7 +1496,6 @@ export default {
           if(that.describeList){
               that.describeList.forEach(item=>{
                 that.Description+=item.GuestName+" ";
-                
             })
           }
           

src/components/Hotel/roomReservationsDetails.vue

@@ -191,11 +191,11 @@
               <!-- 房间数 -->
               <td>
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
-                  v-model='childItem.HouseTypeCount' :disabled="true"></el-input>
+                  v-model='childItem.HouseTypeCount' :disabled="IsEditHotelPeople==0?true:false"></el-input>
               </td>
               <td>
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
-                  @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="true">
+                  @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="IsEditHotelPeople==0?true:false">
                 </el-input>
               </td>
               <!-- 尚差房间数 -->
@@ -489,6 +489,7 @@
         IsOperation: 1,
         LeaderName: "", //领队名称
         GuideName: "", //导游名称
+        IsEditHotelPeople:0,//是否有修改人数权限[0-不能修改，1-可以修改]
       }
     },
     components: {
@@ -705,6 +706,7 @@
           if (res.data.resultCode == 1) {
             this.IsOperation = res.data.data.IsOperation;
             this.IsEditHotel = res.data.data.IsEditHotel;
+            this.IsEditHotelPeople=res.data.data.IsEditHotelPeople;
             let list = res.data.data.HotelOrderListReport;
             this.CreateBy = res.data.data.CreateBy;
             this.CreateByPhoto = res.data.data.CreateByPhoto;
@@ -730,7 +732,7 @@
                 })
               });
               this.list = list;
-             
+   
               this.$forceUpdate();
             }
           } else {

src/components/LeaderManagement/leaderReimbursement.vue

@@ -538,7 +538,7 @@
         </td>
         <td width="80" class="_zhidan">
           <input type="button" v-if="item.TeamType == 1" value="日当费" class="normalBtn" @click="goZhiDan(item, 2)" />
-          <input type="button" value="制单" class="normalBtn" @click="goZhiDan(item)" />
+          <input v-if="item.hideZDBtn" type="button" value="制单" class="normalBtn" @click="goZhiDan(item)" />
         </td>
       </tr>
     </table>
@@ -842,6 +842,10 @@
         if (str == 3)
           return '晚餐'
       },
+      CompareDate(d1, d2){
+        console.log(d1, d2)
+        return ((new Date(d1.replace(/-/g,"\/"))) <= (new Date(d2.replace(/-/g,"\/"))));
+      },
       getNav() {
         let _this = this
         this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
@@ -853,6 +857,11 @@
             nav.forEach(x => {
               nav.LeaderGetPriceT = 0;
               num += x.LeaderGetPrice
+              let dd = this.CompareDate(x.DMCRemark, new Date().Format("yyyy-MM-dd"))
+              x.hideZDBtn = false
+              if(dd) {
+                x.hideZDBtn = true
+              }
             })
             nav.forEach((x, i) => {
               if (i === 0) {

src/components/SalesModule/investigationList.vue

@@ -21,6 +21,7 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>订单号</th>
+        <th>客人名称</th>
         <th>销售名称</th>
         <th>客户名称</th>
         <th>分数</th>
@@ -28,6 +29,7 @@
       </tr>
       <tr v-for="item in dataList">
          <td>{{item.OrderID}}</td>
+         <td>{{item.GuestName}}</td>
          <td>{{item.EnterName}}</td>
          <td>{{item.CustomerName}}</td>
          <td>{{item.ScoreNum}}</td>

src/components/dmc/manager/dmcTotalTable.vue

@@ -463,20 +463,34 @@
 
                     <el-tooltip class="item" effect="dark" content=" 领队/导游配置" placement="top-start"
                       v-if="item.LineId==14&&outItem.PriceCommonList.length>1" style="display:none;">
-                      <el-popover placement="bottom" width="450" trigger="click">
+                      <el-popover placement="bottom" width="800" trigger="click">
                         <table class="dmcSetTable">
-                          <tr>
-                            <template v-for="(hItem,hIndex) in TeamHotelList">
-                              <td>{{hItem.TCNUM}}({{hItem.TCID}})</td>
-                            </template>
-                          </tr>
                           <template v-if="TeamHotelList&&TeamHotelList.length>0">
-                            <template v-for="(hItem,hIndex) in TeamHotelList">
-                            </template>
+                            <tr>
+                              <th>团号/时间</th>
+                              <template v-for="(hItem,hIndex) in TeamHotelList">
+                                  <th>
+                                    {{hItem.TCNUM}}<br/>({{hItem.TCID}})
+                                  </th>
+                              </template>
+                            </tr>
+                          </template>
+                          <template v-for="(hItem,hIndex) in TeamHotelList">
+                           <template v-for="(hSubItem,hSubIndex) in hItem.dayList">
+                            <tr>
+                              <td>{{hSubItem.UseTime}}</td>
+                                <td>
+                                  <template v-if="hSubItem.subList&&hSubItem.subList.length>0">
+                                    {{hSubItem.subList[0].NewHotelName}}
+                                  </template>
+                                </td>
+                               </tr>
+                              </template>
                           </template>
                         </table>
-                        <el-button @click="GetTeamHotelList(outItem.TCIDS)" slot="reference" icon="iconfont icon-suo1"
-                          type="primary" style="background:green; border-color:green"></el-button>
+                        <el-button @click="GetTeamHotelList(outItem.TCIDS)" slot="reference"
+                          icon="iconfont icon-guanli2" type="primary" style="background:green; border-color:green">
+                        </el-button>
                       </el-popover>
                     </el-tooltip>
                   </el-button-group>
@@ -989,7 +1003,7 @@
         }, res => {
           if (res.data.resultCode == 1) {
             this.TeamHotelList = res.data.data;
-            //console.log("TeamHotelList", this.TeamHotelList);
+            console.log("TeamHotelList", this.TeamHotelList);
           } else {
             this.$message.error(res.data.message);
           }

src/components/leaderPay2.vue

@@ -490,6 +490,8 @@ input[type="number"] {
           <th>实付金额</th>
           <th>报账金额
             <input
+              v-if="totalList.SelfPayingExpendTotalPrice>0 || totalList.SelfPayingIncomeTotalPrice>0 || (totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0 ||
+              totalScenicPrice>0 || totalTrafficPrice>0 || totalDinnerPrice>0 || totalHotelPrice>0"
               type="button"
               value="保存"
               class="leader2Btn"
@@ -741,6 +743,66 @@ input[type="number"] {
             <td colspan="5">暂无数据</td>
         </tr>
       </table>
+      <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
+        <tr>
+          <th width="140">团号</th>
+          <th width="200">领款金额</th>
+          <th>出团汇率</th>
+          <th>用款计划汇率</th>
+          <th>汇兑损益金额</th>
+          <th>操作</th>
+        </tr>
+        <tr v-for="(item, index) in TotalNav">
+          <td>{{item.TCNUMS}}</td>
+          <td>{{item.LeaderGetPrice}}</td>
+          <td> 
+            <p v-for="(f, fd) in item.FinanceIds">{{f.Fee}}</p>
+          </td>
+          <td> 
+            <p v-for="(f, fd) in item.FinanceIds">{{f.Rate}}</p>
+          </td>
+          <td> 
+            <p v-for="(f, fd) in item.FinanceIds">{{Math.round(f.OriginalMoney * (f.Rate - f.Fee) * 100) / 100}}</p>
+          </td>
+          <td width="80" class="_zhidan">
+            <input
+              type="button"
+              value="制单"
+              class="leader2Btn"
+              @click="huiDuiShouYi(item, item.FinanceIds)"
+            >
+          </td>
+        </tr>
+        <tr v-if="!TotalNav && !TotalNav.length">
+            <td colspan="5">暂无数据</td>
+        </tr>
+      </table>
+      <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
+        <tr>
+          <th colspan="4">意见调查表</th>
+        </tr>
+        <tr>
+          <th width="140">团号</th>
+          <th>总人数</th>
+          <th>已填写人数</th>
+          <th>明细</th>
+        </tr>
+        <tr v-for="(item, index) in TotalNav">
+          <td>{{item.TCNUMS}}</td>
+          <td>{{item.CommonReport.HouseStatistics.RealityNum}}</td>
+          <td>{{item.TotalGuestsurvey}}</td>
+          <td>
+            <input
+              type="button"
+              value="明细"
+              class="leader2Btn"
+              @click="goDIaoCha(item)">
+          </td>
+        </tr>
+        <tr v-if="!TotalNav && !TotalNav.length">
+            <td colspan="5">暂无数据</td>
+        </tr>
+      </table>
       <template
         v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1"
       >
@@ -816,6 +878,46 @@ export default {
     };
   },
   methods: {
+    // 意见调查列表
+    goDIaoCha: function (obj){
+      let fullPath = `/investigationList?TCID=${obj.TCIDS}&blank=y&tab=问券调查列表`;
+      let dom = document.querySelector("#blankLink");
+      dom.href = `http://${window.location.host}/#${fullPath}`;
+      dom.click();
+    },
+    // 汇兑收益金额制单
+    huiDuiShouYi: function (obj, list){
+      if (obj.ExchangeEarningPrice>0) {
+        this.$message.error('已有财务单据，无法制单')
+        return
+      }
+      let money = 0;
+      for(let i = 0; i < list.length; i++) {
+        money = money + Math.round(list[i].OriginalMoney * (list[i].Rate - list[i].Fee) * 100) / 100
+      }
+      console.log(money)
+      if (money <= 0) {
+        this.$message.error('金额小于0，无法制单')
+        return
+      } else {
+        let userinfo = this.getLocalStorage()
+        let TCIDARR = [obj.TCIDS];
+        let orderObj = {
+          OrderID: 0,
+          OrderSource: 8,
+          Obj: {},
+          SourceID: 0,
+          CostType: 30,
+          TCIDList: TCIDARR,
+          Money: money,
+          laRemark: "实际领款金额 * (实际领款汇率 - 出团汇率)",
+        };
+        let fullPath = `/ChoiceAddFinancialDocuments?Type=${0}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
+        let dom = document.querySelector("#blankLink");
+        dom.href = `http://${window.location.host}/#${fullPath}`;
+        dom.click();
+      }
+    },
     // 保存报账金额
     saveBZPrice: function (){
       let HotelPrice = this.BaoZhangPrice.HotelPrice ? parseFloat(this.BaoZhangPrice.HotelPrice) : 0
@@ -877,7 +979,8 @@ export default {
         this.$message.error('金额有误')
         return
       }
-      if (obj.Type == 1) {
+      // type 1 零件地 自动生成  2 领队人头费 跳转
+      if (obj.Type == 2) {
         let id = [72, 73];
         let TCIDARR = [obj.TCIDs];
         let orderObj = {
@@ -890,7 +993,7 @@ export default {
           Money: inputPrice,
           TCNUMS: ''
         };
-        let fullPath = `/ChoiceAddFinancialDocuments?Type=${2}&templateID=${JSON.stringify(id)}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
+        let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${JSON.stringify(id)}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
         let dom = document.querySelector("#blankLink");
         dom.href = `http://${window.location.host}/#${fullPath}`;
         dom.click();