mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-12 04:16:47 +08:00
改bug
This commit is contained in:
@@ -171,6 +171,7 @@
|
|||||||
:open="openEnd"
|
:open="openEnd"
|
||||||
@ok="onOkEnd"
|
@ok="onOkEnd"
|
||||||
:disabled-date="disabledDate"
|
:disabled-date="disabledDate"
|
||||||
|
:disabled-time="disabledDateTime"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -699,6 +700,10 @@ function onDateEnd(date) {
|
|||||||
const hour = String(date.$H).padStart(2, '0')
|
const hour = String(date.$H).padStart(2, '0')
|
||||||
const minute = String(date.$m).padStart(2, '0')
|
const minute = String(date.$m).padStart(2, '0')
|
||||||
dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
|
dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
|
||||||
|
if(dateTime.value[0]==dateTime.value[1]){
|
||||||
|
const minute = String(date.$m+1).padStart(2, '0')
|
||||||
|
dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
|
||||||
|
}
|
||||||
}
|
}
|
||||||
function onFocusEnd(){
|
function onFocusEnd(){
|
||||||
openEnd.value = true
|
openEnd.value = true
|
||||||
@@ -906,8 +911,21 @@ function openDrawer(row) {
|
|||||||
courseName.value = row.name;
|
courseName.value = row.name;
|
||||||
nextTick(tableRef.value.fetch);
|
nextTick(tableRef.value.fetch);
|
||||||
}
|
}
|
||||||
|
const range = (start, end) => {
|
||||||
|
const result = [];
|
||||||
|
for (let i = start; i < end; i++) {
|
||||||
|
result.push(i);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
};
|
||||||
const disabledDate = (current) => current && current < dayjs(dateTime.value[0]);
|
const disabledDate = (current) => current && current < dayjs(dateTime.value[0]);
|
||||||
|
const disabledDateTime = () => {
|
||||||
|
const currentMinute = dayjs(dateTime.value[0]).minute();
|
||||||
|
return {
|
||||||
|
disabledHours: () => range(0, dayjs(dateTime.value[0]).hour()).splice(0, dayjs(dateTime.value[0]).hour()),
|
||||||
|
disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1),
|
||||||
|
};
|
||||||
|
};
|
||||||
// 删除文件返回参数
|
// 删除文件返回参数
|
||||||
const changevalue = (e) => {
|
const changevalue = (e) => {
|
||||||
let arr = formData.value.attach.split(",");
|
let arr = formData.value.attach.split(",");
|
||||||
|
|||||||
@@ -348,7 +348,11 @@ const ChoiceCourse = (n) => {
|
|||||||
params.value.pid = data.value[n].id;
|
params.value.pid = data.value[n].id;
|
||||||
tableRef.value.fetch();
|
tableRef.value.fetch();
|
||||||
};
|
};
|
||||||
|
watch(()=>params.value.finishStatus,()=>{
|
||||||
|
if(params.value.finishStatus==undefined){
|
||||||
|
params.value.finishStatus=''
|
||||||
|
}
|
||||||
|
})
|
||||||
const removeStu=(id)=> dialog({
|
const removeStu=(id)=> dialog({
|
||||||
content: "确定删除该学员吗?",
|
content: "确定删除该学员吗?",
|
||||||
ok: () => delStudentList({ ids: [id] }).then(() => fetchData())
|
ok: () => delStudentList({ ids: [id] }).then(() => fetchData())
|
||||||
|
|||||||
@@ -985,6 +985,7 @@
|
|||||||
:open="openEnd"
|
:open="openEnd"
|
||||||
@ok="onOkEnd"
|
@ok="onOkEnd"
|
||||||
:disabled-date="disabledDate"
|
:disabled-date="disabledDate"
|
||||||
|
:disabled-time="disabledDateTime"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -2938,6 +2939,10 @@ function onDateEnd(date) {
|
|||||||
const hour = String(date.$H).padStart(2, '0')
|
const hour = String(date.$H).padStart(2, '0')
|
||||||
const minute = String(date.$m).padStart(2, '0')
|
const minute = String(date.$m).padStart(2, '0')
|
||||||
state.xjkkinputV3[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
|
state.xjkkinputV3[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
|
||||||
|
if(state.xjkkinputV3[0]==state.xjkkinputV3[1]){
|
||||||
|
const minute = String(date.$m+1).padStart(2, '0')
|
||||||
|
state.xjkkinputV3[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const openEnd = ref(false)
|
const openEnd = ref(false)
|
||||||
const onOkEnd = ()=>{
|
const onOkEnd = ()=>{
|
||||||
@@ -5070,10 +5075,10 @@ function onFocusEnd(){
|
|||||||
const disabledDate = (current) => current && current < dayjs(state.xjkkinputV3[0]);
|
const disabledDate = (current) => current && current < dayjs(state.xjkkinputV3[0]);
|
||||||
|
|
||||||
const disabledDateTime = () => {
|
const disabledDateTime = () => {
|
||||||
|
const currentMinute = dayjs(state.xjkkinputV3[0]).minute();
|
||||||
return {
|
return {
|
||||||
disabledHours: () => range(0, 24).splice(4, 20),
|
disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()),
|
||||||
disabledMinutes: () => range(30, 60),
|
disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1),
|
||||||
disabledSeconds: () => [55, 56],
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user