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

src/components/FinancialModule/sellCommissionRules.vue

@@ -102,7 +102,6 @@
             <el-col :span="5" :gutter="20">
               <el-form-item label="适用公司：" prop="UsingBranchArray">
                 <el-select
-                  filterable
                   multiple
                   collapse-tags
                   @change="changeData(1)"
@@ -122,7 +121,6 @@
             <el-col :span="5" :gutter="20">
               <el-form-item label="适用线路：" prop="UsingLineArray">
                 <el-select
-                  filterable
                   multiple
                   collapse-tags
                   @change="changeData(2)"
@@ -140,6 +138,27 @@
               </el-form-item>
             </el-col>
             <el-col :span="5" :gutter="20">
+              <el-form-item label="适用目的地：">
+                <el-select
+                  multiple
+                  collapse-tags
+                  @change="changeData(3)"
+                  v-model="addMsg.UsingDestinationArray"
+                >
+                  <el-option label="所有目的地" value="-1"></el-option>
+                  <el-option
+                    v-for="(item, index) in desctions"
+                    :label="item.PlaceName"
+                    :value="item.PlaceID.toString()"
+                    :key="index"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            
+          </el-row>
+          <el-row>
+            <el-col :span="4" :gutter="20">
               <el-form-item label="启用时间：">
                 <el-date-picker v-model="addMsg.EffectDate" type="date" placeholder="选择启用时间"></el-date-picker>
               </el-form-item>
