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

src/components/SalesModule/enrollTotal.vue

@@ -439,7 +439,6 @@
     >
       <tr>
         <th width="160">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th>
-        <th width="60">引流人</th>
         <th width="60">{{ $t("fnc.khxinxi") }}</th>
         <th width="70">{{ $t("salesModule.Type") }}</th>
         <th width="180">
@@ -559,6 +558,7 @@
                   : item.commissionSPeopleName
               }}
             </p>
+            <p>引流人：{{ item.LureEmpName }}</p>
             <p>{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}</p>
             <p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
             <!-- <p v-if="item.commissionMoney" style="color: red;">
@@ -605,7 +605,6 @@
               查看报价单
             </div>
           </td>
-          <td> {{ item.LureEmpName  }}</td>
           <td>
             <p
               class="over_ellipsis"

src/components/SalesModule/groupTourOrder.vue

@@ -1634,7 +1634,6 @@
       <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
         <tr>
           <th width="240">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th>
-          <th width="120">引流人</th>
           <th width="120">{{ $t("fnc.khxinxi") }}</th>
           <th width="70">{{ $t("salesModule.Type") }}</th>
           <th width="150">
@@ -1703,6 +1702,7 @@
               <p class="fz12 over_ellipsis" style="width: 100%">
                 {{ item.commissionSPeopleName }}
               </p>
+              <p>引流人：{{ item.LureEmpName }}</p>
               <p style="min-width: 180px">
                 {{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}
               </p>
@@ -1746,7 +1746,6 @@
                 查看报价单
               </div>
             </td>
-            <td>{{ item.LureEmpName }}</td>
             <td>
               <p class="fz12 over_ellipsis" style="width: 120px" :title="item.contactName">
                 {{ item.contactName }}
@@ -2625,7 +2624,7 @@
           QEndDate: "",
           PayStatus: "-1",
           IsAirTicket: "2",
-          IsOneDay: 0,
+          IsOneDay: 0
         },
         checkedObj: {},
         //返回数据
@@ -4785,6 +4784,9 @@
       this.userId = this.getLocalStorage().EmployeeId;
       if (this.$route.query.id) {
         this.msg.tempOrderId = this.$route.query.id;
+      }else if(this.$route.query.crmOrderObj){
+          let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+          this.msg.tempOrderId = crmOrderObj.OrderId
       } else {
         this.msg.QStartDate = new Date().Format("yyyy-MM-dd");
       }

src/components/SalesModule/groupTourOrderOne.vue

@@ -1442,7 +1442,6 @@
       <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
         <tr>
           <th width="240">{{$t('fnc.danhao')}}&{{$t('visa.v_tuanhao')}}</th>
-          <th width="120">引流人</th>
           <th width="120">{{$t('fnc.khxinxi')}}</th>
           <th width="70">{{$t('salesModule.Type')}}</th>
           <th width="150">{{$t('advmanager.v_xilie')}}&{{$t('advmanager.v_line')}}</th>
@@ -1479,6 +1478,7 @@
               <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
                 :title="item.alName" @click="goUrlX('产品查询','productQueryOne',item.tcid,item.tcnum)">{{item.tcnum}}</p>
               <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
+              <p>引流人：{{ item.LureEmpName }}</p>
               <p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
               <p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
               <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
