页面修改

src/components/LeaderManagement/leaderReimbursement.vue

@@ -2072,10 +2072,10 @@
               });
             }
           });
-          // if (totalUseMoney > 0 && totalUsePercentMoney > 0 && totalUseMoney > totalUsePercentMoney) {
-          //   this.$message.error(this.$t('objFill.zonglkbnc') + "【" + totalUsePercentMoney + "】");
-          //   return;
-          // }
+          if (totalUseMoney > 0 && totalUsePercentMoney > 0 && totalUseMoney > totalUsePercentMoney) {
+            this.$message.error(this.$t('objFill.zonglkbnc') + "【" + totalUsePercentMoney + "】");
+            return;
+          }
         }
         this.CompanyAlipayTCID = obj.TCIDS;
         this.ShowCompanyAlipay = true;
@@ -2341,7 +2341,6 @@
               });
               this.CurrencyListMoney.forEach((cur, i) => {
                 cur.LeaderGetPriceArr.forEach(lead => {
-
                   var tempMoney = (cur.money * this.comRate - cur.yiLing);
                   var tempShowPrice = cur.money * this.comRate;
                   //日本
@@ -2349,7 +2348,7 @@
                     tempShowPrice = Math.round(tempShowPrice / 10000) * 10000;
 
                   } else {
-                    tempShowPrice = Math.round(tempShowPrice / 100) * 100;
+                    tempShowPrice =tempShowPrice;
                   }
                   //未领取，日本线 *0.95 在精确到万
                   if (isreceive == 0) {

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -155,12 +155,10 @@
         <li>
           <span>
             <em>{{$t('fnc.tuanqi')}}</em>
-            <!-- <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
-              v-model="queryMsg.QStartDate">
-            </el-date-picker> -->
-            <DateLimit :clearable="false" :StartGroupDate="queryMsg.QStartDate" :EndGroupDate="queryMsg.QEndDate" @change="(date)=> queryMsg.QStartDate = date"></DateLimit>
-            <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" :picker-options="pickerBeginDateAfter"
-              v-model="queryMsg.QEndDate">
+            <DateLimit :clearable="false" :StartGroupDate="queryMsg.QStartDate" :EndGroupDate="queryMsg.QEndDate"
+              @change="(date)=> queryMsg.QStartDate = date"></DateLimit>
+            <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
+              :picker-options="pickerBeginDateAfter" v-model="queryMsg.QEndDate">
             </el-date-picker>
           </span>
         </li>
@@ -213,7 +211,8 @@
           <td>{{item.LtName}}</td>
           <td>{{item.StartDateStr}} {{item.AlCode}}</td>
           <td>
-            <span :title="$t('objFill.v101.dianjttkolb')" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'"
+            <span :title="$t('objFill.v101.dianjttkolb')"
+              :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'"
               @click="goUrlTCList(item)">{{item.TCID}}</span>
             <br />
             <template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName!=''">
@@ -246,7 +245,6 @@
           <td>{{item.B2BMemberPrice}}</td>
           <td>{{item.TotalSeat}}</td>
           <td>
-            
             <span :title="$t('objFill.v101.dianjtbmqdan')" class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}"
               @click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}
               <span v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span>
@@ -262,7 +260,8 @@
             {{item.AirTicketStatusStr}}
           </td>
           <td>
-            <span :title="$t('objFill.v101.dianjtbmqdan')" :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'"
+            <span :title="$t('objFill.v101.dianjtbmqdan')"
+              :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'"
               @click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName!=""&&item.LeaderName!=null ?item.LeaderName:$t('ground.szlindui')}}</span>
           </td>
           <td>
