|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
|
<view class="modal" >
|
|
|
|
|
|
- <u-modal v-model="showTime" title="请选择生成月份" @confirm="confirmmodal"
|
|
|
+ <u-modal v-model="showTime" title="请选择生成时间" @confirm="confirmmodal"
|
|
|
:show-cancel-button="true" confirm-text="生成结算单" cancel-text="取消">
|
|
|
<u-picker v-model="showTimePicker"
|
|
|
@confirm="confirmTimePicker"
|
|
|
@@ -15,19 +15,19 @@
|
|
|
|
|
|
<view class="item">
|
|
|
<view class="name">
|
|
|
- 启始月份
|
|
|
+ 开始时间
|
|
|
</view>
|
|
|
<view class="content" @click="TimeKey='A',showTimePicker=true">
|
|
|
- {{defaultTimeA?defaultTimeA:'请选择启始月份'}}
|
|
|
+ {{defaultTimeA?defaultTimeA:'请选择开始时间'}}
|
|
|
<u-icon name="arrow-right"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="name">
|
|
|
- 结束月份
|
|
|
+ 结束时间
|
|
|
</view>
|
|
|
<view class="content" @click="TimeKey='B',showTimePicker=true">
|
|
|
- {{defaultTimeB?defaultTimeB:'请选择结束月份'}}
|
|
|
+ {{defaultTimeB?defaultTimeB:'请选择结束时间'}}
|
|
|
<u-icon name="arrow-right"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -142,21 +142,21 @@
|
|
|
confirmmodal(){
|
|
|
if(!this.defaultTimeA){
|
|
|
uni.showToast({
|
|
|
- title:"请选择启始月份"
|
|
|
+ title:"请选择开始时间"
|
|
|
})
|
|
|
this.showTime=true
|
|
|
return
|
|
|
}
|
|
|
if(!this.defaultTimeB){
|
|
|
uni.showToast({
|
|
|
- title:"请选择结束月份"
|
|
|
+ title:"请选择结束时间"
|
|
|
})
|
|
|
this.showTime=true
|
|
|
return
|
|
|
}
|
|
|
if(this.defaultTimeA>this.defaultTimeB){
|
|
|
uni.showToast({
|
|
|
- title:"结束月份需要大于启始月份"
|
|
|
+ title:"结束时间需要大于开始时间"
|
|
|
})
|
|
|
this.showTime=true
|
|
|
return
|
|
|
@@ -166,7 +166,7 @@
|
|
|
},
|
|
|
confirmTimePicker(e){
|
|
|
|
|
|
- var time=e.year+'-'+e.month
|
|
|
+ var time=e.year+'-'+e.month+'-'+e.day
|
|
|
|
|
|
|
|
|
if(this.TimeKey=='A'){
|
zhengkaixin