@@ -289,7 +308,9 @@ export default {
       formLoading: false,
       searchMsg: {
         RB_Group_Id: 0
-      }
+      },
+      desctionsResources:[],
+      desctions:[]
     };
   },
   methods: {
@@ -333,8 +354,10 @@ export default {
           CommissionVariable: 0,
           UsingLineArray: ["-1"],
           UsingBranchArray: ["-1"],
+          UsingDestinationArray:["-1"],
           UsingLine: "",
           UsingBranch: "",
+          UsingDestination: "",
           EffectDate: null,
           RB_Group_Id: this.searchMsg.RB_Group_Id,
           BalanceCyc: 1,
@@ -353,7 +376,17 @@ export default {
       } else {
         data.UsingLineArray = data.UsingLine.split(",");
         data.UsingBranchArray = data.UsingBranch.split(",");
+        this.desctions=[]
+        if(data.UsingLine!='-1'){
+          this.desctionsResources.forEach(x=>{
+            if(data.UsingLineArray.indexOf(x.LineID.toString())!=-1){
+              this.desctions.push(x);
+            }
+          })
+        }
         this.addMsg = data;
+        this.addMsg.UsingDestinationArray = data.UsingDestination.split(",");
+        console.log(this.addMsg)
       }
       this.changeShow(1);
     },
@@ -364,6 +397,7 @@ export default {
           this.formLoading = true;
           this.addMsg.UsingLine = this.addMsg.UsingLineArray.join(",");
           this.addMsg.UsingBranch = this.addMsg.UsingBranchArray.join(",");
+          this.addMsg.UsingDestination = this.addMsg.UsingDestinationArray.join(",");
           this.apipost("sellcommission_rule_set", this.addMsg, x => {
             if (x.data.resultCode == 1) {
               this.changeShow(0);
@@ -540,11 +574,14 @@ export default {
       this.isReady = true;
     },
     changeData(type) {
+      console.log('111111111111111')
       let temp = [];
       if (type == 1) {
         temp = this.addMsg.UsingBranchArray;
       } else if (type == 2) {
         temp = this.addMsg.UsingLineArray;
+      } else if (type == 3) {
+        temp = this.addMsg.UsingDestinationArray;
       }
       let len = temp.length;
       if (len > 1) {
@@ -554,6 +591,17 @@ export default {
           temp.splice(temp.indexOf("-1"), 1);
         }
       }
+      
+      if(type==2 || type==3){
+        this.desctions=[]
+        if(type==2)
+          this.addMsg.UsingDestinationArray=['-1']
+        this.desctionsResources.forEach(x=>{
+          if(this.addMsg.UsingLineArray.indexOf(x.LineID.toString())!=-1){
+            this.desctions.push(x);
+          }
+        })
+      }
     },
     handleCurrentChanges(val) {
       this.pageIndex = val;
@@ -569,16 +617,10 @@ export default {
     },
     filterMethod(filters) {
       console.log("filter", filters);
-      this.msg.Alias = filters.Alias;
-      this.msg.RB_Branch_Id = filters.allName;
-      this.msg.SettlementType =
-        filters.Commission.length == 1 ? filters.Commission[0] : 0;
-      this.msg.HaveContract =
-        filters.HaveContract.length == 1 ? filters.HaveContract[0] : -1;
-      this.msg.SigningLine = filters.SigningLine;
-      this.msg.Accountholder = filters.Accountholder;
-      this.msg.pageIndex = 1;
-      this.getList();
+      this.searchMsg.RuleName = filters.RuleName;
+      this.searchMsg.UsingBranchArray = filters.BranchName;
+      this.searchMsg.UsingLineArray = filters.LineName;
+      this.getData();
     },
     getCompanyList() {
       //获取公司列表
@@ -619,11 +661,34 @@ export default {
         this.tableData = x.data.data;
         this.loading = false;
       });
+    },
+    getDesction(){
+      this.apipost(
+        "place_post_GetPageList",
+        {
+          LineID:0,
+          PlaceName:'',
+          pageIndex:1,
+          pageSize:5000
+        },
+        res => {
+          if (res.data.resultCode == 1) {
+            res.data.data.pageData.forEach(x=>{
+              if(x.IsShow==1)
+                this.desctionsResources.push(x)
+            })
+            //this.desctions=this.desctionsResources
+            //console.log(this.departmentList)
+          }
+        },
+        err => {}
+      );
     }
   },
   mounted() {
     this.searchMsg.RB_Group_Id = this.addMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
     this.getCompanyList();
+    this.getDesction();
     Vue.component("table-operation", {
       template: `<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-edit" circle @click="update(rowData,index)"></el-button><el-button type="danger" size='mini' icon="el-icon-delete" circle @click="deleteRow(rowData,index)"></el-button></div>`,
       props: {

src/components/SalesModule/groupTourOrder.vue

@@ -806,8 +806,16 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="成交单价" prop="Unit_Price">
-              <el-input v-model='addMsg.Unit_Price' :disabled="true"
-                        @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
+                 <el-select v-model='addMsg.Unit_Price' 
+                filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
+                <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
+            </el-form-item>
+              <el-form-item>
+               <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
+              <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
               	</el-form-item>
             <!--<el-form-item>
 							<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
@@ -1751,6 +1759,8 @@
         },
         IsUnion: 2,
         IsChargeLossOrders: 0,
+         Unit_PriceList:[],//成交单价下拉数据
+        LessMoney:0,
         addMsg: {
           OrderId: '0',
           TCID: '0',
@@ -2414,6 +2424,49 @@
                 err => {
                 }
               )
+        this.Unit_PriceList=[];
+        this.apipost('sellorder_post_GetLessPrice', {}, 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);
+                }
+
+	            // this.Unit_PriceList.forEach(person => {
+							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);
+							}
+						// });
+
+                 //判断下拉价格里面是否包含了成交单价，未包含就添加进来
+        //   const option = {ID:this.addMsg.TC_Price,LessMoney:this.addMsg.TC_Price}
+        // // 如果数组里面本身不存在这个对象则把这个加进去
+        //   if(JSON.stringify(this.Unit_PriceList).indexOf(JSON.stringify(option))==-1){
+        //       this.Unit_PriceList.push(option); // 进行动态的操作
+        //   }
+          }
+          else{
+              var obj = {
+								ID: '',
+								LessMoney: ''
+              }
+							obj.ID = this.addMsg.Unit_Price;
+              obj.LessMoney = this.addMsg.Unit_Price;
+                this.Unit_PriceList.push(obj);
+          }
+          }, err => {})
          
               this.getKhmdList(this.addMsg.CustomerType, obj.lineId)
               this.getDdlyList(this.addMsg.CustomerType)
@@ -2520,6 +2573,30 @@
           this.addMsg.CustomerId = '0'
           this.addMsg.CommissionShareMoney = '0'
         }
