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

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -2,9 +2,20 @@
   <div>
     <div class="query-box" style="border-bottom: none;">
       <ul>
-        <li><span><em>系列</em>
+        <li>
+          <span>
+            <em>所属线路</em>
+            <el-select class="w150" v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(msg.LineId)">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>系列</em>
             <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
-              <el-option label="不限" value='-1'></el-option>
+              <el-option label="不限" :value='0'></el-option>
               <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
               </el-option>
             </el-select>
@@ -193,8 +204,8 @@
           pageSize: 8,
           //购物店
           SelectType: 7,
-          LineId: 14,
-          LineteamId: "-1",
+          LineId: 0,
+          LineteamId: 0,
           StartDate: '',
           EndDate: '',
           currentPage: 1,
@@ -232,12 +243,12 @@
         this.LineTeamList = [];
         this.apipost(
           "team_post_GetList", {
-            lineID: 14,
+            lineID: lineId,
             isTOOP: 1
           },
           res => {
             if (res.data.resultCode == 1) {
-              this.msg.LineteamId = "-1";
+              this.msg.LineteamId = 0;
               this.LineTeamList = res.data.data;
             }
           }
@@ -362,8 +373,8 @@
         myDate.getDate();
       this.msg.StartDate = nowDate;
       //this.msg.StartDate = '2019-01-01';
-      this.getLineTeamList();
-      this.getList()
+      this.getLineList();
+      this.getList();
     },
   }
 

src/components/Ticketing/IndividualTicketOrder.vue

@@ -57,7 +57,7 @@
             
         </li>
         <li>
-            <span><em>日期</em>
+            <span><em>报名日期</em>
                 <el-date-picker v-model='msg.StartTime' @change="dataDui()" class='w150' value-format="yyyy-MM-dd"
                             type="date"></el-date-picker>
                                             -
@@ -75,8 +75,8 @@
       <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
         <tr class="title_tr">
           <th>单号</th>
-          <th>机票编码</th>
           <th>客户信息</th>
+          <th>机票编码</th>
           <th>客人数量</th>
           <th>单价</th>
           <th>成交单价</th>
@@ -93,16 +93,11 @@
         </tr>
         <tbody v-for="(item,index) in dataList" :key="index">
         <tr>
-          <td>{{item.Id}} </td>
-          <td>
-            <span @click="goUrl('散客机票','individualTicket',item.AirTicketId)" class="guest_num">{{item.AirTicketId}}</span>
-            </td><!-- 机票编码 -->
-          
-          <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
-            <!-- <p class="fz12">123456</p> -->
-          </td>
+            <td>{{item.Id}}<br/>{{item.EnterName}}<br/>{{item.CreateDate}} </td>
+            <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.CustomerName}}<br/>{{item.CustomerMobile}}</p></td>
+          <td><span @click="goUrl('散客机票','individualTicket',item.AirTicketId)" class="guest_num">{{item.AirTicketId}}</span></td>
           <td>
-            <span class="guest_num">{{item.GuestNum}}/{{item.SeatNum}}/{{item.FreightSpace}}</span>
+            <span class="guest_num">{{item.GuestNum}}/{{item.SeatNum}}{{item.FreightSpace}}</span>
           </td>
           <td class="fz12">{{item.TC_Price}}</td>
           <td class="fz12">{{item.Unit_Price}}</td>
@@ -236,7 +231,7 @@ export default {
         StartTime: moment().format("YYYY-MM-DD"),
         EndTime: ""
       },
-      status: [{ title: "全部", num: 0 },{ title: "待付款", num: 3 },{ title: "正常", num: 1 }, { title: "取消", num: 2 }],
+      status: [{ title: "不限", num: 0 },{ title: "待付款", num: 3 },{ title: "正常", num: 1 }, { title: "取消", num: 2 }],
       dataList:[],   
       loading:false, 
       total:0, 

src/components/Ticketing/IndividualTicketOrderDetails.vue

@@ -25,6 +25,7 @@
                 <tr class="title_tr">
                 <th>单号</th>
                 <th>客户信息</th>
+                <!-- <th>联系人</th> -->
                 <th>客人数量</th>
                 <th>单价</th>
                 <th>成交单价</th>
@@ -41,11 +42,10 @@
                 </tr>
               <tbody v-for="item in dataList" :key="item.ContactName">
                 <tr>
