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

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -751,6 +751,51 @@ export default {
           isResize: true,
           isFrozen: true,
         },
+        {
+          field: "YingShou",
+          formatter: this.moneyFormat,
+          title: "应收金额",
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        }, //,orderBy:''
+        {
+          field: "ShiShou",
+          formatter: this.moneyFormat,
+          title: "实收金额",
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
+        {
+          field: "TuiKuan",
+          formatter: this.moneyFormat,
+          title: "退款",
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
+        {
+          field: "PingTaiShuiJin",
+          formatter: this.moneyFormat,
+          title: "平台税金",
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
+        {
+          field: "ZaiTu",
+          formatter: this.moneyFormat,
+          title: "在途",
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
         {
           field: "ShiJiLiRun",
           formatter: this.moneyFormat,

src/components/SalesModule/groupTourOrder.vue

@@ -1798,7 +1798,7 @@
                       <div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
                         @click='getHouse(item)'>{{$t('salesModule.UpdateRoom')}}
                       </div>
-                       <div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission ==true" @click="transfer(item)">{{$t('salesModule.UpdateRoom')}}{{$t('salesModule.OrderGroup')}}</div>
+                       <div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission ==true" @click="transfer(item)">{{$t('salesModule.OrderGroup')}}</div>
                       <div v-if="item.orderState=='1'||item.orderState=='2'"
                         @click='setChargeLoss(item)'>
                         <span v-if="item.isChargeLossOrders==1">{{$t('salesModule.LossSheet')}}</span>

src/components/SalesModule/yingyanMap.vue

@@ -21,7 +21,7 @@
           <div v-show="mapType == 1" class="titleSjx"></div>
         </div>
         <div @click="getType(2)">
-          <i class="iconfont icon-guijitu"></i> {{ $t("fnc.dqzhuangtai") }}
+          <i class="iconfont icon-guijitu"></i>
           {{ $t("salesModule.GuijiSearch") }}
           <div v-show="mapType == 2" class="titleSjx"></div>
         </div>

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -103,33 +103,40 @@
         <li>
           <span>
             <em>{{$t('system.table_company')}}</em>
-            <el-select class="w150" filterable :placeholder="$t('sm.company')" v-model="queryMsg.OutBranchId">
+            <el-select filterable :placeholder="$t('sm.company')" v-model="queryMsg.OutBranchId">
               <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue2'></el-option>
               <el-option v-for='item in queryCommonData.BranchList' :key="item.Id" :label="item.BName" :value="item.Id">
               </el-option>
             </el-select>
           </span>
         </li>
-        <li>
-          <span>
-            <em>{{$t('advmanager.v_line')}}</em>
-            <el-select class='w150' v-model="queryMsg.LineID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
-              <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
-              <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
-              </el-option>
-            </el-select>
-          </span>
-        </li>
-        <li>
-          <span>
-            <em>{{$t('advmanager.v_xilie')}}</em>
-            <el-select class='w150' v-model="queryMsg.ltID" filterable :placeholder="$t('pub.pleaseSel')">
-              <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
-              <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
-              </el-option>
-            </el-select>
-          </span>
-        </li>
+          <li>
+            <span>
+              <em>{{$t('system.table_ssLine')}}</em>
+              <el-select v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
+                <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
+                <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option>
+              </el-select>
+            </span>
+          </li>
+          <li>
+            <span>
+              <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
+              <el-select v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
+                <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
+                <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID" :key="item.LtID"></el-option>
+              </el-select>
+            </span>
+          </li>
+          <li>
+            <span>
+              <em>{{$t('active.ad_xlmc')}}</em>
+              <el-select v-model="queryMsg.ltID" filterable :placeholder="$t('pub.pleaseSel')">
+                <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
+                <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option>
+              </el-select>
+            </span>
+          </li>
         <li>
           <span>
             <em>{{$t('fnc.tuanqi')}}</em>
@@ -143,7 +150,7 @@
           <span>
             <em>机位占比</em>
             <el-input class="w100" type="text" placeholder="" v-model="queryMsg.TicketStartNum" @keyup.native="checkPrice(queryMsg,'TicketStartNum')" maxlength="3">
-            </el-input>—
+            </el-input> —
             <el-input class="w100" type="text" placeholder="" v-model="queryMsg.TicketEndNum" @keyup.native="checkPrice(queryMsg,'TicketEndNum')" maxlength="3">
             </el-input>
           </span>
@@ -235,6 +242,7 @@ export default {
                 LineList: [],
                 //系列列表
                 LineTeamList: [],
+                PlaceList:[],//目的地
                 //公司数据
                 BranchList: [],
                 //公用下拉默认
@@ -249,6 +257,7 @@ export default {
                 pageSize: 50,
                 LineID: 0,
                 ltID: 0,
+                PlaceID:0,
                 OutBranchId: -1,
                 QStartDate: "",
                 QEndDate: "",
@@ -292,23 +301,42 @@ export default {
                 err => {}
             );
         },
-        //获取线路列表
+   //获取线路列表
         getLineList() {
             this.apipost(
-                "line_post_GetAllList_V2",
-                { LineDirection: 2 },
+                "line_post_GetList",
+                {
+                    LineDirection: 2
+                },
                 res => {
                     if (res.data.resultCode == 1) {
                         this.queryCommonData.LineList = res.data.data;
+                        this.queryCommonData.PlaceList = [];
+                        this.queryCommonData.LineTeamList = [];
                     }
                 }
             );
         },
+        //获取目的地列表
+        getLinePlaceList() {
+            this.queryMsg.PlaceID = 0;
+            this.queryMsg.LineteamId = 0;
+            let msg = {
+                lineID: this.queryMsg.LineId
+            };
+            this.apipost("team_post_GetLinePlace", msg, res => {
+                if (res.data.resultCode == 1) {
+                    this.queryCommonData.PlaceList = res.data.data;
+                    this.queryCommonData.LineTeamList = [];
+                }
+            });
+        },
         //获取系列列表
         getLineTeamList() {
-            this.queryMsg.ltID = 0;
+            this.queryMsg.LineteamId = 0;
             let msg = {
-                lineID: this.queryMsg.LineID,
+                lineID: this.queryMsg.LineId,
+                placeID: this.queryMsg.PlaceID,
                 isTOOP: 1
             };
             this.apipost("team_post_GetList", msg, res => {