@@ -1487,7 +1487,6 @@
               <p v-else-if="item.latestCommissionMoney" style="color:red">
                 {{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p>
             </td>
-            <td>{{ item.LureEmpName }}}</td>
             <td>
               <p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
               <p class="fz12">{{item.contactMobile}}</p>
@@ -4076,6 +4075,9 @@
       this.userId = this.getLocalStorage().EmployeeId
       if (this.$route.query.id) {
         this.msg.tempOrderId = this.$route.query.id
+      }else if(this.$route.query.crmOrderObj){
+          let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+          this.msg.tempOrderId = crmOrderObj.OrderId
       }
       this.msg.QStartDate = new Date().Format('yyyy-MM-dd')
       

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -309,6 +309,12 @@
             <el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
           </span>
         </li>
+        <li>
+          <span>
+            <em>订单ID</em>
+            <el-input class='w220' v-model='msg.OrderId' placeholder="请输入订单ID"></el-input>
+          </span>
+        </li>
         <li>
           <span>
             <em>{{$t('hotel.product_name')}}</em>
@@ -493,7 +499,7 @@
           Name: '',
           VisaTCNUM: '',
           VisaOrderStatus: '0',
-          OrderId: ''
+          OrderId: 0
         },
         addMsg: {
           Id: 0,

src/components/SalesVisa/VisaProductEditOrderOP.vue

@@ -309,6 +309,12 @@
             <el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
           </span>
         </li>
+        <li>
+          <span>
+            <em>订单ID</em>
+            <el-input class='w220' v-model='msg.OrderId' placeholder="请输入订单ID"></el-input>
+          </span>
+        </li>
         <li>
           <span>
             <em>{{$t('hotel.product_name')}}</em>
@@ -511,7 +517,7 @@
           VisaOrderStatus: '0',
           CreateBy: 0,
           RB_Branch_Id: -1,
-          OrderId: ''
+          OrderId: 0
         },
         addMsg: {
           Id: 0,

src/components/SingleAirTicket/components/OrderList.vue

@@ -527,8 +527,8 @@
                     'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
                     'el-icon-check cblack': item.OrderStatus == 2,
                     'el-icon-warning cff9800': item.OrderStatus == 3,
-                    'el-icon-refresh cF1416C': item.OrderStatus == 4,
-                    'el-icon-check cblack': item.OrderStatus == 5,
+                    'el-icon-coin cF1416C': item.OrderStatus == 4,
+                    'el-icon-refresh cF1416C': item.OrderStatus == 5,
                     'el-icon-refresh cF1416C': item.OrderStatus == 6
                   }"
                 >
@@ -631,7 +631,7 @@
                       @click="CheckOutDetails(scope.row)"></i>
                   </template>
                 </el-table-column>
-                <el-table-column
+                <!-- <el-table-column
                   label="操作"
                   min-width="70"
                   style="background:#EAEAEA"
@@ -640,7 +640,7 @@
                     <input type="button" class="normalBtn" value="查看" 
                     @click="goDetails(scope.row)" />
                   </template>
-                </el-table-column>
+                </el-table-column> !-->
                 <template slot="append" v-if="item.Remark">
                   <div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}</div>
                 </template>
@@ -780,47 +780,6 @@
                 </div>
               </div>
             </div>
-            <div
-              v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus!=3"
-              class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
-            >
-              <div
-                v-if="
-                  item.OrderStatus == 1 &&
-                    item.IncomeList.length == 0 &&
-                      item.RefundList.length == 0 &&
-                      item.CostList.length == 0 && item.OrderSource!=1
-                "
-                class="row-c cursor-pointer radius5 cancel py5"
-                @click="clickRightButtom(item, 0)"
-              >
-                <i v-loading="msg.OrderId==item.OrderId&&loading0"></i>
-                <span class="cF1416C">取消订单</span>
-              </div>
-              <div
-                v-if="item.OrderStatus == 1&&pagesTitle!='销售'&&item.OrderSource!=1"
-                class="row-c cursor-pointer radius5 confirm py5"
-                @click="clickRightButtom(item, 1)"
-              >
-                <i v-loading="msg.OrderId==item.OrderId&&loading1"></i>
-                <span class="c20C997">确认订单</span>
-              </div>
-              <div
-                v-if="item.OrderStatus == 1&&pagesTitle=='销售'"
-                class="row-c cursor-pointer radius5 change py5"
-                @click="goRoomDetails(item, '变更订单')"
-              >
-                <span class="c059FF6">订单变更</span>
-              </div>
-              <div
-                v-if="item.OrderStatus > 1"
-                class="row-c cursor-pointer radius5 change1 py5"
-                @click="clickRightButtom(item, 2)"
-              >
-                <i v-loading="msg.OrderId==item.OrderId&&loading2"></i>
-                <span class="c20C997">收损</span>
-              </div>
-            </div>
           </div>
           <div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
             <div style="font-size:16px;font-weight:bold;font-family: pingfangR;">取消理由：</div>

src/components/SingleAirTicket/components/TicketOrder.vue

@@ -68,16 +68,67 @@
                   </el-select>
                 </span>
               </li>
