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

src/components/Hotel/HotelWorkList.vue

@@ -11,7 +11,6 @@
         </li>
         <li>
           <input type="button" class="normalBtn" value="查询" @click="getList()" />
-          <!-- <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" /> -->
         </li>
       </ul>
     </div>
@@ -36,10 +35,12 @@
               <div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">无库存
               </div>
             </template>
-            <template v-else v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
+            <template v-else>
               <template
                 v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
-                <div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'" v-if="childItem.DMCState==0">
+                <template v-for="childItem in scope.row.DayList[index].HotelJourneyOrderList">
+                  <div style="white-space:nowrap;color:red;" :title="childItem.TCID+'【未操作】'"
+                    v-if="childItem.DMCState==0">
                     {{childItem.BookGroup}}</div>
                   <div style="white-space:nowrap;color:green;" :title="childItem.TCID+'【OK】'"
                     v-if="childItem.DMCState==1">
@@ -47,8 +48,74 @@
                   <div style="white-space:nowrap;color:#3333CC;" :title="childItem.TCID+'【暂定】'"
                     v-if="childItem.DMCState==2">{{childItem.BookGroup}}</div>
                 </template>
+              </template>
               <template v-else>
-                 <a style="text-decoration:underline;cursor:pointer;">添加酒店</a>
+                <el-popover width="650" trigger="click" popper-class="Bus_HotelPop" style="display:none;">
+                  <table v-loading="changeLoading">
+                    <tr>
+                      <th width="60">
+                        选择
+                      </th>
+                      <th width="140">
+                        团号
+                      </th>
+                      <th width="120">
+                        酒店
+                      </th>
+                      <th width="120">
+                        更换酒店
+                      </th>
+                      <th width="100">
+                        OP状态
+                      </th>
+                      <th width="100">
+                        地接状态
+                      </th>
+                    </tr>
+                    <tr v-for="(hItem,hIndex) in ChangeHotelList">
+                      <td>
+                        <el-checkbox :checked="hItem.IsChecked" @change="ChangeStatus(hItem)"></el-checkbox>
+                      </td>
+                      <td style="text-align:center;">
+                        {{hItem.TCNUM}}<br />({{hItem.TCID}})
+                      </td>
+                      <td style="text-align:left;">
+                        {{hItem.OldHotelName}}
+                      </td>
+                      <td style="text-align:left;">
+                        {{hItem.NewHotelName}}
+                      </td>
+                      <td>
+                        <template v-if="hItem.OPState==1">
+                          <a style="color:green">OP-指定</a>
+                        </template>
+                        <template v-else-if="hItem.OPState==2">
+                          <a style="color:red">OP-暂定</a>
+                        </template>
+                      </td>
+                      <td>
+                        <template v-if="hItem.DMCState==1">
+                          <a style="color:green">地接-OK</a>
+                        </template>
+                        <template v-else-if="hItem.DMCState==2">
+                          <a style="color:red">地接-暂定</a>
+                        </template>
+                        <template v-else-if="hItem.DMCState==0">
+                          <a style="color:red">地接-未操作</a>
+                        </template>
+                      </td>
+                    </tr>
+                    <tfoot>
+                      <tr>
+                        <td colspan="6">
+                          <input type="button" class="normalBtn" value="保存" @click="SaveHotelOrder(scope.row.Hotel)" />
+                        </td>
+                      </tr>
+                    </tfoot>
+                  </table>
+                  <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
+                    @click="GetChangeList(item.DateAllStr)">设置酒店</div>
+                </el-popover>
               </template>
             </template>
           </template>
@@ -74,9 +141,14 @@
         dataList: [],
         loading: false,
         isShow: false,