-                <td>{{item.AirProductId}} </td>
-                <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
-                    <!-- <p class="fz12">123456</p> -->
-                </td>
-                <td>{{item.GuestNum}}</td>
+                <td>{{item.Id}}<br/>{{item.EnterName}}<br/>{{item.CreateDate}} </td>
+                <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.CustomerName}}<br/>{{item.CustomerMobile}}</p></td>
+                <!-- <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}<br/>{{item.ContactMobile}}</p></td> -->
+                <td>{{item.GuestNum}}/{{item.SeatNum}}{{item.FreightSpace}}</td>
                 <td class="fz12">{{item.TC_Price}}</td>
                 <td class="fz12">{{item.Unit_Price}}</td>
                 <td style="color:#FF9C00">{{item.PreferPrice}}</td>
@@ -160,11 +160,9 @@
                 <!-- 取消订单列表 -->
              <tbody v-show="toggle_status" v-for="(item,index) in CancelList" :key="index">
                 <tr>
-                  <td>{{item.AirProductId}} </td>
-                  <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
-                    <!-- <p class="fz12">123456</p> -->
-                  </td>
-                  <td>{{item.GuestNum}}</td>
+                  <td>{{item.Id}}<br/>{{item.EnterName}}<br/>{{item.CreateDate}} </td>
+                <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.CustomerName}}<br/>{{item.CustomerMobile}}</p></td>
+                  <td>{{item.GuestNum}}/{{item.SeatNum}}{{item.FreightSpace}}</td>
                   <td class="fz12">{{item.TC_Price}}</td>
                   <td class="fz12">{{item.Unit_Price}}</td>
                   <td style="color:#FF9C00">{{item.PreferPrice}}</td>
@@ -180,7 +178,7 @@
                   <td colspan="15" class="RL_Order" style="height:20px">
                     <span class="RL-remarkTitle">名单:</span>
                     <span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
-                        <span v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
+                        <!-- <span v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span> -->
                         <el-popover
                           placement="right"
                           width="1000"

src/components/Ticketing/individualTicket.vue

@@ -315,7 +315,7 @@
         <li>
           <span>
             <em>航班号</em>
-            <el-input v-model="msg.Flight_number" placeholder="机票编号"></el-input>
+            <el-input v-model="msg.Flight_number" placeholder="航班号"></el-input>
           </span>
         </li>
 
@@ -380,7 +380,7 @@
       </ul>
       <div class="_ol_info">
         <ul class="_ol_list" v-loading="loading">
-          <li v-for="(item,index) in dataList" :data-id="item.ID">
+          <li v-for="(item,index) in dataList" :data-id="item.AirTickerId">
             <span class="_oll_line" v-if="item.FreightSpace==1"></span>
             <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
             <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
@@ -388,7 +388,7 @@
               <el-col :span="2">
                 <span class="_lian_style" v-if="item.IsSetUnion==1">联</span>
                 <div class="_oll_img_box">
-                  <span class="TICK_Code PingFangSC">编号：{{item.ID}}</span>
+                  <span class="TICK_Code PingFangSC">编号：{{item.AirTickerId}}</span>
                   <img v-if="!item.AirlineUrl" class="_oll_img" :src="defaultImg">
                   <img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
                 </div>
@@ -472,7 +472,7 @@
                 </div>
               </el-col>
               <el-col :span="2" class="vmiddle">
-                <el-button type="primary" size="mini" @click="goUrl('/IndividualTicketOrderDetails',item)">查看详情</el-button>
+                <el-button type="primary" size="mini" @click="goUrl('/IndividualTicketOrderDetails',item)">查看订单</el-button>
               </el-col>
 
             </el-row>

src/components/dmc/manager/dmcTotalTable.vue

@@ -2,7 +2,9 @@
   <div>
     <div class="query-box" style="border-bottom: none;">
       <ul>
-       <li><span><em>线路</em>
+       <li>
+         <span>
+            <em>线路</em>
             <el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" class="w150" @change="getLineTeamList()">
               <el-option label="不限" :value='0'></el-option>
               <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
@@ -10,7 +12,9 @@
             </el-select>
           </span>
         </li>
-        <li><span><em>系列</em>
+        <li>
+          <span>
+            <em>系列</em>
             <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')" class="w150">
               <el-option label="不限" value='-1'></el-option>
               <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