+              <li>
+                <span>
+                  <em>出票状态</em>
+                  <el-select v-model='msg.TicketStatus' class="w200">
+                      <el-option :value="0" label="不限"></el-option>
+                      <el-option v-for='item in ticketingStatusList'
+                          :label='item.Name'
+                          :value='item.Id'
+                          :key='item.Id'>
+                      </el-option>
+                  </el-select>
+                </span>
+              </li>
+              <li>
+                <span>
+                  <em>出签状态</em>
+                  <el-select v-model='msg.VisaStatus' class="w200">
+                      <el-option v-for='item in VisaList'
+                          :label='item.Name'
+                          :value='item.Id'
+                          :key='item.Id'>
+                      </el-option>
+                  </el-select>
+                </span>
+              </li>
+              <li>
+                <span>
+                  <em>订单状态</em>
+                  <el-select v-model='msg.OrderStatus' class="w200">
+                      <el-option :value="0" label="不限"></el-option>
+                      <el-option v-for='item in OrderStatusList'
+                          :label='item.Name'
+                          :value='item.Id'
+                          :key='item.Id'>
+                      </el-option>
+                  </el-select>
+                </span>
+              </li>
+              <li>
+                <span>
+                  <em>收款状态</em>
+                  <el-select  v-model='msg.Q_IsCollect' class="w200">
+                      <el-option v-for='item in QIsCollectList'
+                          :label='item.Name'
+                          :value='item.Id'
+                          :key='item.Id'>
+                      </el-option>
+                  </el-select>
+                </span>
+              </li>
+              
               <li>
                 <span><em>{{$t('OrderList.search.orderNum')}}</em>
                 <el-input clearable type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w200"/>
                 </span>
               </li>
-                <!-- <li>
+              <li>
                 <span><em>订单ID</em>
                 <el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w200"/>
                 </span>
-                </li> -->
+              </li>
               <!-- <li>
                 <span><em>电话</em>
                 <el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/>
@@ -116,15 +167,51 @@
                     </el-date-picker>
                 </span>
               </li>
+              <li>
+                <span>
+                  <em @click="showWarningSearch=true">高级查询</em>
+                  <el-popover width="260" v-model="showWarningSearch" trigger="click">
+                    <div>
+                      <div class="TC_queryTitle">高级查询</div>
+                      <div class="clearfix">
+                        <div class="TC_leftSearch">
+                          <div>
+                            <span>{{$t('system.query_airCompanyName')}}</span>
+                            <!-- <el-select v-model="msg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')"
+                              class="w150">
+                              <el-option :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue">
+                              </el-option>
+                              <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
+                                :label="item.AlName" :value="item.AirLineId"></el-option>
+                            </el-select> -->
+                            <el-date-picker
+                            class="w150"
+                      style="height: 34px;"
+                      value-format="yyyy-MM-dd"
+                      v-model="Datelist"
+                      type="daterange"
+                      :range-separator="$t('OrderList.zhi')"
+                      :start-placeholder="$t('OrderList.star')"
+                      :end-placeholder="$t('OrderList.end')" @change="getDates">
+                      </el-date-picker>
+                          </div>
+                          </div>
+                        </div>
+                        <button class="normalBtn TC_SearchBtn"
+                          @click="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}}
+                        </button>
+                      </div>
+                  </el-popover>
+                </span>
                 
-                
+              </li>
               <li>
                 <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="msg.pageIndex=1,currentPage=1,GetList()" />
               </li>
             </ul>
         </div>
         <!-- 统计版块 -->
-    <div class="groupTourOrder_count">
+  <div class="groupTourOrder_count" v-if="TotalMsg">
     <el-row :gutter="20">
       <el-col :span="5" class="groupTourOrder_count_col">
         <div class="groupTourOrder_count_item HT_total">
@@ -152,10 +239,10 @@
             <span>{{$t('restaurant.res_Number')}}</span>
           </div>
           <p>
-              <span class="groupTourOrder_count_green">{{$t('op.TotalRoomNum')}}：
+            <span class="groupTourOrder_count_green">报名数：
               {{TotalMsg.NorNumber}}
             </span>
