页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -655,7 +655,7 @@
           <tr>
             <td colspan="6"></td>
             <td class="CP_ComTitle2 CostcomCenter">4</td>
-            <td colspan="2" class="CP_ComTitle2">司机、导游小费</td>
+            <td colspan="2" class="CP_ComTitle2">司机小费</td>
             <td>
               <el-form-item>
                 <el-select v-model='OtherPrice.DriverGuideMoneyCurrencyId' class="w70">
@@ -673,6 +673,27 @@
               </el-form-item>
             </td>
           </tr>
+          <tr>
+            <td colspan="6"></td>
+            <td class="CP_ComTitle2 CostcomCenter">5</td>
+            <td colspan="2" class="CP_ComTitle2">导游小费</td>
+            <td>
+              <el-form-item>
+                <el-select v-model='OtherPrice.GuideMoneyCurrencyId' 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.GuideMoney"
+                  @keyup.native="checkPrice(OtherPrice,'GuideMoney'),getchange()"></el-input>
+              </el-form-item>
+            </td>
+          </tr>
           <tr>
             <td class="CP_ComTitle2">
               外币小计
@@ -961,7 +982,6 @@
                 @keyup.native="checkPrice(teamPrice,'SingleRoomPrice')" class="w100">
               </el-input>
             </td>
-
           </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>
@@ -1082,6 +1102,12 @@
             zazhiTotal += Number(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney(this.OtherPrice
               .DriverGuideMoneyCurrencyId);
           }
+          if (this.OtherPrice.GuideMoneyCurrencyId == 1) {
+            zazhiTotal += Number(this.OtherPrice.GuideMoney);
+          } else {
+            zazhiTotal += Number(this.OtherPrice.GuideMoney) * this.getCurrencyMoney(this.OtherPrice
+              .GuideMoneyCurrencyId);
+          }
         }
         //外币
         else {
@@ -1097,10 +1123,12 @@
           if (this.OtherPrice.DriverGuideMoneyCurrencyId != 1) {
             zazhiTotal += Number(this.OtherPrice.DriverGuideMoney);
           }
+          if (this.OtherPrice.GuideMoneyCurrencyId != 1) {
+            zazhiTotal += Number(this.OtherPrice.GuideMoney);
+          }
         }
         return zazhiTotal.toFixed(0);
       },
-
       //每天小计
       getDayXiaoJi(type, currencyType) {
         var xiaoJi = 0;
@@ -1170,20 +1198,6 @@
         });
         return flag;
       },
-      //获取不同人数组合价
-      getCurrencyNumberTotalMoney(peopleNumber) {
-        let totalMoney = 0.0;
-        this.CurrencyNumberListExt.forEach(x => {
-          x.currencyNumberList.forEach(y => {
-            // if (peopleNumber === y.PeopleNumber) {
-            //   totalMoney +=
-            //     this.getConvertMoney(y.Money) *
-            //     this.getCurrencyMoney(y.CurrencyId);
-            // }
-          });
-        });
-        return totalMoney;
-      },
       //获取主成本价
       getCostTotalMoney() {
         let totalMoney =
@@ -1198,6 +1212,9 @@
           this.getConvertMoney(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney(
             this.OtherPrice.DriverGuideMoneyCurrencyId
           ) +
+         this.getConvertMoney(this.OtherPrice.GuideMoney) * this.getCurrencyMoney(
+            this.OtherPrice.GuideMoneyCurrencyId
+          ) +
           this.getConvertMoney(this.OtherPrice.LeaderTripMoney) * this.getCurrencyMoney(
             this.OtherPrice.LeaderTripMoneyCurrencyId
           ) +
@@ -1429,12 +1446,10 @@
           console.log("trip",trip);
          
           //其他价格
-          var otherPrice = Number(that.getCostTotalMoney())
-           console.log("otherPrice",otherPrice)
+          var otherPrice = Number(that.getCostTotalMoney());
           x.TotalMoney = (trip + otherPrice +
             Number(that.getConvertMoney(x.SubtotalMoney))
           ).toFixed(0);
-          // + that.getCurrencyNumberTotalMoney(x.PeopleNumber)
         });
       },
       //价格转换器

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -163,7 +163,7 @@
                     {{subItem.Title}}
                   </td>
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
-                     {{getCurrencyName(subItem.CurrencyId)}}
+                    {{getCurrencyName(subItem.CurrencyId)}}
                   </td>
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     <template v-if="subItem.ContainDinnerType==0">含餐类型</template>
@@ -465,6 +465,17 @@
               {{OtherPrice.DriverGuideMoney}}
             </td>
           </tr>
+          <tr>
+            <td colspan="6"></td>
+            <td class="CP_ComTitle2 CostcomCenter">5</td>
+            <td colspan="2" class="CP_ComTitle2">导游小费</td>
+            <td>
+              {{getCurrencyName(OtherPrice.GuideMoneyCurrencyId)}}
+            </td>
+            <td colspan="2">
+              {{OtherPrice.GuideMoney}}
+            </td>
+          </tr>
           <tr>
             <td class="CP_ComTitle2">
               外币小计
@@ -808,6 +819,12 @@
             zazhiTotal += Number(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney(this.OtherPrice
               .DriverGuideMoneyCurrencyId);
           }
+          if (this.OtherPrice.GuideMoneyCurrencyId == 1) {
+            zazhiTotal += Number(this.OtherPrice.GuideMoney);
+          } else {
+            zazhiTotal += Number(this.OtherPrice.GuideMoney) * this.getCurrencyMoney(this.OtherPrice
+              .GuideMoneyCurrencyId);
+          }
         }
         //外币
         else {
@@ -823,6 +840,9 @@
           if (this.OtherPrice.DriverGuideMoneyCurrencyId != 1) {
             zazhiTotal += Number(this.OtherPrice.DriverGuideMoney);
           }
+          if (this.OtherPrice.GuideMoneyCurrencyId != 1) {
+            zazhiTotal += Number(this.OtherPrice.GuideMoney);
+          }
         }
         return zazhiTotal.toFixed(0);
       },
@@ -898,6 +918,9 @@
           this.getCurrencyMoney(this.OtherPrice.InlandTrainTicketCurrency) +
           this.getConvertMoney(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney(
             this.OtherPrice.DriverGuideMoneyCurrencyId
+          ) +
+           this.getConvertMoney(this.OtherPrice.GuideMoney) * this.getCurrencyMoney(
+            this.OtherPrice.GuideMoneyCurrencyId
           ) +
           this.getConvertMoney(this.OtherPrice.LeaderTripMoney) * this.getCurrencyMoney(
             this.OtherPrice.LeaderTripMoneyCurrencyId

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -75,7 +75,7 @@
           VisaMoney: 0, //签证费用（每人）
           SafeMoney: 0, //保险费用（每人）
           LeaderTripMoney: 0, //领队小费
-          DriverGuideMoney: 0, //司机导游小费
+          DriverGuideMoney: 0, //司机小费
           SalesCommissionMoney: 0, //销售提成
           OfficeCommissionMoney: 0, //作业处提成
           TripMoney: 0, //小费
@@ -91,7 +91,9 @@
           VisaMoneyCurrencyId: 0, //签证费币种
           SafeMoneyCurrencyId: 0, //保险费币种
           LeaderTripMoneyCurrencyId: 0, //领队小费币种
-          DriverGuideMoneyCurrencyId: 0, //司机导游小费币种
+          DriverGuideMoneyCurrencyId: 0, //司机小费币种
+          GuideMoneyCurrencyId:0,//导游小费币种
+          GuideMoney:0,//导游小费
         },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -70,7 +70,7 @@
           VisaMoney: 0, //签证费用（每人）
           SafeMoney: 0, //保险费用（每人）
           LeaderTripMoney: 0, //领队小费
-          DriverGuideMoney: 0, //司机导游小费
+          DriverGuideMoney: 0, //司机小费
           SalesCommissionMoney: 0, //销售提成
           OfficeCommissionMoney: 0, //作业处提成
           TripMoney: 0, //小费
@@ -86,7 +86,9 @@
           VisaMoneyCurrencyId: 0, //签证费币种
           SafeMoneyCurrencyId: 0, //保险费币种
           LeaderTripMoneyCurrencyId: 0, //领队小费币种
-          DriverGuideMoneyCurrencyId: 0, //司机导游小费币种
+          DriverGuideMoneyCurrencyId: 0, //司机小费币种
+          GuideMoneyCurrencyId:0,//导游小费币种
+          GuideMoney:0,//导游小费
         },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数