@@ -39,7 +43,7 @@
         <li>
           <span>
             <em>地接团号</em>
-            <el-input v-model='msg.CombinationNum' class="w150"></el-input>
+            <el-input v-model='msg.CombinationNum'></el-input>
           </span>
         </li>
         <li>

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -23,6 +23,7 @@
         <th width="150">餐厅</th>
         <th width="150">门票</th>
         <th width="150">车资</th>
+        <th width="150">其它</th>
         <th width="150">总计</th>
       </tr>
       <tr v-for="item in msgList">
@@ -31,7 +32,8 @@
         <td>{{moneyFormat(eatPay)}}</td>
         <td>{{moneyFormat(ticketPay)}}</td>
         <td>{{moneyFormat(busPay)}}</td>
-        <td>{{moneyFormat(hotelPay+eatPay+ticketPay+busPay)}}</td>
+        <td>{{moneyFormat(otherPay)}}</td>
+        <td>{{moneyFormat(hotelPay+eatPay+ticketPay+busPay+otherPay)}}</td>
       </tr>
     </table>
     <p class="teamRevenueExpenditureTitle">
@@ -266,6 +268,64 @@
         <td colspan="9" class="color666">没有找到你需要的财务数据</td>
       </tr>
     </table>
+
+     <p class="teamRevenueExpenditureTitle">
+      其它
+      <span class="fr" style="margin-top: -8px;">
+        <input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button" class="normalBtn"
+          value="新增收款" @click="goUrl(14,1)" />
+      </span>
+    </p>
+    <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
+      <tr>
+        <th width="100">序号</th>
+        <th width="10%">单号</th>
+        <th width="10%">费用说明</th>
+        <th width="10%">日期</th>
+        <th width="20%">备注</th>
+        <th width="10%">应付/应付金额</th>
+        <th width="10%">业务员</th>
+        <th>付款凭证</th>
+        <th width="10%">状态</th>
+      </tr>
+      <tr v-for="(item,index) in otherList">
+        <td>{{index+1}}</td>
+        <td><a style="color:blue;cursor:pointer" @click="goFinaceURL(item.FrID)"> {{item.FrID}} </a></td>
+        <td>
+          <span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
+        </td>
+        <td>{{item.CreateDate}}</td>
+        <td><div v-for="childItem in item.TradeWayList">
+                         支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
+                        <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
+                        <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
+            </div></td>
+        <td>
+          <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
+        </td>
+        <td>{{item.EmName}}</td>
+        <td>
+          <template v-for="(son,sIndex) in item.VorcherInos">
+            <template v-if="son.Type==1||son.Type==2">
+              <i class="iconfont icon-excel" @click="showUpLoadFile(son)"></i>
+            </template>
+            <template v-if="son.Type==3">
+              <img class="vorcherInosImg" @click="showImg(item.VorcherInos)" :src="son.Content" alt="">
+            </template>
+          </template>
+        </td>
+        <td>{{item.StatusStr}}</td>
+      </tr>
+      <tr v-if='otherList.length!=0'>
+        <td>成本总价</td>
+        <td style="text-align:left;padding-left:5px;" colspan="8">
+          ￥{{getTotalMoney(otherList)}}
+        </td>
+      </tr>
+      <tr v-if='otherList.length==0'>
+        <td colspan="9" class="color666">没有找到你需要的财务数据</td>
+      </tr>
+    </table>
     <div v-if='picIsShow' class="viewBigPicLayer" @click="picIsShow=false,picObj=[]">
       <el-carousel height="600px" :interval="5000" trigger="click">
         <el-carousel-item v-for="(item,index) in picObj" :key="index">
@@ -287,10 +347,12 @@
         eatList: [],
         ticketList: [],
         busList: [],
+        otherList: [],
         hotelPay: 0,
         eatPay: 0,
         ticketPay: 0,
         busPay: 0,
+        otherPay:0,
       }
     },
     methods: {
@@ -347,6 +409,9 @@
             case 5:
               this.busPay = money
               break;
+            case 14:
+              this.otherPay = money
+              break;
             default:
               break;
           }