+          this.Unit_PriceList=[];
+        this.apipost('sellorder_post_GetLessPrice', {}, 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);
+                }
+          }
+          else{
+              var obj = {
+								ID: '',
+								LessMoney: ''
+              }
+							obj.ID = this.addMsg.Unit_Price;
+              obj.LessMoney = this.addMsg.Unit_Price;
+                this.Unit_PriceList.push(obj);
+          }
+          }, err => {})
       },
       getTicheng () {
         //提成

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -728,7 +728,12 @@
 					</el-col>
 					<el-col :span="4">
 				  <el-form-item label="成交单价" prop="Unit_Price">
-						   <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
+                 <!-- <el-select v-model='addMsg.Unit_Price' 
+                filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
+                <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
+                </el-option>
+              </el-select> -->
+              <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
             </el-form-item>
 						<!-- <el-form-item>
 							<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
@@ -1041,11 +1046,20 @@
 						</el-form-item>								
 					</el-col>
 					<el-col :span="4">
-						<el-form-item label="成交单价" prop="Unit_Price">
+						<!-- <el-form-item label="成交单价" prop="Unit_Price">
 						   <el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
+						</el-form-item> -->
+             <el-form-item label="成交单价" prop="Unit_Price">
+                 <el-select v-model='addMsg.Unit_Price' 
+                filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
+                <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
             </el-form-item>
 					  <el-form-item>
-							<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
+               <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
+              <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
               	</el-form-item>
 					</el-col>
 				</el-row>
@@ -2044,6 +2058,8 @@ export default {
         isOrder:1
       },
       IsChargeLossOrders:0,
+       Unit_PriceList:[],//成交单价下拉数据
+        LessMoney:0,
       addMsg: {
         OrderId: "0",
         TCID: "0",
@@ -2691,7 +2707,7 @@ export default {
             this.addMsg.GroupType = x.GroupType.toString();
             this.addMsg.TradeWay = x.TradeWay.toString();
             this.addMsg.PredictRoomNum = x.PredictRoomNum;
-            this.addMsg.IsIntermodal = x.IsIntermodal.toString();
+            this.addMsg.IsIntermodal = x.IsIntermodal?x.IsIntermodal.toString():2;
             this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
             this.addMsg.ChirdNum = x.ChirdNum.toString();
             this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
@@ -2724,6 +2740,40 @@ export default {
               this.isShowLayer2 = true;
             }
             
+        this.Unit_PriceList=[];
+        this.apipost('sellorder_post_GetLessPrice', {}, 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 => {})
+
             this.isShowLayerRemarks = false;
             this.apipost(
               "app_today_visit_GetCustomerBrandByCustomerId",
@@ -2856,6 +2906,30 @@ export default {
         this.addMsg.TC_Price = this.addObj.B2CPrice;
         //this.addMsg.CustomerId=0
       }
+        this.Unit_PriceList=[];
+        this.apipost('sellorder_post_GetLessPrice', {}, 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);
+                }
+          }
+          else{
+              var obj = {
+								ID: '',
+								LessMoney: ''
+              }
+							obj.ID = this.addMsg.Unit_Price;
+              obj.LessMoney = this.addMsg.Unit_Price;
+                this.Unit_PriceList.push(obj);
+          }
+          }, err => {})
     },
     getTicheng() {
       if (this.addMsg.GroupType !=5) {
@@ -2932,7 +3006,7 @@ export default {
     getTotalPrice() {
       if (this.addMsg.GroupType !=5) {
         this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum*1 + this.addMsg.ChirdNeedBedNum*1
-      if (this.addObj.IsBirdDiscount == 1) {
+      if (this.addObj.IsBirdDiscount&&this.addObj.IsBirdDiscount == 1) {
         //早鸟优惠
         //this.addMsg.Unit_Price  //成交单价
         //BabyPrice 婴儿价

src/components/SalesModule/productQuery.vue

@@ -234,8 +234,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="成交单价" prop="Unit_Price">
+            <!-- <el-form-item label="成交单价" prop="Unit_Price">
               <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
+            </el-form-item> -->
+
+             <el-form-item label="成交单价" prop="Unit_Price">
+                 <el-select v-model='addMsg.Unit_Price' 
+                filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
+                <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
+            </el-form-item>
+            <el-form-item>
+               <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
+              <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
               	</el-form-item>
             <!--<el-form-item>
 							<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
@@ -869,6 +882,8 @@
         currentPage: 1,
         total: 0,
         addObj: {},
+        Unit_PriceList:[],//成交单价下拉数据
+        LessMoney:0,
         addMsg: {
           OrderId: '0',
           TCID: '0',
@@ -1465,6 +1480,39 @@
           this.addMsg.CustomerId = '0'
           this.addMsg.CommissionShareMoney = '0'
         }
+        this.Unit_PriceList=[];
+        this.apipost('sellorder_post_GetLessPrice', {}, 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.Unit_Price-i*10;
+							obj.LessMoney = this.addMsg.Unit_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 => {})
       },
       getTicheng() { //提成
         let num = Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -863,8 +863,16 @@
           </el-col>
           <el-col :span="4">
               <el-form-item label="成交单价" prop="Unit_Price">
-              <el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
+                 <!-- <el-select v-model='addMsg.Unit_Price' 
+                filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
+                <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
+                </el-option>
+              </el-select> -->
+              <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
             </el-form-item>
+            <!-- <el-form-item label="成交单价" prop="Unit_Price">
+              <el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
@@ -1083,10 +1091,17 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="成交单价" prop="Unit_Price">
-              <el-input v-model='addMsg.Unit_Price' :disabled="isChecked" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
+                 <el-select v-model='addMsg.Unit_Price' 
+                filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
+                <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
             </el-form-item>
             <el-form-item>
-              <p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
+              
+              <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
+              <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
             </el-form-item>
           </el-col>
         </el-row>
@@ -2177,6 +2192,8 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
         },
         IsUnion: 2,
         IsChargeLossOrders:0,
+         Unit_PriceList:[],//成交单价下拉数据
+        LessMoney:0,
         addMsg: {
           OrderId: "0",
           TCID: "0",
@@ -2817,6 +2834,42 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
                 this.isShowLayer = false;
                 this.isShowLayer2 = true;
               }
+
+   this.Unit_PriceList=[];
+        this.apipost('sellorder_post_GetLessPrice', {}, 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 => {})
+
+
               this.isShowLayerRemarks = false;
               this.showSetLeader = false;
               this.apipost(

src/components/administrative/CommissionDetail.vue

@@ -173,6 +173,32 @@ export default {
           return `<span style='color:red'>${rowData.commissionMoney.toFixed(2)}</span>`
         }
       };
+      let peopleCount = {
+        field: "peopleCount",
+        title: "收客人数",
+        titleAlign: "left",
+        columnAlign: "left",
+        isResize: true,
+        width: 80,
+        orderBy: "",
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          return `<span style='color:blue'>${rowData.peopleCount+rowData.visaPeopleCount}人</span>`
+        }
+      };
+      let visaPeopleCount = {
+        field: "visaPeopleCount",
+        title: "单签证人数",
+        titleAlign: "left",
+        columnAlign: "left",
+        isResize: true,
+        width: 80,
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          if(rowData.visaPeopleCount>0)
+            return `<span style='color:orange'>${rowData.visaPeopleCount}人</span>`
+          else
+            return ''
+        }
+      };
       let periods = {
         field: "periods",
         title: "期数",
@@ -205,6 +231,8 @@ export default {
       this.columns.push(department);
       this.columns.push(userName);
       this.columns.push(commissionMoney);
+      this.columns.push(peopleCount);
+      this.columns.push(visaPeopleCount);
       this.columns.push(periods);
       this.columns.push(remark);
       this.columns.push(opera);
@@ -223,6 +251,9 @@ export default {
       }
       if(param.commissionMoney!=''){
         this.msg.OrderStr='CommissionMoney '+param.commissionMoney
+      }
+       if(param.peopleCount!=''){
+        this.msg.OrderStr='PeopleCount '+param.peopleCount
       }
       this.getList();
     },

src/components/administrative/CommissionManagement.vue

@@ -104,8 +104,8 @@
             "sellcommission_SetGenerateCommission",msg,
             res => {
               if(res.data.resultCode==1){
-                this.dataList = res.data.data.pageData;
-                this.total = res.data.data.count;
+                this.getList();
+                this.Success('报表生成成功')
               }else{
                 this.Error(res.data.message);
               }

src/components/commonPage/fiveday.vue

@@ -144,6 +144,9 @@ export default {
     },
     goUrl(url) {
       if(url!=null&&url.length>0){
+        if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){
+            url='http://'+url;
+        }
         window.open(url, "_blank");
       }
     }

src/components/commonPage/fourday.vue

@@ -146,6 +146,9 @@ export default {
     },
     goUrl(url) {
       if(url!=null&&url.length>0){
+        if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){
+            url='http://'+url;
+        }
         window.open(url, "_blank");
       }
     }

src/components/commonPage/oneday.vue

@@ -116,6 +116,9 @@ export default {
     },
     goUrl(url) {
       if(url!=null&&url.length>0){
+        if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){
+            url='http://'+url;
+        }
         window.open(url, "_blank");
       }
     }

src/components/commonPage/threeday.vue

@@ -184,6 +184,9 @@ export default {
     },
     goUrl(url) {
       if(url!=null&&url.length>0){
+        if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){
+            url='http://'+url;
+        }
         window.open(url, "_blank");
       }
     }

src/components/commonPage/twoday.vue

@@ -113,6 +113,9 @@ export default {
     },
     goUrl(url) {
       if(url!=null&&url.length>0){
+        if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){
+            url='http://'+url;
+        }
         window.open(url, "_blank");
       }
     }

src/components/confirmationOrderDownLoad.vue

@@ -8,6 +8,7 @@
   <div class="travelControlTrip detail-box">
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <input type="button" class="travelControlTripBtn" value="下载PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
+    <input style="display:none;" type="button" class="travelControlTripBtn" value="下载WORD" @click="ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
     <!-- <input type="button" class="travelControlTripBtn" value="下载Word" @click="toWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> -->
     <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
     <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
@@ -786,9 +787,6 @@
           });
         }
       },
