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

src/components/confirmationOrderDownLoad.vue

@@ -31,8 +31,8 @@
         <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
         <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
       </el-col>
-      <el-col   :span="10">
-        <span>行程明细</span>
+      <el-col style="display:none" :span="10">
+        <span>行程补充说明</span>
         <el-select filterable size="small" v-model="Typevalue" placeholder="请选择">
           <el-option label="日本寻秋意赏枫季" :value="-1"></el-option>
           <el-option label="仲夏花火夜" :value="-2"></el-option>

src/components/dmc/manager/LeaderHander.vue

@@ -133,17 +133,17 @@
       <tr>
         <td>
           人数：{{sendReceiptData.StartCityName}}出发
-          <el-input type="text" class="w100" v-model="sendReceiptData.CDGuestNum"/>
+          <el-input type="text" class="w100" v-model="sendReceiptData.StartCityNum"/>
           位
         </td>
         <td width="250">
           其他：凑票
-          <el-input type="text" class="w135" v-model="sendReceiptData.TogetherGuestNum"/>
+          <el-input type="text" class="w135" v-model="sendReceiptData.TogetherNum"/>
           位
         </td>
         <td colspan="7">
           外站JOIN
-          <el-input type="text" class="w100" v-model="sendReceiptData.OutsideGuestNum"/>
+          <el-input type="text" class="w100" v-model="sendReceiptData.OutsideNum"/>
           位
         </td>
       </tr>
@@ -534,7 +534,7 @@
           res => {
             if (res.data.resultCode == 1) {
               this.sendReceiptData = res.data.data;
-              console.log(this.sendReceiptData,'sssssssssssss');
+              console.log("sendReceiptData",this.sendReceiptData);
               this.isShow=true;
             }else{
               this.Error(res.data.message);