操作 地接 时间功能权限

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -204,10 +204,11 @@
         <li>
           <span>
             <em>{{$t('pub.date')}}</em>
-            <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
+            <!-- <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
               :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
               :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
-            </el-date-picker>
+            </el-date-picker> -->
+            <StartDateLimit :clearable="false" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}"></StartDateLimit>
           </span>
         </li>
 
@@ -234,9 +235,10 @@
 </template>
 <script>
 import OrderList from './OrderList.vue';
+import StartDateLimit from '../../public/StartDateLimit.vue';
 export default {
   props: ['pagesTitle'],
-  components: { OrderList },
+  components: { OrderList,StartDateLimit },
   data() {
     return {
       useTypes: [
@@ -470,6 +472,12 @@ export default {
     },
   },
   created() {
+    let StartDate = this.getBeforeDate(90, new Date().Format("yyyy-MM-dd"))
+    let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
+    this.DatelistUse = [StartDate, EndDate]
+    this.msg.UseSTime = this.DatelistUse[0];
+    this.msg.UseETime = this.DatelistUse[1];
+
       if(this.$route.query&&this.$route.query.tradeObj){
         let datas = this.$route.query
         let tradeObj = JSON.parse(datas.tradeObj)

src/components/Hotel/reservation/HotelOrderList.vue

@@ -97,7 +97,7 @@
               <li>
                 <span>
                   <em>{{$t('OrderList.search.daterange')}}</em>
-                  <el-date-picker
+                  <!-- <el-date-picker
                     style="height: 34px;"
                     value-format="yyyy-MM-dd"
                     v-model="Datelist"
@@ -105,7 +105,8 @@
                     :range-separator="$t('OrderList.zhi')"
                     :start-placeholder="$t('OrderList.star')"
                     :end-placeholder="$t('OrderList.end')" @change="getDates">
-                    </el-date-picker>
+                    </el-date-picker> -->
+                    <StartDateLimit :clearable="false" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}"></StartDateLimit>
                 </span>
               </li>
               <!-- <li>
@@ -144,9 +145,10 @@
   </template>
   <script>
     import OrderList from './OrderList.vue';
+    import StartDateLimit from '../../public/StartDateLimit.vue';
     export default {
       props:['pagesTitle'],
-      components: { OrderList },
+      components: { OrderList,StartDateLimit },
       data() {
         return {
           userInfo: {},
@@ -367,7 +369,13 @@
         },
       },
       mounted() {
-        this.Datelist = this.getyMDOne()
+        // this.Datelist = this.getyMDOne()
+        let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
+        let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
+        this.Datelist = [StartDate, EndDate]
+        this.msg.StartTime = this.Datelist[0];
+        this.msg.EndTime = this.Datelist[1];
+
         this.userInfo = this.getLocalStorage();
         if(this.$route.query.OrderId){
           this.msg.OrderId = this.$route.query.OrderId

src/components/Hotel/roomQuery.vue

@@ -41,8 +41,9 @@
           </span>
         </li>
         <li><span><em>{{$t('sm.Date')}}</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
-              :picker-options="pickerBeginDateBefore"></el-date-picker>
+            <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
+              :picker-options="pickerBeginDateBefore"></el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
             -
             <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
               :picker-options="pickerBeginDateAfter"></el-date-picker>
@@ -237,7 +238,9 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../public/DateLimit.vue';
   export default {
+    components: {DateLimit},
     data() {
       return {
         userInfo: {}, //用户信息

src/components/Hotel/roomReservations.vue

@@ -41,8 +41,9 @@
           </span>
         </li>
         <li><span><em>{{$t('pub.date')}}</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
-              :picker-options="pickerBeginDateBefore"></el-date-picker>
+            <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
+              :picker-options="pickerBeginDateBefore"></el-date-picker> -->
+              <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
             -
             <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
               :picker-options="pickerBeginDateAfter"></el-date-picker>
@@ -277,7 +278,9 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../public/DateLimit.vue';
   export default {
+    components: {DateLimit},
     data() {
       return {
         userInfo: {}, //当前登录用户信息

src/components/Restaurant/bookDinnerStatistics.vue

@@ -41,9 +41,10 @@
           </span>
         </li>
         <li><span><em>{{$t('sm.Date')}}</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
             -
-            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
           </span>
         </li>
         <li><span><em>{{$t('commonPickUp.Pick_resName')}}</em>
@@ -208,9 +209,17 @@
 </template>
 
 <script>
+  import DateLimit from '../public/DateLimit.vue';
   export default {
+    components: {DateLimit},
     data() {
       return {
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.msg.StartDate);
+            return startTime.getTime() >= time.getTime();
+          }
+        },
         userInfo: {}, //用户信息
         loading: false,
         msg: {

src/components/SalesVisa/components/VisaProductOrder.vue

@@ -375,15 +375,18 @@
         <li>
           <span>
             <em>{{$t('fnc.bmriqi')}}</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-            -<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
+            -<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerStartDate"></el-date-picker>
           </span>
         </li>
         <li>
           <span>
             <em>完结日期</em>
-            <el-date-picker v-model='msg.FinishSDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-            -<el-date-picker v-model='msg.FinishEDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <!-- <el-date-picker v-model='msg.FinishSDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -->
+            <DateLimit :clearable="true" :StartGroupDate="msg.FinishSDate" :EndGroupDate="msg.FinishEDate" @change="(date)=> msg.FinishSDate = date"></DateLimit>
+            <!-- -<el-date-picker v-model='msg.FinishEDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker> -->
+            <DateLimit :clearable="true" :StartGroupDate="msg.FinishEDate" @change="(date)=> {msg.FinishEDate = date,pickerEnd()}"></DateLimit>
           </span>
         </li>
         <li>
@@ -520,13 +523,27 @@
 </template>
 <script>
   import visaOrderList from './visaOrderList.vue';
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
     props: ['pagesTitle'],
     components: {
-      visaOrderList
+      visaOrderList,
+      DateLimit
     },
     data() {
       return {
+        pickerStartDate: {
+          disabledDate: time => {
+            let startTime = new Date(this.msg.StartDate);
+            return startTime.getTime() >= time.getTime();
+          }
+        },
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.msg.FinishSDate);
+            return startTime.getTime() >= time.getTime();
+          }
+        },
         //   pagesTitle: 'OP',
         userInfo: {},
         qjGroupId: -1,
@@ -617,6 +634,12 @@
       }
     },
     methods: {
+      pickerEnd(){
+        if (this.msg.FinishSDate > this.msg.FinishEDate && this.msg.FinishEDate !== "") {
+          this.$message.error("结束日期不能大于开始日期");
+          this.msg.FinishEDate = "";
+        }
+      },
       getCompany() {
         this.apipost(
           "admin_get_BranchGetList",
@@ -926,6 +949,8 @@
       },
     },
     mounted() {
+      let StartDate = this.getBeforeDate(31, new Date().Format("yyyy-MM-dd"))
+      this.msg.StartDate = StartDate
       // crm自动登陆传过来的参数
       if (this.$route.query.crmOrderObj) {
         let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)

src/components/SingleAirTicket/components/TicketOrder.vue

@@ -118,19 +118,21 @@
         <li>
           <span>
             <em>报名时间</em>
-            <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistBM" type="daterange"
+            <!-- <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistBM" type="daterange"
               :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
               :end-placeholder="$t('OrderList.end')" @change="getDatesBM">
-            </el-date-picker>
+            </el-date-picker> -->
+            <StartDateLimit :clearable="false" :dateTime="DatelistBM" @change="(startDate,endDate)=>{DatelistBM=[startDate,endDate],getDatesBM()}"></StartDateLimit>
           </span>
         </li>
         <li>
           <span>
             <em>出发时间</em>
-            <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
+            <!-- <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
               :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
               :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
-            </el-date-picker>
+            </el-date-picker> -->
+            <StartDateLimit :clearable="true" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}"></StartDateLimit>
           </span>
         </li>
         <li>
@@ -161,11 +163,12 @@
                     </div>
                     <div>
                       <span>完结时间</span>
-                      <el-date-picker style="height: 34px;width: 210px;" value-format="yyyy-MM-dd" v-model="Datelist"
+                      <!-- <el-date-picker style="height: 34px;width: 210px;" value-format="yyyy-MM-dd" v-model="Datelist"
                         type="daterange" :range-separator="$t('OrderList.zhi')"
                         :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')"
                         @change="getDates">
-                      </el-date-picker>
+                      </el-date-picker> -->
+                      <StartDateLimit :clearable="true" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}" style="width: 210px;"></StartDateLimit>
                     </div>
                     <div>
                       <span>出行概述</span>
@@ -258,10 +261,12 @@
 </template>
 <script>
   import OrderList from './OrderList.vue';
+  import StartDateLimit from '../../public/StartDateLimit.vue';
   export default {
     props: ['pagesTitle', 'dataObj'],
     components: {
-      OrderList
+      OrderList,
+      StartDateLimit
     },
     data() {
       return {
@@ -311,7 +316,7 @@
           StartTime: "",
           EndTime: "",
           IsMyOrder: "1", //我的订单
-          FinishSTime: "", //完结开始时间 
+          FinishSTime: "", //完结开始时间
           FinishETime: "", //完结结束时间
           DepartSTime: "", //出发开始
           DepartETime: "", //出发结束

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -665,10 +665,11 @@
         <li>
           <span class="hotel_name">
             <em>{{$t('system.ph_flightTime')}}</em>
-            <el-date-picker class="w150" v-model="Query.QFlightDateStart" type="date"
+            <!-- <el-date-picker class="w150" v-model="Query.QFlightDateStart" type="date"
               :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd"
               :placeholder="$t('hotel.hotel_StartDate')">
-            </el-date-picker>
+            </el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="Query.QFlightDateStart" :EndGroupDate="Query.QFlightDateEnd" @change="(date)=> Query.QFlightDateStart = date"></DateLimit>
             <el-date-picker class="w150" v-model="Query.QFlightDateEnd" type="date" value-format="yyyy-MM-dd"
               :picker-options="pickerBeginDateAfter" :placeholder="$t('hotel.hotel_EndDate')">
             </el-date-picker>
@@ -957,7 +958,9 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
+    components: {DateLimit},
     data() {
       return {
         Query: {

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -633,9 +633,10 @@
         <li>
           <span class="hotel_name">
             <em>{{$t('system.ph_flightTime')}}</em>
-            <el-date-picker class="w150" v-model="Query.QNeedDateStart" type="date" value-format="yyyy-MM-dd"
+            <!-- <el-date-picker class="w150" v-model="Query.QNeedDateStart" type="date" value-format="yyyy-MM-dd"
               placeholder="" :picker-options="pickerBeginDateBefore">
-            </el-date-picker>
+            </el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="Query.QNeedDateStart" :EndGroupDate="Query.QNeedDateEnd" @change="(date)=> Query.QNeedDateStart = date"></DateLimit>
             <el-date-picker class="w150" v-model="Query.QNeedDateEnd" type="date" value-format="yyyy-MM-dd"
               placeholder="" :picker-options="pickerBeginDateAfter">
             </el-date-picker>
@@ -908,7 +909,9 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
+    components: {DateLimit},
     data() {
       return {
         Query: {
@@ -1120,6 +1123,8 @@
       },
     },
     mounted() {
+      let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
+      this.Query.QNeedDateStart = StartDate
       this.getEmployeeList();
       this.GetLineList();
       this.initAirline();

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -230,8 +230,9 @@
         <li>
           <span>
             <em>{{$t('salesModule.StartJoin')}}</em>
-            <el-date-picker type="date" v-model="msg.StartTime" :picker-options="StartTimeBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <!-- <el-date-picker type="date" v-model="msg.StartTime" :picker-options="StartTimeBefore"
+              value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime" @change="(date)=> msg.StartTime = date"></DateLimit>
           </span>
         </li>
         <li>
@@ -244,8 +245,9 @@
         <li>
           <span>
             <em>{{$t('salesModule.CreateTime')}}</em>
-            <el-date-picker type="date" v-model="msg.CStartTime" :picker-options="CStartTimeBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <!-- <el-date-picker type="date" v-model="msg.CStartTime" :picker-options="CStartTimeBefore"
+              value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+              <DateLimit :clearable="true" :StartGroupDate="msg.CStartTime" :EndGroupDate="msg.CEndTime" @change="(date)=> msg.CStartTime = date"></DateLimit>
           </span>
         </li>
         <li>
@@ -519,7 +521,9 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
+    components:{DateLimit},
     data() {
       return {
         //当前登录用户功能权限
@@ -938,6 +942,8 @@
       }
     },
     mounted() {
+      let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
+      this.msg.StartTime = StartDate
       if (this.$route.query.teamTCID) {
         this.msg.HotelName = this.$route.query.teamTCID;
       }

src/components/TravelManager/TravelList/OpTripList.vue

@@ -69,9 +69,10 @@
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
-              <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
-                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
-              <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
+              <!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
+                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+                <DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
+                <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
                 :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
             </span>
           </li>
@@ -163,7 +164,11 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
+    components: {
+      DateLimit
+    },
     data() {
       return {
         //查询数据列表
@@ -427,6 +432,8 @@
       this.getLineList();
     },
     created() {
+      let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
+      this.queryMsg.StartGroupDate = StartDate
       this.getControlList();
     },
   };

src/components/TravelManager/TravelList/PleaseStatistics.vue

@@ -136,9 +136,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>
-            <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QEndDate">
+            <!-- <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="" v-model="queryMsg.QEndDate" :picker-options="pickerBeginDateAfter">
             </el-date-picker>
           </span>
         </li>
@@ -182,9 +183,19 @@
   </div>
 </template>
 <script>
+import DateLimit from '../../public/DateLimit.vue';
 export default {
+    components: {
+      DateLimit
+    },
     data() {
         return {
+          pickerBeginDateAfter: {
+            disabledDate: time => {
+              let startTime = new Date(this.queryMsg.QStartDate);
+              return startTime.getTime() >= time.getTime();
+            }
+          },
             queryCommonData: {
                 //线路列表
                 LineList: [],

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -155,10 +155,11 @@
         <li>
           <span>
             <em>{{$t('fnc.tuanqi')}}</em>
-            <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
+            <!-- <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
               v-model="queryMsg.QStartDate">
-            </el-date-picker>
-            <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
+            </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">
             </el-date-picker>
           </span>
@@ -297,9 +298,17 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
+    components: {DateLimit},
     data() {
       return {
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.queryMsg.QStartDate);
+            return startTime.getTime() >= time.getTime();
+          }
+        },
         queryCommonData: {
           //线路列表
           LineList: [],

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -128,8 +128,9 @@
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
-              <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
-                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+              <!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
+                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+                <DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
               <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
                 :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
             </span>
@@ -1098,13 +1099,15 @@
   import priceDialog from '../TravelNewQuotation/priceDialog.vue';
   import EditLeaveGroup from './components/EditLeaveGroup.vue';
   import commonDinnerInfo from "../../commonPage/commonDinnerInfo.vue";
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
     components: {
       commonBusInfo,
       priceDialog,
       commonHotelInfo,
       EditLeaveGroup,
-      commonDinnerInfo
+      commonDinnerInfo,
+      DateLimit
     },
     data() {
       return {

src/components/TravelManager/TravelList/freeTravelOrderStati.vue

@@ -102,11 +102,11 @@
   }
   .HT_total span{
     display: inline-block;
-    margin:5px 10px 0 0!important;   
+    margin:5px 10px 0 0!important;
   }
   .HT_totalFinacel span{
     display: inline-block;
-    margin:3px 5px 0 0!important;   
+    margin:3px 5px 0 0!important;
   }
  .color_red_order {
     color: #e95252 !important;
@@ -204,29 +204,33 @@
         <li>
           <span>
             <em>{{$t('salesModule.StartJoin')}}</em>
-            <el-date-picker type="date" v-model="msg.StartTime"
-            :picker-options="StartTimeBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <!-- <el-date-picker type="date" v-model="msg.StartTime"
+            :picker-options="StartTimeBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartTime" @change="(date)=> msg.StartTime = date"></DateLimit>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('salesModule.PlayOverTime')}}</em>
-            <el-date-picker type="date" v-model="msg.EndTime"
-            :picker-options="EndTimeAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <!-- <el-date-picker type="date" v-model="msg.EndTime"
+            :picker-options="EndTimeAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+            <DateLimit :clearable="true" :StartGroupDate="msg.EndTime" @change="(date)=> msg.EndTime = date"></DateLimit>
            </span>
         </li>
         <li>
           <span>
             <em>{{$t('salesModule.CreateTime')}}</em>
-            <el-date-picker type="date" v-model="msg.CStartTime"
-            :picker-options="CStartTimeBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <!-- <el-date-picker type="date" v-model="msg.CStartTime"
+            :picker-options="CStartTimeBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+            <DateLimit :clearable="true" :StartGroupDate="msg.CStartTime" :EndGroupDate="msg.CEndTime" @change="(date)=> msg.CStartTime = date"></DateLimit>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('salesModule.CreateOverTime')}}</em>
-            <el-date-picker type="date" v-model="msg.CEndTime"
-            :picker-options="CEndTimeAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <!-- <el-date-picker type="date" v-model="msg.CEndTime"
+            :picker-options="CEndTimeAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+            <DateLimit :clearable="true" :StartGroupDate="msg.CEndTime" @change="(date)=> msg.CEndTime = date"></DateLimit>
            </span>
         </li>
 
@@ -305,7 +309,7 @@
         <th>{{$t('Operation.Op_daishou')}}</th>
         <th>{{$t('hotel.hotel_OrderStates')}}</th>
         <th>{{$t('fnc.cjshijian')}}</th>
-        <th>{{$t('scen.sc_etTime')}}</th> 
+        <th>{{$t('scen.sc_etTime')}}</th>
         <th>{{$t('salesModule.CancelFee')}}</th>
         <th>{{$t('fnc.khxinxi')}}</th>
         <th>{{$t('active.cl_addPp')}}</th>
@@ -375,7 +379,7 @@
                             <span  @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-if="subItem.ColorState===1"  class="groupTourOrder_tickets_blue">{{subItem.FrID}}</span>
                             <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green">{{subItem.FrID}}</span>
                             <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red">{{subItem.FrID}}</span>
-                            <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem.FrID}}</span>                        
+                            <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem.FrID}}</span>
                         </span>
                         <span v-if="item.FinanceList==0">{{$t('system.content_noData')}}</span>
                     </div>
@@ -387,7 +391,7 @@
                             <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue">{{subItem.FrID}}</span>
                             <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green">{{subItem.FrID}}</span>
                             <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red">{{subItem.FrID}}</span>
-                            <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem.FrID}}</span>                        
+                            <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem.FrID}}</span>
                         </span>
                         <span v-if="item.RefundFinanceList==0">{{$t('system.content_noData')}}</span>
                     </div>
@@ -432,7 +436,7 @@
     </el-pagination>
     <el-dialog title="取消订单" width="400px" :visible.sync="dialogFormVisible">
         <el-form :model="exitMsg" label-width="80px">
-            
+
             <el-form-item :label="$t('sm.exitType')">
                 <el-select size="small" v-model="exitMsg.cancel_type" :placeholder="$t('sm.qxzqxlx')">
                     <el-option :label="$t('sm.xingchengbghqx')" value="MC001"></el-option>
@@ -442,7 +446,7 @@
                     <el-option :label="$t('sm.jiaotongys')" value="MC005"></el-option>
                     <el-option :label="$t('sm.jiaotongys')" value="MC006"></el-option>
                     <el-option :label="$t('active.cl_qita')" value="MC999"></el-option>
-                    
+
                 </el-select>
             </el-form-item>
             <el-form-item :label="$t('sm.exityy')">
@@ -457,7 +461,9 @@
   </div>
 </template>
 <script>
+import DateLimit from '../../public/DateLimit.vue';
 export default {
+  components:{DateLimit},
   data() {
     return {
       dialogFormVisible:false,
@@ -572,7 +578,7 @@ export default {
               this.Error("请选择取消类型！");
               return;
           }
-          
+
           this.apipost(
         "dmc_post_Get_KKDayOrderCancel",
         this.exitMsg,
@@ -627,7 +633,7 @@ export default {
         },err => {});
       } else {
         this.searchList = [];
-        this.loading2 = false; 
+        this.loading2 = false;
       }
     },
     queren(type, OrderID){
@@ -673,7 +679,7 @@ export default {
              this.dataList = res.data.data.pageData;
              this.total = res.data.data.count;
              let userInfo = this.getLocalStorage();
-             let EmployeeId = userInfo.EmployeeId; 
+             let EmployeeId = userInfo.EmployeeId;
              this.dataList.forEach(x=>{
                if((x.CreateBy == EmployeeId ||EmployeeId == 1 || EmployeeId == 5) && x.IsCanOrder == 0){
                  x.ShowBtn = true;
@@ -746,7 +752,7 @@ export default {
       "dmc_post_Get_GetJAPAN_GetJAPAN_ReservationCancallation",
       msg,
       res => {
-        if (res.data.resultCode == 1) { 
+        if (res.data.resultCode == 1) {
             this.Success('取消成功');
             this.getList();
         } else {
@@ -788,6 +794,8 @@ export default {
    }
   },
   mounted() {
+    let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
+    this.msg.StartTime = StartDate
     let userInfo=this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id;    //集团
     this.getDepartmentMsg.RB_Branch_Id=userInfo.RB_Branch_id;   //公司

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -143,9 +143,10 @@
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
-              <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
-                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
-              <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
+              <!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
+                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+                <DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
+                <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
                 :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
             </span>
           </li>
@@ -942,13 +943,15 @@
   import commonBusInfo from "../../commonPage/commonBusInfo.vue";
   import EditLeaveGroup from './components/EditLeaveGroup.vue';
   import commonDinnerInfo from "../../commonPage/commonDinnerInfo.vue";
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
     components: {
       commonBusInfo,
       priceDialog,
       commonHotelInfo,
       EditLeaveGroup,
-      commonDinnerInfo
+      commonDinnerInfo,
+      DateLimit
     },
     data() {
       return {

src/components/TravelManager/TravelList/oneDayTripList.vue

@@ -58,9 +58,10 @@
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
-              <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
-                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
-              <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
+              <!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
+                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
+                <DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
+                <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
                 :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
             </span>
           </li>
@@ -142,7 +143,11 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
+    components: {
+      DateLimit
+    },
     data() {
       return {
         //查询数据列表
@@ -349,6 +354,14 @@
       this.getLineList();
     },
     created() {
+      var myDate = new Date()
+      var nowDate =
+        myDate.getFullYear() +
+        '-' +
+        parseInt(myDate.getMonth() + 1) +
+        '-' +
+        myDate.getDate()
+      this.queryMsg.StartGroupDate = nowDate
       this.getControlList();
     },
   };

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -78,19 +78,21 @@
         </li>
         <li>
           <span><em>{{ $t("fnc.bmriqi") }}</em>
-            <el-date-picker v-model="msg.CStartDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
-              type="date"></el-date-picker>
+            <!-- <el-date-picker v-model="msg.CStartDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
+              type="date"></el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="msg.CStartDate" :EndGroupDate="msg.CEndDate" @change="(date)=> msg.CStartDate = date"></DateLimit>
             -
             <el-date-picker v-model="msg.CEndDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
-              type="date"></el-date-picker>
+              type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
           </span>
         </li>
         <li>
           <span><em>{{ $t("scen.sc_ftTime") }}</em>
-            <el-date-picker v-model="msg.QStartDate" class="w135" value-format="yyyy-MM-dd" type="date">
-            </el-date-picker>
+            <!-- <el-date-picker v-model="msg.QStartDate" class="w135" value-format="yyyy-MM-dd" type="date">
+            </el-date-picker> -->
+            <DateLimit :clearable="true" :StartGroupDate="msg.QStartDate" :EndGroupDate="msg.QEndDate" @change="(date)=> msg.QStartDate = date"></DateLimit>
             -
-            <el-date-picker v-model="msg.QEndDate" class="w135" value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <el-date-picker v-model="msg.QEndDate" class="w135" value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
           </span>
         </li>
         <li>
@@ -625,13 +627,27 @@
   import Treeselect from "@riophae/vue-treeselect";
   import updateSalesMan from "../../commonPage/updateSalesMan.vue";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
     components: {
       Treeselect,
       updateSalesMan,
+      DateLimit
     },
     data() {
       return {
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.msg.CStartDate);
+            return startTime.getTime() >= time.getTime();
+          }
+        },
+        pickerBeginDateAfterFT: {
+          disabledDate: time => {
+            let startTime = new Date(this.msg.QStartDate);
+            return startTime.getTime() >= time.getTime();
+          }
+        },
         //修改订单业务员权限
         isEditOrderCreate: 0,
         redBagList: [],

src/components/busManagement/BookAcar/components/BookAcarOrder.vue

@@ -92,7 +92,7 @@
               <li>
                 <span>
                   <em>{{$t('OrderList.search.daterange')}}</em>
-                  <el-date-picker
+                  <!-- <el-date-picker
                     style="height: 34px;"
                     value-format="yyyy-MM-dd"
                     v-model="Datelist"
@@ -100,13 +100,14 @@
                     :range-separator="$t('OrderList.zhi')"
                     :start-placeholder="$t('OrderList.star')"
                     :end-placeholder="$t('OrderList.end')" @change="getDates">
-                    </el-date-picker>
+                    </el-date-picker> -->
+                    <StartDateLimit :clearable="false" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}"></StartDateLimit>
                 </span>
               </li>
               <li>
                 <span>
                   <em>{{$t('objFill.yuyuetime')}}</em>
-                  <el-date-picker
+                  <!-- <el-date-picker
                     style="height: 34px;"
                     value-format="yyyy-MM-dd"
                     v-model="DatelistUse"
@@ -114,7 +115,8 @@
                     :range-separator="$t('OrderList.zhi')"
                     :start-placeholder="$t('OrderList.star')"
                     :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
-                    </el-date-picker>
+                    </el-date-picker> -->
+                    <StartDateLimit :clearable="true" :dateTime="DatelistUse" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDatesUse()}"></StartDateLimit>
                 </span>
               </li>
 
@@ -139,9 +141,10 @@
   </template>
   <script>
     import OrderList from './orderList';
+    import StartDateLimit from '../../../public/StartDateLimit.vue';
     export default {
       props:['pagesTitle','dataObj'],
-      components: { OrderList },
+      components: { OrderList,StartDateLimit },
       data() {
         return {
           userInfo: {},
@@ -326,7 +329,12 @@
         if(this.Title!='销售'){
           this.getEmployee()
         }
-        this.Datelist = this.getyMDOne()
+        // this.Datelist = this.getyMDOne()
+        let StartDate = this.getBeforeDate(365, new Date().Format("yyyy-MM-dd"))
+        let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
+        this.Datelist = [StartDate, EndDate]
+        this.msg.StartTime = this.Datelist[0];
+        this.msg.EndTime = this.Datelist[1];
         this.userInfo = this.getLocalStorage();
         this.GetList();
 

src/components/busManagement/tripBusOrder.vue

@@ -55,7 +55,7 @@
         <li>
           <span>
             <em>开始日期</em>
-            <el-date-picker
+            <!-- <el-date-picker
               style="height: 34px;"
               value-format="yyyy-MM-dd"
               v-model="Datelist"
@@ -63,7 +63,8 @@
               :range-separator="$t('OrderList.zhi')"
               :start-placeholder="$t('OrderList.star')"
               :end-placeholder="$t('OrderList.end')" @change="getDates">
-              </el-date-picker>
+              </el-date-picker> -->
+              <StartDateLimit :clearable="false" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}"></StartDateLimit>
           </span>
         </li>
         <li>
@@ -320,6 +321,7 @@
 
 <script>
   import OrderList from './BookAcar/components/tripBusOrderList.vue';
+  import StartDateLimit from '../public/StartDateLimit.vue';
   export default {
     props:['pagesTitle','OrderId'],
     data() {
@@ -412,7 +414,8 @@
       }
     },
     components: {
-      OrderList
+      OrderList,
+      StartDateLimit
     },
     watch: {
         pagesTitle(val,oldval){

src/components/dmc/manager/dmcTotalTable.vue

@@ -41,8 +41,9 @@
           </span>
         </li>
         <li><span><em>{{$t('sm.Date')}}</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
-              :picker-options="pickerBeginDateBefore"></el-date-picker>
+            <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
+              :picker-options="pickerBeginDateBefore"></el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
             -
             <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
               :picker-options="pickerBeginDateAfter"></el-date-picker>
@@ -630,6 +631,7 @@
   import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
   import commonTeamInfo from "../../commonPage/commonTeamInfo.vue";
   import priceDialog from '../../TravelManager/TravelNewQuotation/priceDialog.vue';
+  import DateLimit from '../../public/DateLimit.vue';
   export default {
     data() {
       return {
@@ -783,7 +785,8 @@
       tripDownLoadCommon,
       commonHotelInfo,
       commonTeamInfo,
-      priceDialog
+      priceDialog,
+      DateLimit
     },
     methods: {
 

src/components/myOrdersAllType/components/allList.vue

@@ -255,7 +255,7 @@
                 <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
                   <span>
                     <em>报名时间</em>
-                    <el-date-picker
+                    <!-- <el-date-picker
                       style="height: 34px;"
                       value-format="yyyy-MM-dd"
                       v-model="DatelistBM"
@@ -263,13 +263,14 @@
                       :range-separator="$t('OrderList.zhi')"
                       :start-placeholder="$t('OrderList.star')"
                       :end-placeholder="$t('OrderList.end')" @change="getDatesBM">
-                      </el-date-picker>
+                      </el-date-picker> -->
+                      <StartDateLimit :clearable="false" :dateTime="DatelistBM" @change="(startDate,endDate)=>{msg.StartTime=startDate,msg.EndTime=endDate}"></StartDateLimit>
                   </span>
                 </li>
                 <li v-if="Title=='申请'">
                   <span>
                     <em>出发时间</em>
-                    <el-date-picker
+                    <!-- <el-date-picker
                       style="height: 34px;"
                       value-format="yyyy-MM-dd"
                       v-model="DatelistUse"
@@ -277,7 +278,8 @@
                       :range-separator="$t('OrderList.zhi')"
                       :start-placeholder="$t('OrderList.star')"
                       :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
-                      </el-date-picker>
+                      </el-date-picker> -->
+                      <StartDateLimit :clearable="false" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}"></StartDateLimit>
                   </span>
                 </li>
                 <li style="line-height: 30px; padding-left: 30px;" v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
@@ -303,7 +305,7 @@
                       <tr>
                         <td style="padding: 5px 0">
                           <span style="width: 100px;display: inline-block;">出发日期</span>
-                          <el-date-picker
+                          <!-- <el-date-picker
                       style="height: 34px;width: 210px;"
                       value-format="yyyy-MM-dd"
                       v-model="DatelistUse"
@@ -311,14 +313,15 @@
                       :range-separator="$t('OrderList.zhi')"
                       :start-placeholder="$t('OrderList.star')"
                       :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
-                      </el-date-picker>
+                      </el-date-picker> -->
+                      <StartDateLimit :clearable="false" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}" style="width: 210px;"></StartDateLimit>
                         </td>
 
                       </tr>
                       <tr>
                         <td style="padding: 5px 0">
                           <span style="width: 100px;display: inline-block;">完结日期</span>
-                          <el-date-picker
+                          <!-- <el-date-picker
                       style="height: 34px;width: 210px;"
                       value-format="yyyy-MM-dd"
                       v-model="Datelist"
@@ -326,7 +329,8 @@
                       :range-separator="$t('OrderList.zhi')"
                       :start-placeholder="$t('OrderList.star')"
                       :end-placeholder="$t('OrderList.end')" @change="getDates">
-                      </el-date-picker>
+                      </el-date-picker> -->
+                      <StartDateLimit :clearable="false" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}" style="width: 210px;"></StartDateLimit>
                         </td>
                       </tr>
                       <tr>
@@ -423,9 +427,10 @@
     </template>
     <script>
       import OrderList from './OrderList.vue';
+      import StartDateLimit from '../../public/StartDateLimit.vue';
       export default {
         props:['pagesTitle','dataObj'],
-        components: { OrderList },
+        components: { OrderList,StartDateLimit },
         data() {
           return {
             companyList:[],

src/components/public/DateLimit.vue

@@ -15,12 +15,12 @@
           disabledDate: time => {
             if(this.EndGroupDate){
               if (this.EndGroupDate == null) {
-                if(this.SGroupDate&&!this.isQueryHistoryData){
+                if(this.SGroupDate||this.isQueryHistoryData){
                   let endTime = this.TourDateRestrictions()
                   return time && endTime.getTime() >= time.getTime();
                 }else return false;
               } else {
-                if(this.SGroupDate&&!this.isQueryHistoryData){
+                if(this.SGroupDate||this.isQueryHistoryData){
                   let endTime = this.TourDateRestrictions()
                   return time && endTime.getTime() >= time.getTime();
                 }else{
@@ -29,7 +29,7 @@
                 }
               }
             }else {
-              if(this.SGroupDate&&!this.isQueryHistoryData){
+              if(this.SGroupDate||this.isQueryHistoryData){
                 let endTime = this.TourDateRestrictions()
                 return time && endTime.getTime() >= time.getTime();
               }
@@ -40,35 +40,28 @@
       }
     },
     created() {
-      var myDate = new Date();
-      var nowDate =
-        myDate.getFullYear() +
-        "-" +
-        parseInt(myDate.getMonth() + 1) +
-        "-" +
-        myDate.getDate();
-      if (!this.$route.query.tcmun) {
-        this.SGroupDate = nowDate;
-      }
+      // var myDate = new Date();
+      // var nowDate =
+      //   myDate.getFullYear() +
+      //   "-" +
+      //   parseInt(myDate.getMonth() + 1) +
+      //   "-" +
+      //   myDate.getDate();
+      // if (!this.$route.query.tcmun&&this.StartGroupDate) {
+      //   this.SGroupDate = nowDate;
+      // }
     },
     mounted() {
       this.GetSupperOrderEditAuth()
     },
     watch: {
-      EndGroupDate:{
-        handler(n,o){
-
-        },
-        deep:false,
-        immediate: true,
-      },
       StartGroupDate:{
         handler(n,o){
           this.SGroupDate = n
         },
         deep:false,
         immediate: true,
-      }
+      },
     },
     methods: {
       getTime() {

src/components/public/MonthLimit.vue

@@ -17,7 +17,7 @@
         years: '',
         pickerBeginDateBefore: {
           disabledDate: time => {
-            if(this.years&&!this.isQueryHistoryData){
+            if(this.years&&this.isQueryHistoryData){
               let endTime = this.TourDateRestrictions()
               console.log(endTime)
               return time && endTime.getTime() >= time.getTime();

src/components/public/StartDateLimit.vue

@@ -25,7 +25,7 @@
           },
           disabledDate: time => {
             let endTime = this.TourDateRestrictions()
-            if (time < endTime&&!this.isQueryHistoryData) {
+            if (time < endTime||this.isQueryHistoryData) {
               return true;
             } else {
               if (this.choiceDate) {

src/components/public/StartYMDateLimit.vue

@@ -47,7 +47,7 @@
           },
           disabledDate: time => {
             let endTime = this.TourDateRestrictions()
-            if (time < endTime&&!this.isQueryHistoryData) {
+            if (time < endTime||this.isQueryHistoryData) {
               return true;
             } else {
               if (this.choiceDate) {

src/components/scenicSpot/admissionStatistics.vue

@@ -41,9 +41,10 @@
           </span>
         </li>
         <li><span><em>{{$t('advmanager.v_xilie')}}{{$t('sm.Date')}}</em>
-            <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -->
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
             -
-            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+            <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
           </span>
         </li>
         <li>
@@ -164,9 +165,17 @@
   </div>
 </template>
 <script>
+  import DateLimit from '../public/DateLimit.vue';
   export default {
+    components: {DateLimit},
     data() {
       return {
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.msg.StartDate);
+            return startTime.getTime() >= time.getTime();
+          }
+        },
         userInfo: {}, //用户信息
         loading: false,
         currentPage: 1,

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -221,19 +221,21 @@
         <li>
           <span>
             <em>{{ $t('OrderList.search.daterange') }}</em>
-            <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="Datelist" type="daterange"
+            <!-- <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="Datelist" type="daterange"
               :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
               :end-placeholder="$t('OrderList.end')" @change="getDates">
-            </el-date-picker>
+            </el-date-picker> -->
+            <StartDateLimit :clearable="false" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}"></StartDateLimit>
           </span>
         </li>
         <li>
           <span>
             <em>{{$t('objFill.menpiaotime')}}</em>
-            <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
+            <!-- <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
               :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
               :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
-            </el-date-picker>
+            </el-date-picker> -->
+            <StartDateLimit :clearable="true" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}"></StartDateLimit>
           </span>
         </li>
 
@@ -259,9 +261,10 @@
 </template>
 <script>
 import OrderList from './OrderList.vue';
+import StartDateLimit from '../../public/StartDateLimit.vue';
 export default {
   props: ['pagesTitle'],
-  components: { OrderList },
+  components: { OrderList,StartDateLimit },
   data() {
     return {
       userInfo: {},
@@ -485,7 +488,12 @@ export default {
     }
   },
   mounted() {
-    this.Datelist = this.getyMDOne()
+    // this.Datelist = this.getyMDOne()
+    let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
+    let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
+    this.Datelist = [StartDate, EndDate]
+    this.msg.StartTime = this.Datelist[0];
+    this.msg.EndTime = this.Datelist[1];
     this.userInfo = this.getLocalStorage();
     this.getEmployee()
     this.GetList();