|
@@ -221,11 +221,13 @@ export default defineComponent({
|
|
|
subjectId: '' as any, // 选择的声部
|
|
|
subjectList: [] as any,
|
|
|
startTimeStatus: false,
|
|
|
+ startTimeClosedStatus: false,
|
|
|
endTimeMinDate: new Date(timeRange?.startTime || ''),
|
|
|
endTimeMaxDate: dayjs(new Date(timeRange?.startTime || ''))
|
|
|
.add(1, 'year')
|
|
|
.toDate(),
|
|
|
endTimeStatus: false,
|
|
|
+ endTimeClosedStatus: false,
|
|
|
startTime: new Date(timeRange?.startTime || ''),
|
|
|
startTimeStr: timeRange?.startTime || '',
|
|
|
endTime: new Date(timeRange?.endTime || ''),
|
|
@@ -425,7 +427,10 @@ export default defineComponent({
|
|
|
forms.startTimeStr && styles.hasValue,
|
|
|
forms.startTimeStatus && styles.active
|
|
|
]}
|
|
|
- onClick={() => (forms.startTimeStatus = true)}
|
|
|
+ onClick={() => {
|
|
|
+ forms.startTimeStatus = true
|
|
|
+ forms.startTimeClosedStatus = true
|
|
|
+ }}
|
|
|
>
|
|
|
{forms.startTimeStr || '起始时间'}
|
|
|
</p>
|
|
@@ -436,7 +441,10 @@ export default defineComponent({
|
|
|
forms.endTimeStr && styles.hasValue,
|
|
|
forms.endTimeStatus && styles.active
|
|
|
]}
|
|
|
- onClick={() => (forms.endTimeStatus = true)}
|
|
|
+ onClick={() => {
|
|
|
+ forms.endTimeStatus = true
|
|
|
+ forms.endTimeClosedStatus = true
|
|
|
+ }}
|
|
|
>
|
|
|
{forms.endTimeStr || '终止时间'}
|
|
|
</p>
|
|
@@ -489,26 +497,31 @@ export default defineComponent({
|
|
|
round
|
|
|
class={'popupBottomSearch'}
|
|
|
teleport={'body'}
|
|
|
+ onClosed={() => {
|
|
|
+ forms.startTimeClosedStatus = false
|
|
|
+ }}
|
|
|
>
|
|
|
- <DatetimePicker
|
|
|
- v-model={forms.startTime}
|
|
|
- type="date"
|
|
|
- formatter={formatterDatePicker}
|
|
|
- onCancel={() => (forms.startTimeStatus = false)}
|
|
|
- onConfirm={(val: any) => {
|
|
|
- forms.startTime = val
|
|
|
- forms.startTimeStr = dayjs(val).format('YYYY-MM-DD')
|
|
|
- forms.startTimeStatus = false
|
|
|
+ {forms.startTimeClosedStatus && (
|
|
|
+ <DatetimePicker
|
|
|
+ v-model={forms.startTime}
|
|
|
+ type="date"
|
|
|
+ formatter={formatterDatePicker}
|
|
|
+ onCancel={() => (forms.startTimeStatus = false)}
|
|
|
+ onConfirm={(val: any) => {
|
|
|
+ forms.startTime = val
|
|
|
+ forms.startTimeStr = dayjs(val).format('YYYY-MM-DD')
|
|
|
+ forms.startTimeStatus = false
|
|
|
|
|
|
- forms.endTimeMinDate = dayjs(val || new Date()).toDate()
|
|
|
- forms.endTimeMaxDate = dayjs(val || new Date())
|
|
|
- .add(1, 'year')
|
|
|
- .toDate()
|
|
|
- forms.endTime = val
|
|
|
- forms.endTimeStr = ''
|
|
|
- currentType.value = '' as any
|
|
|
- }}
|
|
|
- />
|
|
|
+ forms.endTimeMinDate = dayjs(val || new Date()).toDate()
|
|
|
+ forms.endTimeMaxDate = dayjs(val || new Date())
|
|
|
+ .add(1, 'year')
|
|
|
+ .toDate()
|
|
|
+ forms.endTime = val
|
|
|
+ forms.endTimeStr = ''
|
|
|
+ currentType.value = '' as any
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ )}
|
|
|
</Popup>
|
|
|
{/* 结束日期 */}
|
|
|
<Popup
|
|
@@ -517,21 +530,26 @@ export default defineComponent({
|
|
|
round
|
|
|
class={'popupBottomSearch'}
|
|
|
teleport={'body'}
|
|
|
+ onClosed={() => {
|
|
|
+ forms.endTimeClosedStatus = false
|
|
|
+ }}
|
|
|
>
|
|
|
- <DatetimePicker
|
|
|
- v-model={forms.endTime}
|
|
|
- type="date"
|
|
|
- minDate={forms.endTimeMinDate}
|
|
|
- maxDate={forms.endTimeMaxDate}
|
|
|
- formatter={formatterDatePicker}
|
|
|
- onCancel={() => (forms.endTimeStatus = false)}
|
|
|
- onConfirm={(val: any) => {
|
|
|
- forms.endTime = val
|
|
|
- forms.endTimeStatus = false
|
|
|
- forms.endTimeStr = dayjs(val).format('YYYY-MM-DD')
|
|
|
- currentType.value = '' as any
|
|
|
- }}
|
|
|
- />
|
|
|
+ {forms.endTimeClosedStatus && (
|
|
|
+ <DatetimePicker
|
|
|
+ v-model={forms.endTime}
|
|
|
+ type="date"
|
|
|
+ minDate={forms.endTimeMinDate}
|
|
|
+ maxDate={forms.endTimeMaxDate}
|
|
|
+ formatter={formatterDatePicker}
|
|
|
+ onCancel={() => (forms.endTimeStatus = false)}
|
|
|
+ onConfirm={(val: any) => {
|
|
|
+ forms.endTime = val
|
|
|
+ forms.endTimeStatus = false
|
|
|
+ forms.endTimeStr = dayjs(val).format('YYYY-MM-DD')
|
|
|
+ currentType.value = '' as any
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ )}
|
|
|
</Popup>
|
|
|
</div>
|
|
|
)
|