Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Restaurant/restaurantList.vue

@@ -369,7 +369,7 @@
             </font>
           </div>
         </el-tooltip>
-        <div class="hotelTitle fz12">最低餐标: <font class="F3">{{item.MinDinnerPrice>0?item.MinDinnerPrice:"/"}}</font>
+        <div class="hotelTitle fz12">最低餐标: <font class="F3">{{item.UnitPrice>0?item.UnitPrice:"/"}}</font>
         </div>
         <div style="padding:0 0 15px 15px;margin-top: 5px;">
           <i class="iconfont icon-renyuanguanli"></i>

src/components/Restaurant/restaurantRankingDetails.vue

@@ -293,6 +293,8 @@
           {{scope.row.TCNUM}}（ {{scope.row.TCID}}）
         </template>
       </el-table-column>
+      <el-table-column prop="DMCNum" label="地接团号">
+      </el-table-column>
       <el-table-column prop="TeamTypeStr" label="团队类型">
       </el-table-column>
       <el-table-column prop="StartDate" label="出发日期">
@@ -301,12 +303,19 @@
       </el-table-column>
       <el-table-column prop="DNum" label="大/中/小人数">
         <template slot-scope="scope">
-          {{scope.row.DNum}}/   {{scope.row.ZNum}}/   {{scope.row.XNum}}
+          <span style="text-decoration:underline;cursor:pointer;" type="info" @click="goUrl('bookDinnerStatisticsDetails',scope.row.TCID)"> {{(scope.row.DNum>0&&scope.row.DUnitPrice>0)?scope.row.DNum:0}}
+          /{{(scope.row.ZNum>0&&scope.row.ZUnitPrice>0)?scope.row.ZNum:0}}
+         /{{(scope.row.XNum>0&&scope.row.XUnitPrice>0)?scope.row.XNum:0}}</span>
+         
         </template>
       </el-table-column>
       <el-table-column prop="DUnitPrice" label="大/中/小价格">
         <template slot-scope="scope">
-          {{scope.row.DUnitPrice}}/   {{scope.row.ZUnitPrice}}/{{scope.row.XUnitPrice}}
+          <span style="text-decoration:underline;cursor:pointer;" type="info"  @click="goUrl('bookDinnerStatisticsDetails',scope.row.TCID)">
+          {{(scope.row.DNum>0&&scope.row.DUnitPrice>0)?scope.row.DUnitPrice:0}}
+          /{{(scope.row.ZNum>0&&scope.row.ZUnitPrice>0)?scope.row.ZUnitPrice:0}}
+         /{{(scope.row.XNum>0&&scope.row.XUnitPrice>0)?scope.row.XUnitPrice:0}}
+        </span>
         </template>
       </el-table-column>
      
@@ -436,7 +445,7 @@
           query: {
             id: id,
             blank: 'y',
-            tab: '套餐查询'
+            tab: '餐厅预定详情'
           }
         });
       },

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -2100,7 +2100,8 @@
               this.queryCommonData.dataList = res.data.data.pageData;
               this.queryMsg.total = res.data.data.count;
               this.queryMsg.noData = !this.queryMsg.total > 0;
-              this.getDiningDetailsList()
+              this.getDiningDetailsList();
+              this.getPriceHotelResultStatisticsList();
               if (!this.isCommissionDetails) return
               this.getDetailsOfRoyalty()
               this.getTravelAccountStatus()
@@ -2135,9 +2136,13 @@
         )
       },
       getDiningDetailsList() {
-        let Ids = this.queryCommonData.dataList.map(x => {
-          return x.TCID
-        })
+        let Ids=[];
+        this.queryCommonData.dataList.forEach((item,index) => {
+          if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
+            Ids.push(item.TCID)
+          }
+        });
+        if(Ids&&Ids.length>0){
         let msg = [...new Set(Ids)]
         this.apipost(
           "dmcstatistics_get_GetDiningStatisticsList", {
@@ -2158,6 +2163,37 @@
             }
           }
         )
