财务 日期功能权限

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -338,9 +338,10 @@ export default {
       if(this.DatelistUse){
         if (this.DatelistUse[0]) {
           this.msg.UseSTime = this.DatelistUse[0]
-        } if (this.DatelistUse[1]) {
+        }else this.msg.UseSTime = ''
+         if (this.DatelistUse[1]) {
           this.msg.UseETime = this.DatelistUse[1]
-        }
+        }else this.msg.UseETime = ''
       }else{
         this.msg.UseSTime = ''
         this.msg.UseETime = ''

src/components/FinancialModule/FinancialDocuments.vue

@@ -2070,7 +2070,8 @@
           JoinFrId: 0,
           TransferMoney: 0,
           CurrencyName: ''
-        }
+        },
+        isQueryHistoryData: false,
       };
     },
     created() {
@@ -2079,6 +2080,8 @@
       this.productionDate = [StartDate, EndDate]
       this.msg.sDate = this.productionDate[0];
       this.msg.eDate = this.productionDate[1];
+      this.GetSupperOrderEditAuth()
+
       if (localStorage.typeSystem && localStorage.typeSystem == 1) this.typeSystem = localStorage.typeSystem
       this.isTerminate = -1
       let userinfo = this.getLocalStorage();
@@ -3140,22 +3143,28 @@
       getActive(active, Conditon, BOSSBtn) {
         this.active = active
 
-        // if (this.active == 2 || this.active == 3) {
-        //   let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
-        //   let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
-        //   this.productionDate = [StartDate, EndDate]
-        //   this.msg.sDate = this.productionDate[0];
-        //   this.msg.eDate = this.productionDate[1];
-        // } else {
-        //   this.productionDate = []
-        //   this.msg.sDate = '';
-        //   this.msg.eDate = '';
-        // }
+
         let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
         let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
-        this.productionDate = [StartDate, EndDate]
-        this.msg.sDate = this.productionDate[0];
-        this.msg.eDate = this.productionDate[1];
+        if(!this.isQueryHistoryData){
+          if(!this.msg.sDate||!this.msg.eDate) {
+            this.productionDate = [StartDate, EndDate]
+            this.msg.sDate = this.productionDate[0]
+            this.msg.eDate = this.productionDate[1]
+          }
+        }else{
+          if (this.active == 2 || this.active == 3) {
+            this.productionDate = [StartDate, EndDate]
+            this.msg.sDate = this.productionDate[0];
+            this.msg.eDate = this.productionDate[1];
+          } else {
+            this.productionDate = []
+            this.msg.sDate = '';
+            this.msg.eDate = '';
+          }
+        }
+
+
 
         this.msg.Conditon = Conditon
         if (BOSSBtn) {
@@ -3164,6 +3173,16 @@
         this.msg.pageIndex == 1
         this.getPageList(0, 1)
       },
+      GetSupperOrderEditAuth() {
+        var actiionContract = this.$AuthCode.isQueryHistoryData;
+        var isQueryHistoryData = this.$AuthCode.isQueryHistoryData;
+        this.CheckUserAuth(actiionContract, res => {
+          if (res.data.resultCode == 1 && res.data.data == 1) {
+            this.isQueryHistoryData = true;
+          }
+        });
+
+      },
       getPageList(t, active) {
         if (active) {
           this.total = 0

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -479,7 +479,7 @@ tr._item_list td:last-child {
                 :picker-options="pickerOptions"
                 :range-separator="$t('OrderList.zhi')"
               ></el-date-picker> -->
-              <StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.startDate=startDate,msg.endDate=endDate}"></StartDateLimit>
+              <StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{productionDate=[startDate,endDate],timeAdd(1)}"></StartDateLimit>
             </el-form-item>
           </el-col>
         </el-row>

src/components/SalesVisa/components/VisaProductOrder.vue

@@ -385,8 +385,8 @@
             <em>完结日期</em>
             <!-- <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>
+            -<el-date-picker v-if="msg.FinishSDate" v-model='msg.FinishEDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
+            <DateLimit v-else :clearable="true" :StartGroupDate="msg.FinishEDate" @change="(date)=> {msg.FinishEDate = date,pickerEnd()}"></DateLimit>
           </span>
         </li>
         <li>

src/components/SingleAirTicket/components/TicketOrder.vue

@@ -447,8 +447,8 @@
       },
       getDatesBM() {
         if (this.DatelistBM) {
-          this.msg.StartTime = this.DatelistBM[0]
-          this.msg.EndTime = this.DatelistBM[1]
+          this.msg.StartTime = this.DatelistBM[0]?this.DatelistBM[0]:''
+          this.msg.EndTime = this.DatelistBM[1]?this.DatelistBM[1]:''
         }
         if (!this.DatelistBM) {
           this.msg.StartTime = ''
@@ -457,8 +457,8 @@
       },
       getDatesUse() {
         if (this.DatelistUse) {
-          this.msg.DepartSTime = this.DatelistUse[0]
-          this.msg.DepartETime = this.DatelistUse[1]
+          this.msg.DepartSTime = this.DatelistUse[0]?this.DatelistUse[0]:''
+          this.msg.DepartETime = this.DatelistUse[1]?this.DatelistUse[1]: ''
         }
         if (!this.DatelistUse) {
           this.msg.DepartSTime = ''
@@ -467,8 +467,8 @@
       },
       getDates() {
         if (this.Datelist) {
-          this.msg.FinishSTime = this.Datelist[0]
-          this.msg.FinishETime = this.Datelist[1]
+          this.msg.FinishSTime = this.Datelist[0]?this.Datelist[0]:''
+          this.msg.FinishETime = this.Datelist[1]?this.Datelist[1]:''
         }
         if (!this.Datelist) {
           this.msg.FinishSTime = ''

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -253,8 +253,9 @@
         <li>
           <span>
             <em>{{$t('salesModule.CreateOverTime')}}</em>
-            <el-date-picker type="date" v-model="msg.CEndTime" :picker-options="CEndTimeAfter" value-format="yyyy-MM-dd"
+            <el-date-picker v-if="msg.CStartTime" type="date" v-model="msg.CEndTime" :picker-options="CEndTimeAfter" value-format="yyyy-MM-dd"
               placeholder></el-date-picker>
+            <DateLimit v-else :clearable="true" :StartGroupDate="msg.CEndTime" @change="(date)=> msg.CEndTime = date"></DateLimit>
           </span>
         </li>
 

src/components/TravelManager/TravelList/OpTripList.vue

@@ -432,7 +432,7 @@
       this.getLineList();
     },
     created() {
-      let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
+      let StartDate = this.getBeforeDate(90, new Date().Format("yyyy-MM-dd"))
       this.queryMsg.StartGroupDate = StartDate
       this.getControlList();
     },

src/components/TravelManager/TravelList/freeTravelOrderStati.vue

@@ -228,9 +228,9 @@
         <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> -->
-            <DateLimit :clearable="true" :StartGroupDate="msg.CEndTime" @change="(date)=> msg.CEndTime = date"></DateLimit>
+            <el-date-picker v-if="msg.CStartTime" type="date" v-model="msg.CEndTime"
+            :picker-options="CEndTimeAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <DateLimit v-else :clearable="true" :StartGroupDate="msg.CEndTime" @change="(date)=> msg.CEndTime = date"></DateLimit>
            </span>
         </li>
 

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -92,7 +92,8 @@
             </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" :picker-options="pickerBeginDateAfter"></el-date-picker>
+            <el-date-picker v-if="msg.QStartDate" v-model="msg.QEndDate" class="w135" value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfterFT"></el-date-picker>
+            <DateLimit v-else :clearable="true" :StartGroupDate="msg.QEndDate" @change="(date)=> {msg.QEndDate = date,pickerEnd()}"></DateLimit>
           </span>
         </li>
         <li>
@@ -735,6 +736,12 @@
       };
     },
     methods: {
+      pickerEnd(){
+        if (this.msg.QStartDate > this.msg.QEndDate && this.msg.QEndDate !== "") {
+          this.$message.error("结束日期不能大于开始日期");
+          this.msg.QEndDate= "";
+        }
+      },
       //跳转到团控列表
       goToTravelList(item) {
         if (item.teamType == 1) {

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

@@ -229,8 +229,8 @@
         },
         getDatesUse(){
           if(this.DatelistUse){
-            this.msg.OrderSTime	 = this.DatelistUse[0]
-            this.msg.OrderETime = this.DatelistUse[1]
+            this.msg.OrderSTime	= this.DatelistUse[0]?this.DatelistUse[0]:''
+            this.msg.OrderETime = this.DatelistUse[1]?this.DatelistUse[1]:''
           }if(!this.DatelistUse){
             this.msg.OrderSTime	= ''
             this.msg.OrderETime	 = ''
@@ -238,8 +238,8 @@
         },
         getDates(){
           if(this.Datelist){
-            this.msg.StartTime = this.Datelist[0]
-            this.msg.EndTime = this.Datelist[1]
+            this.msg.StartTime = this.Datelist[0]?this.Datelist[0]:''
+            this.msg.EndTime = this.Datelist[1]?this.Datelist[1]:''
           }if(!this.Datelist){
             this.msg.StartTime	= ''
             this.msg.EndTime	 = ''

src/components/myOrdersAllType/components/allList.vue

@@ -689,8 +689,8 @@
           },
           getDatesBM(){
             if(this.DatelistBM){
-              this.msg.StartTime = this.DatelistBM[0]
-                this.msg.EndTime = this.DatelistBM[1]
+              this.msg.StartTime = this.DatelistBM[0]?this.DatelistBM[0]:''
+                this.msg.EndTime = this.DatelistBM[1]?this.DatelistBM[1]:''
 
             }if(!this.DatelistBM){
               this.msg.StartTime	= ''
@@ -699,10 +699,10 @@
           },
           getDatesUse(){
             if(this.DatelistUse){
-              this.msg.DepartSTime = this.DatelistUse[0]
-              this.msg.DepartETime = this.DatelistUse[1]
-              this.msg2.DepartSTime = this.DatelistUse[0]
-              this.msg2.DepartETime = this.DatelistUse[1]
+              this.msg.DepartSTime = this.DatelistUse[0]?this.DatelistUse[0]:''
+              this.msg.DepartETime = this.DatelistUse[1]?this.DatelistUse[1] :''
+              this.msg2.DepartSTime = this.DatelistUse[0]?this.DatelistUse[0] :''
+              this.msg2.DepartETime = this.DatelistUse[1]?this.DatelistUse[1] :''
             }if(!this.DatelistUse){
               this.msg.DepartSTime	= ''
               this.msg.DepartETime	 = ''
@@ -712,8 +712,8 @@
           },
           getDates(){
             if(this.Datelist){
-              this.msg.FinishSTime = this.Datelist[0]
-              this.msg.FinishETime = this.Datelist[1]
+              this.msg.FinishSTime = this.Datelist[0]?this.Datelist[0]:''
+              this.msg.FinishETime = this.Datelist[1]?this.Datelist[1]:''
             }if(!this.Datelist){
               this.msg.FinishSTime	= ''
               this.msg.FinishETime	 = ''

src/components/public/DateLimit.vue

@@ -2,7 +2,7 @@
     <el-date-picker class="w150" type="date" v-model="SGroupDate"
     :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd"
     placeholder
-    :clearable="clearable==false||clearable?clearable:true"
+    :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true"
     @change="getTime"></el-date-picker>
 </template>
 <script>
@@ -14,22 +14,14 @@
         pickerBeginDateBefore: {
           disabledDate: time => {
             if(this.EndGroupDate){
-              if (this.EndGroupDate == null) {
-                if(this.SGroupDate||this.isQueryHistoryData){
-                  let endTime = this.TourDateRestrictions()
-                  return time && endTime.getTime() >= time.getTime();
-                }else return false;
-              } else {
-                if(this.SGroupDate||this.isQueryHistoryData){
-                  let endTime = this.TourDateRestrictions()
-                  return time && endTime.getTime() >= time.getTime();
-                }else{
-                  let endTime = new Date(this.EndGroupDate);
-                  return endTime.getTime() < time.getTime();
-                }
+              if(!this.isQueryHistoryData){
+                let endTime = this.TourDateRestrictions()
+                return time && endTime.getTime() >= time.getTime();
+              }else{
+                let endTime = new Date(this.EndGroupDate);
               }
             }else {
-              if(this.SGroupDate||this.isQueryHistoryData){
+              if(!this.isQueryHistoryData){
                 let endTime = this.TourDateRestrictions()
                 return time && endTime.getTime() >= time.getTime();
               }

src/components/public/MonthLimit.vue

@@ -6,7 +6,7 @@
       :picker-options="pickerBeginDateBefore"
       value-format="yyyy-MM"
       placeholder="选择月"
-      :clearable="clearable==false||clearable?clearable:true">
+      :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true">
     </el-date-picker>
 </template>
 <script>
@@ -17,9 +17,8 @@
         years: '',
         pickerBeginDateBefore: {
           disabledDate: time => {
-            if(this.years&&this.isQueryHistoryData){
+            if(!this.isQueryHistoryData){
               let endTime = this.TourDateRestrictions()
-              console.log(endTime)
               return time && endTime.getTime() >= time.getTime();
             }
           }

src/components/public/StartDateLimit.vue

@@ -7,7 +7,7 @@
     value-format="yyyy-MM-dd"
     :picker-options="pickerOptions"
     :range-separator="$t('OrderList.zhi')"
-    :clearable="clearable==false||clearable?clearable:true"
+    :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true"
   ></el-date-picker>
 </template>
 <script>
@@ -24,16 +24,17 @@
             }
           },
           disabledDate: time => {
-            let endTime = this.TourDateRestrictions()
-            if (time < endTime||this.isQueryHistoryData) {
-              return true;
+            if (!this.isQueryHistoryData) {
+              let endTime = this.TourDateRestrictions()
+              return time && endTime.getTime() >= time.getTime();
+              // return true;
             } else {
-              if (this.choiceDate) {
-                const one = 365 * 24 * 3600 * 1000;
-                const minTime = this.choiceDate - one;
-                const maxTime = this.choiceDate + one;
-                return time.getTime() < minTime || time.getTime() > maxTime;
-              }
+              // if (this.choiceDate) {
+              //   const one = 365 * 24 * 3600 * 1000;
+              //   const minTime = this.choiceDate - one;
+              //   const maxTime = this.choiceDate + one;
+              //   return time.getTime() < minTime || time.getTime() > maxTime;
+              // }
             }
           }
         },
@@ -53,7 +54,15 @@
         handler(n,o){
           this.productionDate = this.dateTime
         },
-        deep:true,
+        deep:false,
+        immediate: true,
+      },
+      clearable:{
+        handler(n,o){
+          if(n)console.log(n,'--------')
+
+        },
+        deep:false,
         immediate: true,
       }
     },

src/components/public/StartYMDateLimit.vue

@@ -8,7 +8,7 @@
     align="right"
     :picker-options="pickerOptions"
     :range-separator="$t('OrderList.zhi')"
-    :clearable="clearable==false||clearable?clearable:true"
+    :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true"
   ></el-date-picker>
 </template>
 <script>
@@ -46,16 +46,17 @@
             }
           },
           disabledDate: time => {
-            let endTime = this.TourDateRestrictions()
-            if (time < endTime||this.isQueryHistoryData) {
-              return true;
+            if (!this.isQueryHistoryData) {
+              let endTime = this.TourDateRestrictions()
+              return time && endTime.getTime() >= time.getTime();
+              // return true;
             } else {
-              if (this.choiceDate) {
-                const one = 365 * 24 * 3600 * 1000;
-                const minTime = this.choiceDate - one;
-                const maxTime = this.choiceDate + one;
-                return time.getTime() < minTime || time.getTime() > maxTime;
-              }
+              // if (this.choiceDate) {
+              //   const one = 365 * 24 * 3600 * 1000;
+              //   const minTime = this.choiceDate - one;
+              //   const maxTime = this.choiceDate + one;
+              //   return time.getTime() < minTime || time.getTime() > maxTime;
+              // }
             }
           }
         },

src/components/public/YearLimit.vue

@@ -5,7 +5,7 @@
         type="year"
         value-format="yyyy"
         placeholder="选择年"
-        :clearable="clearable==false||clearable?clearable:true">
+        :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true">
     </el-date-picker>
 </template>
 <script>
@@ -16,7 +16,7 @@
         QStartDate: '',
         pickerBeginDateBefore: {
           disabledDate: time => {
-            if(this.QStartDate&&!this.isQueryHistoryData){
+            if(!this.isQueryHistoryData){
               let endTime = this.TourDateRestrictions()
               return time && endTime.getTime() >= time.getTime();
             }

src/components/rank/entryForm.vue

@@ -403,8 +403,8 @@
       },
       getDatesBM() {
         if (this.DatelistBM) {
-          this.msg.StartTime = this.DatelistBM[0];
-          this.msg.EndTime = this.DatelistBM[1];
+          this.msg.StartTime = this.DatelistBM[0]?this.DatelistBM[0]:''
+          this.msg.EndTime = this.DatelistBM[1]?this.DatelistBM[1]:''
         }
         if (!this.DatelistBM) {
           this.msg.StartTime = "";
@@ -413,8 +413,8 @@
       },
       getDatesUse() {
         if (this.DatelistUse) {
-          this.msg.DepartSTime = this.DatelistUse[0];
-          this.msg.DepartETime = this.DatelistUse[1];
+          this.msg.DepartSTime = this.DatelistUse[0]?this.DatelistUse[1]:'';
+          this.msg.DepartETime = this.DatelistUse[1]?this.DatelistUse[1]:'';
         }
         if (!this.DatelistUse) {
           this.msg.DepartSTime = "";
@@ -423,8 +423,8 @@
       },
       getDates() {
         if (this.Datelist) {
-          this.msg.FinishSTime = this.Datelist[0];
-          this.msg.FinishETime = this.Datelist[1];
+          this.msg.FinishSTime = this.Datelist[0]?this.Datelist[0]:''
+          this.msg.FinishETime = this.Datelist[1]?this.Datelist[1]:''
         }
         if (!this.Datelist) {
           this.msg.FinishSTime = "";

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -342,9 +342,10 @@ export default {
       if(this.DatelistUse){
         if (this.DatelistUse[0]) {
           this.msg.UseSTime = this.DatelistUse[0]
-        } if (this.DatelistUse[1]) {
+        }else this.msg.UseSTime = ''
+         if (this.DatelistUse[1]) {
           this.msg.UseETime = this.DatelistUse[1]
-        }
+        }else this.msg.UseETime = ''
       }else{
         this.msg.UseSTime = ''
         this.msg.UseETime = ''
@@ -353,9 +354,9 @@ export default {
     getDates() {
       if(this.Datelist){
         if (this.Datelist[0]) {
-          this.msg.StartTime = this.Datelist[0]
+          this.msg.StartTime = this.Datelist[0]?this.Datelist[0]:''
         } if (this.Datelist[1]) {
-          this.msg.EndTime = this.Datelist[1]
+          this.msg.EndTime = this.Datelist[1]?this.Datelist[1]:''
         }
       }else{
         this.msg.StartTime = ''