页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -22,7 +22,7 @@
     color: #106BAF;
     font-weight: bold;
     background-color: #D1EEEE;
-    white-space:nowrap; 
+    white-space: nowrap;
   }
 
   .CostNewTable td {
@@ -394,7 +394,15 @@
             </td>
             <td class="CP_ComTitle2 CostcomCenter">1</td>
             <td colspan="2" class="CP_ComTitle2">签证费(每人)</td>
-            <td colspan="3">
+            <el-form-item>
+              <el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70">
+                <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
+                <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
+                  :key='items.CurrencyId'>
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w100" v-model="OtherPrice.VisaMoney"
                   @keyup.native="checkPrice(OtherPrice,'VisaMoney'),getchange()"></el-input>
@@ -422,7 +430,17 @@
             </td>
             <td class="CP_ComTitle2 CostcomCenter">2</td>
             <td colspan="2" class="CP_ComTitle2">保险费(每人)</td>
-            <td colspan="3">
+            <td>
+              <el-form-item>
+                <el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70">
+                  <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
+                  <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
+                    :key='items.CurrencyId'>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w100" v-model="OtherPrice.SafeMoney"
                   @keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
@@ -450,7 +468,17 @@
             </td>
             <td class="CP_ComTitle2 CostcomCenter">3</td>
             <td colspan="2" class="CP_ComTitle2">领队小费</td>
-            <td colspan="3">
+            <td>
+              <el-form-item>
+                <el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70">
+                  <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
+                  <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
+                    :key='items.CurrencyId'>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w100" v-model="OtherPrice.LeaderTripMoney"
                   @keyup.native="checkPrice(OtherPrice,'LeaderTripMoney'),getchange()"></el-input>
@@ -461,7 +489,17 @@
             <td colspan="5"></td>
             <td class="CP_ComTitle2 CostcomCenter">4</td>
             <td colspan="2" class="CP_ComTitle2">司机、导游小费</td>
-            <td colspan="3">
+            <td>
+              <el-form-item>
+                <el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70">
+                  <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
+                  <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
+                    :key='items.CurrencyId'>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w100" v-model="OtherPrice.DriverGuideMoney"
                   @keyup.native="checkPrice(OtherPrice,'DriverGuideMoney'),getchange()"></el-input>
@@ -482,6 +520,20 @@
               {{Number(OtherPrice.VisaMoney)+Number(OtherPrice.SafeMoney)+Number(OtherPrice.LeaderTripMoney)+Number(OtherPrice.DriverGuideMoney)}}
             </td>
           </tr>
+          <tr>
+            <td class="CP_ComTitle2">
+              人民币 小计
+            </td>
+            <td colspan="4">
+              {{Number(OtherPrice.InlandAirTicketMoney)+Number(OtherPrice.InlandShipTicketMoney)+Number(OtherPrice.InlandTrainTicketMoney)}}
+            </td>
+            <td class="CP_ComTitle2">
+              人民币 小计
+            </td>
+            <td colspan="5">
+              {{Number(OtherPrice.VisaMoney)+Number(OtherPrice.SafeMoney)+Number(OtherPrice.LeaderTripMoney)+Number(OtherPrice.DriverGuideMoney)}}
+            </td>
+          </tr>
           <tr>
             <td colspan="12"></td>
           </tr>
@@ -575,6 +627,7 @@
               {{Number(OtherPrice.KBMoney)}}
             </td>
           </tr>
+
           <tr>
             <td colspan="12"></td>
           </tr>
@@ -637,15 +690,25 @@
             <td colspan="12"></td>
           </tr>
           <tr>
-            <td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）</td>
+            <td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
+              计算规则: (房+餐+车+景点)*汇率+内陆段交通+杂支部分+其他资产+机票票+收入+团负费+领队分摊+地接报价*汇率
+            </td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2">人数统计</td>
-            <td colspan="11">计算规则: (房+餐+车+景点)*汇率+内陆段交通+杂支部分+其他资产+机票票+收入+团负费+领队分摊+地接报价*汇率</td>
+            <td class="CP_ComTitle2">人数统计
+
+            </td>
+            <td class="CP_ComTitle2">成本价</td>
+            <td class="CP_ComTitle2">销售价格</td>
+            <td colspan="8" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
-            <td colspan="11">{{item.TotalMoney}}</td>
+            <td>{{item.TotalMoney}}</td>
+            <td> <el-input type='text' class="w70" ></el-input></td>
+            <td colspan="8">
+              <el-input type="textarea"  ></el-input>
+            </td>
           </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>

src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue

@@ -119,7 +119,7 @@
               :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></CostNewPrice>
           </div>
         </div>
-        <div class="DirectRightPrice" style="margin-left:20px;">
+        <div class="DirectRightPrice" style="margin-left:20px; display:none">
           <div class="dingjiaDiv">
             <span class="TMTitle"><i></i>定价</span>
             &nbsp;&nbsp;&nbsp;&nbsp;