+        }
+      },
+      getPriceHotelResultStatisticsList() {
+        let Ids=[];
+        this.queryCommonData.dataList.forEach((item,index) => {
+          if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
+            Ids.push(item.TCID)
+          }
+        });
+        if(Ids&&Ids.length>0){
+          let msg = [...new Set(Ids)]
+          this.apipost(
+            "travel_get_GetPriceHotelResultStatisticsList", {
+              tcids: msg.join(',')
+            },
+            res => {
+              if (res.data.resultCode == 1) {
+                let DiningStatisticsList = []
+                DiningStatisticsList = res.data.data
+                this.queryCommonData.dataList.forEach(x => {
+                  DiningStatisticsList.forEach(y => {
+                    if (x.TCID == y.TCID) {
+                      x.HotelOrderListReports = y.HotelOrderListReports
+                    }
+                  })
+                })
+                this.$forceUpdate()
+              }
+            }
+        )
+        }
       },
       getTravelAccountStatus() {
         let Ids = this.queryCommonData.dataList.map(x => {
@@ -3106,8 +3142,8 @@
       if (routeName == 'TravelControlList2') {
         this.queryMsg.TeamType = 0;
       }
-      this.getTeamList();
       this.getControlList();
+      this.getTeamList();
     }
   };
 

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1555,6 +1555,7 @@
               this.queryMsg.total = res.data.data.count;
               this.queryMsg.noData = !this.queryMsg.total > 0;
               this.getDiningDetailsList();
+              this.getPriceHotelResultStatisticsList();
               if (!this.isCommissionDetails) return
               this.getDetailsOfRoyalty();
               this.getTravelAccountStatus();
@@ -1563,10 +1564,44 @@
           err => {}
         );
       },
+      getPriceHotelResultStatisticsList() {
+        let Ids=[];
+        this.queryCommonData.dataList.forEach((item,index) => {
+          if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
+            Ids.push(item.TCID)
+          }
+        });
+        if(Ids&&Ids.length>0){
+        let msg = [...new Set(Ids)]
+        this.apipost(
+          "travel_get_GetPriceHotelResultStatisticsList", {
+            tcids: msg.join(',')
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              let DiningStatisticsList = []
+              DiningStatisticsList = res.data.data
+              this.queryCommonData.dataList.forEach(x => {
+                DiningStatisticsList.forEach(y => {
+                  if (x.TCID == y.TCID) {
+                    x.HotelOrderListReports = y.HotelOrderListReports
+                  }
+                })
+              })
+              this.$forceUpdate()
+            }
+          }
+        )
+        }
+      },
       getDiningDetailsList() {
-        let Ids = this.queryCommonData.dataList.map(x => {
-          return x.TCID
-        })
+        let Ids=[];
+        this.queryCommonData.dataList.forEach((item,index) => {
+          if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
+            Ids.push(item.TCID)
+          }
+        });
+        if(Ids&&Ids.length>0){
         let msg = [...new Set(Ids)]
         this.apipost(
           "dmcstatistics_get_GetDiningStatisticsList", {
@@ -1587,6 +1622,7 @@
             }
           }
         )
+        }
       },
       getDetailsOfRoyalty() {
         let Ids = this.queryCommonData.dataList.map(x => {

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -1462,7 +1462,8 @@
               this.queryCommonData.dataList = res.data.data.pageData
               this.queryMsg.total = res.data.data.count
               this.queryMsg.noData = !this.queryMsg.total > 0;
-              this.getDiningDetailsList()
+              this.getDiningDetailsList();
+              this.getPriceHotelResultStatisticsList();
               if (!this.isCommissionDetails) return
               this.getDetailsOfRoyalty()
             }
@@ -1471,9 +1472,13 @@
         )
       },
       getDiningDetailsList() {
-        let Ids = this.queryCommonData.dataList.map(x => {
-          return x.TCID
-        })
+        let Ids=[];
+        this.queryCommonData.dataList.forEach((item,index) => {
+          if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
+            Ids.push(item.TCID)
+          }
+        });
+        if(Ids&&Ids.length>0){
         let msg = [...new Set(Ids)]
         this.apipost(
           "dmcstatistics_get_GetDiningStatisticsList", {
@@ -1494,6 +1499,7 @@
             }
           }
         )
+        }
       },
       getDetailsOfRoyalty() {
         let Ids = this.queryCommonData.dataList.map(x => {
@@ -1995,6 +2001,36 @@
         this.queryCommonData.UploadWORDTip = true
         this.queryCommonData.UploadItem = item
       },
+      getPriceHotelResultStatisticsList() {
+        let Ids=[];
+        this.queryCommonData.dataList.forEach((item,index) => {
+          if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
+            Ids.push(item.TCID)
+          }
+        });
+        if(Ids&&Ids.length>0){
+        let msg = [...new Set(Ids)]
+        this.apipost(
+          "travel_get_GetPriceHotelResultStatisticsList", {
+            tcids: msg.join(',')
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              let DiningStatisticsList = []
+              DiningStatisticsList = res.data.data
+              this.queryCommonData.dataList.forEach(x => {
+                DiningStatisticsList.forEach(y => {
+                  if (x.TCID == y.TCID) {
+                    x.HotelOrderListReports = y.HotelOrderListReports
+                  }
+                })
+              })
+              this.$forceUpdate()
+            }
+          }
+        )
+        }
+      },
       //保存WORD路劲
       UploadAttachment(file) {
         var that = this