diff --git a/src/api/common/api.ts b/src/api/common/api.ts
index dca4646..2f6c189 100644
--- a/src/api/common/api.ts
+++ b/src/api/common/api.ts
@@ -174,7 +174,7 @@ export const startProcess = (params) => {
* 根据业务ID查询流程列表
* @param params
*/
-export const queryByBusinessId = (params) => defHttp.get({ url: Api.queryByBusinessId, params }, { isTransformResponse: false });
+export const queryByBusinessId = (params) => defHttp.get({ url: Api.queryByBusinessId, params });
/**
* 删除单个流程实例
diff --git a/src/components/semri/process/BusinessProcessListModal.vue b/src/components/semri/process/BusinessProcessListModal.vue
index 759a6e1..eb3744e 100644
--- a/src/components/semri/process/BusinessProcessListModal.vue
+++ b/src/components/semri/process/BusinessProcessListModal.vue
@@ -53,14 +53,26 @@
const approvalHistoryRef = ref();
const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
- const [registerTable, { setColumns, setTableData, setLoading, clearSelectedRowKeys }] = useTable({
+ const [registerTable, { setColumns, setTableData, reload, clearSelectedRowKeys }] = useTable({
rowKey: 'id',
columns: columns,
+ api: queryByBusinessId,
+ immediate: false,
useSearchForm: false,
canResize: false,
- pagination: false,
+ pagination: {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '20', '30'],
+ },
showIndexColumn: true,
bordered: true,
+ beforeFetch: (params) => {
+ return {
+ ...params,
+ businessId: currentBusinessId.value,
+ };
+ },
actionColumn: {
title: '操作',
dataIndex: 'action',
@@ -79,21 +91,8 @@
setTableData([]);
return;
}
-
- setLoading(true);
- try {
- const res = await queryByBusinessId({ businessId: currentBusinessId.value });
- const list = Array.isArray(res?.result) ? res.result : [];
- setTableData(list);
- if (!list.length) {
- createMessage.warning(res?.message || '未查询到流程数据');
- }
- } catch (error) {
- setTableData([]);
- } finally {
- setLoading(false);
- clearSelectedRowKeys();
- }
+ await reload({ page: 1 });
+ clearSelectedRowKeys();
}
async function open(params: OpenParams = {}) {
@@ -124,7 +123,7 @@
async function handlePreviewApprovalHistory(record) {
const processInstId = record?.processInstId;
if (!processInstId) {
- createMessage.error('流程实例ID不能为空');
+ createMessage.error('流程未发起,请等待流程自动发起');
return;
}
@@ -145,7 +144,7 @@
async function handleDeleteProcess(record) {
const processInstId = record?.processInstId;
if (!processInstId) {
- createMessage.error('流程实例ID不能为空');
+ createMessage.error('流程未发起,请等待流程自动发起');
return;
}
@@ -153,7 +152,7 @@
const res = await deleteSingleProcess({ processInstId });
if (res?.success) {
createMessage.success(res.message || '删除流程成功');
- await loadData();
+ await reload();
} else {
createMessage.error(res?.message || '删除流程失败');
}
diff --git a/src/components/semri/process/QueryProcessList.data.ts b/src/components/semri/process/QueryProcessList.data.ts
index dd84d92..b61e9f9 100644
--- a/src/components/semri/process/QueryProcessList.data.ts
+++ b/src/components/semri/process/QueryProcessList.data.ts
@@ -13,6 +13,12 @@ export const columns: BasicColumn[] = [
// align: "center",
// dataIndex: 'flowCode'
// },
+ {
+ title: '督办开始时间',
+ align: 'center',
+ dataIndex: 'startTime',
+ width: 160,
+ },
{
title: '督办标题',
align: 'center',
@@ -27,20 +33,7 @@ export const columns: BasicColumn[] = [
width: 220,
ellipsis: true,
},
- {
- title: '流程名称',
- align: 'center',
- dataIndex: 'flowName',
- width: 160,
- ellipsis: true,
- },
- {
- title: '流程实例ID',
- align: 'center',
- dataIndex: 'processInstId',
- width: 220,
- ellipsis: true,
- },
+
// {
// title: '流程类型',
// align: "center",
@@ -165,12 +158,7 @@ export const columns: BasicColumn[] = [
return text;
},
},
- {
- title: '督办开始时间',
- align: 'center',
- dataIndex: 'startTime',
- width: 160,
- },
+
// {
// title: '截止时间(精确到时分,与 require_finish_date 互补)',
// align: "center",
@@ -183,6 +171,21 @@ export const columns: BasicColumn[] = [
dataIndex: 'actualFinishTime',
width: 160,
},
+ {
+ title: '流程名称',
+ align: 'center',
+ dataIndex: 'flowName',
+ width: 160,
+ ellipsis: true,
+ },
+
+ {
+ title: '流程实例ID',
+ align: 'center',
+ dataIndex: 'processInstId',
+ width: 220,
+ ellipsis: true,
+ },
// {
// title: '是否已逾期',
// align: "center",
diff --git a/src/views/bg/bgpartymatter/BgOfficematterList.vue b/src/views/bg/bgpartymatter/BgOfficematterList.vue
new file mode 100644
index 0000000..c48b2ae
--- /dev/null
+++ b/src/views/bg/bgpartymatter/BgOfficematterList.vue
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue
index 1e5066f..1fe01f3 100644
--- a/src/views/bg/bgpartymatter/BgPartymatterList.vue
+++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue
@@ -43,9 +43,9 @@
- 新增
-
-
+ 新增
+
+
@@ -55,7 +55,7 @@
-
+
@@ -143,10 +143,32 @@
import { columns, superQuerySchema, bgPartymatterFeedbackColumns } from './BgPartymatter.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, bgPartymatterFeedbackList, saveOrUpdate } from './BgPartymatter.api';
+ const props = withDefaults(
+ defineProps<{
+ meetingType?: string;
+ ledgerTitle?: string;
+ flowName?: string;
+ permissionPrefix?: string;
+ }>(),
+ {
+ meetingType: 'party',
+ ledgerTitle: '党委会',
+ flowName: '党委会决议事项督办',
+ permissionPrefix: 'bgpartymatter:bg_partymatter',
+ }
+ );
+
const FLOW_CODE = 'dev_task_task_001';
- const FLOW_NAME = '党委会决议事项督办';
const BUSINESS_TABLE_NAME = 'bg_partymatter';
const FORM_URL = 'bg/bgpartymatter/components/BgPartymatterBPMForm';
+ const actionAuth = {
+ add: `${props.permissionPrefix}:add`,
+ edit: `${props.permissionPrefix}:edit`,
+ delete: `${props.permissionPrefix}:delete`,
+ deleteBatch: `${props.permissionPrefix}:deleteBatch`,
+ exportXls: `${props.permissionPrefix}:exportXls`,
+ importExcel: `${props.permissionPrefix}:importExcel`,
+ };
const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
const formRef = ref();
@@ -177,7 +199,7 @@
const { tableContext, onExportXls, onImportXls } = useListPage({
tableProps:{
- title: '党委会',
+ title: props.ledgerTitle,
api: list,
columns,
canResize:false,
@@ -190,7 +212,7 @@
fixed:'right'
},
beforeFetch: async (params) => {
- return Object.assign(params, getQueryParams());
+ return Object.assign(params, getLedgerQueryParams());
},
pagination: {
current: 1,
@@ -199,9 +221,9 @@
},
},
exportConfig: {
- name:"党委会",
+ name: props.ledgerTitle,
url: getExportUrl,
- params: getQueryParams,
+ params: getLedgerQueryParams,
},
importConfig: {
url: getImportUrl,
@@ -244,6 +266,16 @@
return params;
}
+ /**
+ * 台账入口固定追加会议类型,避免党委会和所务会共表后数据串台。
+ */
+ function getLedgerQueryParams() {
+ return {
+ ...getQueryParams(),
+ meetingType: props.meetingType,
+ };
+ }
+
/**
* 清空查询条件。
* 通过删除 reactive 对象中的字段,让查询表单和实际请求参数都恢复为空。
@@ -331,7 +363,7 @@
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
- registerModal.value.add();
+ registerModal.value.add({ meetingType: props.meetingType });
}
/**
@@ -381,7 +413,7 @@
{
label: '编辑',
onClick: handleEdit.bind(null, record),
- auth: 'bgpartymatter:bg_partymatter:edit'
+ auth: actionAuth.edit
},
];
}
@@ -401,7 +433,7 @@
confirm: handleDelete.bind(null, record),
placement: 'topLeft'
},
- auth: 'bgpartymatter:bg_partymatter:delete'
+ auth: actionAuth.delete
},
// {
// label: '审批进度',
@@ -513,8 +545,10 @@
const selectedDeadline = options.deadline || record.deadline;
const selectedUrgencyLevel = options.urgencyLevel ?? record.urgencyLevel ?? '0';
const defaultDeptIds = getResponsibleDeptIds(record);
+ const currentMeetingType = record.meetingType || props.meetingType;
const flowJsonData = {
...record,
+ meetingType: currentMeetingType,
isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
superviseCount: nextSuperviseCount,
@@ -533,7 +567,7 @@
//流程相关字段
flowCode: FLOW_CODE,
formUrl: FORM_URL,
- flowName: FLOW_NAME,
+ flowName: props.flowName,
jsonData: flowJsonData,
//台账相关字段
businessTablename: BUSINESS_TABLE_NAME,
@@ -549,7 +583,7 @@
};
await startProcessSchedules(params);
- await saveOrUpdate({ id: record.id, bpmStatus: '2', superviseCount: nextSuperviseCount }, true);
+ await saveOrUpdate({ id: record.id, bpmStatus: '2', superviseCount: nextSuperviseCount, meetingType: currentMeetingType }, true);
handleSuccess();
}
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
index 46cffd8..5c209a1 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
@@ -77,12 +77,15 @@
import { bgPartymatterFeedbackSaveOrUpdate } from '../BgPartymatter.api';
import { useUserStore } from '/@/store/modules/user';
import { buildUUID } from '/@/utils/uuid';
+ import { dateUtil } from '/@/utils/dateUtil';
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
const emit = defineEmits(['success']);
const { createMessage } = useMessage();
const userStore = useUserStore();
+ const DEFAULT_COMPLETED_STATUS = '3';
+ const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
const visible = ref(false);
const saving = ref(false);
@@ -137,6 +140,9 @@
formData.bpmProcessId = formData.bpmProcessId || bpmProcessId;
} else {
modalTitle.value = '新增反馈';
+ // 新增反馈默认按“已完成”处理,时间取打开弹窗时刻,编辑已有记录不覆盖。
+ formData.bpmStatus = DEFAULT_COMPLETED_STATUS;
+ formData.actualTime = dateUtil().format(DATE_TIME_FORMAT);
void applyCurrentUserFeedbackInfo();
}
visible.value = true;
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index 51a32b6..a48a4ae 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -272,6 +272,7 @@
startCount: '',
intervalType: '',
intervalStartTime: '',
+ meetingType: 'party',
});
const feedbackBaseColumns = [
@@ -809,8 +810,14 @@
min-width: 300px;
:deep(.file-list-wrapper) {
- min-height: auto;
- padding: 8px;
+ min-height: 0 !important;
+ padding: 4px 8px;
+ }
+
+ :deep(.ant-spin-nested-loading),
+ :deep(.ant-spin-container) {
+ min-height: 0 !important;
+ line-height: 20px;
}
:deep(.file-list-header) {
@@ -824,7 +831,21 @@
}
: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;
}
}
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
index cb51c04..9ff0f28 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
@@ -15,13 +15,13 @@
-
-
+
+
-
-
+
+
@@ -186,7 +186,8 @@
isNeedInterval:'',
startCount:'',
intervalType:'',
- intervalStartTime:''
+ intervalStartTime:'',
+ meetingType: 'party',
});
const { createMessage } = useMessage();
const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
@@ -316,8 +317,8 @@
/**
* 新增
*/
- function add() {
- edit({});
+ function add(record: Record = {}) {
+ edit(record);
}
/**
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterModal.vue
index 55bd08e..96a66d9 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterModal.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterModal.vue
@@ -25,11 +25,11 @@
/**
* 新增
*/
- function add() {
+ function add(record: Record = {}) {
title.value = '新增';
visible.value = true;
nextTick(() => {
- registerForm.value.add();
+ registerForm.value.add(record);
});
}
@@ -81,4 +81,4 @@
display: none !important;
}
-
\ No newline at end of file
+
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue
index 901beaf..7bb1eea 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue
@@ -15,7 +15,7 @@
import { list as queryApprovalOpinionList } from '/@/views/taskApprovalOpinion/TaskApprovalOpinion.api';
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: 'opTime', width: 170, align: 'center' },
{
diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts b/src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts
index 2fa8ea0..b904edf 100644
--- a/src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts
+++ b/src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts
@@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [
{
title: '事项截止时间',
align: 'center',
- width: 120,
+ width: 180,
dataIndex: 'deadline',
customRender: ({ text, record }) => {
const value = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;