页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -1038,9 +1038,18 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>
-            <td colspan="11">
+            <td colspan="7">
               <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,6 +1089,16 @@
         currencyTypeArr: [], //币种下拉列表
         LineTeamList: [], //系列下拉列表
         companyList: [], //出团公司
+        payTypeList: [{
+          value: 1,
+          label: '现金'
+        }, {
+          value: 2,
+          label: '汇款'
+        }, {
+          value: 3,
+          label: '外站自理'
+        }, ]
       }
     },
     methods: {
@@ -1351,7 +1370,7 @@
           this.getConvertMoney(this.OtherPrice.TripMoney) +
           this.getConvertMoney(this.OtherPrice.GuidePeopleMoney) -
           this.getConvertMoney(this.OtherPrice.KBMoney) +
-          this.getConvertMoney(this.OtherPrice.VisaMoney) - 
+          this.getConvertMoney(this.OtherPrice.VisaMoney) -
           this.getConvertMoney(this.OtherPrice.TipComplement) -
           this.getConvertMoney(this.OtherPrice.GuideComplement);
         //KBMoney[团负费用减法]
@@ -1573,7 +1592,7 @@
           var jpyTrip = Number(that.getLocalJpyTotalMoney(x.PeopleNumber));
           //其他价格
           var otherPrice = Number(that.getCostTotalMoney());
-          var jpyotherPrice=Number(that.getCostJpyTotalMoney());
+          var jpyotherPrice = Number(that.getCostJpyTotalMoney());
           x.TotalMoney = (trip + otherPrice +
             Number(that.getConvertMoney(x.SubtotalMoney))
           ).toFixed(0);
@@ -1595,8 +1614,8 @@
           Number(this.getDayXiaoJi(4, 2)) +
           Number(this.getDayXiaoJi(5, 2)) +
           Number(this.getDayXiaoJi(6, 2)) +
-          Number(this.getDayXiaoJi(2, 2))   +
-          Number(this.getDayXiaoJi(7, 2))  ;
+          Number(this.getDayXiaoJi(2, 2)) +
+          Number(this.getDayXiaoJi(7, 2));
         return totalMoney.toFixed(0);
       },
       //获取地接项目报价
@@ -1607,8 +1626,8 @@
           Number(this.getDayXiaoJi(4, 1)) +
           Number(this.getDayXiaoJi(5, 1)) +
           Number(this.getDayXiaoJi(6, 1)) +
-          Number(this.getDayXiaoJi(2, 1))   +
-          Number(this.getDayXiaoJi(7, 1))  ;
+          Number(this.getDayXiaoJi(2, 1)) +
+          Number(this.getDayXiaoJi(7, 1));
         return totalMoney.toFixed(0);
       },
 

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -765,7 +765,6 @@
           <tr>
             <td class="CP_ComTitle2">附件</td>
             <td colspan="11">
-
               <a style="margin-left:20px;color:blue;" :href="teamPrice.ContractArray[0].Url"
                 v-if="teamPrice.ContractArray&&teamPrice.ContractArray.length>0" target="_blank">预览</a>
             </td>
@@ -777,12 +776,15 @@
             </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>
+              <template v-if="postConfig.OfferPayType==1">
+                现金
+              </template>
+              <template v-if="postConfig.OfferPayType==2">
+                汇款
+              </template>
+              <template v-if="postConfig.OfferPayType==3">
+                外站自理
+              </template>
             </td>
           </tr>
           <tr>
@@ -808,7 +810,7 @@
         AduitMsg: {
 
         },
-        payTypeList: [{value: 1, label: '收现'},{value: 2, label: '汇款'},{value: 3, label: '外站自理'},]
+       
       }
     },
     methods: {

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -61,7 +61,7 @@
           OutBranchId: -1, //出团公司
           OutBranchName: "", //出团公司名称
           OutDateTime: "", //出发时间
-           OfferPayType:0,//报价单付款方式()
+          OfferPayType: 0, //报价单付款方式()
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -149,7 +149,7 @@
           ID: this.$route.query.configId,
           AuditContent: this.postData.AuditContent,
           TravelState: Type,
-          OfferPayType:this.postData.OfferPayType,
+          OfferPayType: this.postData.OfferPayType,
         };
         this.loading = true;
         this.apipost(
@@ -227,6 +227,7 @@
               this.postData.OutBranchId = tempData.OutBranchId;
               this.postData.OutDateTime = tempData.OutDateTime;
               this.postData.OutBranchName = tempData.OutBranchName;
+              this.postData.OfferPayType = tempData.OfferPayType;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -237,6 +237,7 @@
               this.postData.CustomerName = tempData.CustomerName;
               this.postData.OutBranchId = tempData.OutBranchId;
               this.postData.OutDateTime = tempData.OutDateTime;
+              this.postData.OfferPayType=tempData.OfferPayType;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {