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

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -24,7 +24,7 @@
   }
 
   .CostNewTable {
-    width: 70%;
+    /* width: 70%; */
   }
 
   .CostNewTable td {
@@ -46,54 +46,63 @@
   .w505 {
     width: 505px !important;
   }
-
+  .w79 {
+    width: 79px !important;
+  }
+  .w688{
+    width:688px!important;
+  }
   .CostcomCenter {
     text-align: center;
   }
-
+  .txtRightCost{
+    text-align: right;
+    padding-right: 10px;
+  }
 </style>
 
 <template>
   <div>
-    <div class="CostNewPrice clearfix CP_Div">
+    <div class="CostNewPrice clearfix CP_Div" style="width:980px;">
       <el-form>
         <div class="QuotationFirstDiv1">
-          <el-row :gutter="40">
-            <el-col :span="6">
-              <el-form-item label="线路" label-width="100px">
-                <el-select v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')" class="w240"
+          <table>
+            <tr>
+              <td width="80" class="txtRightCost">线路</td>
+              <td>
+                <el-select style="width:100%" v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')"
                   @change="getLineTeamList(postConfig.LineId,1)" filterable>
                   <el-option :label="$t('pub.unlimitedSel')" :value='0'></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-col>
-            <el-col :span="6">
-              <el-form-item label="系列" label-width="100px">
-                <el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable class="w240">
+              </td>
+              <td width="60" class="txtRightCost">系列</td>
+              <td>
+                <el-select class="w300" v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
                   <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                   <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
                   </el-option>
                 </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="客户名称" label-width="100px">
-                <el-input v-model="postConfig.CustomerName" type="text" class="w280" placeholder="客户名称" maxlength="200">
+              </td>
+              <td width="80" class="txtRightCost">客户名称</td>
+              <td>
+                <el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200">
                 </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="40">
-            <el-col :span="6">
-              <el-form-item label="团队标题" label-width="100px">
-                <el-input v-model="postConfig.Title" type="textarea" class="w240" :autosize="{minRows: 1, maxRows: 2 }"
+              </td>
+            </tr>
+            <tr>
+              <td colspan="6" style="height:20px;">
+              </td>
+            </tr>
+            <tr>
+              <td width="80" class="txtRightCost">团队标题</td>
+              <td colspan="3">
+                  <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }"
                   resize="none" placeholder="请填写团队标题" maxlength="200"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="行程天数" label-width="100px">
+              </td>
+              <td width="80" class="txtRightCost">行程天数</td>
+              <td>
                 <el-input class="w240 LowNum" v-model="postConfig.DayNum"
                   @keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
                   <template slot="append">天</template>
@@ -102,9 +111,9 @@
                   @keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
                   <template slot="append">晚</template>
                 </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
+              </td>
+            </tr>
+          </table>
           <div class="seat-box" style="display:none;">
             <div class="left" style="float:left;margin:6px 0 0 64px;">座位</div>
             <div class="right">
@@ -148,12 +157,15 @@
 
         <table class="CostPriceTable CostNewTable">
           <thead>
+            <tr>
+              <td colspan="9" class="CP_ComTitle2 CostcomCenter">报价信息</td>
+            </tr>
             <tr>
               <td width="170" class="CP_ComTitle2 CostcomCenter">币种</td>
               <td v-for='(item,index) in CostCurrencyList'>
                 {{item.CurrencyName}}
                 <span>
-                  <i class="iconfont icon-quxiao" @click="DeleteCurrency(index)"></i>
+                  <i class="iconfont icon-quxiao" style="display:inline-block;" @click="DeleteCurrency(index)"></i>
                 </span>
               </td>
               <td :colspan="9-2-CostCurrencyList.length+1">
@@ -181,7 +193,7 @@
             <tr>
               <td width="170" class="CP_ComTitle2 CostcomCenter">人数</td>
               <td v-for="(item,index) in CostNumberList" :key='item.subCode'>
-                <el-input class="w80" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')">
+                <el-input class="w79" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')">
                 </el-input>
                 <span>
                   <i class="iconfont icon-quxiao" @click="DeletePNumber(index),getchange()"></i>
@@ -189,10 +201,10 @@
               </td>
               <td width="150" :colspan="9-2-CostNumberList.length+1">
                 <el-form-item>