@@ -406,7 +471,7 @@
           if (res.data.resultCode == 1) {
             switch (type) {
               case 1:
-				this.hotelList = res.data.data
+                this.hotelList = res.data.data
                 break;
               case 2:
                 this.eatList = res.data.data
@@ -417,12 +482,15 @@
               case 5:
                 this.busList = res.data.data
                 break;
+              case 14:
+                this.otherList = res.data.data
+                break;
               default:
                 break;
 
             }
           } else {
-            this.$message.error(res.data.message)
+            this.Error(res.data.message)
           }
         }, err => {})
       }
@@ -432,6 +500,7 @@
       this.getList(2)
       this.getList(3)
       this.getList(5)
+      this.getList(14)
       this.getTuanMsg()
     }
   }

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -342,7 +342,7 @@
           type: contentType
         });
       },
-      getHtml: function (postData, SaveType,postType) {
+      getHtml: function (postData, SaveType) {
         var FeatureData = {
           B2BRemark: postData.B2BRemark,
           ConfigId: postData.ConfigId,
@@ -369,7 +369,6 @@
         } else {
           flagWangYue = true;
         }
-
         if (this.$refs.newFeature != undefined) {
           var obj = '';
           try {
@@ -389,100 +388,53 @@
         setTimeout(() => {
           try {
             FeatureData.FeatureHtml = document.getElementById("newFeatureBox").innerHTML;
-          } catch (err) {}
-          if (postType == 1) {
-            this.apipost("travel_post_SetFeature", FeatureData, res => {
-                try {
-                  this.$refs.newFeature.setReadOnly(false)
-                } catch (ex) {}
-                try {
-                  this.$refs.newFeature2.canEditChange(true)
-                } catch (ex) {}
-                //解锁表单重复提交
-                this.$emit("unlockFormCommit", true);
-                if (res.data.resultCode == 1) {
-                  //保存按钮跳转当当前页码
-                  if (SaveType == 1) {
-                    let path = flagWangYue ? 'TravelManager3' : 'TravelManager2';
-                    this.Success("保存成功");
-                    if (flagWangYue || this.isNewConfig) {
-                      this.$router.push({
-                        path: path,
-                        query: {
-                          flag: flagWangYue,
-                          configId: FeatureData.ConfigId,
-                          openState: 1
-                        }
-                      });
-                      if (localStorage.openMode === "0") {
-                        this.loadConfigInfo();
-                      }
-                    } else {
-                      this.loadConfigInfo();
-                    }
-                  }
-                  //提交按钮和另存模板跳转团控列表
-                  else if (SaveType == 2 || SaveType == 3) {
+          } catch (err) {
+          }
+          this.apipost("travel_post_SetFeature", FeatureData, res => {
+              try {
+                this.$refs.newFeature.setReadOnly(false)
+              } catch (ex) {}
+              try {
+                this.$refs.newFeature2.canEditChange(true)
+              } catch (ex) {}
+              //解锁表单重复提交
+              this.$emit("unlockFormCommit", true);
+              if (res.data.resultCode == 1) {
+                //保存按钮跳转当当前页码
+                if (SaveType == 1) {
+                  let path = flagWangYue ? 'TravelManager3' : 'TravelManager2';
+                  this.Success("保存成功");
+                  if (flagWangYue || this.isNewConfig) {
                     this.$router.push({
-                      path: "TravelControlList",
+                      path: path,
                       query: {
-                        cache: true
+                        flag: flagWangYue,
+                        configId: FeatureData.ConfigId,
+                        openState: 1
                       }
                     });
-                  }
-                }
-                this.MsgBus.$emit('saveTravel', false);
-                this.FeatureData.IsSave = false;
-              },
-              err => {}
-            )
-          } else {
-            this.ApiPost2("TripSetFeature", FeatureData, res => {
-                try {
-                  this.$refs.newFeature.setReadOnly(false)
-                } catch (ex) {}
-                try {
-                  this.$refs.newFeature2.canEditChange(true)
-                } catch (ex) {}
-                //解锁表单重复提交
-                this.$emit("unlockFormCommit", true);
-                if (res.data.resultCode == 1) {
-                  //保存按钮跳转当当前页码
-                  if (SaveType == 1) {
-                    let path = flagWangYue ? 'TravelManager3' : 'TravelManager2';
-                    this.Success("保存成功");
-                    if (flagWangYue || this.isNewConfig) {
-                      this.$router.push({
-                        path: path,
-                        query: {
-                          flag: flagWangYue,
-                          configId: FeatureData.ConfigId,
-                          openState: 1
-                        }
-                      });
-                      if (localStorage.openMode === "0") {
-                        this.loadConfigInfo();
-                      }
-                    } else {
+                    if (localStorage.openMode === "0") {
                       this.loadConfigInfo();
                     }
-                  }
-                  //提交按钮和另存模板跳转团控列表
-                  else if (SaveType == 2 || SaveType == 3) {
-                    this.$router.push({
-                      path: "TravelControlList",
-                      query: {
-                        cache: true
-                      }
-                    });
+                  } else {
+                    this.loadConfigInfo();
                   }
                 }
-                this.MsgBus.$emit('saveTravel', false);
-                this.FeatureData.IsSave = false;
-              },
-              err => {}
-            )
-          }
+                //提交按钮和另存模板跳转团控列表
+                else if (SaveType == 2 || SaveType == 3) {
+                  this.$router.push({
+                    path: "TravelControlList",
+                    query: {
+                      cache: true
+                    }
+                  });
+                }
+              }
+              this.MsgBus.$emit('saveTravel', false);
+              this.FeatureData.IsSave = false;
+            },
+            err => {}
+          )
         }, 2000)
       },
       //切换tab事件

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -371,52 +371,28 @@
         } else {
           basicData.TeamType = 0;
         }
-        var postType = 1;
-        if (postType == 1) {
-          this.apipost(
-            "travel_post_SetTravelConfigInfo",
-            basicData,
-            res => {
-              if (res.data.resultCode == 1) {
-                //配置编号
-                TripFeature.ConfigId = res.data.data;
-                this.$refs.TravelFeature.getHtml(TripFeature, SaveType,postType);
-              } else if (res.data.resultCode == 10009) {
-                this.FeatureData.IsSave = false;
-                //表单重复提交
-                this.isSubmit = true;
-              } else {
-                this.FeatureData.IsSave = false;
-                this.Error(res.data.message);
-                this.isSubmit = true;
-                this.submitText = "提交";
-                this.$refs.TravelFeature.del_show = true;
-              }
-            },
-            err => {}
-          );
-        } else {
-          this.ApiPost2(
-            "TripSetTravelConfigInfo",
-            basicData,
-            res => {
-              if (res.data.resultCode == 1) {
-                //配置编号
-                TripFeature.ConfigId = res.data.data;
-                this.$refs.TravelFeature.getHtml(TripFeature, SaveType,postType);
-              } else if (res.data.resultCode == 10009) {
-                this.FeatureData.IsSave = false;
-                //表单重复提交
-                this.isSubmit = true;
-              } else {
-                this.FeatureData.IsSave = false;
-                this.Error(res.data.message);
-                this.isSubmit = true;
-                this.submitText = "提交";
-                this.$refs.TravelFeature.del_show = true;
-              }
-            });
-        }
+        this.apipost(
+          "travel_post_SetTravelConfigInfo",
+          basicData,
+          res => {
+            if (res.data.resultCode == 1) {
+              //配置编号
+              TripFeature.ConfigId = res.data.data;
+              this.$refs.TravelFeature.getHtml(TripFeature, SaveType);
+            } else if (res.data.resultCode == 10009) {
+              this.FeatureData.IsSave = false;
+              //表单重复提交
+              this.isSubmit = true;
+            } else {
+              this.FeatureData.IsSave = false;
+              this.Error(res.data.message);
+              this.isSubmit = true;
+              this.submitText = "提交";
+              this.$refs.TravelFeature.del_show = true;
+            }
+          },
+          err => {}
+        );
       },
       //初始化团的幻灯片
       initFileList() {

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -356,6 +356,9 @@
                     <el-checkbox v-model="priceData.IsSupportChildren"
                                  :true-label="CheckedVaule" :false-label="UnCheckedVaule">支持儿童出游
                     </el-checkbox>
+                    <el-checkbox v-model="priceData.IsBookTeam" style="display:none"
+                                 :true-label="CheckedVaule" :false-label="UnCheckedVaule">订团
+                    </el-checkbox>
                   </div>
                   <el-form-item prop="B2BMemberPrice">
                     <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@@ -885,6 +888,8 @@
                 AirportService:"",//机场服务
                 //可销售机票数量
                 CanSellTicketNum:2,
+                //是否订团，0-不订，1需要订
+                IsBookTeam:0
               };
             }
             // if (this.modifyTcid > 0) {