报价单增加汇率，支付方式

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -938,18 +938,25 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">人数统计</td>
-            <td class="CP_ComTitle2">成本价</td>
-            <td class="CP_ComTitle2" colspan="2">销售价格</td>
+            <td class="CP_ComTitle2">成本价(人民币)</td>
+            <td class="CP_ComTitle2">成本价(日元)</td>
+            <td class="CP_ComTitle2" colspan="2">销售价格(人民币)</td>
+            <td class="CP_ComTitle2" colspan="2">销售价格(日元)</td>
             <td class="CP_ComTitle2" colspan="2">手配费</td>
             <td colspan="6" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
             <td>{{item.TotalMoney}}</td>
+            <td>{{item.JPYSalePrice}}</td>
             <td colspan="2">
               <el-input type='text' class="w70" v-model="item.SalePrice"
                 @keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
             </td>
+            <td colspan="2">
+              <el-input type='text' class="w70" v-model="item.JPYTotalMoney"
+                @keyup.native="checkPrice(item,'JPYTotalMoney',true)" maxlength="8"></el-input>
+            </td>
             <td colspan="2">
               <el-input type='text' class="w70" v-model="item.ShouPeiFee"
                 @keyup.native="checkPrice(item,'ShouPeiFee',true)" maxlength="8"></el-input>
@@ -1547,6 +1554,13 @@
           x.TotalMoney = (trip + otherPrice +
             Number(that.getConvertMoney(x.SubtotalMoney))
           ).toFixed(0);
+          // console.log('this.getCurrencyMoney(this.subItem.CurrencyId)', this.dayCostPrice)
+          // console.log('this.getCurrencyMoney(this.subItem.CurrencyId)', this.getCurrencyMoney(this.dayCostPrice[0].CurrencyId), this.dayCostPrice[0].CurrencyId)
+          if(this.dayCostPrice[0] && this.dayCostPrice[0].CurrencyId) {
+            x.JPYSalePrice = ((trip + otherPrice +
+            Number(that.getConvertMoney(x.SubtotalMoney))
+          )/this.getCurrencyMoney(this.dayCostPrice[0].CurrencyId)).toFixed(0);
+          }
         });
       },
       //价格转换器

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -677,17 +677,23 @@
           <tr>
             <td class="CP_ComTitle2">人数统计
             </td>
-            <td class="CP_ComTitle2">成本价</td>
-            <td class="CP_ComTitle2" colspan="2">销售价格</td>
+            <td class="CP_ComTitle2">成本价(人民币)</td>
+            <td class="CP_ComTitle2">成本价(日元)</td>
+            <td class="CP_ComTitle2" colspan="2">销售价格(人民币)</td>
+            <td class="CP_ComTitle2" colspan="2">销售价格(日元)</td>
             <td class="CP_ComTitle2" colspan="2">手配费</td>
             <td colspan="6" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
             <td>{{item.TotalMoney}}</td>
+            <td>{{item.JPYSalePrice}}</td>
             <td colspan="2">
               {{item.SalePrice}}
             </td>
+            <td colspan="2">
+              {{item.JPYTotalMoney}}
+            </td>
             <td colspan="2">
               {{item.ShouPeiFee}}
             </td>
@@ -766,9 +772,18 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">审核备注</td>
-            <td colspan="12">
+            <td colspan="8">
               <el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
             </td>
+            <td class="CP_ComTitle2">付款方式</td>
+            <td colspan="4">
+                <el-select style="width:100%" v-model="postConfig.OfferPayType" :placeholder="$t('pub.pleaseSel')"
+                   filterable>
+                  <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                  <el-option v-for="item in payTypeList" :label='item.label' :value='item.value' :key='item.value'>
+                  </el-option>
+                </el-select>
+            </td>
           </tr>
           <tr>
             <td colspan="13" style="text-align:center;">
@@ -792,7 +807,8 @@
         //审核信息
         AduitMsg: {
 
-        }
+        },
+        payTypeList: [{value: 1, label: '收现'},{value: 2, label: '汇款'},{value: 3, label: '外站自理'},]
       }
     },
     methods: {