diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue index 97e87ef..58343af 100644 --- a/src/views/bg/bgpartymatter/BgPartymatterList.vue +++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue @@ -158,6 +158,8 @@ + + @@ -180,6 +182,7 @@ import { Tooltip } from 'ant-design-vue'; import Icon from '/@/components/Icon/index'; import BgPartymatterModal from './components/BgPartymatterModal.vue'; + import BgPartymatterDetailModal from './components/BgPartymatterDetailModal.vue'; import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue'; import FlowScheduleStartModalForBG from '/src/components/semri/process/FlowScheduleStartModalForBG.vue'; import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue'; @@ -239,6 +242,7 @@ const [registerBpmModal, { openModal: bpmPicModal }] = useModal(); const formRef = ref(); const registerModal = ref(); + const detailModalRef = ref(); const flowScheduleModalRef = ref(); const businessProcessListModalRef = ref(); const queryParam = reactive({}); @@ -474,8 +478,7 @@ */ function handleDetail(record: Recordable) { expandedRowKeys.value = []; - registerModal.value.disableSubmit = true; - registerModal.value.edit(record); + detailModalRef.value?.open(record); } /** diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterDetailModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterDetailModal.vue new file mode 100644 index 0000000..c5206b1 --- /dev/null +++ b/src/views/bg/bgpartymatter/components/BgPartymatterDetailModal.vue @@ -0,0 +1,299 @@ + + + + + + + {{ field.label }} + {{ field.value }} + + + + + + + + + + + 办理情况 + 未开始 {{ count.notStarted }} + 进行中 {{ count.inProgress }}(已逾期 {{ count.overdue }}) + 已完成 {{ count.completed }} + 共 {{ count.total }} 条 + + 当前事项的责任部门办理情况记录 + + + + + + - + + + + + + + + + + + diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue index 8528fd9..f1c2170 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue @@ -103,8 +103,8 @@ disabled: { type: Boolean, default: false }, }); const formItemLayout = { - labelCol: { xs: { span: 24 }, sm: { span: 7 } }, - wrapperCol: { xs: { span: 24 }, sm: { span: 17 } }, + labelCol: { style: { width: '110px' } }, + wrapperCol: { style: { flex: 1 } }, }; /** @@ -242,5 +242,17 @@ diff --git a/src/views/bg/bqtakepulse/BgTakepulseList.vue b/src/views/bg/bqtakepulse/BgTakepulseList.vue index 75e2006..7f74708 100644 --- a/src/views/bg/bqtakepulse/BgTakepulseList.vue +++ b/src/views/bg/bqtakepulse/BgTakepulseList.vue @@ -200,6 +200,8 @@ + + @@ -214,6 +216,7 @@ import { useListPage } from '/@/hooks/system/useListPage'; import { useModal } from '/@/components/Modal'; import BgTakepulseModal from './components/BgTakepulseModal.vue'; + import BgTakepulseDetailModal from './components/BgTakepulseDetailModal.vue'; import { columns, superQuerySchema } from './BgTakepulse.data'; import { list, @@ -272,6 +275,7 @@ } const formRef = ref(); + const detailModalRef = ref(); const queryParam = reactive({}); const selectedResponDept = ref([]); const selectedAssistDept = ref([]); @@ -491,11 +495,7 @@ * 详情 */ function handleDetail(record: Recordable) { - openModal(true, { - record, - isUpdate: true, - showFooter: false, - }); + detailModalRef.value?.open(record); } /** * 删除事件 diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseDetailModal.vue b/src/views/bg/bqtakepulse/components/BgTakepulseDetailModal.vue new file mode 100644 index 0000000..361b7ee --- /dev/null +++ b/src/views/bg/bqtakepulse/components/BgTakepulseDetailModal.vue @@ -0,0 +1,329 @@ + + + + + + + {{ field.label }} + {{ field.value }} + + + + + + + + + + + 办理情况 + 未开始 {{ count.notStarted }} + 进行中 {{ count.inProgress }}(已逾期 {{ count.overdue }}) + 已完成 {{ count.completed }} + 共 {{ count.total }} 条 + + 当前事项的责任部门办理情况记录 + + + + + + - + + + + + + + + + + + diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue index 8a82a1e..372544a 100644 --- a/src/views/bg/xispeak/BgXiSpeakList.vue +++ b/src/views/bg/xispeak/BgXiSpeakList.vue @@ -118,6 +118,8 @@ + + @@ -146,6 +148,7 @@ import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue'; import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervision'; import BgXiSpeakModal from './components/BgXiSpeakModal.vue'; + import BgXiSpeakDetailModal from './components/BgXiSpeakDetailModal.vue'; import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue'; import FlowScheduleStartModal from '/src/components/semri/process/FlowScheduleStartModal.vue'; @@ -180,6 +183,7 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi const [registerBpmModal, { openModal: bpmPicModal }] = useModal(); const { createMessage } = useMessage(); const formRef = ref(); + const detailModalRef = ref(); const expandedRowKeys = ref([]); const queryParam = ref({}); const registerModal = ref(); @@ -297,9 +301,8 @@ import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervi /** * 详情 */ - async function handleDetail(record) { - registerModal.value.disableSubmit = true; - registerModal.value.edit(record); + function handleDetail(record) { + detailModalRef.value?.open(record); } /** diff --git a/src/views/bg/xispeak/components/BgXiSpeakDetailModal.vue b/src/views/bg/xispeak/components/BgXiSpeakDetailModal.vue new file mode 100644 index 0000000..761f08c --- /dev/null +++ b/src/views/bg/xispeak/components/BgXiSpeakDetailModal.vue @@ -0,0 +1,304 @@ + + + + + + + {{ field.label }} + {{ field.value }} + + + + + + + + + + + 办理情况 + 共 {{ total }} 条 + 已完成 {{ done }} 条 + + 当前事项的落实情况反馈记录 + + + + + 查看详情 + + + + - + + + + + + + + + + + + diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue index 1ce1e47..0c452ae 100644 --- a/src/views/dq/inspectTask/DqInspectTaskList.vue +++ b/src/views/dq/inspectTask/DqInspectTaskList.vue @@ -119,6 +119,8 @@ + + @@ -134,6 +136,7 @@ import { useListPage } from '/@/hooks/system/useListPage'; import { useModal } from '/@/components/Modal'; import DqInspectTaskModal from './components/DqInspectTaskModal.vue'; + import DqInspectTaskDetailModal from './components/DqInspectTaskDetailModal.vue'; import DqInspectProgressFeedbackViewModal from '../inspectProgress/components/DqInspectProgressFeedbackViewModal.vue'; import { ledgerColumns, superQuerySchema } from './DqInspectTask.data'; import { @@ -169,6 +172,7 @@ const checkedKeys = ref>([]); //注册model const [registerModal, { openModal }] = useModal(); + const detailModalRef = ref(); const feedbackViewModalRef = ref(); const flowScheduleModalRef = ref(); const businessProcessListModalRef = ref(); @@ -270,11 +274,7 @@ * 详情 */ function handleDetail(record: Recordable) { - openModal(true, { - record, - isUpdate: true, - showFooter: false, - }); + detailModalRef.value?.open(record); } /** * 删除事件 diff --git a/src/views/dq/inspectTask/components/DqInspectTaskDetailModal.vue b/src/views/dq/inspectTask/components/DqInspectTaskDetailModal.vue new file mode 100644 index 0000000..0ee1552 --- /dev/null +++ b/src/views/dq/inspectTask/components/DqInspectTaskDetailModal.vue @@ -0,0 +1,288 @@ + + + + + + + {{ field.label }} + {{ field.value }} + + + + + + + + + + + 办理情况 + 共 {{ total }} 条 + 已完成 {{ done }} 条 + + 当前整改任务的工作进展反馈记录 + + + + + + - + + + + + + + + + + +