页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -175,14 +175,14 @@
           <tr>
             <td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">总车资</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/人</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费/人</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:100px">景点名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">名称</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
           </tr>
           <template v-for="(subItem,subIndex) in dayCostPrice">
             <tr :key="subIndex+100000">
@@ -427,14 +427,14 @@
                 </td>
                 <td>
                   {{getDayXiaoJi(1,1)}}(酒)+
-                  {{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
-                  +{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
+                  {{ getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+                  +{{getDayXiaoJi(9,1)}}(杂支)
                 </td>
                 <td>
-                  {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
+                  {{getLocalJpyTotalMoney()}}
                 </td>
                 <td colspan="2">
-                  {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                  {{getLocalTotalMoney()}}
                 </td>
                 <td colspan="4">
                   {{subItem.TotalMoney}}
@@ -625,30 +625,24 @@
         return parseFloat(value);
       },
       //获取地接项目(人民币)
-      getLocalTotalMoney(PeopleNumber) {
+      getLocalTotalMoney() {
         let totalMoney = 0.0;
-        if (PeopleNumber <= 0) {
-          PeopleNumber = 1;
-        }
         var hotelPrice = Number(this.getDayXiaoJi(1, 2)); //酒店费用
         var sencePrice = Number(this.getDayXiaoJi(3, 2)); //景点费用
         var canPrice = Number(this.getDayXiaoJi(4, 2)); //餐
-        var otherPrice = Number(this.getDayXiaoJi(9, 2)) / PeopleNumber; //其它费用
-        var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
+        var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
+        var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
         return totalMoney.toFixed(2);
       },
       //获取地接项目报价(日元)
-      getLocalJpyTotalMoney(PeopleNumber) {
-        if (PeopleNumber <= 0) {
-          PeopleNumber = 1;
-        }
+      getLocalJpyTotalMoney() {
         let totalMoney = 0.0;
-        var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
+        var busFee = Number(this.getDayXiaoJi(2, 1)) ;
         var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
         var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
         var canPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
-        var otherPrice = Number(this.getDayXiaoJi(9, 1)) / PeopleNumber; //其它费用
+        var otherPrice = Number(this.getDayXiaoJi(9, 1)) ; //其它费用
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
         return totalMoney.toFixed(2);
       },

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -82,14 +82,14 @@
           <tr>
             <td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">总车资</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/人</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费/人</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:100px">景点名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">名称</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
           </tr>
           <template v-for="(subItem,subIndex) in dayCostPrice">
             <tr :key="subIndex+100000">
@@ -334,14 +334,14 @@
                 </td>
                 <td>
                   {{getDayXiaoJi(1,1)}}(酒)+
-                  {{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
-                  +{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
+                  {{getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+                  +{{getDayXiaoJi(9,1)}}(杂支)
                 </td>
                 <td>
-                  {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
+                  {{getLocalJpyTotalMoney()}}
                 </td>
                 <td colspan="2">
-                  {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                  {{getLocalTotalMoney()}}
                 </td>
                 <td colspan="4">
                   {{subItem.TotalMoney}}
@@ -484,30 +484,24 @@
         return parseFloat(value);
       },
       //获取地接项目(人民币)
-      getLocalTotalMoney(PeopleNumber) {
+      getLocalTotalMoney() {
         let totalMoney = 0.0;
-        if (PeopleNumber <= 0) {
-          PeopleNumber = 1;
-        }
         var hotelPrice = Number(this.getDayXiaoJi(1, 2)); //酒店费用
         var sencePrice = Number(this.getDayXiaoJi(3, 2)); //景点费用
         var canPrice = Number(this.getDayXiaoJi(4, 2)); //餐
-        var otherPrice = Number(this.getDayXiaoJi(9, 2)) / PeopleNumber; //其它费用
-        var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
+        var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
+        var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
         return totalMoney.toFixed(2);
       },
       //获取地接项目报价(日元)
-      getLocalJpyTotalMoney(PeopleNumber) {
-        if (PeopleNumber <= 0) {
-          PeopleNumber = 1;
-        }
+      getLocalJpyTotalMoney() {
         let totalMoney = 0.0;
-        var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
+        var busFee = Number(this.getDayXiaoJi(2, 1));
         var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
         var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
         var canPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
-        var otherPrice = Number(this.getDayXiaoJi(9, 1)) / PeopleNumber; //其它费用
+        var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
         return totalMoney.toFixed(2);
       },

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -144,14 +144,14 @@
           <tr>
             <td style="width:150px" class="CP_ComTitle2 CostcomCenter">酒店名称</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/间</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">总车资</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">车资/人</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费/人</td>
             <td style="width:110px" class="CP_ComTitle2 CostcomCenter">餐厅名称</td>
             <td style="width:90px" class="CP_ComTitle2 CostcomCenter">价格/餐</td>
             <td style="width:100px" class="CP_ComTitle2 CostcomCenter">景点名称</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">名称</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
           </tr>
           <template v-for="(subItem,subIndex) in dayCostPrice">
             <tr :key="subIndex">
@@ -442,14 +442,13 @@
                   </td>
                   <td colspan="2">
                     {{getDayXiaoJi(1,1)}}(酒)+
-                    {{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
-                    +{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
+                    {{getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)+{{(getDayXiaoJi(9,1))}}(杂支)
                   </td>
                   <td>
-                    {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
+                    {{getLocalJpyTotalMoney()}}
                   </td>
                   <td>
-                    {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                    {{getLocalTotalMoney()}}
                   </td>
                   <td colspan="4">
                     {{subItem.TotalMoney}}
@@ -825,8 +824,8 @@
         let that = this;
         this.CostNumberList.forEach(x => {
           //房餐车景点价格
-          var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
-          var jpyTrip = Number(that.getLocalJpyTotalMoney(x.PeopleNumber));
+          var trip = Number(that.getLocalTotalMoney());
+          var jpyTrip = Number(that.getLocalJpyTotalMoney());
           //其他价格
           var otherPrice = Number(that.getCostTotalMoney());
           var jpyotherPrice = 0;
@@ -842,30 +841,24 @@
         return parseFloat(value);
       },
       //获取地接项目(人民币)
-      getLocalTotalMoney(PeopleNumber) {
+      getLocalTotalMoney() {
         let totalMoney = 0.0;
-        if (PeopleNumber <= 0) {
-          PeopleNumber = 1;
-        }
         var hotelPrice = Number(this.getDayXiaoJi(1, 2)); //酒店费用
         var sencePrice = Number(this.getDayXiaoJi(3, 2)); //景点费用
         var canPrice = Number(this.getDayXiaoJi(4, 2)); //餐
-        var otherPrice = Number(this.getDayXiaoJi(9, 2)) / PeopleNumber; //其它费用
-        var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
+        var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
+        var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
         return totalMoney.toFixed(2);
       },
       //获取地接项目报价(日元)
-      getLocalJpyTotalMoney(PeopleNumber) {
-        if (PeopleNumber <= 0) {
-          PeopleNumber = 1;
-        }
+      getLocalJpyTotalMoney() {
         let totalMoney = 0.0;
-        var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
+        var busFee = Number(this.getDayXiaoJi(2, 1));
         var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
         var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
         var canPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
-        var otherPrice = Number(this.getDayXiaoJi(9, 1)) / PeopleNumber; //其它费用
+        var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
         return totalMoney.toFixed(2);
       },

src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue

@@ -218,7 +218,7 @@
 
         LineTeamList: [], //系列下拉列表
         companyList: [], //出团公司
-        teamList: [],
+        teamList: [],//团队类型
         payTypeList: [{
           value: 1,
           label: '现金'