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

src/components/FinancialModule/ReportForm/TeamRevenueReport2.vue

@@ -865,7 +865,7 @@ tr._item_list td:last-child {
           {{scope.row.DMCNUM}}
         </template>
       </el-table-column>
-      <el-table-column prop="" :label="$t('fnc.ysjine')" ">
+      <el-table-column prop="" :label="$t('fnc.ysjine')">
         <template slot-scope="scope">
           <span class="teamRevenRep2">
             <span style="cursor: pointer" v-if="scope.row.DataType===1"  

src/components/SalesModule/MyCustomer.vue

@@ -492,6 +492,17 @@
               :key="item.Id"></el-option>
           </el-select>
         </span>
+      </li>
+       <li style="margin-left: 10px">
+        <span>
+          <em>VIP{{$t("admin.admin_status")}}：</em>
+         <el-select class="w120" :placeholder="$t('pub.pleaseSel')" filterable 
+          v-model="msg.IsVip"
+            @change="reSearchPage">
+            <el-option v-for="item in VipStatusList" :label="item.Name" :value="item.Id"
+              :key="item.Id"></el-option>
+          </el-select>
+        </span>
       </li>
       <li>
         <button class="hollowFixedBtn" @click="reSearchPage">{{$t('pub.searchBtn')}}</button>
@@ -532,6 +543,7 @@
           <th>{{$t('system.query_name')}}</th>
           <th>{{$t('restaurant.res_ContactNumber')}}</th>
           <th>{{$t('salesModule.storeName')}}</th>
+          <th>VIP</th>
           <th>{{$t('objFill.v102.appjihuozhuant')}}</th>
           <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.Yuefang')}}</th>
           <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.Visit')}}</th>
@@ -571,6 +583,10 @@
               {{$t('objFill.dai')}}{{item.departmentManagerStr}}{{$t('fnc.shenhe')}}
             </span>
           </td>
+          <td>
+            {{item.isVip==1?$t('fnc.yes'):$t('fnc.fou')}}
+          
+          </td>
           <td>
             <span :style="{'color':item.openIdStatus==1?'red':''}">
               {{ item.openIdStatus==1?$t('objFill.v102.yijihuo'):$t('objFill.v102.weijihuo') }}
@@ -1092,7 +1108,8 @@
           City: '-1',
           District: '-1',
           SigningType: 0,
-          OpenIdStatus: 0// 0-全部，1-已激活，2-未激活 
+          OpenIdStatus: 0,// 0-全部，1-已激活，2-未激活 
+          IsVip:-1,//1-是VIP
         },
         addMsg: {
           CustomerId: 0,
@@ -1262,6 +1279,11 @@
           { Name: this.$t('objFill.v102.yijihuo'),Id: 1 },
           { Name: this.$t('objFill.v102.weijihuo'),Id: 2 },
         ],
+        VipStatusList:[
+          { Name: this.$t('objFill.v101.activity.col3.t4'),Id: -1 },
+          { Name: this.$t('fnc.yes'),Id: 1 },
+          { Name: this.$t('fnc.fou'),Id: 0 },
+        ],
         customerStatus: 0,
       }
     },

src/components/SalesModule/customerTransfer.vue

@@ -130,6 +130,15 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+                <el-col :span="6">
+                <el-form-item label="VIP">
+                  <el-select class="w120" :placeholder="$t('pub.pleaseSel')" filterable 
+          v-model="msg.IsVip">
+            <el-option v-for="item in VipStatusList" :label="item.Name" :value="item.Id"
+              :key="item.Id"></el-option>
+          </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </li>
@@ -179,6 +188,7 @@
           <th width="14%">{{$t('salesModule.storeName')}}
             <!--<label><input type="checkbox"  v-model="isCkedAll"  @click='checkedAll()'  style="vertical-align: middle;"/>{{$t('salesModule.storeName')}}</label>-->
           </th>
+            <th width="3%">VIP</th>
           <th width="7%">激活状态</th>
           <th width="7%">{{$t('hotel.suplier_contact')}}</th>
           <th width="8%">{{$t('restaurant.res_ContactNumber')}}</th>
@@ -241,6 +251,10 @@
               </table>
               <span v-if="item.ExceptionCount > 0" slot="reference" class="yichangde" @click="yichangde(item)">异</span>
             </el-popover>
+          </td>
+           <td>
+            {{item.IsVip==1?$t('fnc.yes'):$t('fnc.fou')}}
+          
           </td>
           <td>
             <span
@@ -477,6 +491,11 @@
         EnterTime: [],
         isSelLayer: false,
         layerShow: false,
+          VipStatusList:[
+          { Name: this.$t('objFill.v101.activity.col3.t4'),Id: -1 },
+          { Name: this.$t('fnc.yes'),Id: 1 },
+          { Name: this.$t('fnc.fou'),Id: 0 },
+        ],
         msg: {
           pageIndex: 1,
           pageSize: 14,
@@ -500,6 +519,7 @@
           OpenIdStatus: '',
           ActivateStartDate: '',
           ActivateEndDate: '',
+         IsVip:-1,//1-是VIP
         },
         RecipientMsg: {
           CustomerIdArr: [],

src/components/busManagement/HPTripPlan.vue

@@ -7,7 +7,7 @@
   .tripPlanTab tr th,
   .tripPlanTab tr td {
     border: 1px solid gray;
-    
+
     text-align: center;
     padding-left: 1px;
     padding-right: 1px;
@@ -35,6 +35,17 @@
             </el-date-picker>
           </span>
         </li>
+        <li>
+          <span><em>公司</em>
+            <el-select v-model="msg.BusCompany" filterable :placeholder="$t('pub.pleaseSel')" clearable
+              @clear="getCarList(),getList()" @change="getCarList(),getList()" :disabled="!isHaveAuth">
+              <el-option label="永樂車行(東京)" :value="1248" :key="1248">
+              </el-option>
+              <el-option label="永樂車行(大阪)" :value="1256" :key="1256" v>
+              </el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <span><em>车</em>
             <el-select v-model="msg.CarId" filterable :placeholder="$t('pub.pleaseSel')" clearable @clear="getList()"
@@ -59,7 +70,7 @@
       <table class="tripPlanTab" v-if="dataList&&dataList.length>0">
         <thead>
           <tr>
-            <th>
+            <th style="width:115px;">
               {{msg.MonthStr}}
             </th>
             <template v-if="headerList&&headerList.length>0">
@@ -76,7 +87,12 @@
           <template v-for="(subItem,subIndex) in item.DayList">
             <tr :key="`d1_`+index+`s1_`+subIndex">
               <td :rowspan="item.DayList.length*2" v-if="subIndex==0">
-                {{item.CarName}}({{item.CarSeatNum}}座)
+                {{item.CarName}}({{item.CarSeatNum}}座)<br />
+                <font style="color:blue">{{item.CarNo}}</font>
+                <template v-if="item.BusStateName!='正常'">
+                  <br />
+                  <font style="color:red">{{item.BusStateName}}</font>
+                </template>
               </td>
               <template v-for="(childItem,childIndex) in subItem">
                 <td :key="`d1_`+index+`s1_`+subIndex+`d1`+childIndex">
@@ -109,14 +125,28 @@
                     :key="`d2_`+index+`s2_`+subIndex+`d2`+childIndex">
                     <el-tooltip
                       :content="(childItem.OrderType==1?`常规订单:`:`包车订单:`)+childItem.OrderId+`,用车时间:`+childItem.StartDateStr+`至`+childItem.EndDateStr">
-                      <font :style="{color: childItem.Income>0?'#29b6f6':'#000000'}">
-                        <template v-if="childItem.TCNUM">
-                          {{childItem.TCNUM}}
-                        </template>
-                        <template v-else>
-                          {{childItem.OrderTCNUM}}
-                        </template>
-                      </font>
+                      <template v-if="isHaveAuth">
+                        <font :style="{color: childItem.Income>0?'#29b6f6':'#000000'}" @click="goToBus(childItem)"
+                          style="cursor:pointer;">
+                          <template v-if="childItem.TCNUM">
+                            {{childItem.TCNUM}}
+                          </template>
+                          <template v-else>
+                            {{childItem.OrderTCNUM}}
+                          </template>
+                        </font>
+                      </template>
+                      <template v-else>
+                        <font :style="{color: childItem.Income>0?'#29b6f6':'#000000'}">
+                          <template v-if="childItem.TCNUM">
+                            {{childItem.TCNUM}}
+                          </template>
+                          <template v-else>
+                            {{childItem.OrderTCNUM}}
+                          </template>
+                        </font>
+                      </template>
+
                     </el-tooltip>
                   </td>
                 </template>
@@ -146,6 +176,7 @@
           MonthStr: "",
           CarId: "",
           QOrderId: "",
+          BusCompany: "", //车公司
         },
         headerList: [], //表头
         dataList: [],
@@ -157,15 +188,31 @@
         isShowEditPlanDialog: false, //是否显示新增修改
         dialogTitle: "",
         carList: [],
+        isHaveAuth: false,
       }
     },
     components: {
       editTripPlan
     },
     methods: {
+      //跳转到车订单
+      goToBus(item) {
+        let carUrl = this.domainManager().CarUrl;
+        var nPath = "CarOrders/" + item.OrderId
+        var that = this;
+        this.apipost("travel_temp_token", {}, res => {
+          if (res.data.resultCode == 1) {
+            let newUrl = carUrl + "/auth/autologin?tk=" + res.data.data + "&gpath=" + nPath;
+            window.open(newUrl)
+          }
+        })
+      },
       //获取车辆列表
       getCarList() {
-        this.apipost("travel_post_GetJapanCarList", {}, res => {
+        var carMsg = {
+          BusCompany: this.msg.BusCompany
+        }
+        this.apipost("travel_post_GetJapanCarList", carMsg, res => {
           if (res.data.resultCode == 1) {
             this.carList = res.data.data;
           }
@@ -256,6 +303,14 @@
       },
     },
     mounted() {
+      var userInfo = this.getLocalStorage();
+      if (userInfo.EmployeeId == 1 || userInfo.EmployeeId == 5 || userInfo.RB_Branch_id == 49 || userInfo
+        .RB_Branch_id == 1248 || userInfo.RB_Branch_id == 1256) {
+        this.isHaveAuth = true;
+      }
+      if (!this.isHaveAuth) {
+        this.msg.BusCompany = 1248;
+      }
       let myDate = new Date();
       let yearStr = myDate.getFullYear();
       let monthStr = parseInt(myDate.getMonth() + 1);