+        changeLoading: false, //改变酒店loading
+        ChangeHotelList: [], //获取可变更的酒店列表
       };
     },
     methods: {
+      ChangeStatus(item) {
+        item.IsChecked = !item.IsChecked;
+      },
       GotoHotel(HotelId) {
         this.$router.push({
           path: "HotelManagement",
@@ -99,7 +171,6 @@
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data;
               this.isShow = true;
-              console.log("this.dataList", this.dataList);
             } else {
               this.Error(res.data.message);
             }
@@ -107,7 +178,37 @@
           err => {}
         );
       },
-
+      //获取可以改变的酒店列表
+      GetChangeList(useTime) {
+        this.changeLoading = true;
+        this.ChangeHotelList = [];
+        this.apipost("journeyorder_post_GetCanChangeHotelListService", {
+            UseTime: useTime
+          },
+          res => {
+            this.changeLoading = false;
+            if (res.data.resultCode == 1) {
+              this.ChangeHotelList = res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+      //保存酒店订单
+      SaveHotelOrder(HotelID) {
+        console.log("hotelId", HotelID);
+        var newList=[];
+        if (this.ChangeHotelList && this.ChangeHotelList.length > 0) {
+          this.ChangeHotelList.forEach(item => {
+             if(item.IsChecked)
+             {
+                 newList.push(item);
+             }
+          });
+        }
+      }
     },
     mounted() {
       this.msg.YearMonthStr = new Date().Format("yyyy-MM");

src/components/LeaderManagement/leaderPerformance.vue

@@ -312,7 +312,7 @@
               <el-option :key="-1" label="全部" :value="-1"></el-option>
               <el-option v-for="item in yearList" :key="item" :label="item" :value="item"></el-option>
             </el-select>
-            <el-select v-model="msg.Month" >
+            <el-select v-model="msg.Month">
               <el-option :key="-1" label="全部" :value="-1"></el-option>
               <el-option v-for="item in monthList" :key="item" :label="item" :value="item"></el-option>
             </el-select>
@@ -327,6 +327,7 @@
               <el-option label="总榜" :value='6'></el-option>
               <el-option label="人均" :value='4'></el-option>
               <el-option label="回佣人均" :value='5'></el-option>
+              <el-option label="人均低于1W" :value='7'></el-option>
               </el-option>
             </el-select>
           </span>
@@ -369,8 +370,13 @@
               回佣人均
               <i></i>
             </li>
+            <li :class="msg.Type==7?'Day_active':''" @click="msg.Type=7,getStatis()" title="回佣人均低于1W">
+              人均低于1W
+              <i></i>
+            </li>
           </ul>
           <div class="ChampionsLeague clearfix">
+            <template v-if="msg.Type!=7">
               <div class="championList" v-for="item in yajun" :key="item.subCode">
                 <div class="runnderUp">
                   <img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
@@ -401,8 +407,30 @@
                 <div class="championName">{{item.Name}}</div>
                 <div class="championMoney cmoney">￥{{item.LeaderExtract}}</div>
               </div>
+            </template>
+            <template v-else>
+              <table class="singeRowTable" style="margin-top:5px;">
+                <tr>
+                   <th width="100">编号</th>
+                   <th width="100">姓名</th>
+                   <th width="200">人均回佣金额</th>
+                </tr>
+                <tr v-for="(item,index) in DataList">
+                  <td>
+                     {{index+1}}
+                  </td>
+                  <td>
+                    {{item.Name}}
+                  </td>
+                  <td>
+                    ￥{{item.LeaderExtract}}
+                  </td>
+                </tr>
+              </table>
+            </template>
           </div>
         </div>
+        <template v-if="msg.Type!=7">
           <div class="leftBottom clearfix">
             <div class="bottomList">
               <div class="btLittle" v-for="(item,index) in fourToSeven" :key="item.subCode">
@@ -431,7 +459,9 @@
               </div>
             </div>
           </div>
+        </template>
       </div>
+      <template v-if="msg.Type!=7">
         <div class="rightDiv">
           <div class="_btTitle" v-for="(item,index) in twelveToTwenty" :key="item.subCode">
             <div class="tweleindex">{{12+index}}</div>
@@ -445,6 +475,7 @@
             </div>
           </div>
         </div>
+      </template>
     </div>
   </div>
 </template>
@@ -465,7 +496,7 @@
         },
         //工作类型
         workTypeList: [],
-        DataList: "",
+        DataList: [],
         //冠军
         Champion: [],
         //亚军
@@ -493,11 +524,10 @@
           Type: this.msg.Type,
           QLeaderType: this.msg.QLeaderType,
           QMonthStr: this.msg.MonthStr,
-          ShoppingID:this.msg.ShoppingID
+          ShoppingID: this.msg.ShoppingID
         };
-        if(msg.Type==4||msg.Type==5)
-        {
-          msg.QMonthStr=this.msg.Year+","+this.msg.Month;
+        if (msg.Type == 4 || msg.Type == 5 || msg.Type == 7) {
+          msg.QMonthStr = this.msg.Year + "-" + this.msg.Month;
         }
         this.Champion = [];
         this.yajun = [];
@@ -505,16 +535,19 @@
         this.fourToSeven = [];
         this.eightToeleven = [];
         this.twelveToTwenty = [];
+        this.DataList = [];
         this.apipost("LeaderSchedule_get_GetLeaderList", msg, res => {
             this.loading = false;
             if (res.data.resultCode == 1) {
-              if (res.data.data.length > 0) {
-                this.Champion = res.data.data.splice(0, 1);
-                this.yajun = res.data.data.splice(0, 1);
-                this.jijun = res.data.data.splice(0, 1);
-                this.fourToSeven = res.data.data.splice(0, 4);
-                this.eightToeleven = res.data.data.splice(0, 4);
-                this.twelveToTwenty = res.data.data.splice(0, 9);
+              this.DataList =JSON.parse(JSON.stringify(res.data.data));
+              var nArray = JSON.parse(JSON.stringify(res.data.data));
+              if (nArray && nArray.length > 0) {
+                this.Champion = nArray.splice(0, 1);
+                this.yajun = nArray.splice(0, 1);
+                this.jijun = nArray.splice(0, 1);
+                this.fourToSeven = nArray.splice(0, 4);
+                this.eightToeleven = nArray.splice(0, 4);
+                this.twelveToTwenty = nArray.splice(0, 9);
               }
             }
           },
@@ -550,8 +583,8 @@
     },
     mounted() {
       var Year = new Date().getFullYear();
-      this.msg.Year= new Date().getFullYear();
-      this.msg.Month= new Date().getMonth() + 1;
+      this.msg.Year = new Date().getFullYear();
+      this.msg.Month = new Date().getMonth() + 1;
       let count = Year - (Year - 8);
       for (let i = 0; i <= count; i++) {
         this.yearList.push(Year - i);