1、修改下载行程酒店连接问题

2、修改提成管理界面
3、提成新增目的地关联

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/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");
       }
     }