@@ -301,7 +300,9 @@
 <script>
   import DateLimit from '../../public/DateLimit.vue';
   export default {
-    components: {DateLimit},
+    components: {
+      DateLimit
+    },
     data() {
       return {
         pickerBeginDateAfter: {
@@ -355,6 +356,10 @@
             Id: 2,
             Name: this.$t('MarketingActi.local')
           },
+          {
+            Id: 5,
+            Name: '切位团'
+          },
         ],
         //数据列表
         DataList: [],
@@ -366,15 +371,15 @@
       goUrlTCList(item) {
         var title = "";
         var path = "";
-        if (item.TeamType == 0) {
-          title = "团控列表";
-          path = "TravelControlList";
-        } else if (item.TeamType == 1) {
+        if (item.TeamType == 1) {
           title = "小包团列表";
           path = "TravelControlListSale";
         } else if (item.TeamType == 2) {
           title = "当地游列表";
           path = "oneDayTrip";
+        } else {
+          title = "团控列表";
+          path = "TravelControlList";
         }
         this.$router.push({
           name: path,
@@ -550,7 +555,7 @@
         this.GetLocalFile(
           "travel_get_DownTravelPriceOrderStatistics",
           this.queryMsg,
-          this.$t('objFill.v101.Rest.baomintj')+".xls",
+          this.$t('objFill.v101.Rest.baomintj') + ".xls",
           res => {
             if (this.queryMsg.TicketStartNum == 0) {
               this.queryMsg.TicketStartNum = "";

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -149,10 +149,8 @@
         <li>
           <span>
             <em>{{$t('fnc.tuanqi')}}</em>
-            <!-- <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
-              v-model="queryMsg.QStartDate">
-            </el-date-picker> -->
-            <DateLimit :clearable="false" :StartGroupDate="queryMsg.QStartDate" :EndGroupDate="queryMsg.QEndDate" @change="(date)=> queryMsg.QStartDate = date"></DateLimit>
+            <DateLimit :clearable="false" :StartGroupDate="queryMsg.QStartDate" :EndGroupDate="queryMsg.QEndDate"
+              @change="(date)=> queryMsg.QStartDate = date"></DateLimit>
             <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"
               v-model="queryMsg.QEndDate" :picker-options="pickerBeginDateAfter">
             </el-date-picker>
@@ -269,7 +267,9 @@
 <script>
   import DateLimit from '../../public/DateLimit.vue';
   export default {
-    components: {DateLimit},
+    components: {
+      DateLimit
+    },
     data() {
       return {
         isQueryHistoryData: false,
@@ -320,6 +320,10 @@
             Id: 2,
             Name: this.$t('MarketingActi.local')
           },
+          {
+            Id: 5,
+            Name: '切位团'
+          },
         ],
         //数据列表
         DataList: [],
@@ -333,7 +337,7 @@
         this.CheckUserAuth(actionCode, res => {
           if (res.data.resultCode == 1 && res.data.data == 1) {
             this.isQueryHistoryData = true;
-          }else{
+          } else {
             let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
             this.queryMsg.QStartDate = StartDate
           }
@@ -463,7 +467,7 @@
         this.GetLocalFile(
           "travel_get_DownTravelPriceOrderStatistics",
           this.queryMsg,
-          this.$t('objFill.v101.Rest.baomintj')+".xls"
+          this.$t('objFill.v101.Rest.baomintj') + ".xls"
         );
       },
       goUrl(path, id, title) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1088,18 +1088,17 @@
                     <span v-if="item.LeaderName" class="TCL-greenType">{{
                       item.LeaderName
                     }}</span>
-                    <span v-else class="TCL-redType">{{
-                      $t("Operation.Op_nozhipai")
-                    }}</span>
+                    <span v-else class="TCL-redType" style="cursor:pointer;text-decoration: underline;" @click="setLeaderOrGuide(item,0)">
+                      {{ $t("ground.szlindui") }}
+                    </span>
                   </p>
                   <p>
                     <span>{{ $t("leader.leader_Guide") }}</span>
                     <span v-if="item.GuideName" class="TCL-greenType">{{
                       item.GuideName
                     }}</span>
-                    <span v-else class="TCL-redType">{{
-                      $t("Operation.Op_nozhipai")
-                    }}</span>
+                    <span v-else class="TCL-redType" style="cursor:pointer;text-decoration: underline;"
+                      @click="setLeaderOrGuide(item,1)">{{$t('objFill.v101.shezhidaoy')}}</span>
                   </p>
                 </div>
               </div>
@@ -2203,6 +2202,25 @@
       },
     },
     methods: {
+      setLeaderOrGuide(item, type) {
+        var NameStr = "设置领队";
+        var path = "RegistrationList";
+        if (type == 1) {
+          path = 'leaderArrangement';
+          NameStr = "设置导游";
+        }
+        var id = item.TCID;
+        if (id > 0) {
+          this.$router.push({
+            name: path,
+            query: {
+              id: id,
+              blank: "y",
+              tab: NameStr
+            }
+          });
+        }
+      },
       CancelGroupType() {
         this.GroupTypeVisible = false;
         this.GroupTypeObj = {};
@@ -3333,7 +3351,7 @@
               that.changePriceMsg.isShowChangePrice = false;
               that.changePriceMsg.NewB2BPrice = "";
               that.changePriceMsg.NewB2CPrice = "";
-              that.changePriceMsg.ChangeRemark="";
+              that.changePriceMsg.ChangeRemark = "";
               that.changePriceMsg.TCID = 0;
               that.getControlList();
             } else {

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -723,12 +723,16 @@
                   <p>
                     <span>{{$t('leader.leader_Leader')}}</span>
                     <span v-if="item.LeaderName==null" class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
-                    <span v-else class="TCL-greenType">{{item.LeaderName}}</span>
+                    <span v-else class="TCL-redType" style="cursor:pointer;text-decoration: underline;"
+                      @click="setLeaderOrGuide(item,0)">
+                      {{ $t("ground.szlindui") }}
+                    </span>
                   </p>
                   <p>
                     <span>{{$t('leader.leader_Guide')}}</span>
                     <span v-if="item.GuideName" class="TCL-greenType">{{item.GuideName}}</span>
-                    <span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
+                    <span v-else class="TCL-redType" style="cursor:pointer;text-decoration: underline;"
+                      @click="setLeaderOrGuide(item,1)">{{$t('objFill.v101.shezhidaoy')}}</span>
                   </p>
                 </div>
               </div>
@@ -1538,6 +1542,25 @@
       };
     },
     methods: {
+      setLeaderOrGuide(item, type) {
+        var NameStr = "设置领队";
+        var path = "RegistrationList";
+        if (type == 1) {
+          path = 'leaderArrangement';
+          NameStr = "设置导游";
+        }
+        var id = item.TCID;
+        if (id > 0) {
+          this.$router.push({
+            name: path,
+            query: {
+              id: id,
+              blank: "y",
+              tab: NameStr
+            }
+          });
+        }
+      },
       //获取TCID
       clickAirticket(item) {
         this.updateAirticketObj.TCID = item.TCID;