|
@@ -1,7 +1,7 @@
|
|
|
import React,{Component} from 'react';
|
|
|
import Taro,{getCurrentInstance } from '@tarojs/taro';
|
|
|
import {Text, View} from '@tarojs/components'
|
|
|
-import moment from 'moment';
|
|
|
+import dayjs from 'dayjs';
|
|
|
import './index.less';
|
|
|
import DateTimePicker from '../../components/common/DateTimePicker';
|
|
|
|
|
@@ -59,15 +59,15 @@ class PublicContent extends Component{
|
|
|
}
|
|
|
|
|
|
getHours(startTime,endTime){
|
|
|
- let a1 = moment(startTime);
|
|
|
- let b1 = moment(endTime);
|
|
|
+ let a1 = dayjs(startTime);
|
|
|
+ let b1 = dayjs(endTime);
|
|
|
let c1 = b1.diff(a1,'minutes');
|
|
|
let hourse = parseInt(c1/60);
|
|
|
let minutes = c1%60
|
|
|
let minutes1 = parseInt(minutes / 30)*0.5
|
|
|
- if(a1.isBefore(moment(moment(this.state.rangeStartMinuteVal).format('YYYY-MM-DD')+' 13:30')) && a1.isAfter(moment(moment(this.state.rangeStartMinuteVal).format('YYYY-MM-DD')+' 12:00'))){
|
|
|
- this.getHours(moment(moment(this.state.rangeStartMinuteVal).format('YYYY-MM-DD')+' 13:30'),endTime);
|
|
|
- }else if(a1.isBefore(moment(moment(this.state.rangeStartMinuteVal).format('YYYY-MM-DD')+' 13:30'))){
|
|
|
+ if(a1.isBefore(dayjs(dayjs(this.state.rangeStartMinuteVal).format('YYYY-MM-DD')+' 13:30')) && a1.isAfter(dayjs(dayjs(this.state.rangeStartMinuteVal).format('YYYY-MM-DD')+' 12:00'))){
|
|
|
+ this.getHours(dayjs(dayjs(this.state.rangeStartMinuteVal).format('YYYY-MM-DD')+' 13:30'),endTime);
|
|
|
+ }else if(a1.isBefore(dayjs(dayjs(this.state.rangeStartMinuteVal).format('YYYY-MM-DD')+' 13:30'))){
|
|
|
return hourse+minutes1-1.5
|
|
|
}else{
|
|
|
return hourse+minutes1
|
|
@@ -75,13 +75,13 @@ class PublicContent extends Component{
|
|
|
}
|
|
|
|
|
|
getNumHourse(startTime,endTime){
|
|
|
- if(moment(moment(startTime).format('YYYY-MM-DD')).isSame(moment(moment(endTime).format('YYYY-MM-DD')))){
|
|
|
+ if(dayjs(dayjs(startTime).format('YYYY-MM-DD')).isSame(dayjs(dayjs(endTime).format('YYYY-MM-DD')))){
|
|
|
this.setState({
|
|
|
totalDuration:this.getHours(startTime,endTime)
|
|
|
})
|
|
|
}else{
|
|
|
- let a = this.getHours(startTime,moment(startTime.format('YYYY-MM-DD')+' 17:30'));
|
|
|
- let b = this.getHours(moment(endTime.format('YYYY-MM-DD')+' 8:30'),endTime);
|
|
|
+ let a = this.getHours(startTime,dayjs(startTime.format('YYYY-MM-DD')+' 17:30'));
|
|
|
+ let b = this.getHours(dayjs(endTime.format('YYYY-MM-DD')+' 8:30'),endTime);
|
|
|
let c = (this.state.validDates.length-2)*7.5;
|
|
|
this.setState({
|
|
|
totalDuration:a+b+c
|
|
@@ -112,8 +112,12 @@ class PublicContent extends Component{
|
|
|
return ;
|
|
|
}
|
|
|
let annexUrl = '';
|
|
|
- for(let i of this.state.imgs){
|
|
|
- annexUrl+=','+i;
|
|
|
+ for(let i in this.state.imgs){
|
|
|
+ if(i === 0){
|
|
|
+ annexUrl+=this.state.imgs[i];
|
|
|
+ }else{
|
|
|
+ annexUrl+=','+this.state.imgs[i];
|
|
|
+ }
|
|
|
}
|
|
|
this.setState({
|
|
|
loading:true
|
|
@@ -177,7 +181,7 @@ class PublicContent extends Component{
|
|
|
return (
|
|
|
<View className='publicContent'>
|
|
|
<View className='formItem'>
|
|
|
- <View className='formName'>外出企业:</View>
|
|
|
+ <View className='formName'>公出企业:</View>
|
|
|
<View className='formValue'>{this.props.enterpriseInfor.name}</View>
|
|
|
</View>
|
|
|
<View className='formItem'>
|
|
@@ -186,26 +190,26 @@ class PublicContent extends Component{
|
|
|
<DateTimePicker ref={ref=>this.rangeStartRef = ref} onOk={(current)=>{
|
|
|
let arr = [];
|
|
|
if(this.state.rangeEndVal){
|
|
|
- let str = moment(current.current).format('YYYY-MM-DD');
|
|
|
+ let str = dayjs(current.current).format('YYYY-MM-DD');
|
|
|
arr.push({value:str});
|
|
|
- let a = moment(this.state.rangeEndVal.split('-'));
|
|
|
- let b = moment(str.split('-'));
|
|
|
+ let a = dayjs(this.state.rangeEndVal.split('-'));
|
|
|
+ let b = dayjs(str.split('-'));
|
|
|
let num = a.diff(b, 'days');
|
|
|
let strAdd = str;
|
|
|
for(let i = 0;i<num;i++){
|
|
|
- let time = moment(strAdd).add(1, 'days').format('YYYY-MM-DD');
|
|
|
+ let time = dayjs(strAdd).add(1, 'days').format('YYYY-MM-DD');
|
|
|
strAdd = time
|
|
|
arr.push({value:time});
|
|
|
}
|
|
|
}
|
|
|
this.setState({
|
|
|
- rangeStartVal:moment(current.current).format('YYYY-MM-DD'),
|
|
|
- rangeStartMinuteVal: moment(current.current).format('YYYY-MM-DD HH:mm:ss'),
|
|
|
+ rangeStartVal:dayjs(current.current).format('YYYY-MM-DD'),
|
|
|
+ rangeStartMinuteVal: dayjs(current.current).format('YYYY-MM-DD HH:mm:ss'),
|
|
|
validDates:arr
|
|
|
},()=>{
|
|
|
if(this.state.rangeEndVal){
|
|
|
- let a1 = moment(moment(current.current).format('YYYY-MM-DD HH:mm:ss'));
|
|
|
- let b1 = moment(moment(this.state.rangeEndMinuteVal).format('YYYY-MM-DD HH:mm:ss'));
|
|
|
+ let a1 = dayjs(dayjs(current.current).format('YYYY-MM-DD HH:mm:ss'));
|
|
|
+ let b1 = dayjs(dayjs(this.state.rangeEndMinuteVal).format('YYYY-MM-DD HH:mm:ss'));
|
|
|
this.getNumHourse(a1,b1)
|
|
|
}
|
|
|
})
|
|
@@ -216,7 +220,7 @@ class PublicContent extends Component{
|
|
|
validDates:[],
|
|
|
totalDuration:0
|
|
|
})
|
|
|
- }} initValue={moment().format('YYYY-MM-DD HH:mm:ss')} wrap-class="my-class" select-item-class="mySelector" />
|
|
|
+ }} initValue={dayjs().format('YYYY-MM-DD HH:mm:ss')} wrap-class="my-class" select-item-class="mySelector" />
|
|
|
</View>
|
|
|
</View>
|
|
|
<View className='formItem'>
|
|
@@ -225,26 +229,26 @@ class PublicContent extends Component{
|
|
|
<DateTimePicker ref={ref=>this.rangeEndRef = ref} onOk={(current)=>{
|
|
|
let arr = [];
|
|
|
if(this.state.rangeStartVal){
|
|
|
- let str = moment(current.current).format('YYYY-MM-DD');
|
|
|
+ let str = dayjs(current.current).format('YYYY-MM-DD');
|
|
|
arr.push({value:this.state.rangeStartVal});
|
|
|
- let a = moment(this.state.rangeStartVal.split('-'));
|
|
|
- let b = moment(str.split('-'));
|
|
|
+ let a = dayjs(this.state.rangeStartVal.split('-'));
|
|
|
+ let b = dayjs(str.split('-'));
|
|
|
let num = b.diff(a, 'days');
|
|
|
let strAdd = this.state.rangeStartVal;
|
|
|
for(let i = 0;i<num;i++){
|
|
|
- let time = moment(strAdd).add(1, 'days').format('YYYY-MM-DD');
|
|
|
+ let time = dayjs(strAdd).add(1, 'days').format('YYYY-MM-DD');
|
|
|
strAdd = time
|
|
|
arr.push({value:time});
|
|
|
}
|
|
|
}
|
|
|
this.setState({
|
|
|
- rangeEndVal:moment(current.current).format('YYYY-MM-DD'),
|
|
|
- rangeEndMinuteVal: moment(current.current).format('YYYY-MM-DD HH:mm:ss'),
|
|
|
+ rangeEndVal:dayjs(current.current).format('YYYY-MM-DD'),
|
|
|
+ rangeEndMinuteVal: dayjs(current.current).format('YYYY-MM-DD HH:mm:ss'),
|
|
|
validDates:arr,
|
|
|
},()=>{
|
|
|
if(this.state.rangeStartVal){
|
|
|
- let a1 = moment(moment(current.current).format('YYYY-MM-DD HH:mm:ss'));
|
|
|
- let b1 = moment(moment(this.state.rangeStartMinuteVal).format('YYYY-MM-DD HH:mm:ss'));
|
|
|
+ let a1 = dayjs(dayjs(current.current).format('YYYY-MM-DD HH:mm:ss'));
|
|
|
+ let b1 = dayjs(dayjs(this.state.rangeStartMinuteVal).format('YYYY-MM-DD HH:mm:ss'));
|
|
|
this.getNumHourse(b1,a1)
|
|
|
}
|
|
|
})
|
|
@@ -255,7 +259,7 @@ class PublicContent extends Component{
|
|
|
validDates:[],
|
|
|
totalDuration:0
|
|
|
})
|
|
|
- }} initValue={moment().format('YYYY-MM-DD HH:mm:ss')} wrap-class="my-class" select-item-class="mySelector" />
|
|
|
+ }} initValue={dayjs().format('YYYY-MM-DD HH:mm:ss')} wrap-class="my-class" select-item-class="mySelector" />
|
|
|
</View>
|
|
|
</View>
|
|
|
<View className='formItem'>
|
|
@@ -272,8 +276,8 @@ class PublicContent extends Component{
|
|
|
isSwiper={false}
|
|
|
validDates={this.state.validDates}
|
|
|
onDayLongClick={(item)=>{
|
|
|
- if(!(moment(item.value.split('-')).isSame(this.state.rangeStartVal.split('-')) || moment(item.value.split('-')).isSame(this.state.rangeEndVal.split('-')))){
|
|
|
- if(!(moment(item.value.split('-')).isAfter(this.state.rangeStartVal.split('-')) && moment(item.value.split('-')).isBefore(this.state.rangeEndVal.split('-')))){
|
|
|
+ if(!(dayjs(item.value.split('-')).isSame(this.state.rangeStartVal.split('-')) || dayjs(item.value.split('-')).isSame(this.state.rangeEndVal.split('-')))){
|
|
|
+ if(!(dayjs(item.value.split('-')).isAfter(this.state.rangeStartVal.split('-')) && dayjs(item.value.split('-')).isBefore(this.state.rangeEndVal.split('-')))){
|
|
|
return;
|
|
|
}
|
|
|
}else{
|
|
@@ -281,7 +285,7 @@ class PublicContent extends Component{
|
|
|
return
|
|
|
}
|
|
|
let index = this.state.validDates.findIndex(v=>{
|
|
|
- let lv = moment(v.value.split('-')).isSame(item.value.split('-'));
|
|
|
+ let lv = dayjs(v.value.split('-')).isSame(item.value.split('-'));
|
|
|
return lv
|
|
|
})
|
|
|
if(index<0){
|
|
@@ -336,7 +340,7 @@ class PublicContent extends Component{
|
|
|
</View>
|
|
|
</View>
|
|
|
<View className='operation'>
|
|
|
- <AtButton type='secondary' circle onClick={()=>{
|
|
|
+ <AtButton disabled={this.state.loading} type='secondary' circle onClick={()=>{
|
|
|
Taro.eventCenter.trigger('enterpriseBack')
|
|
|
}}>
|
|
|
上一步
|