解决冲突

src/components/Hotel/roomReservationsDetails.vue

@@ -871,11 +871,13 @@
           })
         }
         var flag=true;
+        var isUpload=true;
+        var str="";
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
-            if(subItem.CurrencyId==3&&subItem.ContractUrl==''){
-              this.Error('请上传手配书');
-              flag=false;
+            if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''){
+               str+=""
+                      isUpload=false;
             }
             subItem.OrderDetailsList.forEach((y, sIndex) => {
               if (y.HouseTypeCount) {
@@ -905,6 +907,7 @@
             }
           });
         })
+
         if(flag){
           this.loading = true;
           this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {

src/router/config.js

@@ -2066,6 +2066,14 @@ export default {
                                 title: '简易报表'
                             },
                         },
+                        {
+                            path: '/PleaseStatistics', //团机位统计
+                            name: 'PleaseStatistics',
+                            component: resolve => require(['@/components/TravelManager/TravelList/PleaseStatistics'], resolve),
+                            meta: {
+                                title: '团机位统计'
+                            },
+                        },
                         {
                             path: '/RegistrationStatisticsv2', //团控系统-简易报表(销售)
                             name: 'RegistrationStatisticsv2',