架构化审批表单控制权限，添加xispeak审批节点的控制权限说明，修改反馈表单查看格式，修改树形表单实现正确的折叠效果，实现反馈表单的必填字段校验
This commit is contained in:
wsm
@@ -12,7 +12,7 @@
|
||||
showProcessHandle → 流程办理区域
|
||||
└── showSubApproveUser → 是否办结 + 部门经办人选人
|
||||
|
||||
showApproveInfo → 反馈信息区域（表格 + 表头）
|
||||
showFeedbackInfo → 反馈信息区域（表格 + 表头）
|
||||
├── showAddFeedback → 新增反馈按钮
|
||||
├── showEditFeedback → 编辑/删除操作列
|
||||
├── showDeptFeedback → 按部门过滤反馈数据
|
||||
@@ -21,48 +21,178 @@ showApproveInfo → 反馈信息区域（表格 + 表头）
|
||||
|
||||
## 节点权限配置
|
||||
|
||||
> 格式：节点名称 (taskDefKey)，列出开启的属性
|
||||
|
||||
<!--
|
||||
新增节点时复制以下模板填写：
|
||||
|
||||
### 节点: <节点名称>
|
||||
- taskDefKey: `<taskDefKey>`
|
||||
| 属性 | 值 | 说明 |
|
||||
|------|-----|------|
|
||||
| showProcessHandle | 0 | |
|
||||
| showSubApproveUser | 0 | |
|
||||
| showApproveInfo | 0 | |
|
||||
| showAddFeedback | 0 | |
|
||||
| showEditFeedback | 0 | |
|
||||
| showDeptFeedback | 0 | |
|
||||
| showJiJianFields | 0 | |
|
||||
-->
|
||||
> 格式：`| L1 属性 | L2 属性 | 值 | 说明 |`，缩进表示层级，L2 仅在 L1=1 时生效
|
||||
|
||||
---
|
||||
|
||||
### 节点: <待填写>
|
||||
- taskDefKey: `<待填写>`
|
||||
| 属性 | 值 | 说明 |
|
||||
|------|-----|------|
|
||||
| showProcessHandle | 0 | |
|
||||
| showSubApproveUser | 0 | |
|
||||
| showApproveInfo | 0 | |
|
||||
| showAddFeedback | 0 | |
|
||||
| showEditFeedback | 0 | |
|
||||
| showDeptFeedback | 0 | |
|
||||
| showJiJianFields | 0 | |
|
||||
### 节点: <督办部门经办人发起流程>
|
||||
* taskDefKey: `<Task_00v3pcv>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `0` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
|
||||
### 节点: <督办部门负责人审批>
|
||||
* taskDefKey: `<Task_0zmn6ik>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `0` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <所党委审批>
|
||||
* taskDefKey: `<Task_15sm4w5>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `0` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <收集流程部门负责人接受任务并分配>
|
||||
* taskDefKey: `<Task_1v9ce78>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `1` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `0` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <收集流程门经办人填写>
|
||||
* taskDefKey: `<Task_0jrgrzs>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `1` —— 新增反馈按钮
|
||||
* **showEditFeedback** `1` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `1` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <收集流程部门负责人审批>
|
||||
* taskDefKey: `<Task_0mf32ge>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `1` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <收集流程督办发起人确认部门经办人填写内容>
|
||||
* taskDefKey: `<Task_1w4vxgc>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
|
||||
### 节点: <反馈流程部门经办人填写反馈情况>
|
||||
* taskDefKey: `<Task_08zb04x>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `1` —— 新增反馈按钮
|
||||
* **showEditFeedback** `1` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `1` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <反馈流程部门负责人审批>
|
||||
* taskDefKey: `<Task_04bazej>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `1` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <反馈流程督办经办人核查>
|
||||
* taskDefKey: `<Task_175afz2>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
|
||||
### 节点: <反馈流程督办部门负责人审批>
|
||||
* taskDefKey: `<Task_00i7rrp>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `0` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <反馈流程纪检经办人监察>
|
||||
* taskDefKey: `<Task_1wfkrvj>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `1` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `1` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <反馈流程纪检负责人审批>
|
||||
* taskDefKey: `<Task_1ogk921>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `1` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <督办部门经办人确认全部反馈事项>
|
||||
* taskDefKey: `<Task_0bj578x>`
|
||||
|
||||
* **showProcessHandle** `1` —— 流程办理区域
|
||||
* **showSubApproveUser** `0` —— 是否办结 + 部门经办人
|
||||
* **showFeedbackInfo** `1` —— 反馈信息区域
|
||||
* **showAddFeedback** `0` —— 新增反馈按钮
|
||||
* **showEditFeedback** `0` —— 编辑/删除操作列
|
||||
* **showDeptFeedback** `0` —— 按部门过滤反馈
|
||||
* **showJiJianFields** `1` —— 纪检字段列
|
||||
---
|
||||
|
||||
### 节点: <待填写>
|
||||
- taskDefKey: `<待填写>`
|
||||
| 属性 | 值 | 说明 |
|
||||
|------|-----|------|
|
||||
| showProcessHandle | 0 | |
|
||||
| showSubApproveUser | 0 | |
|
||||
| showApproveInfo | 0 | |
|
||||
| showAddFeedback | 0 | |
|
||||
| showEditFeedback | 0 | |
|
||||
| showDeptFeedback | 0 | |
|
||||
| showJiJianFields | 0 | |
|
||||
|
||||
@@ -13,6 +13,7 @@ enum Api {
|
||||
loadTreeData = '/bg/xispeak/bgXiSpeak/loadTreeRoot',
|
||||
getChildList = '/bg/xispeak/bgXiSpeak/childList',
|
||||
getChildListBatch = '/bg/xispeak/bgXiSpeak/getChildListBatch',
|
||||
getRootListWithDept = '/bg/xispeak/bgXiSpeak/getRootListWithDept',
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -33,6 +34,8 @@ export const getImportUrl = Api.importExcel;
|
||||
*/
|
||||
export const list = (params) => defHttp.get({ url: Api.list, params });
|
||||
|
||||
export const getRootListWithDept = (deptIds: string) => defHttp.get({ url: Api.getRootListWithDept, params: { dept_ids: deptIds } });
|
||||
|
||||
/**
|
||||
* 删除
|
||||
* @param params
|
||||
@@ -181,3 +184,19 @@ export const updateLaunchType = (params) => {
|
||||
export const withDrawXiSpeak = (params) => {
|
||||
return defHttp.post({ url: '/bg/xispeak/bgXiSpeak/withDrawXiSpeak', params }, { joinParamsToUrl: true, isTransformResponse: false });
|
||||
};
|
||||
|
||||
/**
|
||||
* 批量查询反馈统计数量（每个 xispeak 下的 feedback 总条数和已闭环数）
|
||||
* @param params { ids: "id1,id2,id3" }
|
||||
*/
|
||||
export const queryFeedbackCounts = (params) => {
|
||||
return defHttp.get({ url: '/bg/xispeak/bgXiSpeak/queryFeedbackCounts', params });
|
||||
};
|
||||
|
||||
/**
|
||||
* 更新 task_task 的部门经办人姓名
|
||||
* @param params { processInstanceId, deptHandlerName }
|
||||
*/
|
||||
export const updateDeptHandlerName = (params) => {
|
||||
return defHttp.post({ url: '/tasktask/taskTask/updateDeptHandlerName', params }, { isTransformResponse: false });
|
||||
};
|
||||
|
||||
@@ -29,6 +29,12 @@ export const columns: BasicColumn[] = [
|
||||
align: 'center',
|
||||
dataIndex: 'status',
|
||||
},
|
||||
{
|
||||
title: '密级',
|
||||
align: 'center',
|
||||
dataIndex: 'secretLevel_dictText',
|
||||
width: 80,
|
||||
},
|
||||
{
|
||||
title: '责任人',
|
||||
align: 'center',
|
||||
|
||||
@@ -30,6 +30,9 @@
|
||||
</a-dropdown>
|
||||
<!-- 高级查询 -->
|
||||
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
|
||||
<div class="table-title-search">
|
||||
<j-select-dept v-model:value="searchDeptIds" placeholder="选择牵头部门" allow-clear style="width: 100%" @change="handleDeptSearch" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!--操作栏-->
|
||||
@@ -40,49 +43,7 @@
|
||||
<template v-slot:bodyCell="{ column, record, index, text }"> </template>
|
||||
</BasicTable>
|
||||
|
||||
<div v-if="selectedFeedbackId" class="feedback-standalone-panel">
|
||||
<div class="feedback-expand-header">
|
||||
<div class="feedback-expand-title">
|
||||
<span class="feedback-expand-icon">
|
||||
<Icon icon="ant-design:message-outlined" />
|
||||
</span>
|
||||
<span>反馈信息</span>
|
||||
<a-tag class="feedback-expand-count" color="processing">
|
||||
{{ getFeedbackTableLoading(selectedFeedbackRecord) ? '加载中' : `${getFeedbackCount(selectedFeedbackRecord)} 条` }}
|
||||
</a-tag>
|
||||
</div>
|
||||
<div class="feedback-expand-actions">
|
||||
<a-button type="link" size="small" @click="handleCloseFeedback">收起反馈信息</a-button>
|
||||
</div>
|
||||
</div>
|
||||
<BasicTable
|
||||
class="feedback-inner-table"
|
||||
bordered
|
||||
size="small"
|
||||
rowKey="id"
|
||||
:canResize="false"
|
||||
:showIndexColumn="false"
|
||||
:showActionColumn="false"
|
||||
:showTableSetting="false"
|
||||
:clickToRowSelect="false"
|
||||
:columns="feedbackExpandColumns"
|
||||
:dataSource="getFeedbackTableData(selectedFeedbackRecord)"
|
||||
:loading="getFeedbackTableLoading(selectedFeedbackRecord)"
|
||||
:pagination="false"
|
||||
:scroll="{ x: 1220 }"
|
||||
>
|
||||
<template #feedbackAttachments="{ record: feedbackRecord }">
|
||||
<SUploadFile
|
||||
v-if="feedbackRecord.id"
|
||||
class="feedback-attachment-list"
|
||||
:bussiness-id="feedbackRecord.id"
|
||||
:disabled="true"
|
||||
:multiple="true"
|
||||
/>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</BasicTable>
|
||||
</div>
|
||||
<BgXiSpeakFeedbackViewModal ref="feedbackViewModalRef" />
|
||||
<!-- 表单区域 -->
|
||||
<BgXiSpeakModal ref="registerModal" @success="handleSuccess"></BgXiSpeakModal>
|
||||
<!-- 审批记录 -->
|
||||
@@ -96,20 +57,21 @@
|
||||
<script lang="ts" name="bg.xispeak-bgXiSpeak" setup>
|
||||
import { ref, reactive, unref, computed, provide } from 'vue';
|
||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||
import type { BasicColumn } from '/@/components/Table';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { startProcessSchedules } from '/@/api/common/api';
|
||||
import { dateUtil } from '/@/utils/dateUtil';
|
||||
import Icon from '/@/components/Icon/index';
|
||||
|
||||
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
|
||||
import BgXiSpeakModal from './components/BgXiSpeakModal.vue';
|
||||
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
|
||||
|
||||
import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
|
||||
import FlowScheduleStartModal from '/src/components/semri/process/FlowScheduleStartModal.vue';
|
||||
import FeedbackRightNowModal from './components/FeedbackRightNowModal.vue';
|
||||
import BgXiSpeakFeedbackViewModal from './components/BgXiSpeakFeedbackViewModal.vue';
|
||||
import { columns as taskTaskColumns } from '/@/views/taskProcess/TaskTask.data';
|
||||
import { columns, superQuerySchema, bgXiSpeakFeedbackColumns } from './BgXiSpeak.data';
|
||||
import { columns, superQuerySchema } from './BgXiSpeak.data';
|
||||
import {
|
||||
list,
|
||||
deleteBgXiSpeak,
|
||||
@@ -120,8 +82,9 @@
|
||||
getChildListBatch,
|
||||
updateLaunchType,
|
||||
saveOrUpdateDict,
|
||||
bgXiSpeakFeedbackList,
|
||||
withDrawXiSpeak,
|
||||
getRootListWithDept,
|
||||
bgXiSpeakFeedbackList,
|
||||
} from './BgXiSpeak.api';
|
||||
|
||||
const FLOW_CODE = 'dev_bg_xi_speak_001';
|
||||
@@ -133,32 +96,16 @@
|
||||
const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
|
||||
const { createMessage } = useMessage();
|
||||
const expandedRowKeys = ref([]);
|
||||
const queryParam = ref<any>({});
|
||||
const queryParams = ref<any>({});
|
||||
const toggleSearchStatus = ref<boolean>(false);
|
||||
const registerModal = ref();
|
||||
const flowScheduleModalRef = ref();
|
||||
const feedbackViewModalRef = ref();
|
||||
const feedbackRightNowModalRef = ref();
|
||||
const businessProcessListModalRef = ref();
|
||||
const currentBusinessId = ref('');
|
||||
const pendingFeedbackRightNow = ref(0);
|
||||
const processColumns = taskTaskColumns;
|
||||
const selectedFeedbackId = ref<string | number | null>(null);
|
||||
const feedbackTableData = reactive<Record<string, Recordable[]>>({});
|
||||
const feedbackTableLoading = reactive<Record<string, boolean>>({});
|
||||
|
||||
// 注册table数据
|
||||
const feedbackExpandColumns: BasicColumn[] = [
|
||||
...bgXiSpeakFeedbackColumns,
|
||||
{
|
||||
title: '附件下载',
|
||||
dataIndex: 'id',
|
||||
key: 'attachments',
|
||||
align: 'left',
|
||||
width: 340,
|
||||
slots: { customRender: 'feedbackAttachments' },
|
||||
},
|
||||
];
|
||||
|
||||
// 是否显示DW领导列表选择
|
||||
const showSdwLeaderSelect = computed(() => queryParam.value.needSdwApproval === '1');
|
||||
|
||||
@@ -189,15 +136,31 @@
|
||||
},
|
||||
});
|
||||
|
||||
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
|
||||
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource, setTableData }, { rowSelection, selectedRowKeys }] =
|
||||
tableContext;
|
||||
const selectedFeedbackRecord = computed(() => {
|
||||
if (!selectedFeedbackId.value) return {};
|
||||
return findTableDataRecord(selectedFeedbackId.value) || { id: selectedFeedbackId.value };
|
||||
});
|
||||
const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
|
||||
provide('mainId', mainId);
|
||||
|
||||
const searchDeptIds = ref([]);
|
||||
const isDeptSearching = ref(false);
|
||||
|
||||
async function handleDeptSearch(value) {
|
||||
if (!value || (Array.isArray(value) && value.length === 0)) {
|
||||
isDeptSearching.value = false;
|
||||
reload();
|
||||
return;
|
||||
}
|
||||
const deptIds = Array.isArray(value) ? value.join(',') : value;
|
||||
try {
|
||||
const res = await getRootListWithDept(deptIds);
|
||||
isDeptSearching.value = true;
|
||||
const records = res?.records || res || [];
|
||||
setTableData(records);
|
||||
} catch (e) {
|
||||
createMessage.error('按部门查询失败');
|
||||
}
|
||||
}
|
||||
|
||||
const labelCol = reactive({
|
||||
xs: 24,
|
||||
sm: 4,
|
||||
@@ -317,6 +280,9 @@
|
||||
result = result.records ? result.records : result;
|
||||
if (result && result.length > 0) {
|
||||
record.children = getDataByResult(result);
|
||||
await refreshFeedbackCounts(record.children);
|
||||
// 触发表格重新渲染
|
||||
updateTableDataRecord(record.id, { ...record });
|
||||
} else {
|
||||
record.children = null;
|
||||
record.hasChild = '0';
|
||||
@@ -345,11 +311,77 @@
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归收集所有 ID（含子节点）
|
||||
*/
|
||||
function collectAllIds(records) {
|
||||
const ids: string[] = [];
|
||||
const walk = (list) => {
|
||||
if (!list) return;
|
||||
for (const item of list) {
|
||||
if (item.id) ids.push(item.id);
|
||||
if (item.children) walk(item.children);
|
||||
}
|
||||
};
|
||||
walk(records);
|
||||
return ids;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量查询反馈统计数量并更新到 records 中
|
||||
*/
|
||||
async function refreshFeedbackCounts(records) {
|
||||
const ids = collectAllIds(records);
|
||||
if (ids.length === 0) return;
|
||||
try {
|
||||
// 并行加载所有记录的反馈数据
|
||||
const results = await Promise.all(
|
||||
ids.map((id) =>
|
||||
bgXiSpeakFeedbackList({
|
||||
mainId: id,
|
||||
pageNo: 1,
|
||||
pageSize: 9999,
|
||||
column: 'createTime',
|
||||
order: 'desc',
|
||||
}).catch(() => null)
|
||||
)
|
||||
);
|
||||
// 构建 id -> { total, closed } 映射
|
||||
const countsMap: Record<string, { total: number; closed: number }> = {};
|
||||
ids.forEach((id, index) => {
|
||||
const res = results[index];
|
||||
const list = Array.isArray(res) ? res : res?.records || [];
|
||||
const total = list.length;
|
||||
const closed = list.filter((item: any) => item.completionStatus == 1).length;
|
||||
countsMap[id] = { total, closed };
|
||||
});
|
||||
const updateFn = (list) => {
|
||||
if (!list) return;
|
||||
for (const item of list) {
|
||||
const counts = countsMap[item.id];
|
||||
if (counts) {
|
||||
item.implCount = counts.total;
|
||||
item.closedCount = counts.closed;
|
||||
}
|
||||
if (item.children) updateFn(item.children);
|
||||
}
|
||||
};
|
||||
updateFn(records);
|
||||
} catch (e) {
|
||||
// 静默处理查询异常
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 接口请求成功后回调
|
||||
*/
|
||||
function onFetchSuccess(result) {
|
||||
async function onFetchSuccess(result) {
|
||||
getDataByResult(result.items) && loadDataByExpandedRows();
|
||||
if (result.items && result.items.length > 0) {
|
||||
await refreshFeedbackCounts(result.items);
|
||||
// 触发表格重新渲染以显示更新后的 implCount / closedCount
|
||||
setTableData([...getDataSource()]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -450,11 +482,11 @@
|
||||
},
|
||||
auth: 'bg.xispeak:bg_xi_speak:delete',
|
||||
},
|
||||
{
|
||||
label: '审批进度',
|
||||
onClick: handlePreviewPic.bind(null, record),
|
||||
ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
|
||||
},
|
||||
// {
|
||||
// label: '审批进度',
|
||||
// onClick: handlePreviewPic.bind(null, record),
|
||||
// ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
|
||||
// },
|
||||
{
|
||||
label: '查询督办流程',
|
||||
onClick: handleQueryProcess.bind(null, record),
|
||||
@@ -469,7 +501,7 @@
|
||||
ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
|
||||
},
|
||||
{
|
||||
label: selectedFeedbackId.value === record.id ? '收起反馈信息' : '查看反馈',
|
||||
label: '查看反馈',
|
||||
onClick: handleViewFeedback.bind(null, record),
|
||||
},
|
||||
];
|
||||
@@ -604,6 +636,24 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// 查询已有反馈记录，按部门获取处理人姓名
|
||||
const deptHandlerMap = new Map<string, string>();
|
||||
try {
|
||||
const feedbackRes = await bgXiSpeakFeedbackList({ mainId: record.id, pageNo: 1, pageSize: 999 });
|
||||
const feedbackRecords = feedbackRes?.records || feedbackRes?.result?.records || [];
|
||||
for (const fb of feedbackRecords) {
|
||||
const fbDeptIds = splitDeptValue(fb.responDeptid);
|
||||
const handlerName = fb.responPersonname || '';
|
||||
for (const fbDeptId of fbDeptIds) {
|
||||
if (fbDeptId && handlerName && !deptHandlerMap.has(fbDeptId)) {
|
||||
deptHandlerMap.set(fbDeptId, handlerName);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// 查询反馈失败则继续，deptHandlerName 留空
|
||||
}
|
||||
|
||||
let successCount = 0;
|
||||
const total = selectedDeptIds.length;
|
||||
|
||||
@@ -628,6 +678,7 @@
|
||||
urgencyLevel: record.completionStatus,
|
||||
deptId: deptId,
|
||||
deptLeaderId: deptId,
|
||||
deptHandlerName: deptHandlerMap.get(deptId) || '',
|
||||
requireFinishDate: formatDate(record.time, 'YYYY-MM-DD'),
|
||||
deadline: record.deadline || formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
|
||||
},
|
||||
@@ -683,53 +734,8 @@
|
||||
});
|
||||
}
|
||||
|
||||
function getFeedbackKey(record: Recordable) {
|
||||
return String(record?.id ?? '');
|
||||
}
|
||||
|
||||
function getFeedbackTableData(record: Recordable) {
|
||||
return feedbackTableData[getFeedbackKey(record)] || [];
|
||||
}
|
||||
|
||||
function getFeedbackCount(record: Recordable) {
|
||||
return getFeedbackTableData(record).length;
|
||||
}
|
||||
|
||||
function getFeedbackTableLoading(record: Recordable) {
|
||||
return !!feedbackTableLoading[getFeedbackKey(record)];
|
||||
}
|
||||
|
||||
function handleCloseFeedback() {
|
||||
selectedFeedbackId.value = null;
|
||||
}
|
||||
|
||||
async function loadFeedbackTableData(mainId: string | number) {
|
||||
const key = String(mainId);
|
||||
feedbackTableLoading[key] = true;
|
||||
try {
|
||||
const res = await bgXiSpeakFeedbackList({
|
||||
mainId,
|
||||
pageNo: 1,
|
||||
pageSize: 9999,
|
||||
column: 'createTime',
|
||||
order: 'desc',
|
||||
});
|
||||
feedbackTableData[key] = Array.isArray(res) ? res : res?.records || [];
|
||||
} finally {
|
||||
feedbackTableLoading[key] = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function handleViewFeedback(record: Recordable) {
|
||||
const mainId = record.id;
|
||||
if (selectedFeedbackId.value === mainId) {
|
||||
selectedFeedbackId.value = null;
|
||||
} else {
|
||||
selectedFeedbackId.value = mainId;
|
||||
if (!feedbackTableData[mainId] || feedbackTableData[mainId].length === 0) {
|
||||
await loadFeedbackTableData(mainId);
|
||||
}
|
||||
}
|
||||
feedbackViewModalRef.value.open(record);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -759,97 +765,10 @@
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.feedback-standalone-panel {
|
||||
margin: 12px 0;
|
||||
padding: 12px 14px 14px;
|
||||
background: #f6fbff;
|
||||
border: 1px solid #d6e8ff;
|
||||
border-left: 4px solid #1677ff;
|
||||
border-radius: 6px;
|
||||
|
||||
.feedback-expand-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.feedback-expand-title {
|
||||
.table-title-search {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
min-width: 0;
|
||||
color: #1f2937;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
line-height: 24px;
|
||||
}
|
||||
|
||||
.feedback-expand-icon {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
margin-right: 8px;
|
||||
color: #1677ff;
|
||||
background: #e6f4ff;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.feedback-expand-count {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.feedback-expand-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
:deep(.jeecg-basic-table) {
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
:deep(.feedback-inner-table .ant-table-wrapper) {
|
||||
padding: 0;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
:deep(.feedback-inner-table .ant-table-thead > tr > th) {
|
||||
background: #eef6ff;
|
||||
color: #334155;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
:deep(.feedback-inner-table .ant-table-tbody > tr > td) {
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
:deep(.feedback-inner-table .ant-table-tbody > tr:hover > td) {
|
||||
background: #f8fbff;
|
||||
}
|
||||
|
||||
.feedback-attachment-list {
|
||||
min-width: 300px;
|
||||
|
||||
:deep(.file-list-wrapper) {
|
||||
min-height: auto;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
:deep(.file-list-header) {
|
||||
margin-bottom: 6px;
|
||||
padding-bottom: 6px;
|
||||
}
|
||||
|
||||
:deep(.file-list .file-item) {
|
||||
padding: 8px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
:deep(.ant-empty) {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
margin-left: 8px;
|
||||
width: 280px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -68,17 +68,17 @@
|
||||
<!-- <a-textarea v-model:value="formData.completionPlan" :rows="3" allow-clear />-->
|
||||
<!-- </a-form-item>-->
|
||||
<!-- </a-col>-->
|
||||
<a-col :span="12">
|
||||
<a-col v-if="showJiJianFields" :span="12">
|
||||
<a-form-item label="检查情况(纪检)" name="checkStatus">
|
||||
<a-input v-model:value="formData.checkStatus" placeholder="填写监督检查情况，成果是否完整，符合，时间是否按时等" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-col v-if="showJiJianFields" :span="24">
|
||||
<a-form-item label="监督意见(纪检)" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
|
||||
<a-textarea v-model:value="formData.inspectionAdvice" placeholder="是否通过审核" :rows="3" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-col v-if="showJiJianFields" :span="12">
|
||||
<a-form-item label="措施数量(纪检)" name="measureNum">
|
||||
<a-input-number v-model:value="formData.measureNum" placeholder="填写本条举措设计的措施数量" style="width: 100%" allow-clear />
|
||||
</a-form-item>
|
||||
@@ -112,6 +112,9 @@
|
||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||
|
||||
const emit = defineEmits(['success']);
|
||||
const props = defineProps({
|
||||
showJiJianFields: { type: Boolean, default: false },
|
||||
});
|
||||
const { createMessage } = useMessage();
|
||||
const userStore = useUserStore();
|
||||
|
||||
@@ -155,7 +158,8 @@
|
||||
});
|
||||
|
||||
const formRules = {
|
||||
implStatus: [{ required: true, message: '请输入落实情况' }],
|
||||
progress: [{ required: true, message: '请输入进展情况' }],
|
||||
completionStatus: [{ required: true, message: '请选择完成状态' }],
|
||||
};
|
||||
|
||||
function resetForm(mainId = '', bpmProcessId = '') {
|
||||
@@ -188,7 +192,6 @@
|
||||
formData[key] = record[key];
|
||||
}
|
||||
});
|
||||
uploadKey.value += 1;
|
||||
visible.value = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
<template>
|
||||
<a-spin :spinning="loading">
|
||||
<div class="bg-xispeak-bpm-form">
|
||||
<a-form class="main-form" :class="{ 'main-form-readonly': mainDisabled }" labelAlign="left" :labelCol="labelCol" :wrapperCol="wrapperCol" :model="mainForm">
|
||||
<a-form
|
||||
class="main-form"
|
||||
:class="{ 'main-form-readonly': mainDisabled }"
|
||||
labelAlign="left"
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
:model="mainForm"
|
||||
>
|
||||
<div class="base-info-header section-toolbar">
|
||||
<div class="section-title">基础信息</div>
|
||||
<a-space class="section-actions">
|
||||
@@ -9,7 +16,12 @@
|
||||
<Icon icon="ant-design:save-outlined" />
|
||||
保存
|
||||
</a-button>
|
||||
<a-button class="section-action-button" :type="showBaseInfoDetail ? 'default' : 'link'" size="small" @click="showBaseInfoDetail = !showBaseInfoDetail">
|
||||
<a-button
|
||||
class="section-action-button"
|
||||
:type="showBaseInfoDetail ? 'default' : 'link'"
|
||||
size="small"
|
||||
@click="showBaseInfoDetail = !showBaseInfoDetail"
|
||||
>
|
||||
<Icon :icon="showBaseInfoDetail ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
|
||||
{{ showBaseInfoDetail ? '收起基础信息' : '展开全部信息' }}
|
||||
</a-button>
|
||||
@@ -32,6 +44,17 @@
|
||||
<a-date-picker v-model:value="mainForm.time" value-format="YYYY-MM-DD" :disabled="mainDisabled" style="width: 100%" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="密级" name="secretLevel">
|
||||
<j-dict-select-tag
|
||||
v-model:value="mainForm.secretLevel"
|
||||
dictCode="secret_level"
|
||||
placeholder="请选择密级"
|
||||
:disabled="mainDisabled"
|
||||
allow-clear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="责任人" name="responsiblePerson">
|
||||
<j-select-user v-model:value="mainForm.responsiblePerson" :disabled="mainDisabled" allow-clear />
|
||||
@@ -74,12 +97,25 @@
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="完成状态" name="completionStatus">
|
||||
<JDictSelectTag v-model:value="mainForm.completionStatus" dictCode="db_status" placeholder="请选择完成状态" type="radio" :disabled="mainDisabled" />
|
||||
<JDictSelectTag
|
||||
v-model:value="mainForm.completionStatus"
|
||||
dictCode="db_status"
|
||||
placeholder="请选择完成状态"
|
||||
type="radio"
|
||||
:disabled="mainDisabled"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="截止日期" name="deadline">
|
||||
<a-date-picker v-model:value="mainForm.deadline" value-format="YYYY-MM-DD HH:mm:ss" :show-time="true" :disabled="mainDisabled" style="width: 100%" allow-clear />
|
||||
<a-date-picker
|
||||
v-model:value="mainForm.deadline"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
:show-time="true"
|
||||
:disabled="mainDisabled"
|
||||
style="width: 100%"
|
||||
allow-clear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
@@ -120,7 +156,15 @@
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="父级节点" name="pid">
|
||||
<j-tree-select v-model:value="mainForm.pid" dict="bg_xi_speak,impl_status,id" pidField="pid" pidValue="0" hasChildField="has_child" :disabled="mainDisabled" allow-clear />
|
||||
<j-tree-select
|
||||
v-model:value="mainForm.pid"
|
||||
dict="bg_xi_speak,impl_status,id"
|
||||
pidField="pid"
|
||||
pidValue="0"
|
||||
hasChildField="has_child"
|
||||
:disabled="mainDisabled"
|
||||
allow-clear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
@@ -134,14 +178,26 @@
|
||||
|
||||
<a-divider />
|
||||
|
||||
<div class="feedback-header section-toolbar">
|
||||
<div class="feedback-header section-toolbar" v-if="showFeedbackInfo">
|
||||
<div class="section-title">反馈信息</div>
|
||||
<a-space class="section-actions">
|
||||
<a-button v-if="showAddFeedback" class="section-action-button feedback-add-button" type="primary" @click="openFeedbackModal">
|
||||
<Icon icon="ant-design:plus-outlined" />
|
||||
新增反馈
|
||||
</a-button>
|
||||
<a-button
|
||||
class="section-action-button"
|
||||
:type="showFeedbackDetail ? 'default' : 'link'"
|
||||
size="small"
|
||||
@click="showFeedbackDetail = !showFeedbackDetail"
|
||||
>
|
||||
<Icon :icon="showFeedbackDetail ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
|
||||
{{ showFeedbackDetail ? '收起反馈信息' : '展开反馈信息' }}
|
||||
</a-button>
|
||||
</a-space>
|
||||
</div>
|
||||
<a-table
|
||||
v-if="showFeedbackInfo"
|
||||
rowKey="id"
|
||||
size="small"
|
||||
bordered
|
||||
@@ -152,13 +208,7 @@
|
||||
>
|
||||
<template #bodyCell="{ column, record }">
|
||||
<template v-if="column.key === 'attachments'">
|
||||
<SUploadFile
|
||||
v-if="record.id"
|
||||
class="feedback-attachment-list"
|
||||
:bussiness-id="record.id"
|
||||
:disabled="true"
|
||||
:multiple="true"
|
||||
/>
|
||||
<SUploadFile v-if="record.id" class="feedback-attachment-list" :bussiness-id="record.id" :disabled="true" :multiple="true" />
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
<template v-if="column.key === 'feedbackAction'">
|
||||
@@ -170,7 +220,7 @@
|
||||
</template>
|
||||
</a-table>
|
||||
|
||||
<BgXiSpeakBPMFeedbackModal ref="feedbackModalRef" @success="loadFeedbackList" />
|
||||
<BgXiSpeakBPMFeedbackModal ref="feedbackModalRef" :showJiJianFields="showJiJianFields" @success="loadFeedbackList" />
|
||||
|
||||
<template v-if="showProcessHandle">
|
||||
<a-divider />
|
||||
@@ -187,13 +237,9 @@
|
||||
</a-radio-group>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col v-if="showSubApproveUserSelector" :span="12">
|
||||
<a-col v-if="showSubApproveUser" :span="12">
|
||||
<a-form-item label="部门经办人" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
|
||||
<j-select-user
|
||||
v-model:value="subApproveUser"
|
||||
:disabled="savingSubApproveUser"
|
||||
allow-clear
|
||||
/>
|
||||
<j-select-user v-model:value="subApproveUser" :disabled="savingSubApproveUser" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
@@ -219,7 +265,14 @@
|
||||
import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
|
||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||
import Icon from '/@/components/Icon/index';
|
||||
import { bgXiSpeakFeedbackList, bgXiSpeakFeedbackListWithDept, bgXiSpeakFeedbackDelete, saveBpmForm, setProcessVariable } from '../BgXiSpeak.api';
|
||||
import {
|
||||
bgXiSpeakFeedbackList,
|
||||
bgXiSpeakFeedbackListWithDept,
|
||||
bgXiSpeakFeedbackDelete,
|
||||
saveBpmForm,
|
||||
setProcessVariable,
|
||||
updateDeptHandlerName,
|
||||
} from '../BgXiSpeak.api';
|
||||
import { usePermission } from '/@/hooks/web/usePermission';
|
||||
import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
|
||||
import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
|
||||
@@ -235,8 +288,8 @@
|
||||
});
|
||||
|
||||
initBpmFormData(props.formData);
|
||||
console.log("@props.formData", props.formData);
|
||||
console.log("@props", props);
|
||||
console.log('@props.formData', props.formData);
|
||||
console.log('@props', props);
|
||||
|
||||
const emit = defineEmits(['ok', 'success', 'claimSuccess']);
|
||||
const { createMessage } = useMessage();
|
||||
@@ -254,6 +307,7 @@
|
||||
const savingMain = ref(false);
|
||||
const savingSubApproveUser = ref(false);
|
||||
const showBaseInfoDetail = ref(true);
|
||||
const showFeedbackDetail = ref(true);
|
||||
const feedbackList = ref<any[]>([]);
|
||||
const subApproveUser = ref('');
|
||||
const isEnd = ref(0);
|
||||
@@ -265,6 +319,7 @@
|
||||
time: '',
|
||||
elmComment: '',
|
||||
status: '',
|
||||
secretLevel: '',
|
||||
responsiblePerson: '',
|
||||
needSdwApproval: 0,
|
||||
sdwLeaderList: '',
|
||||
@@ -296,11 +351,15 @@
|
||||
{ title: '是否有报送上级报告', dataIndex: 'isReportedToHigher_dictText', align: 'center', width: 140 },
|
||||
{ title: '进展情况', dataIndex: 'progress', align: 'left', width: 200 },
|
||||
{ title: '落实情况', dataIndex: 'implStatus', align: 'left', width: 200 },
|
||||
{ title: '检查情况(纪检)', dataIndex: 'checkStatus', align: 'left', width: 160 },
|
||||
{ title: '监督意见(纪检)', dataIndex: 'inspectionAdvice', align: 'left', width: 160 },
|
||||
{ title: '措施数量(纪检)', dataIndex: 'measureNum', align: 'center', width: 100 },
|
||||
{ title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },
|
||||
];
|
||||
if (showJiJianFields.value) {
|
||||
cols.push(
|
||||
{ title: '检查情况(纪检)', dataIndex: 'checkStatus', align: 'left', width: 160 },
|
||||
{ title: '监督意见(纪检)', dataIndex: 'inspectionAdvice', align: 'left', width: 160 },
|
||||
{ title: '措施数量(纪检)', dataIndex: 'measureNum', align: 'center', width: 100 }
|
||||
);
|
||||
}
|
||||
if (showEditFeedback.value) {
|
||||
cols.push({ title: '操作', dataIndex: 'id', key: 'feedbackAction', align: 'center', width: 120, fixed: 'right' });
|
||||
}
|
||||
@@ -313,11 +372,36 @@
|
||||
}
|
||||
return props.formDisabled;
|
||||
});
|
||||
const showProcessHandle = computed(() => props.formBpm && !!props.formData?.taskId);
|
||||
const showAddFeedback = computed(() => String(props.formData?.extendUrlParams?.addfeedback ?? '') === '1');
|
||||
const showEditFeedback = computed(() => String(props.formData?.extendUrlParams?.editfeedback ?? '') === '1');
|
||||
const showDeptFeedback = computed(() => String(props.formData?.extendUrlParams?.deptfeedback ?? '') === '1');
|
||||
const showSubApproveUser = computed(() => String(props.formData?.extendUrlParams?.selectuser ?? '') === '1');
|
||||
const showProcessHandle = computed(() => {
|
||||
const explicit = props.formData?.extendUrlParams?.showProcessHandle;
|
||||
if (explicit === '0') return false;
|
||||
if (explicit === '1') return true;
|
||||
return props.formBpm && !!props.formData?.taskId;
|
||||
});
|
||||
const showAddFeedback = computed(
|
||||
() => String(props.formData?.extendUrlParams?.showAddFeedback ?? props.formData?.extendUrlParams?.addfeedback ?? '') === '1'
|
||||
);
|
||||
const showFeedbackInfo = computed(() => {
|
||||
const p = props.formData?.extendUrlParams;
|
||||
const explicit = p?.showFeedbackInfo ?? p?.showApproveInfo;
|
||||
if (explicit === '0') return false;
|
||||
if (explicit === '1') return true;
|
||||
// 未显式设置时，任一子属性开启则自动显示反馈区域
|
||||
return String(p?.showAddFeedback ?? p?.addfeedback ?? '') === '1'
|
||||
|| String(p?.showEditFeedback ?? p?.editfeedback ?? '') === '1'
|
||||
|| String(p?.showDeptFeedback ?? p?.deptfeedback ?? '') === '1';
|
||||
});
|
||||
const showEditFeedback = computed(
|
||||
() => String(props.formData?.extendUrlParams?.showEditFeedback ?? props.formData?.extendUrlParams?.editfeedback ?? '') === '1'
|
||||
);
|
||||
const showDeptFeedback = computed(
|
||||
() => String(props.formData?.extendUrlParams?.showDeptFeedback ?? props.formData?.extendUrlParams?.deptfeedback ?? '') === '1'
|
||||
);
|
||||
const showJiJianFields = computed(() => String(props.formData?.extendUrlParams?.showJiJianFields ?? '') === '1');
|
||||
const showDeptFields = computed(() => String(props.formData?.extendUrlParams?.deptfields ?? '') === '1');
|
||||
const showSubApproveUser = computed(
|
||||
() => String(props.formData?.extendUrlParams?.showSubApproveUser ?? props.formData?.extendUrlParams?.selectuser ?? '') === '1'
|
||||
);
|
||||
const showSubApproveUserSelector = computed(() => showSubApproveUser.value && String(isEnd.value) !== '1');
|
||||
|
||||
const processInfo = computed(() => ({
|
||||
@@ -339,10 +423,7 @@
|
||||
initFormData();
|
||||
});
|
||||
|
||||
watch(
|
||||
[() => props.formData?.dataId, () => processInfo.value.processInstanceId],
|
||||
() => initFormData()
|
||||
);
|
||||
watch([() => props.formData?.dataId, () => processInfo.value.processInstanceId], () => initFormData());
|
||||
|
||||
watch(
|
||||
() => props.formData?.vars?.isEnd,
|
||||
@@ -442,7 +523,7 @@
|
||||
createMessage.warning('流程实例ID不能为空，无法新增反馈');
|
||||
return;
|
||||
}
|
||||
feedbackModalRef.value?.open(mainForm.id, undefined, processInstanceId);
|
||||
feedbackModalRef.value?.open(mainForm.id, mainForm.secretLevel, processInstanceId);
|
||||
}
|
||||
|
||||
function handleEditFeedback(record) {
|
||||
@@ -485,6 +566,8 @@
|
||||
createMessage.warning(subApproveUserResult.message || '保存失败');
|
||||
return false;
|
||||
}
|
||||
// 同步更新 task_task 表的 deptHandlerName，供 XiSpeakFeedbackFlow.getImplDeptWorker 使用
|
||||
updateDeptHandlerName({ processInstanceId, deptHandlerName: usernameValue }).catch(() => {});
|
||||
}
|
||||
if (showSuccessMessage) {
|
||||
createMessage.success('保存成功');
|
||||
|
||||
@@ -2,21 +2,30 @@
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<template #detail>
|
||||
<a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef" name="BgXiSpeakFeedbackForm">
|
||||
<a-row>
|
||||
<a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef" :model="formData" :rules="validatorRules" name="BgXiSpeakFeedbackForm">
|
||||
<!-- 基本信息 -->
|
||||
<a-divider orientation="left" plain>基本信息</a-divider>
|
||||
<a-row :gutter="[16, 0]">
|
||||
<a-col :span="12">
|
||||
<a-form-item label="反馈部门" v-bind="validateInfos.responDeptid" name="responDeptid">
|
||||
<a-form-item label="反馈部门" name="responDeptid">
|
||||
<j-select-dept v-model:value="formData.responDeptid" :multiple="true" checkStrictly allow-clear @change="handleDeptChange" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="反馈人" v-bind="validateInfos.responPersonid" name="responPersonid">
|
||||
<a-form-item label="反馈人" name="responPersonid">
|
||||
<j-select-user v-model:value="formData.responPersonid" allow-clear @change="handleUserChange" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="反馈时间" v-bind="validateInfos.responTime" name="responTime">
|
||||
<a-date-picker placeholder="请选择反馈时间" v-model:value="formData.responTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
|
||||
<a-form-item label="反馈时间" name="responTime">
|
||||
<a-date-picker
|
||||
placeholder="请选择反馈时间"
|
||||
v-model:value="formData.responTime"
|
||||
showTime
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
style="width: 100%"
|
||||
allow-clear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
@@ -24,6 +33,10 @@
|
||||
<a-input-number v-model:value="formData.num" placeholder="请输入序号" style="width: 100%" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<!-- 措施内容 -->
|
||||
<a-divider orientation="left" plain>措施信息</a-divider>
|
||||
<a-row :gutter="[16, 0]">
|
||||
<a-col :span="24">
|
||||
<a-form-item label="措施内容" name="method">
|
||||
<a-textarea v-model:value="formData.method" placeholder="请输入措施内容" :rows="3" allow-clear></a-textarea>
|
||||
@@ -31,7 +44,13 @@
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="完成期限" name="deadline">
|
||||
<a-date-picker placeholder="请选择完成期限" v-model:value="formData.deadline" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
|
||||
<a-date-picker
|
||||
placeholder="请选择完成期限"
|
||||
v-model:value="formData.deadline"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
style="width: 100%"
|
||||
allow-clear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
@@ -40,27 +59,48 @@
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="进展情况" name="progress">
|
||||
<a-form-item label="进展情况" v-bind="validateInfos.progress" name="progress">
|
||||
<a-textarea v-model:value="formData.progress" placeholder="请输入进展情况" :rows="3" allow-clear></a-textarea>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<!-- 状态与落实 -->
|
||||
<a-divider orientation="left" plain>状态与落实</a-divider>
|
||||
<a-row :gutter="[16, 0]">
|
||||
<a-col :span="12">
|
||||
<a-form-item label="落实情况" v-bind="validateInfos.implStatus" name="implStatus">
|
||||
<a-form-item label="落实情况" name="implStatus">
|
||||
<a-input v-model:value="formData.implStatus" placeholder="请输入落实情况" allow-clear></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="完成状态" v-bind="validateInfos.completionStatus" name="completionStatus">
|
||||
<JDictSelectTag v-model:value="formData.completionStatus" dictCode="measure_complete_status" placeholder="请选择完成状态" type="select" allow-clear />
|
||||
<JDictSelectTag
|
||||
v-model:value="formData.completionStatus"
|
||||
dictCode="measure_complete_status"
|
||||
placeholder="请选择完成状态"
|
||||
type="select"
|
||||
allow-clear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="是否有报送上级报告" name="isReportedToHigher">
|
||||
<JDictSelectTag v-model:value="formData.isReportedToHigher" dictCode="need_report_higher" placeholder="请选择" type="select" allow-clear />
|
||||
<a-form-item label="是否报送上级报告" name="isReportedToHigher">
|
||||
<JDictSelectTag
|
||||
v-model:value="formData.isReportedToHigher"
|
||||
dictCode="need_report_higher"
|
||||
placeholder="请选择"
|
||||
type="select"
|
||||
allow-clear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="检查情况" name="checkStatus">
|
||||
<a-input v-model:value="formData.checkStatus" placeholder="请输入检查情况" allow-clear></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="落实计划" v-bind="validateInfos.completionPlan" name="completionPlan">
|
||||
<a-form-item label="落实计划" name="completionPlan">
|
||||
<a-textarea v-model:value="formData.completionPlan" placeholder="请输入落实计划" :rows="3" allow-clear></a-textarea>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
@@ -70,8 +110,8 @@
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="检查情况" name="checkStatus">
|
||||
<a-input v-model:value="formData.checkStatus" placeholder="请输入检查情况" allow-clear></a-input>
|
||||
<a-form-item label="措施数量" name="measureNum">
|
||||
<a-input-number v-model:value="formData.measureNum" placeholder="请输入措施数量" style="width: 100%" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
@@ -79,11 +119,10 @@
|
||||
<a-textarea v-model:value="formData.inspectionAdvice" placeholder="请输入监督意见" :rows="3" allow-clear></a-textarea>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="措施数量" name="measureNum">
|
||||
<a-input-number v-model:value="formData.measureNum" placeholder="请输入措施数量" style="width: 100%" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<!-- 周期配置 -->
|
||||
<a-divider orientation="left" plain>周期配置</a-divider>
|
||||
<a-row :gutter="[16, 0]">
|
||||
<a-col :span="12">
|
||||
<a-form-item label="发起类型" name="launchType">
|
||||
<a-select v-model:value="formData.launchType" placeholder="请选择发起类型" allow-clear>
|
||||
@@ -110,15 +149,21 @@
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="周期开始时间" name="startTime">
|
||||
<a-date-picker v-model:value="formData.startTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" placeholder="请选择周期开始时间" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="外键" name="mainId" style="display: none">
|
||||
<a-input v-model:value="formData.mainId" placeholder="请输入外键" allow-clear></a-input>
|
||||
<a-date-picker
|
||||
v-model:value="formData.startTime"
|
||||
showTime
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
style="width: 100%"
|
||||
placeholder="请选择周期开始时间"
|
||||
allow-clear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<!-- 外键隐藏 -->
|
||||
<a-form-item label="外键" name="mainId" style="display: none">
|
||||
<a-input v-model:value="formData.mainId" placeholder="请输入外键" allow-clear></a-input>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</template>
|
||||
</JFormContainer>
|
||||
@@ -127,11 +172,11 @@
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, reactive, defineExpose, nextTick, inject, unref } from 'vue';
|
||||
import { Form } from 'ant-design-vue';
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { getValueType } from '/@/utils';
|
||||
import { bgXiSpeakFeedbackSaveOrUpdate } from '../BgXiSpeak.api';
|
||||
import { Form } from 'ant-design-vue';
|
||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
|
||||
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
|
||||
@@ -139,7 +184,6 @@
|
||||
|
||||
const mainId = inject('mainId');
|
||||
const formRef = ref();
|
||||
const useForm = Form.useForm;
|
||||
const emit = defineEmits(['register', 'ok']);
|
||||
const formData = reactive<Record<string, any>>({
|
||||
id: '',
|
||||
@@ -171,14 +215,17 @@
|
||||
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
|
||||
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
|
||||
const confirmLoading = ref<boolean>(false);
|
||||
const validatorRules = {};
|
||||
const validatorRules = reactive({
|
||||
completionStatus: [{ required: true, message: '请选择完成状态' }],
|
||||
progress: [{ required: true, message: '请输入进展情况' }],
|
||||
});
|
||||
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
|
||||
const props = defineProps({
|
||||
disabled: { type: Boolean, default: false },
|
||||
});
|
||||
const formItemLayout = {
|
||||
labelCol: { xs: { span: 24 }, sm: { span: 5 } },
|
||||
wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
|
||||
labelCol: { xs: { span: 24 }, sm: { span: 6 } },
|
||||
wrapperCol: { xs: { span: 24 }, sm: { span: 18 } },
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -229,7 +276,7 @@
|
||||
|
||||
async function submitForm() {
|
||||
try {
|
||||
await validate();
|
||||
await formRef.value?.validate();
|
||||
} catch ({ errorFields }) {
|
||||
if (errorFields) {
|
||||
const firstField = errorFields[0];
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
}
|
||||
|
||||
function handleOk() {
|
||||
registerForm.value.submitForm();
|
||||
return registerForm.value.submitForm();
|
||||
}
|
||||
|
||||
function submitCallback() {
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
<template>
|
||||
<j-modal
|
||||
:title="title"
|
||||
:width="900"
|
||||
:visible="visible"
|
||||
:okButtonProps="{ class: { 'jee-hidden': true } }"
|
||||
@cancel="handleCancel"
|
||||
cancelText="关闭"
|
||||
>
|
||||
<BasicTable
|
||||
size="small"
|
||||
rowKey="id"
|
||||
:canResize="false"
|
||||
:showIndexColumn="false"
|
||||
:showActionColumn="false"
|
||||
:showTableSetting="false"
|
||||
:clickToRowSelect="false"
|
||||
:columns="columns"
|
||||
:dataSource="feedbackTableData"
|
||||
:loading="loading"
|
||||
:pagination="false"
|
||||
:bordered="false"
|
||||
/>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, computed, defineExpose } from 'vue';
|
||||
import { BasicTable } from '/@/components/Table';
|
||||
import type { BasicColumn } from '/@/components/Table';
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
import { bgXiSpeakFeedbackList } from '../BgXiSpeak.api';
|
||||
|
||||
const visible = ref(false);
|
||||
const loading = ref(false);
|
||||
const feedbackTableData = ref<Recordable[]>([]);
|
||||
const currentRecord = ref<Recordable>({});
|
||||
|
||||
const columns: BasicColumn[] = [
|
||||
{
|
||||
title: '反馈人',
|
||||
dataIndex: 'responPersonname',
|
||||
align: 'center',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '反馈部门',
|
||||
dataIndex: 'responDeptname',
|
||||
align: 'center',
|
||||
width: 140,
|
||||
},
|
||||
{
|
||||
title: '反馈措施',
|
||||
dataIndex: 'method',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
},
|
||||
{
|
||||
title: '完成状态',
|
||||
dataIndex: 'completionStatus_dictText',
|
||||
align: 'center',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '成果形式',
|
||||
dataIndex: 'outcomeForm',
|
||||
align: 'center',
|
||||
width: 120,
|
||||
},
|
||||
];
|
||||
|
||||
const title = computed(() => {
|
||||
const count = loading.value ? '加载中' : `${feedbackTableData.value.length} 条`;
|
||||
return `反馈信息（${count}）`;
|
||||
});
|
||||
|
||||
async function open(record: Recordable) {
|
||||
currentRecord.value = record;
|
||||
visible.value = true;
|
||||
loading.value = true;
|
||||
try {
|
||||
const res = await bgXiSpeakFeedbackList({
|
||||
mainId: record.id,
|
||||
pageNo: 1,
|
||||
pageSize: 9999,
|
||||
column: 'createTime',
|
||||
order: 'desc',
|
||||
});
|
||||
feedbackTableData.value = Array.isArray(res) ? res : res?.records || [];
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function handleCancel() {
|
||||
visible.value = false;
|
||||
}
|
||||
|
||||
defineExpose({ open });
|
||||
</script>
|
||||
@@ -29,6 +29,11 @@
|
||||
<a-input v-model:value="formData.status" placeholder="请输入学习传达研究部署情况" allow-clear></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="密级" v-bind="validateInfos.secretLevel" id="BgXiSpeakForm-secretLevel" name="secretLevel">
|
||||
<j-dict-select-tag v-model:value="formData.secretLevel" dictCode="secret_level" placeholder="请选择密级" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="责任人" v-bind="validateInfos.responsiblePerson" id="BgXiSpeakForm-responsiblePerson" name="responsiblePerson">
|
||||
<j-select-user v-model:value="formData.responsiblePerson" placeholder="请从所党委选择责任人" allow-clear />
|
||||
@@ -202,6 +207,7 @@
|
||||
time: '',
|
||||
elmComment: '经单位主要负责同时签批同意，由xx部做好贯彻落实',
|
||||
status: 'x月x日召开xxxx年第x次党委会议',
|
||||
secretLevel: '',
|
||||
responsiblePerson: '',
|
||||
needSdwApproval: 0,
|
||||
sdwLeaderList: '',
|
||||
@@ -234,6 +240,7 @@
|
||||
time: [{ required: true, message: '请选择时间' }],
|
||||
elmComment: [{ required: true, message: '请输入企业负责同志批示情况' }],
|
||||
status: [{ required: true, message: '请输入学习传达研究部署情况' }],
|
||||
secretLevel: [{ required: true, message: '请选择密级' }],
|
||||
responsiblePerson: [{ required: true, message: '请选择责任人' }],
|
||||
needSdwApproval: [{ required: true, message: '请选择是否需要督办领导' }],
|
||||
implMeasures: [{ required: true, message: '请输入贯彻落实措施' }],
|
||||
|
||||
Reference in New Issue
Block a user