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

@@ -525,10 +525,10 @@
                   class="mx5"
                   :class="{
                     '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-warning cff9800': item.OrderStatus == 2,
+                    'el-icon-check cblack': item.OrderStatus == 3,
+                    'el-icon-coin cF1416C': item.OrderStatus == 4,
+                    'el-icon-refresh cF1416C': item.OrderStatus == 5,
                     'el-icon-refresh cF1416C': item.OrderStatus == 6
                   }"
                 >
@@ -584,7 +584,7 @@
                 </el-table-column>
                 <el-table-column label="退款">
                   <template slot-scope="scope">
-                    {{ scope.row.PayMoney }}
+                    {{ scope.row.BackMoney }}
                   </template>
                 </el-table-column>
                 <el-table-column label="成本">
@@ -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>
@@ -691,8 +691,8 @@
                   暂无收款单据
                 </span>
               </div>
-              <el-tooltip
-                v-if="item.OrderStatus == 2"
+              <!--<el-tooltip
+                v-if="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6"
                 class="item"
                 effect="dark"
                 content="制单"
@@ -702,7 +702,7 @@
                   class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
                   @click="makeAdocument(item, index, 1)"
                 ></i>
-              </el-tooltip>
+              </el-tooltip>!-->
             </div>
             <div class="column px15 bgf5 radius5 ml flex-g pa relative">
               <div class="fz12">退款单据</div>
@@ -719,8 +719,8 @@
                   暂无退款单据
                 </span>
               </div>
-              <el-tooltip
-                v-if="item.OrderStatus == 2"
+              <!-- <el-tooltip
+                v-if="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6"
                 class="item"
                 effect="dark"
                 content="制单"
@@ -730,7 +730,7 @@
                   class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
                   @click="makeAdocument(item, index, 2)"
                 ></i>
-              </el-tooltip>
+              </el-tooltip>!-->
             </div>
             <div class="column px15 bgf5 radius5 ml flex-g pa relative">
               <div class="fz12">成本单据</div>
@@ -747,7 +747,7 @@
                   暂无成本单据
                 </span>
               </div>
-              <div class="item absolute right20 bottom20" v-if="item.OrderStatus == 2 && pagesTitle != '销售'">
+              <!-- <div class="item absolute right20 bottom20" v-if="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6 && pagesTitle != '销售'">
                 <el-tooltip class="" effect="dark" content="制单"
                 placement="top">
                 <i class="el-icon-circle-plus cursor-pointer c059FF6"
@@ -757,7 +757,7 @@
                   <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
                     @click="isOffset(item, index, 3)"></i>
                 </el-tooltip>
-              </div>
+              </div> -->
             </div>
             <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
@@ -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/busManagement/BookAcar/CharterPreview.vue

@@ -650,7 +650,7 @@
             detailsObj: {},
             beforeCheck: {
               disabledDate: time => {
-                  let endTime = new Date(this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")));
+                  let endTime = new Date(this.getBeforeDate(1,new Date().Format("yyyy-MM-dd")));
                   return time && endTime.getTime() >= time.getTime();
               }
             },

src/components/busManagement/BookAcar/components/orderList.vue

@@ -438,7 +438,7 @@
                   item.CustomerTel
                 }})</span>
               <span>下单时间：</span>
-              <span class="mr">{{ item.OrderDate }}</span>
+              <span class="mr">{{ item.CreateTime }}</span>
               <div class="">
                 <i
                   class="mx5"
@@ -466,14 +466,14 @@
           <div class="mb">
             <el-table :data="[item]" style="width:100%" border>
               <el-table-column
-                label="产品名称(下单日期)"
+                label="产品名称(出发日期)"
                 min-width="100"
                 style="background:#EAEAEA"
               >
                 <template slot-scope="scope">
                   <template>
                     <div>{{ scope.row.ProductName }}</div>
-                    <span style="color: #999999;">{{scope.row.CreateTime}}</span>
+                    <span style="color: #999999;">{{scope.row.OrderDate}}</span>
                   </template>
                 </template>
               </el-table-column>

src/components/busManagement/BookAcar/list.vue

@@ -308,7 +308,7 @@
           ViewType:1,
           beforeCheck: {
             disabledDate: time => {
-                let endTime = new Date(this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")));
+                let endTime = new Date(this.getBeforeDate(1,new Date().Format("yyyy-MM-dd")));
                 return time && endTime.getTime() >= time.getTime();
             }
           },

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',