save

src/components/SalesModule/productOrderList.vue

@@ -341,6 +341,7 @@
         currentPage: 1,
         total: 0,
         msg: {
+          SelectOP: 0,
           pageIndex: 1,
           pageSize: 10,
           LineId: "-1",

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -454,7 +454,7 @@
                     <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
                       :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
                     </el-checkbox>
-                    <el-checkbox v-model="priceData.IsNeedAirportShuttle" :true-label="CheckedVaule"
+                    <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange" :true-label="CheckedVaule"
                       :false-label="UnCheckedLessPrice">是否需要送团
                     </el-checkbox>
                     <template v-if="CurrentUserInfo.RB_Group_id==2">
@@ -738,8 +738,22 @@
                       <template slot="prepend">紧急联系人</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item prop="SendPersion">
+                    <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle" placeholder="请输入送团人" v-model="priceData.SendPersion">
+                      <template slot="prepend">送团人</template>
+                    </el-input>
+                  </el-form-item>
+                  <div class="w260"></div>
                   <el-form-item>
-                    <el-input :placeholder="$t('pub.pleaseImport')" class="w260 ComSeat" v-model="priceData.GatherTag">
+                  </el-form-item>
+                  <el-form-item>
+                  <div class="w260"></div>
+                  </el-form-item>
+                  <el-form-item>
+                  <div class="w260"></div>
+                  </el-form-item>
+                  <el-form-item style="margin-top: -20px">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w260" v-model="priceData.GatherTag">
                       <template slot="prepend">{{$t('op.JHbiaoshi')}}</template>
                     </el-input>
                   </el-form-item>
@@ -1206,6 +1220,11 @@
       };
     },
     methods: {
+      IsNeedAirportShuttleChange() {
+        if(!this.priceData.IsNeedAirportShuttle) {
+          this.priceData.SendPersion = ''
+        }
+      },
       //获取团期供应商列表
       getTravelSupplier() {
         this.apipost(

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -454,7 +454,7 @@
                     <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
                       :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
                     </el-checkbox>
-                    <el-checkbox v-model="priceData.IsNeedAirportShuttle" :true-label="CheckedVaule"
+                    <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange" :true-label="CheckedVaule"
                       :false-label="UnCheckedLessPrice">是否需要送团
                     </el-checkbox>
                     <template v-if="CurrentUserInfo.RB_Group_id==2">
@@ -738,7 +738,21 @@
                       <template slot="prepend">紧急联系人</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item prop="SendPersion">
+                    <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle" placeholder="请输入送团人" v-model="priceData.SendPersion">
+                      <template slot="prepend">送团人</template>
+                    </el-input>
+                  </el-form-item>
+                  <div class="w260"></div>
                   <el-form-item>
+                  </el-form-item>
+                  <el-form-item>
+                  <div class="w260"></div>
+                  </el-form-item>
+                  <el-form-item>
+                  <div class="w260"></div>
+                  </el-form-item>
+                  <el-form-item style="margin-top: -20px">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w260 ComSeat" v-model="priceData.GatherTag">
                       <template slot="prepend">{{$t('op.JHbiaoshi')}}</template>
                     </el-input>
@@ -1206,6 +1220,11 @@
       };
     },
     methods: {
+      IsNeedAirportShuttleChange() {
+        if(!this.priceData.IsNeedAirportShuttle) {
+          this.priceData.SendPersion = ''
+        }
+      },
       //获取团期供应商列表
       getTravelSupplier() {
         this.apipost(

src/plug/index.js

@@ -118,9 +118,9 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-        // domainUrl = "http://192.168.10.128";
+        domainUrl = "http://192.168.10.128";
         // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-         domainUrl = "http://192.168.10.226:8015";
+        //  domainUrl = "http://192.168.10.226:8015";
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";