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

src/App.vue

@@ -73,7 +73,7 @@ export default {
     }
   },
   mounted() {
-    if (!this.getLocalStorage()) {
+    if (!this.getLocalStorage() && document.URL.indexOf("SupplierLogin")==-1) {
       this.$router.push({
         path: '/login'
       })

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -624,7 +624,7 @@ Vue.component("TCIDJump", {
   <div>
     <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span> 
     <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
-    <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span>
   </div>
@@ -651,7 +651,7 @@ Vue.component("TCIDJump", {
     goUrlVisa(path, id) {
       this.$router.push({
         path: "/" + path,
-        query: { VisaID: id, blank: "y" }
+        query: { id: id,isShow:0,EmId:-1, blank: "y" }
       });
     }
   }
@@ -661,7 +661,7 @@ Vue.component("TCNUMJump", {
   template: `<div>
   <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span> 
   <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
-  <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
@@ -693,7 +693,7 @@ Vue.component("TCNUMJump", {
     goUrlVisa(path, id) {
       this.$router.push({
         path: "/" + path,
-        query: { VisaID: id, blank: "y" }
+        query: { id: id,isShow:0,EmId:-1, blank: "y" }
       });
     }
   }

src/components/SalesModule/MyCustomer.vue

@@ -361,7 +361,7 @@ export default {
                 customerName:[{required: true, message: "请输入客户名", trigger: "blur"}],
                 contactNumber:[
                     {required: true, message: "请输入联系电话", trigger: "blur"},
-                    { pattern: this.$commonUtils.Regex.el_ISphone, message: "请输入正确的电话" }
+                    { pattern: /^1[123457890]\d{9}$/, message: "请输入正确的电话" }
                 ],
                 brandIds:[{required: true, message: "请选择所属品牌", trigger: "change"}],
                 Duty:[{required: true, message: "请选择职务", trigger: "change"}],

src/components/SalesModule/enrollTotal.vue

@@ -276,7 +276,7 @@
       <tr style="height:20px">
         <td colspan="15" class="RL_Order" style="height:20px">
           <span style="font-size: 14px;color: #333333">名单:</span>
-          <span v-for="(childItem) in item.guestList" >{{childItem.userName}}&nbsp;&nbsp;</span>
+          <span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
           <!--            <span v-else>暂无名单</span>-->
           <span style="display: block;font-size: 14px;color: #333333">房间信息：{{item.orderGuestHouseStr}}</span>
         </td>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1746,8 +1746,8 @@
         </tr>
         <tr style="height:20px">
             <td colspan="15" class="RL_Order" style="height:20px">
-              <span class="RL-remarkTitle" v-if="item.guestList.length>0 && item.isOwn !=2">名单:</span>
-              <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0 && item.isOwn !=2">
+                <span class="RL-remarkTitle" v-if="item.guestList.length>0  && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span>
+              <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">
                 <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
               </span>
 <!--              <span class="RL-redType RL-remarkCon" v-else>-->

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -89,7 +89,7 @@
               <el-input type="number" v-model="item.ShopDetailsList[0].GuideCommission"></el-input>
               <!--GuideCommission 导游佣金应付-->
             </td>
-            <td class="more_td _height_45" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
+            <td class="more_td _height_45" >
               <el-input type="number" v-model="subItem.CompanyCommission"></el-input>
               <!--CompanyCommission 公司佣金应收-->
             </td>

src/components/Supplier/roomQuery.vue

@@ -154,7 +154,7 @@
                   </template>
                 </span>
               </td>
-              <td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
+              <td v-if="childIndex==0" :rowspan="subItem.hotelList.length+1">
                 <a style="text-decoration:underline;color:blue;cursor:pointer"
                   @click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
                   <template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
@@ -164,6 +164,11 @@
                   @click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
               </td>
             </tr>
+            <tr v-if="subIndex==0" > 
+               <td colspan="8" class="redTip">
+                 <p>备注：{{subItem.SupplierRemarks}}</p>
+               </td>
+            </tr>
           </template>
         </template>
       </table>
@@ -521,4 +526,10 @@
     padding-left: 5px;
   }
 
+    .roomQuery_SupplierTable .redTip {
+    text-align: left;
+    color:red;
+    padding-left: 5px;
+  }
+
 </style>

src/components/SupplierLogin.vue

@@ -48,7 +48,7 @@
     <div class="homepage-hero-module">
       <div :style="{'height':'100vh'}">
         <div class="item">
-          <img :style="{'height':'100vh'}" src="../assets/img/supplierBg.png" />
+          <img :style="{'height':'100vh'}" src="../assets/img/supplierBg.jpg" />
         </div>
       </div>
     </div>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -3165,7 +3165,7 @@
               this.Unit_PriceList = [];
               this.apipost('sellorder_post_GetLessPrice', {
                 "TCID": obj.TCID,
-                "MaxPeopleNum": MaxPeopleNum
+                "MaxPeopleNum": maxPeopleNum
               }, res => {
                 this.LessMoney = res.data.data.lessMoney;
                 if (parseFloat(this.LessMoney) > 0) {
@@ -3807,6 +3807,7 @@
         } else {
           this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney;
         }
+        this.getlessPrice();
         this.getTicheng();
       },
       yzBigBed2() {
@@ -4770,6 +4771,45 @@
         //     }
         //   },
         //   err => {})
+      },
+      getlessPrice(){
+        let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this
+          .addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum))
+        this.Unit_PriceList = [];
+        this.apipost('sellorder_post_GetLessPrice', {
+          "TCID": this.addMsg.TCID,
+          "MaxPeopleNum": maxPeopleNum
+        }, res => {
+          this.LessMoney = res.data.data.lessMoney;
+          if (parseFloat(this.LessMoney) > 0) {
+            for (var i = 0; i <= parseInt(this.LessMoney) / 10; i++) {
+              var obj = {
+                ID: '',
+                LessMoney: ''
+              }
+              obj.ID = this.addMsg.TC_Price - i * 10;
+              obj.LessMoney = this.addMsg.TC_Price - i * 10;
+              this.Unit_PriceList.push(obj);
+            }
+            if (this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price) < 0) {
+              var obj = {
+                ID: '',
+                LessMoney: ''
+              }
+              obj.ID = this.addMsg.Unit_Price;
+              obj.LessMoney = this.addMsg.Unit_Price;
+              this.Unit_PriceList.push(obj);
+            }
+          } else {
+            var obj = {
+              ID: '',
+              LessMoney: ''
+            }
+            obj.ID = this.addMsg.Unit_Price;
+            obj.LessMoney = this.addMsg.Unit_Price;
+            this.Unit_PriceList.push(obj);
+          }
+        }, err => {})
       }
     },
     mounted() {

src/components/dmc/manager/dmcTotalTable.vue

@@ -357,12 +357,22 @@
                             <td style="text-align:right;">备注：</td>
                             <td>
                               <el-input class='mt10' v-model='NumObj.remarkString' type='textarea'></el-input>
-                              <br />
                             </td>
                           </tr>
                           <tr>
                             <td colspan="2">
-                              此备注会现在在组团团控列表.
+                              此备注会带到组团团控列表.
+                            </td>
+                          </tr>
+                           <tr>
+                            <td style="text-align:right;">供应商备注：</td>
+                            <td>
+                              <el-input class='mt10' v-model='NumObj.SupplierRemarks' type='textarea'></el-input>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td colspan="2">
+                              此备注会带到供应商订房查询列表.
                             </td>
                           </tr>
                         </table>
@@ -401,6 +411,9 @@
                   <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"
                     style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}
                   </div>
+                   <div v-show="outItem.StaticsReportList[0].SupplierRemarks!=''" class="colorE95252"
+                    style="padding-top:5px;padding-bottom:4px;">对供应商备注:{{outItem.StaticsReportList[index].SupplierRemarks}}
+                   </div>
                 </div>
               </td>
             </tr>
@@ -446,6 +459,7 @@
           DMCNum: "",
           TCIDs: "",
           remarkString: '',
+          SupplierRemarks:''
         },
         queryCommonData: {
           //公司数据
@@ -487,6 +501,7 @@
         this.NumObj.TCIDs = TCIDs;
         this.NumObj.remarkString = obj.DMCRemark;
         this.NumObj.DMCNum = obj.DMCNum;
+        this.NumObj.SupplierRemarks=obj.SupplierRemarks;
       },
       saveRemark() {
         this.apipost('dmcstatistics_post_SetDMCRemark', this.NumObj, res => {
@@ -642,9 +657,9 @@
         this.currentPage = 1;
       },
       getList() {
-        this.loading = true
+        this.loading = true;
         this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
-          this.loading = false
+          this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
             this.list = res.data.data.pageData.data;

src/store/actions/session.js

@@ -94,6 +94,9 @@ export function setCurrSession ({state, commit, dispatch}, sessionId) {
 
 export function resetCurrSession ({state, commit}) {
   const nim = state.nim
+  if(!nim){
+    return;
+  }
   console.log('重置了..................')
   nim.resetCurrSession()
   commit('updateCurrSessionMsgs', {