新增字段

src/components/TravelManager/TravelList/TravelControlList.vue

 <style>
   @import "../../../assets/css/newTravelManager.css";
- .flex {
-  display: flex;
- }
+
+  .flex {
+    display: flex;
+  }
+
   .TC_companyList span,
   .TC_OtherCompany span {
     display: inline-block;
@@ -484,8 +486,6 @@
                     style="font-size: 11px;font-weight:bold;color:red">
                     <span v-if="item.CustomerName">客户名称：{{item.CustomerName}}
                     </span>
-                    <span v-if="item.OfferPayTypeStr">({{item.OfferPayTypeStr}})
-                    </span>
                   </div>
                 </div>
               </div>
@@ -597,6 +597,24 @@
                       </template>
                     </span>
                   </p>
+                  <p class="travelnowrap flex" v-if="item.OfferShouPeiFee>0">
+                    <span>手配费</span>
+                    <span class="go_date">
+                      {{item.OfferShouPeiFee}} ({{item.OfferPayTypeStr}})
+                    </span>
+                  </p>
+                  <p class="travelnowrap flex" v-if="item.OfferJPYSalePrice>0">
+                    <span>售价</span>
+                    <span class="go_date">
+                      {{item.OfferJPYSalePrice}} ({{item.SaleOfferPayTypeStr}})
+                    </span>
+                  </p>
+                  <p class="travelnowrap flex" v-if="item.OfferRebatePrice>0">
+                    <span>回佣</span>
+                    <span class="go_date">
+                      {{item.OfferRebatePrice}}
+                    </span>
+                  </p>
                   <p class="travelnowrap">
                     <span>{{$t('Operation.Op_teamNotice')}}</span>
                     {{item.OutNotice==1?'OK':'暂定'}}

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -856,7 +856,7 @@
           <tr>
             <td colspan="14" class="CP_ComTitle2">领队分摊部分
               <span style="color:red;padding-left:5px;">
-                领队导游分摊，请直接输入人民币
+                领队导游分摊，请直接输入日元
               </span>
             </td>
           </tr>
@@ -926,7 +926,7 @@
           <tr>
             <td colspan="14" class="CP_ComTitle2">成本回扣
               <span style="color:red;padding-left:5px;">
-                成本回扣，请直接输入人民币
+                成本回扣，请直接输入日元
               </span>
             </td>
           </tr>
@@ -961,8 +961,10 @@
             <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 class="CP_ComTitle2">销售价格(日元)</td>
+            <td class="CP_ComTitle2">销售付款方式</td>
+            <td class="CP_ComTitle2">手配费</td>
+            <td class="CP_ComTitle2">手配费付款方式</td>
             <td colspan="5" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
@@ -973,14 +975,30 @@
               <el-input type='text' class="w70" v-model="item.SalePrice"
                 @keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
             </td>
-            <td colspan="2">
+            <td>
               <el-input type='text' class="w70" v-model="item.JPYSalePrice"
                 @keyup.native="checkPrice(item,'JPYSalePrice',true)" maxlength="8"></el-input>
             </td>
-            <td colspan="2">
+            <td>
+              <el-select style="width:100%" v-model="postConfig.SaleOfferPayType" :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>
+            <td>
               <el-input type='text' class="w70" v-model="item.ShouPeiFee"
                 @keyup.native="checkPrice(item,'ShouPeiFee',true)" maxlength="8"></el-input>
             </td>
+            <td>
+              <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>
             <td colspan="5">
               <el-input type="textarea" v-model="item.CostRemark"></el-input>
             </td>
@@ -1058,18 +1076,9 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>
-            <td colspan="7">
+            <td colspan="13">
               <el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
             </td>
-            <td class="CP_ComTitle2">付款方式</td>
-            <td colspan="5">
-              <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 class="CP_ComTitle2">附件</td>
@@ -1080,7 +1089,7 @@
               </el-upload>
               <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
                 <template v-for="(subItem,subIndex) in teamPrice.ContractArray">
-                  <a style="margin-left:20px;color:blue;cursor:pointer;" :key="subIndex"
+                  <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
                     @click="downloadFile(subItem.Url,subItem.Name)">{{subItem.Name}}</a>
                 </template>
               </template>

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -691,8 +691,10 @@
             <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 class="CP_ComTitle2">销售价格(日元)</td>
+            <td class="CP_ComTitle2">销售付款方式</td>
+            <td class="CP_ComTitle2">手配费</td>
+            <td class="CP_ComTitle2">手配费付款方式</td>
             <td colspan="5" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
@@ -702,12 +704,34 @@
             <td colspan="2">
               {{item.SalePrice}}
             </td>
-            <td colspan="2">
+            <td>
               {{item.JPYSalePrice}}
             </td>
-            <td colspan="2">
+            <td>
+              <template v-if="postConfig.SaleOfferPayType==1">
+                现金
+              </template>
+              <template v-if="postConfig.SaleOfferPayType==2">
+                汇款
+              </template>
+              <template v-if="postConfig.SaleOfferPayType==3">
+                外站自理
+              </template>
+            </td>
+            <td>
               {{item.ShouPeiFee}}
             </td>
+            <td>
+              <template v-if="postConfig.OfferPayType==1">
+                现金
+              </template>
+              <template v-if="postConfig.OfferPayType==2">
+                汇款
+              </template>
+              <template v-if="postConfig.OfferPayType==3">
+                外站自理
+              </template>
+            </td>
             <td colspan="5">
               {{item.CostRemark}}
             </td>
@@ -786,21 +810,9 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">审核备注</td>
-            <td colspan="7">
+            <td colspan="13">
               <el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
             </td>
-            <td class="CP_ComTitle2">付款方式</td>
-            <td colspan="5">
-              <template v-if="postConfig.OfferPayType==1">
-                现金
-              </template>
-              <template v-if="postConfig.OfferPayType==2">
-                汇款
-              </template>
-              <template v-if="postConfig.OfferPayType==3">
-                外站自理
-              </template>
-            </td>
           </tr>
           <tr v-if="IsEdit==2">
             <td colspan="14" style="text-align:center;">

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -62,6 +62,7 @@
           OutBranchName: "", //出团公司名称
           OutDateTime: "", //出发时间
           OfferPayType: 0, //报价单付款方式()
+          SaleOfferPayType:0,//售价付款方式
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -228,6 +229,7 @@
               this.postData.OutDateTime = tempData.OutDateTime;
               this.postData.OutBranchName = tempData.OutBranchName;
               this.postData.OfferPayType = tempData.OfferPayType;
+              this.postData.SaleOfferPayType=tempData.SaleOfferPayType;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -56,7 +56,8 @@
           TravelState: 1, //团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
           OutBranchId: -1, //出团公司
           OutDateTime: "", //出发时间
-          OfferPayType: 0, //报价单付款方式()
+          OfferPayType: 0, //报价单付款方式
+          SaleOfferPayType:0,//售价付款方式
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -238,6 +239,7 @@
               this.postData.OutBranchId = tempData.OutBranchId;
               this.postData.OutDateTime = tempData.OutDateTime;
               this.postData.OfferPayType = tempData.OfferPayType;
+              this.postData.SaleOfferPayType=tempData.SaleOfferPayType;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {