新增页面

src/assets/utils/commonUtils.js

@@ -350,6 +350,12 @@ var commonUtils = {
     //返回年月日
     return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
   },
+    //格式化日期
+    getFormatDate(dateStr) {
+        var myDate = new Date(dateStr);
+        //返回年月日
+        return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
+      },
   //判断字符串是否为数字
   isNumber: function (val) {
     var regPos = /^\d+(\.\d+)?$/; //非负浮点数

src/components/TravelManager/TravelNewQuotation/QuotationPrice_SWT.vue

@@ -426,7 +426,7 @@
             </td>
             <td>
               <el-input v-model="hItem.Times" @keyup.native="checkInteger(hItem,'Times'),CalcFeeTotal()"
-                placeholder="次/N數" maxlength="1" class="w150"></el-input>
+                placeholder="次/N數" maxlength="2" class="w150"></el-input>
             </td>
             <td>
               {{hItem.TotalNum}}
@@ -553,7 +553,7 @@
               </td>
               <td>
                 <el-input v-model="childItem.Times" @keyup.native="checkInteger(childItem,'Times'),CalcFeeTotal()"
-                  placeholder="次/N數" maxlength="1" class="w150"></el-input>
+                  placeholder="次/N數" maxlength="2" class="w150"></el-input>
               </td>
               <td>
                 {{childItem.TotalNum}} 人
@@ -674,7 +674,7 @@
               </td>
               <td>
                 <el-input v-model="childItem.Times" @keyup.native="checkInteger(childItem,'Times'),CalcFeeTotal()"
-                  placeholder="次/N數" maxlength="1" class="w150"></el-input>
+                  placeholder="次/N數" maxlength="2" class="w150"></el-input>
               </td>
               <td>
                 {{childItem.TotalNum}} 人
@@ -880,7 +880,7 @@
               </td>
               <td>
                 <el-input v-model="childItem.Times" @keyup.native="checkInteger(childItem,'Times'),CalcFeeTotal()"
-                  placeholder="次/N數" maxlength="1" class="w150"></el-input>
+                  placeholder="次/N數" maxlength="2" class="w150"></el-input>
               </td>
               <td>
                 {{childItem.TotalNum}}
@@ -973,15 +973,15 @@
               </td>
               <td>
                 <el-input v-model="childItem.DayNum" @keyup.native="checkInteger(childItem,'DayNum'),CalcFeeTotal()"
-                  placeholder="次/N數" maxlength="1" class="w150"></el-input>
+                  placeholder="次/N數" maxlength="2" class="w150"></el-input>
               </td>
               <td>
                 <el-input v-model="childItem.Times" @keyup.native="checkInteger(childItem,'Times'),CalcFeeTotal()"
-                  placeholder="次/N數" maxlength="1" class="w150"></el-input>
+                  placeholder="次/N數" maxlength="2" class="w150"></el-input>
               </td>
               <td>
                 <el-input v-model="childItem.FOCNum" @keyup.native="checkInteger(childItem,'FOCNum'),CalcFeeTotal()"
-                  placeholder="FOC" maxlength="1" class="w150"></el-input>
+                  placeholder="FOC" maxlength="2" class="w150"></el-input>
               </td>
               <td>
                 {{childItem.USSubTotal}}
@@ -1073,7 +1073,7 @@
               </td>
               <td>
                 <el-input v-model="childItem.FOCNum" @keyup.native="checkInteger(childItem,'FOCNum'),CalcFeeTotal()"
-                  placeholder="次/N數" maxlength="1" class="w150"></el-input>
+                  placeholder="次/N數" maxlength="2" class="w150"></el-input>
               </td>
               <td>
                 {{childItem.USSubTotal}}
@@ -1163,7 +1163,7 @@
               </td>
               <td>
                 <el-input v-model="childItem.FOCNum" @keyup.native="checkInteger(childItem,'FOCNum'),CalcFeeTotal()"
-                  placeholder="次/N數" maxlength="1" class="w150"></el-input>
+                  placeholder="次/N數" maxlength="2" class="w150"></el-input>
               </td>
               <td>
                 {{childItem.USSubTotal}}
@@ -1235,10 +1235,10 @@
               房費
             </td>
             <td>
-              {{HotelSum.USPriceSum}}
+              {{(HotelSum.USPriceSum/2).toFixed(2)}}
             </td>
             <td>
-              {{HotelSum.VNDPriceSum}}
+              {{(HotelSum.VNDPriceSum/2).toFixed(2)}}
             </td>
             <td>
               {{HotelSum.USTotalSum}}
@@ -1305,6 +1305,7 @@
             <td>
             </td>
             <td>
+              {{(BusSum.VNDTotalSum/getPeopleNum.totalNum).toFixed(2)}}
             </td>
             <td>
             </td>
@@ -1317,10 +1318,10 @@
               船 或 導遊機票
             </td>
             <td>
-              {{ShipSum.USPriceSum}}
+              {{(ShipSum.USPriceSum/getPeopleNum.totalNum).toFixed(2)}}
             </td>
             <td>
-              {{ShipSum.VNDPriceSum}}
+              {{(ShipSum.VNDPriceSum/getPeopleNum.totalNum).toFixed(2)}}
             </td>
             <td>
               {{ShipSum.USTotalSum}}
@@ -1411,6 +1412,7 @@
           SWTOtherPayList: [], //杂支信息
           SWTSelfFeeList: [], //自费明细
           SWTTipFeeList: [], //小费明细
+          AuditStatus: -1, //审核状态
         },
         BusTypeList: [], //车辆类型
         //酒店统计
@@ -1809,6 +1811,11 @@
             }
           })
         }
+        if (type == 0) {
+          this.postData.AuditStatus = -1;
+        } else {
+          this.postData.AuditStatus = 0;
+        }
         this.apipost("travel_post_SetBaoJiaDanSwtService", this.postData, res => {
           if (res.data.resultCode == 1) {
             this.Id = res.data.data;
@@ -2181,14 +2188,14 @@
             USPrice_Single = parseFloat(subUSPrice) / parseFloat(this.postData.GuestNum);
           }
           this.ZaZhiSum.USPriceSingle = USPrice_Single.toFixed(2);
-          
-          this.ZaZhiSum.VNDPriceSum=subVNDPrice.toFixed(2);
+
+          this.ZaZhiSum.VNDPriceSum = subVNDPrice.toFixed(2);
           var VNDPrice_Single = 0;
           if (this.postData.GuestNum > 0) {
             VNDPrice_Single = parseFloat(subVNDPrice) / parseFloat(this.postData.GuestNum);
           }
           this.ZaZhiSum.VNDPriceSingle = VNDPrice_Single.toFixed(2);
-          
+
           this.ZaZhiSum.USTotalSum = totalUSPrice.toFixed(2);
           this.ZaZhiSum.VNDTotalSum = totalVNDPrice.toFixed(2);
         }

src/components/TravelManager/TravelNewQuotation/newQuotation_SWT.vue

@@ -134,6 +134,22 @@
             <div style="margin: 0 13px 0 10px;" class="newQuostayDays">
               {{item.DayNum}} 天</div>
           </div>
+          <div class="_cent">
+            <div style="margin: 0 13px 0 10px;" class="newQuostayDays">
+              审核人: {{item.AuditMan}} </div>
+          </div>
+          <div class="_cent">
+            <div style="margin: 0 13px 0 10px;" class="newQuostayDays">
+              审核状态: {{item.AuditStatusStr}} </div>
+          </div>
+          <div class="_cent">
+            <div style="margin: 0 13px 0 10px;" class="newQuostayDays">
+              审核时间: {{item.AuditTimeStr}} </div>
+          </div>
+          <div class="_cent">
+            <div style="margin: 0 13px 0 10px;" class="newQuostayDays">
+              意见: {{item.AuditContent}} </div>
+          </div>
           <div class="_right">
             <div class="AuditUserInfo clearfix aa" style="margin-left:10px;">
               <div class="AuditDanHeader">
@@ -239,6 +255,7 @@
           total: 0,
           currentPage: 1,
           Title: "",
+          AuditStatus: -1,
         },
         loading: true,
         //线路列表

src/router/config.js

@@ -2938,6 +2938,14 @@ export default {
                                 title: '制作报价单'
                             },
                         },
+                        { //新版制作报价单详情[SWT旅行社]
+                            path: '/QuotationPrice_SWT_details',
+                            name: 'QuotationPrice_SWT_details',
+                            component: resolve => require(['@/components/TravelManager/TravelNewQuotation/QuotationPrice_SWT_details'], resolve),
+                            meta: {
+                                title: '制作报价单'
+                            },
+                        },
                         { //新版报价单审核
                             path: '/QuotationAduit',
                             name: 'QuotationAduit',
@@ -3025,7 +3033,18 @@ export default {
                             meta: {
                                 title: '审核单'
                             },
-                        }, { //团控-报价详情
+                            
+                        }, 
+                        { //团控-审核单
+                            path: '/SWTAuditDan',
+                            name: 'SWTAuditDan',
+                            component: resolve => require(['@/components/TravelManager/TravelNewQuotation/SWTAuditDan'], resolve),
+                            meta: {
+                                title: '审核单'
+                            },
+                            
+                        }, 
+                        { //团控-报价详情
                             path: '/QuotationDetails',
                             name: 'QuotationDetails',
                             component: resolve => require(['@/components/TravelManager/TravelGroupControl/QuotationDetails'], resolve),