-              <span class="color_red_order">{{$t('op.CanCelRoomNum')}}：
+            <span class="color_red_order">取消数：
               {{TotalMsg.CancelNum}}
             </span>
           </p>
@@ -213,6 +300,7 @@
       components: { OrderList },
       data() {
         return {
+          showWarningSearch: false,
           TotalMsg: null,
           MultipleChoiceList: [ //多选项目
               {
@@ -242,24 +330,6 @@
           //默认高度
           tableHeight: 0,
           msg:{
-              // pageIndex: 1,
-              // pageSize: 5,
-  
-              // OrderType: '1',
-              // OrderId: '',
-              // OrderNo: '',
-              // SurName: '',
-              // Name: '',
-              // OrderStatus: 0,
-              // StartTime: '',
-              // EndTime: '',
-              // OrderSTime: '',
-              // OrderETime: '',
-              // ProductName: '',
-              // Mobile: '',//电话
-              // IsSelectSale: 1,
-              // EnterID: 0,//业务员
-
             pageIndex: 1,
             pageSize: 15,
             OrderId: "", //订单id
@@ -268,9 +338,9 @@
             StartCityName: "", //出发城市
             EndCityName: "", //到达城市
             EnterID: "", //业务员id
-              TicketStatus: "0", //出票状态
+            TicketStatus: 0, //出票状态
             VisaStatus: "0", //出签状态
-              OrderStatus: "0", //订单状态
+            OrderStatus: 0, //订单状态
             Q_IsCollect: "0", //收款状态
             StartTime: "",
             EndTime: "",
@@ -308,6 +378,18 @@
                 PostId:0,
                 IsLeave:0,
             },
+            OrderStatusList: [],
+            QIsCollectList: [
+              { Name: "不限", Id: "0" },
+              { Name: "已收齐", Id: "1" },
+              { Name: "未收齐", Id: "2" },
+            ],
+            ticketingStatusList: [],
+            VisaList: [
+              { Name: "不限", Id: "0" },
+              { Name: "未出签", Id: "1" },
+              { Name: "已出签", Id: "2" },
+            ],
         };
       },
       watch: {
@@ -324,6 +406,26 @@
         }
       },
       methods: {
+        // 获取出票状态枚举
+    GetTicketStatusEnumList() {
+      this.crmapipost("/api/Order/GetTicketStatusEnumList", {}, (res) => {
+        if (res.data.resultCode == 1) {
+          this.ticketingStatusList = res.data.data;
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
+        // 获取订单状态枚举
+    GetOrderStatusEnumList() {
+      this.crmapipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
+        if (res.data.resultCode == 1) {
+          this.OrderStatusList = res.data.data;
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
         getEmployee() { //员工
             this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
                 if(res.data.resultCode == 1) {
@@ -383,12 +485,12 @@
         //获取酒店订单列表
         GetList() {
           this.loading = true
-            let url
+          let url = "/api/Order/GetGuestOrderStatisticsPageList"
           // 销售 OP
           if(this.pagesTitle=='销售'){
-              url = "/api/Order/GetGuestOrderStatisticsPageList"
+            this.msg.IsMyOrder = '1'
           }else{
-              // url = "CarSingle_post_GetAdminCarOrderPageList"
+            this.msg.IsMyOrder = '0'
           }
           this.crmapipost(url, this.msg,
             res => {
@@ -555,6 +657,8 @@
         if(this.Title!='销售'){
           this.getEmployee()
         }
+        this.GetOrderStatusEnumList()
+        this.GetTicketStatusEnumList()
         this.Datelist = this.getyMDOne()
         this.userInfo = this.getLocalStorage();
         this.GetList();
@@ -572,4 +676,3 @@
   <style>
 
   </style>
-  
\ No newline at end of file

src/router/config.js

@@ -2118,6 +2118,14 @@ export default {
                 title: '单机票订单'
               },
             },
+            {
+              path: '/CRMTicketOrderOP', //crm单项机票订单
+              name: 'CRMTicketOrderOP',
+              component: resolve => require(['@/components/SingleAirTicket/TicketOrderOP'], resolve),
+              meta: {
+                title: '单机票订单'
+              },
+            },
             {
               path: '/CharterAddEditVehicle', //新增/编辑团订
               name: 'CharterAddEditVehicle',