Commit 71d9489d authored by 沈翠玲's avatar 沈翠玲

修改样式

parent a21604ae
...@@ -409,8 +409,8 @@ body { ...@@ -409,8 +409,8 @@ body {
color: #234ca3 !important; color: #234ca3 !important;
} }
.el-form-item__label { .el-form-item__label {
display: flex; display: flex !important;
align-items: center; align-items: center !important;
& > div { & > div {
display: flex; display: flex;
align-items: center; align-items: center;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
esc-closable esc-closable
> >
<div class="w-full px-3 h-full overflow-auto flex-col flex mytable"> <div class="w-full px-3 h-full overflow-auto flex-col flex mytable">
是否审批通过申请人{{currentRow?.applyUser?.username}}于{{currentRow?.applyTime}}时提交的{{currentRow?.downloadStatus === 'pending' ? '下载' : ''}}申请? 是否审批通过申请人{{currentRow?.applyUser?.username}}于{{currentRow?.downloadStatus === 'pending' ?currentRow?.applyTime : currentRow?.downloadApplyTime}}时提交的{{currentRow?.downloadStatus === 'pending' ? '下载' : ''}}申请?
</div> </div>
<template #footer> <template #footer>
<el-button type="default" @click="showModal = false">取消</el-button> <el-button type="default" @click="showModal = false">取消</el-button>
...@@ -88,6 +88,11 @@ ...@@ -88,6 +88,11 @@
if (obj['applyTime'][1]) obj['applyTimeEnd'] = obj['applyTime'][1]; if (obj['applyTime'][1]) obj['applyTimeEnd'] = obj['applyTime'][1];
delete obj['applyTime']; delete obj['applyTime'];
} }
if (obj['downloadApplyTime']) {
if (obj['downloadApplyTime'][0]) obj['downloadApplyTimeBegin'] = obj['downloadApplyTime'][0];
if (obj['downloadApplyTime'][1]) obj['downloadApplyTimeEnd'] = obj['downloadApplyTime'][1];
delete obj['downloadApplyTime'];
}
setTimeout(() => { setTimeout(() => {
const arr = JSON.parse(JSON.stringify(FlowStatus.value)) const arr = JSON.parse(JSON.stringify(FlowStatus.value))
getRepairApplyTotal({...obj, flowStatus: null}).then(res => { getRepairApplyTotal({...obj, flowStatus: null}).then(res => {
...@@ -231,6 +236,17 @@ ...@@ -231,6 +236,17 @@
labelWidth: 105, labelWidth: 105,
}, },
}, },
{
field: 'downloadApplyTime',
title: '下载申请时间',
showOverflow: 'tooltip',
width: 140,
search: {
el: 'date-picker',
props: { type: 'daterange', valueFormat: 'YYYY-MM-DD' },
labelWidth: 105,
},
},
{ {
field: 'repairTime', field: 'repairTime',
title: '审核时间', title: '审核时间',
...@@ -308,7 +324,7 @@ ...@@ -308,7 +324,7 @@
} else { } else {
return ( return (
<> <>
<ElButton type="primary" onClick={() => applyDownload(row)}> <ElButton type="primary" onClick={() => applyDownload(row)} disabled={row.downloadStatus === 'pending'}>
下载申请 下载申请
</ElButton> </ElButton>
</> </>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment