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

src/components/Hotel/reservation/OrderList.vue

@@ -326,7 +326,7 @@
           </div>
           <div class="c9e fz12">
             <span>订单编号：</span>
-            <span>{{ item.OrderNo }}</span>
+            <span>{{ item.OrderNo }}({{ item.OrderId}})</span>
             <span
               class="copy cblack cursor-pointer"
               v-if="copyId != item.OrderId"

src/components/Login2019.vue

@@ -171,16 +171,16 @@
             <div class="pwd_bline_left" :class="pwd_bline==true?'_bline_w':''"></div>
             <div class="pwd_bline_right" :class="pwd_bline==true?'_bline_w':''"></div>
           </div>
-          <div class="login-commonBotm">
+          <!-- <div class="login-commonBotm">
             <i class="icon-login-password iconfont icon-mima" :style="{color: pwd_bline==true?'#E95252':'#000000'}"></i>
             <input class="input FPF_b" @focus="pwd_bline=true" @blur="pwd_bline=false" autocomplete="new-password"
               maxlength="20" v-model="passwordSure" style="background-color:transparent !important" type="password"
               placeholder="确认密码：大写字母+小写字母+数字或?!&$%#_" />
             <div class="pwd_bline_left" :class="pwd_bline==true?'_bline_w':''"></div>
             <div class="pwd_bline_right" :class="pwd_bline==true?'_bline_w':''"></div>
-          </div>
+          </div> -->
 
-          <!-- <div class="login-commonBotm btValidate">
+          <div class="login-commonBotm btValidate">
             <i class="icon-login-password iconfont icon-yanzhengma"
               :style="{color: validate_bline==true?'#E95252':'#000000'}"></i>
             <input class="input FPF_b phoneValidate" maxlength="4" onkeyup="value=value.replace(/[^\d]/g,'')"
@@ -192,7 +192,7 @@
               <span v-show="show" @click="getCode" class="FPF_s">获取验证码</span>
               <span v-show="!show" class="count FPF_s">{{count}}s重新获取</span>
             </div>
-          </div> -->
+          </div> 
           <div class="forgetPw">
             <div class="error-msg" style="float:left;width:auto;">
               <div v-show="passwordIsShow"><img src="../assets/img/login-error-tips.png" />{{ passwordErrorMsg }}</div>