-      // toWord: function (title) {
-      //   $('#pdfNode').wordExport(title)
-      // },
       // 生成pdf
       toPDF: function (title) {
         this.pdfLoading = true
@@ -821,6 +819,17 @@
           console.log(err)
         })
       },
+      ToWord:function(title)
+      {
+        let msg = {
+          configId: this.$route.query.configId,
+          cityId: this.$route.query.cityId,
+          tcid: this.$route.query.tcid,
+          orderId: this.$route.query.orderId,
+          FileName:title
+        };
+        this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc");
+      },
       DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
         var aDate, oDate1, oDate2, iDays
         aDate = sDate1.split("-")

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -447,9 +447,47 @@
       },
       //切换tab事件
       clickFeature(item) {
-        if (item.TypeState === 5) {
-          this.$message.warning('尊敬的用户，行程特色"1"暂时无法直接切换为行程特色"2"!')
+          let state = this.FeatureData.FeatureType
+          if (state === 4 && item.TypeState === 5) {
+            this.$confirm('尊敬的用户，行程特色“1”切换为行程特色“2”将会清空行程特色“1”里面的所有内容，您确定切换吗？', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$message({
+              type: 'success',
+              message: '已切换!'
+            });
+            this.TypeArray.forEach(x => {
+              if (x.TypeState == item.TypeState) {
+                x.isShow = true;
+                this.ckTitle = x.ckTitle;
+                this.FeatureData.FeatureType = item.TypeState;
+              } else {
+                x.isShow = false;
               }
+            });
+            this.FeatureData.FeatureHtmlJson = null
+            this.FeatureData.FeatureHtmlJsonDelete = null
+            this.FeatureData.switch4or5 = true
+            this.$forceUpdate()
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消'
+            });
+            this.TypeArray.forEach(x => {
+              if (x.TypeState == 4) {
+                x.isShow = true;
+                this.ckTitle = x.ckTitle;
+              } else {
+                x.isShow = false;
+              }
+            });
+            this.FeatureData.FeatureType = state;
+          });
+          // this.$message.warning('尊敬的用户，行程特色"1"暂时无法直接切换为行程特色"2"!')
+        }else{
           this.TypeArray.forEach(x => {
             if (x.TypeState == item.TypeState) {
               x.isShow = true;
@@ -459,6 +497,7 @@
               x.isShow = false;
             }
           });
+        }
         this.initFileList();
       },
       //点击折叠

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -1353,8 +1353,8 @@
         let dataList = JSON.parse(JSON.stringify(this.FeatureData));
         let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
         this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList;
