Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
chendaze 2024-03-27 15:55:18 +08:00
commit a99c1e0732

View File

@ -143,33 +143,25 @@
</a-form-item>
</a-col>
<a-col :span='10'>
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='启用时间'>
<a-date-picker
format='YYYY-MM-DD HH:mm:ss'
<a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='上班时间'>
<a-time-picker v-decorator="['startTime',{rules: [{ required: true, message: '输入启用时间'}]}]"
format='HH:mm:ss'
valueFormat='YYYY-MM-DD HH:mm:ss'
v-decorator="['startTime',{rules: [{ required: true, message: '输入启用时间'}]}]"
:show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
type='date'
placeholder='选择时间'
style='width: 100%;'
/>
:show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
style='width: 100%;' />
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span='10'>
<a-form-item label='结束时间' :labelCol='labelCol' :wrapperCol='wrapperCol'>
<a-date-picker
format='YYYY-MM-DD HH:mm:ss'
<a-form-item label='下班时间' :labelCol='labelCol' :wrapperCol='wrapperCol'>
<a-time-picker v-decorator="['endDate',{rules: [{ required: true, message: '输入启用时间'}]}]"
format='HH:mm:ss'
valueFormat='YYYY-MM-DD HH:mm:ss'
v-decorator="['endDate',{rules: [{ required: true, message: '输入结束时间'}]}]"
placeholder='选择时间'
:show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
type='date'
placeholder='选择时间结束时间'
style='width: 100%;'
/>
style='width: 100%;' />
</a-form-item>
</a-col>
<a-col :span='10'>