@@ -452,16 +452,13 @@
         this.mobileCodeType = 2;
       },
       changePwd() {
-        if (this.passwordSure != this.password) {
-          this.Error('新密码和确认密码不一致');
-          return;
-        }
+        
         let msg = {
           password: this.password,
-          mobileNumber: this.mobileNumber
-         // code: this.code
+          mobileNumber: this.mobileNumber,
+          code: this.code
         };
-        this.apipost("user_change_password_by_mobile", msg, res => {
+        this.apipost("user_change_password_by_mobileNumber", msg, res => {
           if (res.data.resultCode == 1) {
             this.isShow = 1;
             this.$notify.success({

src/components/SalesModule/enrollTotal.vue

@@ -1520,6 +1520,9 @@ export default {
       let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
       this.msg.tempOrderId = crmOrderObj.OrderId
     }
+    if(this.$route.query.OrderId){
+      this.msg.tempOrderId = this.$route.query.OrderId
+    }
     this.getCompany();
 
     this.getCtlxList();

src/components/SalesModule/groupTourOrder.vue

@@ -4787,6 +4787,8 @@
       }else if(this.$route.query.crmOrderObj){
           let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
           this.msg.tempOrderId = crmOrderObj.OrderId
+      }else if(this.$route.query.OrderId){
+          this.msg.tempOrderId = this.$route.query.OrderId
       } else {
         this.msg.QStartDate = new Date().Format("yyyy-MM-dd");
       }

src/components/SalesModule/groupTourOrderOne.vue

@@ -4075,6 +4075,8 @@
       this.userId = this.getLocalStorage().EmployeeId
       if (this.$route.query.id) {
         this.msg.tempOrderId = this.$route.query.id
+      }else if(this.$route.query.OrderId){
+          this.msg.tempOrderId = this.$route.query.OrderId
       }else if(this.$route.query.crmOrderObj){
           let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
           this.msg.tempOrderId = crmOrderObj.OrderId

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -838,6 +838,8 @@
       if(this.$route.query.crmOrderObj){
         let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
         this.msg.OrderId = crmOrderObj.OrderId
+      }else if(this.$route.query.OrderId){
+          this.msg.OrderId = this.$route.query.OrderId
       }
       this.qjGroupId = this.QjGroupId();
       this.userInfo = this.getLocalStorage();

src/components/SalesVisa/VisaProductEditOrderOP.vue

@@ -886,6 +886,8 @@
       if(this.$route.query.crmOrderObj){
         let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
         this.msg.OrderId = crmOrderObj.OrderId
+      }else if(this.$route.query.OrderId){
+          this.msg.OrderId = this.$route.query.OrderId
       }
       this.qjGroupId = this.QjGroupId();
       this.userInfo = this.getLocalStorage();

src/components/SingleAirTicket/components/OrderList.vue

@@ -496,7 +496,7 @@
                 v-for="(items,i) in item.MultipleChoiceList">{{items.Name}}</span> -->
               </div>
               <div class="c9e fz12">
-                <span>订单编号：</span>
+                <span>订单Id：</span>
                 <span>{{ item.OrderId }}</span>
                 <span
                   class="copy cblack cursor-pointer"

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

@@ -406,7 +406,7 @@
               </div>
               <div class="c9e fz12">
                 <span>订单编号：</span>
-                <span>{{ item.OrderNo }}</span>
+                <span>{{ item.OrderNo }}({{ item.OrderId}})</span>
                 <span
                   class="copy cblack cursor-pointer"
                   v-if="copyId != item.OrderId"

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -349,7 +349,7 @@
               </div>
               <div class="c9e fz12">
                 <span>订单编号：</span>
-                <span>{{ item.OrderNo }}</span>
+                <span>{{ item.OrderNo }}({{ item.Id}})</span>
                 <span
                   class="copy cblack cursor-pointer"
                   v-if="copyId != item.Id"

src/components/busManagement/BookAcar/order.vue

@@ -55,12 +55,20 @@
         
       },
       mounted() {
-        if(this.$route.query.OrderType){
+        if(this.$route.query.OrderType||this.$route.query.Type){
           this.dataObj.OrderId = this.$route.query.OrderId
-          if(this.$route.query.Type<4){
-            this.dataObj.tab = this.$route.query.Type
+          if(this.$route.query.Type){
+            if(this.$route.query.Type<4){
+              this.dataObj.tab = this.$route.query.Type
+            }else{
+              this.dataObj.tab = '0'
+            }
           }else{
-            this.dataObj.tab = '0'
+            if(this.$route.query.OrderType<4){
+              this.dataObj.tab = this.$route.query.OrderType
+            }else{
+              this.dataObj.tab = '0'
+            }
           }
         }else if(this.$route.query.crmOrderObj){
           let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)

src/components/busManagement/BookAcar/orderOP.vue

@@ -57,10 +57,18 @@
     mounted() {
       if(this.$route.query.OrderType){
           this.dataObj.OrderId = this.$route.query.OrderId
-          if(this.$route.query.Type<4){
-            this.dataObj.tab = this.$route.query.Type
+          if(this.$route.query.Type){
+            if(this.$route.query.Type<4){
+              this.dataObj.tab = this.$route.query.Type
+            }else{
+              this.dataObj.tab = '0'
+            }
           }else{
-            this.dataObj.tab = '0'
+            if(this.$route.query.OrderType<4){
+              this.dataObj.tab = this.$route.query.OrderType
+            }else{
+              this.dataObj.tab = '0'
+            }
           }
         }else if(this.$route.query.OrderId){
           this.dataObj.OrderId = this.$route.query.OrderId

src/components/myOrdersAllType/components/OrderList.vue

 
       <template>
         <el-table
-        stripe
+        border
         ref="multipleTable"
         :data="OrderList"
-        tooltip-effect="dark"
         style="width: 100%"
         :default-sort = "{prop: 'date', order: 'descending'}">
         <el-table-column 
@@ -32,7 +31,7 @@
             </template>
         </el-table-column>
         <el-table-column
-            label="客人姓名"
+            label="客人"
             show-overflow-tooltip>
             <template slot-scope="scope">
               <span :class="{'colorblue font-color-link':pagesTitle!='详情'}"  @click="pagesTitle!='详情'?openNameDetails(scope.row):''">
@@ -42,30 +41,26 @@
         </el-table-column>
         <el-table-column 
             prop="SaleName"
-            label="销售姓名"
+            label="销售"
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column 
             prop="LureEmpName"
-            label="引流姓名"
+            label="引流"
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column 
             label="商品名称"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.Name" placement="top">
-                <span style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Name}}</span>
-              </el-tooltip>
+              <div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Name}}</div>
             </template>
         </el-table-column>
         <el-table-column 
             label="商品详情"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.Description" placement="top">
-                <span style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Description}}</span>
-              </el-tooltip>
+              <div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Description}}</div>
             </template>
         </el-table-column>
         <el-table-column 
@@ -256,20 +251,128 @@
           }
         },
         methods: {
-          goDetails(item){
-            let data = [
-              {
-                  path: "myCustomerOrder",
-                  OrderId: item.OrderId
-              },
-            ];
-            let href = this.domainManager().crmRoutingUrl +
-            "automaticLogin?token=" +
-            this.getLocalStorage().token +
-            "&data=" +
-            JSON.stringify(data);
-            window.open(href);
-          },
+          goDetails(row){
+      let data = [{
+          path: "",
+          OrderId: row.OrderId,
+          Type: ''
+        }]
+        let href
+        let url = this.domainManager().crmRoutingUrl;
+        
+      if (row.OrderType == 1) {
+        
+        if(this.pagesTitle=='销售'){
+          data[0].path = 'myCustomerOrderAllType'
+        }else{
+          data[0].path = 'customerOrderAllType'
+        }
+        href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
+        window.open(href);
+        
+      }else{
+        let name = ''
+        if (row.OrderType == 6) {
+          if(this.pagesTitle=='销售'){
+            name = 'VisaProductEditOrder'
+          }else{
+            name = 'VisaProductEditOrderOP'
+          }
+          this.$router.push({
+            name: name,
+          });
+        }else if (row.OrderType == 2) {//跟团 一日游
+          if(this.pagesTitle=='销售'){
+            if(row.TravelType==1){
+              name = 'groupTourOrder'
+            }else{
+              name = 'groupTourOrderOne'
+            }
+          }else{
+            name = 'enrollTotal'
+          }
+        }
+        else if (row.OrderType == 3) {//酒店
+          if(this.pagesTitle=='销售'){
+            name = 'singleProductHotelOrder'
+          }else{
+            name = 'singleProductHotelOrderOP'
+          }
+        }
+        else if (row.OrderType == 4) {//门票
+          if(this.pagesTitle=='销售'){
+            name = 'SingleticketOrderList'
+          }else{
+            name = 'SingleticketOrderListOP'
+          }
+        }
+        else if (row.OrderType == 5) {//包车
+            this.GetAdminCarOrderPageList(row,url,href,data)
+        }
+        else if (row.OrderType == 7) {//jalan酒店
+          // if(this.pagesTitle=='销售'){
+          //   name = 'CharterOrderList'
+          // }else{
+          //   name = 'CharterOrderListOP'
+          // }
+        }
+        if(name){
+          this.$router.push({
+            name: name,
+            query: {
+              OrderId: row.OrderId,
+              blank: "y",
+            }
+          });
+        }
+        
+      }
+    },
+    GetAdminCarOrderPageList(row,url,href,data){
+      let msg = {
+              pageIndex: 1,
+              pageSize: 5,
+              OrderType: '',
+              OrderId: row.OrderId,
+              OrderNo: '',
+              SurName: '',
+              Name: '',
+              OrderStatus: 0,
+              StartTime: '',
+              EndTime: '',
+              OrderSTime: '',
+              OrderETime: '',
+              ProductName: '',
+              Mobile: '',//电话
+              IsSelectSale: 1,
+              EnterID: 0,//业务员
+          }
+          let name
+          this.apipost('CarSingle_post_GetAdminCarOrderPageList', msg, res => {
+              if (res.data.resultCode == 1) {
+                let pageData = res.data.data.pageData
+                let OrderType
+                if(pageData&&pageData.length>0){
+                    OrderType = pageData[0].OrderType
+                }
+                if(this.pagesTitle=='销售'){
+                  name = 'CharterOrderList'
+                }else{
+                  name = 'CharterOrderListOP'
+                }
+                this.$router.push({
+                  name: name,
+                  query: {
+                    OrderId: row.OrderId,
+                    OrderType: OrderType?OrderType:4,
+                    blank: "y",
+                  }
+                });
+              }
+          })
+    },
+   // 获取订单状态枚举
+   
           // 签证状态
           AmendVisa(){
   

src/components/myOrdersAllType/components/allList.vue

@@ -74,7 +74,19 @@
                     <el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/>
                     </span>
                   </li> -->
-                  
+                  <li v-if="!Title">
+                    <span>
+                      <em>业务员</em>
+                      <el-select filterable  v-model='msg.EnterId' class="w200">
+                          <el-option :value="0" label="不限"></el-option>
+                          <el-option v-for='item in EmployeeList'
+                              :label='item.EmName'
+                              :value='item.EmployeeId'
+                              :key='item.EmployeeId'>
+                          </el-option>
+                      </el-select>
+                    </span>
+                  </li>
                 <li>
                     <span>
                       <em>引流人</em>
@@ -90,27 +102,14 @@
                   </li>
                 <li>
                   <span>
-                    <em>{{$t('OrderList.search.status')}}</em>
-                    <el-select v-model="msg.OrderStatus" class="w200 HworkInput">
-                      <el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
-                      <el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-                    </el-select>
-                  </span>
-                </li>
-                <li v-if="!Title">
-                  <span>
-                    <em>业务员</em>
-                    <el-select filterable  v-model='msg.EnterId' class="w200">
-                        <el-option :value="0" label="不限"></el-option>
-                        <el-option v-for='item in EmployeeList'
-                            :label='item.EmName'
-                            :value='item.EmployeeId'
-                            :key='item.EmployeeId'>
-                        </el-option>
+                    <em>订单类型</em>
+                    <el-select v-model="msg.OrderType" class="w200 HworkInput">
+                      <el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
                     </el-select>
                   </span>
                 </li>
                 
+                
                 <li>
                   <span>
                     <em>订单状态</em>
@@ -152,20 +151,6 @@
                       </el-date-picker>
                   </span>
                 </li>
-                <li>
-                  <span>
-                    <em>出发时间</em>
-                    <el-date-picker
-                      style="height: 34px;"
-                      value-format="yyyy-MM-dd"
-                      v-model="DatelistUse"
-                      type="daterange"
-                      :range-separator="$t('OrderList.zhi')"
-                      :start-placeholder="$t('OrderList.star')"
-                      :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
-                      </el-date-picker>
-                  </span>
-                </li>
                 <li>
                   <span>
                     <em @click.stop="showWarningSearch=true" 
@@ -175,30 +160,8 @@
                         <div class="TC_queryTitle">订单高级查询</div>
                         <div class="clearfix">
                           <div class="TC_leftSearch">
-                            
                             <div>
-                              <span>出票状态</span>
-                              <el-select  v-model='msg.TicketStatus' class="w150">
-                                <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>
-                            </div>
-                            <div>
-                              <span>出签状态</span>
-                              <el-select v-model='msg.VisaStatus' class="w150">
-                                <el-option v-for='item in VisaList'
-                                    :label='item.Name'
-                                    :value='item.Id'
-                                    :key='item.Id'>
-                                </el-option>
-                            </el-select>
-                            </div>
-                            <div>
-                                <span>线路</span>
+                                <span>选择线路</span>
                                 <el-select  v-model='msg.LineId' class="w150">
                                   <el-option :value="0" label="不限"></el-option>
                                   <el-option v-for='item in LineList'
@@ -208,6 +171,18 @@
                                   </el-option>
                               </el-select>
                               </div>
+                              <div>
+                                <span>出发时间</span>
+                                <el-date-picker
+                      style="height: 34px;width: 210px;"
+                      value-format="yyyy-MM-dd"
+                      v-model="DatelistUse"
+                      type="daterange"
+                      :range-separator="$t('OrderList.zhi')"
+                      :start-placeholder="$t('OrderList.star')"
+                      :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
+                      </el-date-picker>
+                              </div>
                             <div>
                               <span>完结时间</span>
                               <el-date-picker
@@ -378,12 +353,7 @@
             },
             total: 0,
             currentPage: 1,
-            OrderStatusType:[
-              {Name: this.$t('OrderList.orderStatus.apply'),ID:'1'},
-              {Name: this.$t('OrderList.orderStatus.check'),ID:'2'},
-              {Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'},
-              {Name: this.$t('OrderList.orderStatus.sun'),ID:'4'},
-            ],
+            OrderTypeList:[],
             OrderStateType:[
               {Name: '接机',ID:'1'},
               {Name: '送机',ID:'2'},
@@ -434,6 +404,20 @@
           }
         },
         methods: {
+            GetOrderTypeEnumList() {
+          this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
+            if (res.data.resultCode == 1) {
+              this.OrderTypeList = res.data.data;
+              let data = {
+                Name: "不限",
+                Id: "0",
+              };
+              this.OrderTypeList.unshift(data);
+            } else {
+              this.$message.error(res.data.message);
+            }
+          });
+        },
             getLineList() {
         this.apipost(
           "line_post_GetAllList", {
@@ -591,6 +575,7 @@
           this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
           this.GetOrderStatusEnumList()
           this.GetTicketStatusEnumList()
+          this.GetOrderTypeEnumList()
           this.getLineList()
           this.Datelist = this.getyMDOne()
           this.userInfo = this.getLocalStorage();

src/components/platformModule/menuManagement.vue

@@ -360,11 +360,11 @@
           this.addMsg.Sort = updateList.Sort
           this.addMsg.GroupingCode = updateList.GroupingCode
           this.addMsg.MenuUrl = updateList.MenuUrl
-          this.addMsg.menutype = updateList.MenuType
+          this.addMsg.menutype = updateList.MenuType?updateList.MenuType:1
           this.addMsg.MenuStatus = updateList.MenuStatus.toString()
           let style = JSON.parse(updateList.MenuStyle)
           // this.addMsg.MenuStyleIcon = style.icon
-          console.log(style,'----')
+          console.log(updateList.MenuType,'----')
           this.addMsg.MenuStyleIcon = style.icon
           this.addMsg.MenuStyleColor = style.color
           

src/components/scenicSpot/reservation/OrderList.vue

@@ -512,7 +512,7 @@
           </div>
           <div class="c9e fz12">
             <span>订单编号：</span>
-            <span>{{ item.OrderNo }}</span>
+            <span>{{ item.OrderNo }}({{ item.OrderId}})</span>
             <span class="copy cblack cursor-pointer" v-if="copyId != item.OrderId" @click="CopyHandler(item)">复制</span>
             <span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span>
           </div>