-         console.log("dataList",dataList)
-        if (!this.$route.query.configId){
+        console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
+        if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) ){
           for (let i = 0; i < dataList.DayList.length; i++) {  //组装数据
             let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
             let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList)  // 酒店

src/components/systemManagement/LessPriceManagement.vue

@@ -81,7 +81,7 @@
       <table border="0" cellspacing="0" cellpadding="0" class="LP_table" v-loading="this.loading">
         <tr>
           <th class="first">
-            <span class="Lp_role">角色</span>
+            <span class="Lp_role">岗位</span>
             <span class="Lp_company">公司</span>
           </th>
           <template v-for="item in BranchList">
@@ -97,13 +97,13 @@
           <td>
             <el-select :placeholder="$t('pub.pleaseSel')" class="w150" v-model="item.RoleId">
               <el-option label="不限" :value="0"></el-option>
-              <el-option v-for="item in RoleList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
+              <el-option v-for="item in RoleList" :label="item.PostName" :value="item.PostId" :key="item.PostId"></el-option>
             </el-select>
           </td>
           <template v-for="subItem in item.DetailExtList">
             <td>
-              <el-input class="w80" placeholder="金額" v-model="subItem.LessMoney"></el-input>
-              <el-input class="w80" placeholder="百分比" v-model="subItem.LessPercent"></el-input>
+              <el-input class="w80" placeholder="少价金額" v-model="subItem.LessMoney"></el-input>
+              <el-input class="w80" placeholder="减少提成百分比" v-model="subItem.LessPercent"></el-input>
             </td>
           </template>
           <td>
@@ -184,8 +184,9 @@
       },
       //获取列表
       GetRoleList() {
+        let userInfo=this.getLocalStorage();
         this.apipost(
-          "admin_get_RoleGetList", {},
+          "admin_get_PostGetList", {"RB_Group_Id":userInfo.RB_Group_id},
           res => {
             if (res.data.resultCode == 1) {
               this.RoleList = res.data.data;

src/router/config.js

@@ -1275,6 +1275,13 @@ export default {
                 title: '车辆报价'
               },
             }, {
+              path: '/BusApportionManagement',
+              name: 'BusApportionManagement',
+              component: resolve => require(['@/components/busManagement/BusApportionManagement'], resolve),
+              meta: {
+                title: '车资分摊管理'
+              },
+            },{
               path: '/visaList',//签证列表
               name: 'visaList',
               component: resolve => require(['@/components/VisaCenter/visaList'], resolve),