yxk-20260601-bug修复
1、党委会反馈时,默认选择已完成、完成时间为当前时间 2、反馈信息化流程bpm表单中,附件高度过高的问题修改
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
<BgPartymatterList
|
<BgPartymatterList
|
||||||
meeting-type="office"
|
meeting-type="office"
|
||||||
ledger-title="所务会"
|
ledger-title="所务会"
|
||||||
flow-name="所务会决议事项"
|
flow-name="所务会决议事项督办"
|
||||||
permission-prefix="bgofficematter:bg_officematter"
|
permission-prefix="bgofficematter:bg_officematter"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -77,12 +77,15 @@
|
|||||||
import { bgPartymatterFeedbackSaveOrUpdate } from '../BgPartymatter.api';
|
import { bgPartymatterFeedbackSaveOrUpdate } from '../BgPartymatter.api';
|
||||||
import { useUserStore } from '/@/store/modules/user';
|
import { useUserStore } from '/@/store/modules/user';
|
||||||
import { buildUUID } from '/@/utils/uuid';
|
import { buildUUID } from '/@/utils/uuid';
|
||||||
|
import { dateUtil } from '/@/utils/dateUtil';
|
||||||
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
|
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
|
||||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||||
|
|
||||||
const emit = defineEmits(['success']);
|
const emit = defineEmits(['success']);
|
||||||
const { createMessage } = useMessage();
|
const { createMessage } = useMessage();
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
|
const DEFAULT_COMPLETED_STATUS = '3';
|
||||||
|
const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
|
||||||
|
|
||||||
const visible = ref(false);
|
const visible = ref(false);
|
||||||
const saving = ref(false);
|
const saving = ref(false);
|
||||||
@@ -137,6 +140,9 @@
|
|||||||
formData.bpmProcessId = formData.bpmProcessId || bpmProcessId;
|
formData.bpmProcessId = formData.bpmProcessId || bpmProcessId;
|
||||||
} else {
|
} else {
|
||||||
modalTitle.value = '新增反馈';
|
modalTitle.value = '新增反馈';
|
||||||
|
// 新增反馈默认按“已完成”处理,时间取打开弹窗时刻,编辑已有记录不覆盖。
|
||||||
|
formData.bpmStatus = DEFAULT_COMPLETED_STATUS;
|
||||||
|
formData.actualTime = dateUtil().format(DATE_TIME_FORMAT);
|
||||||
void applyCurrentUserFeedbackInfo();
|
void applyCurrentUserFeedbackInfo();
|
||||||
}
|
}
|
||||||
visible.value = true;
|
visible.value = true;
|
||||||
|
|||||||
@@ -810,8 +810,14 @@
|
|||||||
min-width: 300px;
|
min-width: 300px;
|
||||||
|
|
||||||
:deep(.file-list-wrapper) {
|
:deep(.file-list-wrapper) {
|
||||||
min-height: auto;
|
min-height: 0 !important;
|
||||||
padding: 8px;
|
padding: 4px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.ant-spin-nested-loading),
|
||||||
|
:deep(.ant-spin-container) {
|
||||||
|
min-height: 0 !important;
|
||||||
|
line-height: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.file-list-header) {
|
:deep(.file-list-header) {
|
||||||
@@ -825,7 +831,21 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
:deep(.ant-empty) {
|
:deep(.ant-empty) {
|
||||||
margin: 0;
|
margin: 0 !important;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
min-height: 20px;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.ant-empty-image) {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.ant-empty-description) {
|
||||||
|
color: #94a3b8;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 20px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@
|
|||||||
import { list as queryApprovalOpinionList } from '/@/views/taskApprovalOpinion/TaskApprovalOpinion.api';
|
import { list as queryApprovalOpinionList } from '/@/views/taskApprovalOpinion/TaskApprovalOpinion.api';
|
||||||
|
|
||||||
const approvalHistoryColumns: BasicColumn[] = [
|
const approvalHistoryColumns: BasicColumn[] = [
|
||||||
{ title: '节点名称', dataIndex: 'taskName', width: 160, align: 'center' },
|
{ title: '节点名称', dataIndex: 'taskName', width: 160, align: 'left' },
|
||||||
{ title: '开始时间', dataIndex: 'startTime', width: 170, align: 'center' },
|
{ title: '开始时间', dataIndex: 'startTime', width: 170, align: 'center' },
|
||||||
{ title: '办理时间', dataIndex: 'opTime', width: 170, align: 'center' },
|
{ title: '办理时间', dataIndex: 'opTime', width: 170, align: 'center' },
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [
|
|||||||
{
|
{
|
||||||
title: '事项截止时间',
|
title: '事项截止时间',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 120,
|
width: 180,
|
||||||
dataIndex: 'deadline',
|
dataIndex: 'deadline',
|
||||||
customRender: ({ text, record }) => {
|
customRender: ({ text, record }) => {
|
||||||
const value = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
|
const value = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
|
||||||
|
|||||||
Reference in New Issue
Block a user