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

src/components/FinancialModule/OPRules.vue

@@ -42,7 +42,7 @@
       <tr>
         <th>公司名称</th>        
         <th style="width:20%">线路名称</th>
-        <th>系列名称</th>
+        <th>目的</th>
         <th>线控</th>
         <th>助理</th>
         <th>分负责OP</th>
@@ -106,6 +106,11 @@
                     <el-option label='全线' :value='-1' :key='-1'></el-option>                    
                     <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
                 </el-select>
+            </el-form-item>
+             <el-form-item label="目的地" prop="LineIdList">
+                <el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList">                  
+                    <el-option v-for="item in PlaceList" :label='item.PlaceName' :value='item.PlaceID' :key='item.PlaceID'></el-option>
+                </el-select>
             </el-form-item>
             <!-- <el-form-item label="系列" v-show="form.LineIdList.length==1 && form.LineIdList[0]!=-1">
                 <el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList" >
@@ -227,6 +232,8 @@ export default {
             departmentList:[],
             stateShow:true,
             tips:'',
+            PlaceList:[],
+            PlaceShow:true,
         }
     },
     created(){
@@ -240,6 +247,7 @@ export default {
        
     },
     methods:{
+      
         Delete(item) {
             this.$confirm("是否删除? 删除后不可恢复", "提示", {
                 confirmButtonText: "确定",
@@ -367,6 +375,7 @@ export default {
         },
         //获取系列列表
       getLineTeamList() {
+          this.PlaceList =[];
         if(this.form.LineIdList.indexOf(-1)!=-1){
             this.form.LineIdList=[-1];
             this.form.LtIdList = [];
@@ -376,6 +385,12 @@ export default {
             this.form.LtIdList = [];
             return;
         }
+        if(this.form.LineIdList.indexOf(-1)==-1 && this.form.LineIdList.length==1){
+            let id= this.form.LineIdList[0];
+            
+            console.log("id=",id)
+            this.getLinePlaceList(id);
+        }
         let msg = {
           lineID: this.form.LineIdList[0],
         }
@@ -384,6 +399,18 @@ export default {
             this.LineTeamList = res.data.data;
           }
         })
+      },
+        //获取目的地
+      getLinePlaceList(id) {
+        this.form.LtIdList=[];
+        let msg = {
+          lineID: id,
+        }
+        this.apipost('team_post_GetLinePlace', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.PlaceList = res.data.data;
+          }
+        })
       },
         getCompany() {
             let userInfo = this.getLocalStorage()

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -871,9 +871,9 @@
   }
 .GO_Contract{
     color:blue;
-    display: block;
+    display: inline-block;
     cursor: pointer;
-    max-width: 200px;
+    margin-right: 20px;
   }
     .SQguestList{
     display: flex;

src/components/commonPage/commonShouSun.vue

@@ -65,7 +65,7 @@
             <tr>
                 <td>
                     <template v-if="Type==2">
-                        <el-input class="w135" v-model="dataList.LossTicketMoney" @keyup.native="checkPrice(dataList,'LossTicketMoney'),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
+                        <el-input class="w135" v-model="dataList.LossTicketMoney" @keyup.native="checkPrice(dataList,'LossTicketMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
                     </template>
                     <template v-else>
                         <span v-if="dataList.TicketIsSet==1">{{dataList.LossTicketMoney}}</span>
@@ -74,7 +74,7 @@
                 </td>
                 <td>
                     <template v-if="Type==3">
-                        <el-input class="w135" v-model="dataList.LossVisaMoney" @keyup.native="checkPrice(dataList,'LossVisaMoney'),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
+                        <el-input class="w135" v-model="dataList.LossVisaMoney" @keyup.native="checkPrice(dataList,'LossVisaMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
                     </template>
                     <template v-else>
                         <span v-if="dataList.VisaIsSet==1">{{dataList.LossVisaMoney}}</span>
@@ -83,7 +83,7 @@
                 </td>
                 <td>
                     <template v-if="Type==4">
-                        <el-input class="w135" v-model="dataList.LossDiJieMoney" @keyup.native="checkPrice(dataList,'LossDiJieMoney'),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
+                        <el-input class="w135" v-model="dataList.LossDiJieMoney" @keyup.native="checkPrice(dataList,'LossDiJieMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
                     </template>
                     <template v-else>
                         <span v-if="dataList.DiJieIsSet==1">{{dataList.LossDiJieMoney}}</span>
@@ -92,7 +92,7 @@
                 </td>
                 <td>
                     <template v-if="Type==1">
-                        <el-input class="w135" v-model="dataList.LossOPMoney" @keyup.native="checkPrice(dataList,'LossOPMoney'),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
+                        <el-input class="w135" v-model="dataList.LossOPMoney" @keyup.native="checkPrice(dataList,'LossOPMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
                     </template>
                     <template v-else>
                         <span v-if="dataList.OPIsSet==1">{{dataList.LossOPMoney}}</span>