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

src/components/TravelManager/TravelList/OpTripList.vue

@@ -77,6 +77,7 @@
           </li>
           <li>
             <button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button>
+            <button class="hollowFixedBtn" @click="goToOpenTravel('TravelManager',0)">创建行程</button>
           </li>
         </ul>
       </div>
@@ -125,7 +126,7 @@
               </div>
               <div class="el-col">
                 <div class="d7">
-                  <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">
+                  <el-button @click="goToOpenTravel('TravelManager',item.ID)" type="primary">
                     {{$t('Operation.Op_tripUpdate')}}</el-button>
                   <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
                   <el-button @click="goUrlR(item)" type="primary">
@@ -326,19 +327,14 @@
       goToOpenTravel(path, configId) {
         if (configId > 0) {
           this.$store.commit("pageConditionUpdate", this.queryMsg);
-          this.$router.push({
-            name: path,
-            query: {
+          this.OpenNewPage(path, {
             configId: configId,
             openState: 1,
             blank: 'y',
             tab: '团期配置'
-            }
           });
         } else {
-          this.$router.push({
-            name: path
-          });
+          this.OpenNewPage(path, {});
         }
       },
       //行程复制

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -361,7 +361,7 @@
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="单地接">
+              <el-form-item label="单地接(成本)">
                 {{teamPrice.SingleDMCPrice}}
               </el-form-item>
             </td>
@@ -375,11 +375,16 @@
                 {{teamPrice.ChildNeedPrice}}
               </el-form-item>
             </td>
-            <td colspan="6">
+            <td colspan="2">
               <el-form-item label="单房差">
                 {{teamPrice.SingleRoomPrice}}
               </el-form-item>
             </td>
+            <td colspan="4">
+              <el-form-item label="单地接(价格)">
+                {{teamPrice.SingleDMCTCPrice}}
+              </el-form-item>
+            </td>
           </tr>
           <tr>
             <td colspan="2">

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -268,7 +268,7 @@
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="单地接">
+              <el-form-item label="单地接(成本)">
                 {{teamPrice.SingleDMCPrice}}
               </el-form-item>
             </td>
@@ -283,11 +283,16 @@
                 {{teamPrice.ChildNeedPrice}}
               </el-form-item>
             </td>
-            <td colspan="6">
+            <td colspan="2">
               <el-form-item label="单房差">
                 {{teamPrice.SingleRoomPrice}}
               </el-form-item>
             </td>
+            <td colspan="4">
+              <el-form-item label="单地接(价格)">
+                {{teamPrice.SingleDMCTCPrice}}
+              </el-form-item>
+            </td>
           </tr>
           <tr>
             <td colspan="2">

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -368,7 +368,7 @@
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="单地接">
+              <el-form-item label="单地接(成本)">
                 <el-input v-model="teamPrice.SingleDMCPrice"
                   @keyup.native="checkInteger(teamPrice,'SingleDMCPrice'),getchange()" class="w70">
                 </el-input>
@@ -388,13 +388,20 @@
                 </el-input>
               </el-form-item>
             </td>
-            <td colspan="6">
+            <td colspan="2">
               <el-form-item label="单房差">
                 <el-input placeholder="" v-model="teamPrice.SingleRoomPrice"
                   @keyup.native="checkPrice(teamPrice,'SingleRoomPrice')" class="w70">
                 </el-input>
               </el-form-item>
             </td>
+            <td colspan="4">
+              <el-form-item label="单地接(价格)">
+                <el-input placeholder="" v-model="teamPrice.SingleDMCTCPrice"
+                  @keyup.native="checkPrice(teamPrice,'SingleDMCTCPrice')" class="w70">
+                </el-input>
+              </el-form-item>
+            </td>
           </tr>
           <tr>
             <td colspan="2">
@@ -972,7 +979,7 @@
       },
       getchange(type) {
         this.getSubtotalMoney();
-        var that=this;
+        var that = this;
         if (type && type == 1) {
           var tempPrice = 0;
           this.CostNumberList.forEach(x => {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -127,7 +127,8 @@
           VisaPrice: 0, //签证
           OtherPrice: 0, //杂费
           SingleRoomPrice: 0, //单房差
-          SingleDMCPrice: 0, //单地接
+          SingleDMCPrice: 0, //单地接(成本)
+          SingleDMCTCPrice:0,//单地接团售价
           RebatePrice: 0, //同行返佣
           DiscountPrice: 0, //早鸟优惠
           IsSupportChildren: 1, //是否支持儿童出游（1-支持，2-不支持）