-                  <el-input class="w80" v-model='queryMsg.PeopleNumber'
+                  <el-input class="w79" v-model='queryMsg.PeopleNumber'
                     @keyup.native="checkInteger(queryMsg,'PeopleNumber'),getchange()"></el-input>
+                    <i class="iconfont icon-img_haha" style="cursor:pointer;" @click="addPeoNunber"></i>
                 </el-form-item>
-                <a @click="addPeoNunber" style="cursor:pointer;color:red;">添加</a>
               </td>
             </tr>
             <tr v-for="item in CostCurrencyList">
@@ -274,8 +286,8 @@
             <td colspan="9"></td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2" colspan="5">内陆段交通部分</td>
-            <td class="CP_ComTitle2" colspan="4">杂支部分</td>
+            <td class="CP_ComTitle2" colspan="4">内陆段交通部分</td>
+            <td class="CP_ComTitle2" colspan="5">杂支部分</td>
           </tr>
           <tr>
             <td class="CostcomCenter">1</td>
@@ -290,17 +302,17 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td  >
               <el-form-item>
-                <el-input type='text' class="w180" v-model="OtherPrice.InlandAirTicketMoney"
+                <el-input type='text' class="w100" v-model="OtherPrice.InlandAirTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
             <td class="CostcomCenter">1</td>
-            <td>签证费(每人)</td>
+            <td colspan="2">签证费(每人)</td>
             <td colspan="2">
               <el-form-item>
-                <el-input type='text' class="w160" v-model="OtherPrice.VisaMoney"
+                <el-input type='text' class="w100" v-model="OtherPrice.VisaMoney"
                   @keyup.native="checkPrice(OtherPrice,'VisaMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
@@ -318,17 +330,17 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td  >
               <el-form-item>
-                <el-input type='text' class="w180" v-model="OtherPrice.InlandShipTicketMoney"
+                <el-input type='text' class="w100" v-model="OtherPrice.InlandShipTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
             <td class="CostcomCenter">2</td>
-            <td>保险费(每人)</td>
+            <td colspan="2">保险费(每人)</td>
             <td colspan="2">
               <el-form-item>
-                <el-input type='text' class="w160" v-model="OtherPrice.SafeMoney"
+                <el-input type='text' class="w100" v-model="OtherPrice.SafeMoney"
                   @keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
@@ -346,28 +358,28 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td  >
               <el-form-item>
-                <el-input type='text' class="w180" v-model="OtherPrice.InlandTrainTicketMoney"
+                <el-input type='text' class="w100" v-model="OtherPrice.InlandTrainTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
             <td class="CostcomCenter">3</td>
-            <td>领队小费</td>
+            <td colspan="2">领队小费</td>
             <td colspan="2">
               <el-form-item>
-                <el-input type='text' class="w160" v-model="OtherPrice.LeaderTripMoney"
+                <el-input type='text' class="w100" v-model="OtherPrice.LeaderTripMoney"
                   @keyup.native="checkPrice(OtherPrice,'LeaderTripMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
           <tr>
-            <td colspan="5"></td>
+            <td colspan="4"></td>
             <td class="CostcomCenter">4</td>
-            <td>司机、导游小费</td>
+            <td colspan="2">司机、导游小费</td>
             <td colspan="2">
               <el-form-item>
-                <el-input type='text' class="w160" v-model="OtherPrice.DriverGuideMoney"
+                <el-input type='text' class="w100" v-model="OtherPrice.DriverGuideMoney"
                   @keyup.native="checkPrice(OtherPrice,'DriverGuideMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
@@ -392,7 +404,7 @@
             <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额（人民币）</td>
           </tr>
           <tr>
-            <td>销售提成1%</td>
+            <td style="white-space:nowrap; ">销售提成1%</td>
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.SalesCommissionMoney"
@@ -422,7 +434,7 @@
             </td>
           </tr>
           <tr>
-            <td>作业处提成</td>
+            <td style="white-space:nowrap; ">作业处提成</td>
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.OfficeCommissionMoney"

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -175,6 +175,7 @@
           res => {
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
+              console.log("temp",tempData);
               if (tempData.ID && tempData.ID > 0) {
                 this.postData.ID = tempData.ID;
               }