Merge branch 'dev' of gitlab.33.cn:CassiniatSaturn/fns_backend into dev

src/views/Root/OutletManagement/index.vue

@@ -784,24 +784,16 @@ export default Vue.extend({
       
       if (arr2?.length === 2) {
         const [startDate, endDate] = arr2;
-        this.formData.startTime = moment("00:00", "HH:mm");
-      this.formData.endTime = moment("22:00", "HH:mm");
-//         var dateStr = startDate.getTime()
-//         this.formatDate(dateStr)
-// // var date = new Date(dateStr.replace(/\-/g, "/"));
-// // var ms = date.getTime();
-        // const starh=startDate.getHours()<10? '0'+startDate.getHours():startDate.getHours()
-        // const starm=startDate.getMinutes()<10? '0'+startDate.getMinutes():startDate.getMinutes()
-        // const endh=endDate.getHours()<10? '0'+endDate.getHours():endDate.getHours()
-        // const endm=endDate.getMinutes()<10? '0'+endDate.getMinutes():endDate.getMinutes()
-        // this.formData.startTime = moment(starh+':'+starm,"HH:mm")
-        // this.formData.endTime = moment(endh+':'+endm,"HH:mm")
+        // this.formData.startTime = moment("00:00", "HH:mm");
+        // this.formData.endTime = moment("22:00", "HH:mm");      
+        const starh=startDate.getHours()<10? '0'+startDate.getHours():startDate.getHours()+''
+        const starm=startDate.getMinutes()<10? '0'+startDate.getMinutes():startDate.getMinutes()+''
+        const endh=endDate.getHours()<10? '0'+endDate.getHours():endDate.getHours()+''
+        const endm=endDate.getMinutes()<10? '0'+endDate.getMinutes():endDate.getMinutes()+''
+        this.formData.startTime = moment(starh+':'+starm,"HH:mm")
+        this.formData.endTime = moment(endh+':'+endm,"HH:mm")
         // this.formData.startTime = moment(startDate,"HH:mm")
-        // this.formData.endTime = moment(endDate);   
-        console.log( this.formData.startTime,' this.formData.startTime');
-        // console.log(dateStr,'dateStr');
-        
-          
+        // this.formData.endTime = moment(endDate);           
       }
       const ret = await AddressService.getInstance().note(record.id);
       if (ret.code === 200) {