sz-team/supervision-test-frontend-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!7 集成删除相关流程按钮

Browse Source 
Merge pull request !7 from new_new_new/feature/0514-adapt
This commit is contained in:
new_new_new
2026-05-15 08:43:37 +00:00
committed by Gitee
parent fccd0b1354 350e2120ee
commit 0d4d3b0c09
7 changed files with 1005 additions and 829 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/bg/xispeak/BgXiSpeak.api.ts
+4
View File
@@ -166,3 +166,7 @@ export const setProcessVariable = (params) => {
export const updateLaunchType = (params) => {
return defHttp.post({ url: '/bg/xispeak/bgXiSpeak/edit', params }, { isTransformResponse: false });
};
export const withDrawXiSpeak = (params) => {
return defHttp.post({ url: '/bg/xispeak/bgXiSpeak/withDrawXiSpeak', params }, { joinParamsToUrl: true, isTransformResponse: false });
};
src/views/bg/xispeak/BgXiSpeak.data.ts
+19 -19
View File
@@ -85,30 +85,30 @@ export const columns: BasicColumn[] = [
dataIndex: 'delayRiskMitigation',
},
{
title: '完成状态(0推进中，1已完成)',
title: '完成状态',
align: 'center',
dataIndex: 'completionStatus',
dataIndex: 'completionStatus_dictText',
},
{
title: '落实部门id',
title: '落实部门',
align: 'center',
dataIndex: 'implDept_dictText',
},
{
title: '层深(最顶层节点层深为0)',
align: 'center',
dataIndex: 'treeDepth',
},
{
title: '同级数据排序号',
align: 'center',
dataIndex: 'sortOrder',
},
{
title: '流程引擎状态字段',
align: 'center',
dataIndex: 'bpmStatus',
},
// {
// title: '层深(最顶层节点层深为0)',
// align: 'center',
// dataIndex: 'treeDepth',
// },
// {
// title: '同级数据排序号',
// align: 'center',
// dataIndex: 'sortOrder',
// // },
// {
// title: '流程引擎状态字段',
// align: 'center',
// dataIndex: 'bpmStatus',
// },
{
title: '督办次数',
align: 'center',
@@ -250,7 +250,7 @@ export const superQuerySchema = {
reportFeedbackStatus: { title: '报告反馈情况', order: 13, view: 'text', type: 'string' },
isCompletionRisk: { title: '是否存在完成风险(0不存在，1存在)', order: 14, view: 'number', type: 'number' },
delayRiskMitigation: { title: '拖期风险应对措施', order: 15, view: 'text', type: 'string' },
completionStatus: { title: '完成状态(0推进中，1已完成)', order: 16, view: 'number', type: 'number' },
completionStatus: { title: '完成状态(督办中，1已完成)', order: 16, view: 'number', type: 'number' },
implDept: { title: '落实部门id', order: 17, view: 'sel_depart', type: 'string' },
treeDepth: { title: '层深(最顶层节点层深为0)', order: 18, view: 'number', type: 'number' },
sortOrder: { title: '同级数据排序号', order: 19, view: 'number', type: 'number' },
src/views/bg/xispeak/BgXiSpeakList.vue
+98 -268
View File
@@ -1,8 +1,6 @@
<template>
<div class="erpNativeList">
<div class="content">
<!--引用表格-->
<BasicTable @register="registerTable" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
<div>
<BasicTable @register="registerTable" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">新增</a-button>
@@ -30,15 +28,6 @@
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<!-- 自定义展开图标，完全复刻 Jeecg 原生树形效果 -->
<template #expandIcon="{ expanded, onExpand, record }">
<span v-if="record.hasChild === '1'" class="jeecg-tree-expand-icon" @click="(e) => onExpand(record, e)">
<!-- 用方块样式的加减号，和 Jeecg 原生一致 -->
<Icon :icon="expanded ? 'ant-design:minus-square-outlined' : 'ant-design:plus-square-outlined'" />
</span>
<span v-else class="jeecg-tree-expand-placeholder"></span>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
@@ -92,12 +81,12 @@
</div>
</template>
</BasicTable>
</div>
<!-- 表单区域 -->
<BgXiSpeakModal ref="registerModal" @success="handleSuccess"></BgXiSpeakModal>
<!-- 审批记录 -->
<BpmPictureModal @register="registerBpmModal" />
<FlowScheduleStartModal ref="flowScheduleModalRef" @confirm="handleFlowScheduleConfirm" />
<FeedbackRightNowModal ref="feedbackRightNowModalRef" @confirm="handleFeedbackRightNowConfirm" />
<BusinessProcessListModal ref="businessProcessListModalRef" />
</div>
</template>
@@ -116,6 +105,7 @@
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 { columns as taskTaskColumns } from '/@/views/taskProcess/TaskTask.data';
import { columns, superQuerySchema, bgXiSpeakFeedbackColumns } from './BgXiSpeak.data';
import {
@@ -127,7 +117,9 @@
getChildList,
getChildListBatch,
updateLaunchType,
saveOrUpdateDict,
bgXiSpeakFeedbackList,
withDrawXiSpeak,
} from './BgXiSpeak.api';
const FLOW_CODE = 'dev_bg_xi_speak_001';
@@ -143,7 +135,9 @@
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const flowScheduleModalRef = ref();
const feedbackRightNowModalRef = ref();
const businessProcessListModalRef = ref();
const pendingFeedbackRightNow = ref(0);
const processColumns = taskTaskColumns;
const selectedFeedbackId = ref<string | number | null>(null);
const feedbackTableData = reactive<Record<string, Recordable[]>>({});
@@ -166,6 +160,7 @@
const showSdwLeaderSelect = computed(() => queryParam.value.needSdwApproval === '1');
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
designScope: 'bg-xispeak-template',
tableProps: {
title: '习总书记重要讲话指示批示情况',
api: list,
@@ -173,13 +168,7 @@
canResize: false,
useSearchForm: false,
isTreeTable: true,
indentSize: 24, // 和 Jeecg 原生树形缩进保持一致
expandIconColumnIndex: 0,
clickToRowSelect: true,
treeProps: {
children: 'children',
indent: 24, // 和 indentSize 保持一致，保证缩进对齐
},
actionColumn: {
width: 120,
fixed: 'right',
@@ -190,7 +179,6 @@
},
afterFetch: (result) => {
if (result && result.length > 0) {
// 为有子节点的记录设置 children（用于显示展开图标）
result.forEach((item) => {
if (item.hasChild == '1' && (!item.children || item.children.length === 0)) {
item.children = [{ id: item.id + '_loadChild', name: 'loading...', isLoading: true }];
@@ -274,6 +262,16 @@
await deleteBgXiSpeak({ id: record.id }, success);
}
async function handleWithDraw(record) {
const res = await withDrawXiSpeak({ id: record.id });
if (res.success) {
createMessage.success(res.message || '删除流程成功');
reload();
} else {
createMessage.error(res.message || '删除流程失败');
}
}
/**
* 批量删除事件
*/
@@ -471,6 +469,15 @@
label: '查询督办流程',
onClick: handleQueryProcess.bind(null, record),
},
{
label: '删除关联流程',
popConfirm: {
title: '确定删除该记录关联的所有运行中流程吗？',
confirm: handleWithDraw.bind(null, record),
placement: 'topLeft',
},
ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
},
{
label: selectedFeedbackId.value === record.id ? '收起反馈信息' : '查看反馈',
onClick: handleViewFeedback.bind(null, record),
@@ -487,14 +494,62 @@
onClick: handleProcessJbr.bind(null, record),
});
}
if (record.bpmStatus == '2') {
dropDownAction.push({
label: '再次发起经办人执行反馈流程',
onClick: handleProcessJbr.bind(null, record),
});
}
return dropDownAction;
}
function splitDeptValue(value) {
if (Array.isArray(value)) {
return value.map((item) => String(item || '').trim()).filter(Boolean);
}
return String(value || '')
.split(/[,\uFF0C]/)
.map((item) => item.trim())
.filter(Boolean);
}
function getImplDeptOptions(record) {
const deptIds = splitDeptValue(record?.implDept);
const deptNames = splitDeptValue(record?.implDept_dictText);
return deptIds.map((deptId, index) => ({
value: deptId,
label: deptNames[index] || deptId,
}));
}
function getLeadDeptOptions(record) {
const deptIds = splitDeptValue(record?.leadDepartment);
const deptNames = splitDeptValue(record?.leadDepartment_dictText);
return deptIds.map((deptId, index) => ({
value: deptId,
label: deptNames[index] || deptId,
}));
}
function getNextSuperviseCount(value) {
const count = Number(value || 0);
return Number.isFinite(count) ? count + 1 : 1;
}
function handleProcess(record) {
feedbackRightNowModalRef.value?.open(record);
}
function handleFeedbackRightNowConfirm({ record, feedbackRightNow }) {
pendingFeedbackRightNow.value = feedbackRightNow;
flowScheduleModalRef.value?.open({
title: '发起督办计划收集流程',
payload: { record },
deptOptions: getLeadDeptOptions(record),
showSuoleaderFields: true,
isNeedAppro: record?.needSdwApproval,
supDeptleaderid: record?.sdwLeaderList,
});
}
@@ -502,6 +557,10 @@
flowScheduleModalRef.value?.open({
title: '发起落实部门经办人执行反馈流程',
payload: { record, flowCode: FLOW_CODE_JBR },
deptOptions: getImplDeptOptions(record),
showSuoleaderFields: true,
isNeedAppro: record?.needSdwApproval,
supDeptleaderid: record?.sdwLeaderList,
});
}
@@ -520,46 +579,33 @@
return value ? dateUtil(value).format(format) : undefined;
};
// triggerType: 1=立即发起, 2=重复发起; launchType: 0=收集后直接发起, 1=收集后周期性发起
const launchType = options.triggerType === 2 ? 1 : 0;
// 先保存 launchType 到主表
if (flowCode === FLOW_CODE) {
await updateLaunchType({ id: record.id, launchType });
}
// 合并选中的DW领导列表到record中
const recordWithSdwLeader = {
const nextSuperviseCount = getNextSuperviseCount(record.supervisionCount);
const flowJsonData = {
...record,
sdwLeaderList: queryParam.value.sdwLeaderList || '',
needSdwApproval: queryParam.value.needSdwApproval || '',
isNeedAppro: options.isNeedAppro ?? record.needSdwApproval ?? '',
supDeptleaderid: options.supDeptleaderid ?? record.sdwLeaderList ?? '',
supervisionCount: nextSuperviseCount,
feedback_right_now: flowCode === FLOW_CODE ? pendingFeedbackRightNow.value : undefined,
};
// 如果是经办人执行反馈流程，需要遍历每个部门单独发起
if (flowCode === FLOW_CODE_JBR) {
let approveInfo = {};
if (record.approveInfo) {
try {
approveInfo = typeof record.approveInfo === 'string' ? JSON.parse(record.approveInfo) : record.approveInfo;
} catch (e) {
createMessage.error('审批信息解析失败');
return;
}
}
const deptKeys = Object.keys(approveInfo);
if (deptKeys.length === 0) {
createMessage.warning('没有可用的部门审批信息');
const selectedDeptIds = options.deptIds || [];
if (selectedDeptIds.length === 0) {
createMessage.warning('请选择落实部门');
return;
}
let successCount = 0;
const total = deptKeys.length;
for (const deptId of deptKeys) {
const deptApproveDetail = approveInfo[deptId];
const implUserIdList = deptApproveDetail.implUserIdList || [];
const implUserNameList = deptApproveDetail.implUserNameList || [];
const total = selectedDeptIds.length;
for (const deptId of selectedDeptIds) {
const params = {
intervalType: options.intervalType,
startCount: options.startCount,
@@ -570,21 +616,16 @@
formUrl: FORM_URL,
flowName: '落实部门经办人执行反馈流程',
jsonData: {
...recordWithSdwLeader,
...flowJsonData,
currentDeptId: deptId,
currentApproverId: deptApproveDetail.approverId,
currentApproverName: deptApproveDetail.approverName,
implUserIdList: implUserIdList.join(','),
implUserNameList: implUserNameList.join(','),
},
businessTablename: BUSINESS_TABLE_NAME,
businessId: record.id,
deptHandlerName: deptApproveDetail.implUserNameList.join(','),
title: record.speakStatus,
content: record.implStatus,
urgencyLevel: record.completionStatus,
deptId: deptId,
deptLeaderId: deptApproveDetail.approverId,
deptLeaderId: deptId,
requireFinishDate: formatDate(record.time, 'YYYY-MM-DD'),
deadline: formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
},
@@ -594,6 +635,7 @@
await startProcessSchedules(params);
successCount++;
if (successCount === total) {
await saveOrUpdateDict({ id: record.id, bpmStatus: '2', supervisionCount: nextSuperviseCount, completionStatus: 0 }, true);
createMessage.success(`成功发起 ${total} 个经办人执行反馈流程`);
reload();
}
@@ -604,7 +646,6 @@
return;
}
// 原有的督办计划收集流程逻辑
const params = {
intervalType: options.intervalType,
startCount: options.startCount,
@@ -614,13 +655,13 @@
flowCode: flowCode,
formUrl: FORM_URL,
flowName: FLOW_NAME,
jsonData: recordWithSdwLeader,
jsonData: flowJsonData,
businessTablename: BUSINESS_TABLE_NAME,
businessId: record.id,
title: record.speakStatus,
content: record.implStatus,
urgencyLevel: record.completionStatus,
deptId: record.leadDepartment,
deptId: options.deptId || record.leadDepartment,
deptLeaderId: record.responsiblePerson,
requireFinishDate: formatDate(record.time, 'YYYY-MM-DD'),
deadline: formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),
@@ -628,6 +669,7 @@
};
await startProcessSchedules(params);
await saveOrUpdateDict({ id: record.id, bpmStatus: '2', supervisionCount: nextSuperviseCount, completionStatus: 0 }, true);
createMessage.success('发起成功');
reload();
}
@@ -715,199 +757,6 @@
</script>
<style lang="less" scoped>
.erpNativeList {
height: 100%;
padding: 16px;
background: #f5f7fa;
// 查询区域卡片
.search-card {
background: #fff;
border-radius: 8px;
padding: 20px 24px;
margin-bottom: 16px;
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.04);
transition: box-shadow 0.3s ease;
&:hover {
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
}
:deep(.ant-form-item) {
margin-bottom: 0;
}
:deep(.ant-select),
:deep(.ant-picker) {
border-radius: 6px;
}
}
// 内容区域
.content {
background: #fff;
border-radius: 8px;
padding: 0;
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.04);
overflow: hidden;
}
// 表格标题区域
:deep(.ant-table-title) {
padding: 16px 20px !important;
border-bottom: 1px solid #f0f0f0;
background: #fafafa;
.ant-btn {
height: 32px;
padding: 0 16px;
border-radius: 6px;
font-size: 13px;
margin-right: 8px;
border: none;
transition: all 0.2s ease;
&:hover {
transform: translateY(-1px);
box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
}
&:active {
transform: translateY(0);
}
}
.ant-btn-primary {
background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
&:hover {
background: linear-gradient(135deg, #40a9ff 0%, #1890ff 100%);
}
}
}
// 表格样式优化
:deep(.ant-table-thead > tr > th) {
background: #fafafa;
font-weight: 600;
color: #333;
border-bottom: 1px solid #f0f0f0;
padding: 12px 16px;
}
:deep(.ant-table-tbody > tr > td) {
padding: 14px 16px;
border-bottom: 1px solid #f5f5f5;
transition: background 0.2s ease;
}
// 树形表格缩进样式，和 Jeecg 原生对齐
:deep(.ant-table-row) {
.ant-table-row-indent {
display: inline-block;
width: 24px; // 和 indentSize 保持一致
height: 1px;
}
}
:deep(.ant-table-tbody > tr:hover > td) {
background: #f5f7fa;
}
// Jeecg 原生风格的树形展开图标
:deep(.jeecg-tree-expand-icon) {
display: inline-flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
margin-right: 6px;
cursor: pointer;
border-radius: 2px;
transition: all 0.2s;
&:hover {
background-color: #f0f0f0;
}
.anticon {
font-size: 14px;
color: #666;
transition: color 0.2s;
}
&:hover .anticon {
color: #1890ff;
}
}
:deep(.jeecg-tree-expand-placeholder) {
display: inline-block;
width: 20px;
height: 20px;
margin-right: 6px;
}
// 操作按钮样式
:deep(.ant-btn-link) {
padding: 4px 8px;
height: auto;
border-radius: 4px;
&:hover {
background: rgba(24, 144, 255, 0.1);
}
}
// 标签页样式
:deep(.ant-tabs) {
margin: 16px;
.ant-tabs-nav {
margin-bottom: 12px;
}
.ant-tabs-tab {
padding: 8px 0;
font-size: 14px;
&:hover {
color: #1890ff;
}
}
.ant-tabs-tab-active .ant-tabs-tab-btn {
color: #1890ff;
font-weight: 500;
}
}
// 下拉菜单样式
:deep(.ant-dropdown-menu-item) {
border-radius: 4px;
margin: 2px 4px;
&:hover {
background: #e6f7ff;
}
}
// 分页样式
:deep(.ant-pagination) {
padding: 16px 20px;
margin: 0 !important;
border-top: 1px solid #f0f0f0;
background: #fafafa;
}
// 搜索和重置按钮
:deep(.ant-form-item-with-search) {
display: flex;
justify-content: flex-end;
gap: 8px;
}
}
.feedback-expand-table {
margin: 4px 10px 12px 42px;
padding: 12px 14px 14px;
@@ -915,7 +764,6 @@
border: 1px solid #d6e8ff;
border-left: 4px solid #1677ff;
border-radius: 6px;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.72);
.feedback-expand-header {
display: flex;
@@ -951,13 +799,6 @@
margin-left: 10px;
}
.feedback-expand-desc {
color: #64748b;
font-size: 13px;
line-height: 22px;
white-space: nowrap;
}
.feedback-expand-actions {
display: flex;
align-items: center;
@@ -1009,15 +850,4 @@
}
}
}
// 响应式适配
@media (max-width: 768px) {
.erpNativeList {
padding: 12px;
.search-card {
padding: 16px;
}
}
}
</style>
src/views/bg/xispeak/components/BgXiSpeakBPMFeedbackModal.vue
+305
View File
@@ -0,0 +1,305 @@
<template>
<JModal
title="新增反馈"
:width="820"
:visible="visible"
:confirmLoading="saving"
okText="保存"
cancelText="取消"
@ok="handleOk"
@cancel="handleCancel"
>
<a-form
ref="formRef"
class="bpm-feedback-modal-form"
:model="formData"
:rules="formRules"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-row :gutter="16">
<a-col :span="12">
<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="反馈人" 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="序号" name="num">
<a-input-number v-model:value="formData.num" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="完成期限" name="deadline">
<a-date-picker 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="24">
<a-form-item label="措施内容" name="method" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.method" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="成果形式" name="outcomeForm">
<a-input v-model:value="formData.outcomeForm" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="完成状态" name="completionStatus">
<a-input v-model:value="formData.completionStatus" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="进展情况" name="progress" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.progress" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实情况" name="implStatus" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.implStatus" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实计划" name="completionPlan" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.completionPlan" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="总措施号" name="sumMethodNum">
<a-input v-model:value="formData.sumMethodNum" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="检查情况" name="checkStatus">
<a-input v-model:value="formData.checkStatus" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="监督意见" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.inspectionAdvice" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="措施数量" name="measureNum">
<a-input-number v-model:value="formData.measureNum" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="发起类型" name="launchType">
<a-select v-model:value="formData.launchType" placeholder="请选择发起类型" allow-clear>
<a-select-option :value="0">立即发起</a-select-option>
<a-select-option :value="1">周期发起</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="周期类型" name="intervalType">
<a-select v-model:value="formData.intervalType" placeholder="请选择周期类型" allow-clear>
<a-select-option :value="1">日</a-select-option>
<a-select-option :value="2">周</a-select-option>
<a-select-option :value="3">两周</a-select-option>
<a-select-option :value="4">月</a-select-option>
<a-select-option :value="5">季</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="周期任务数量" name="startCount">
<a-input-number v-model:value="formData.startCount" style="width: 100%" allow-clear />
</a-form-item>
</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="24">
<a-form-item label="附件" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<SUploadFile
:key="uploadKey"
ref="uploadFileRef"
:bussiness-id="formData.id"
:bussiness-secret-level="uploadSecretLevel"
:multiple="true"
/>
</a-form-item>
</a-col>
</a-row>
</a-form>
</JModal>
</template>
<script lang="ts" setup>
import { nextTick, reactive, ref } from 'vue';
import { useMessage } from '/@/hooks/web/useMessage';
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
import { bgXiSpeakFeedbackSaveOrUpdate } from '../BgXiSpeak.api';
import { useUserStore } from '/@/store/modules/user';
import { buildUUID } from '/@/utils/uuid';
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
const emit = defineEmits(['success']);
const { createMessage } = useMessage();
const userStore = useUserStore();
const visible = ref(false);
const saving = ref(false);
const formRef = ref();
const uploadFileRef = ref<InstanceType<typeof SUploadFile> | null>(null);
const uploadSecretLevel = ref(1);
const uploadKey = ref(0);
const labelCol = { xs: { span: 24 }, sm: { span: 7 } };
const wrapperCol = { xs: { span: 24 }, sm: { span: 17 } };
const wideLabelCol = { xs: { span: 24 }, sm: { span: 3 } };
const wideWrapperCol = { xs: { span: 24 }, sm: { span: 21 } };
const formData = reactive<Record<string, any>>({
id: '',
responDeptid: '',
responDeptname: '',
responPersonid: '',
responPersonname: '',
implStatus: '',
completionStatus: '',
completionPlan: '',
mainId: '',
bpmProcessId: '',
num: undefined,
method: '',
deadline: '',
outcomeForm: '',
progress: '',
sumMethodNum: '',
checkStatus: '',
inspectionAdvice: '',
measureNum: undefined,
launchType: undefined,
intervalType: undefined,
startCount: undefined,
startTime: '',
});
const formRules = {
implStatus: [{ required: true, message: '请输入落实情况' }],
};
function resetForm(mainId = '', bpmProcessId = '') {
Object.keys(formData).forEach((key) => {
if (key === 'num' || key === 'measureNum' || key === 'launchType' || key === 'intervalType' || key === 'startCount') {
formData[key] = undefined;
} else {
formData[key] = '';
}
});
formData.mainId = mainId;
formData.bpmProcessId = bpmProcessId;
uploadKey.value += 1;
nextTick(() => formRef.value?.clearValidate?.());
}
function open(mainId: string, secretLevel?: string | number, bpmProcessId = '') {
resetForm(mainId, bpmProcessId);
uploadSecretLevel.value = normalizeSecretLevel(secretLevel);
void applyCurrentUserFeedbackInfo();
visible.value = true;
}
function normalizeSecretLevel(value?: string | number) {
const level = Number(value);
return [1, 2, 3, 4].includes(level) ? level : 1;
}
function getCurrentLoginDepart() {
const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
const loginInfo = (userStore.getLoginInfo || {}) as Record<string, any>;
const departs = Array.isArray(loginInfo.departs) ? loginInfo.departs : [];
if (userInfo.orgCode) {
return departs.find((item) => item.orgCode === userInfo.orgCode);
}
return departs.length === 1 ? departs[0] : undefined;
}
async function getCurrentDepartInfo() {
const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
const loginDepart = getCurrentLoginDepart();
if (loginDepart) {
return {
id: loginDepart.id || '',
departName: loginDepart.departName || '',
};
}
return {
id: userInfo.departIds || '',
departName: userInfo.departIds_dictText || userInfo.orgCodeTxt || '',
};
}
async function applyCurrentUserFeedbackInfo() {
const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
formData.responPersonid = userInfo.id || userInfo.userId || '';
formData.responPersonname = userInfo.realname || '';
const departInfo = await getCurrentDepartInfo();
formData.responDeptid = departInfo.id;
formData.responDeptname = departInfo.departName;
}
function handleDeptChange(value, row) {
if (row) {
formData.responDeptname = row.name || '';
}
}
function handleUserChange(value, row) {
if (row) {
formData.responPersonname = row.realname || row.name || '';
}
}
function handleCancel() {
visible.value = false;
}
async function handleOk() {
try {
await formRef.value?.validate?.();
} catch {
return;
}
saving.value = true;
try {
await applyCurrentUserFeedbackInfo();
if (!formData.id && uploadFileRef.value?.hasPendingFiles?.()) {
formData.id = buildUUID();
}
const res = await bgXiSpeakFeedbackSaveOrUpdate({ ...formData }, false);
if (res.success) {
if (formData.id && uploadFileRef.value?.hasPendingFiles?.()) {
await uploadFileRef.value.bindBussinessId(formData.id);
}
createMessage.success(res.message || '保存成功');
visible.value = false;
emit('success');
} else {
createMessage.warning(res.message || '保存失败');
}
} finally {
saving.value = false;
}
}
defineExpose({
open,
});
</script>
<style lang="less" scoped>
.bpm-feedback-modal-form {
padding: 12px 8px 0;
}
</style>
src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+464 -439
View File
File diff suppressed because it is too large Load Diff
src/views/bg/xispeak/components/BgXiSpeakForm.vue
+60 -103
View File
@@ -3,118 +3,115 @@
<JFormContainer :disabled="disabled">
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BgXiSpeakForm">
<a-row :gutter="20">
<a-col :span="24">
<a-form-item label="习近平总书记重要讲话指示批示情况" v-bind="validateInfos.speakStatus">
<a-input v-model:value="formData.speakStatus" placeholder="请输入重要指示批示情况" allow-clear></a-input>
<a-row>
<a-col :span="12">
<a-form-item label="重要讲话指示批示" v-bind="validateInfos.speakStatus" id="BgXiSpeakForm-speakStatus" name="speakStatus">
<a-textarea v-model:value="formData.speakStatus" :rows="4" placeholder="请输入重要指示批示情况" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="时间" v-bind="validateInfos.time">
<a-col :span="12">
<a-form-item label="时间" v-bind="validateInfos.time" id="BgXiSpeakForm-time" name="time">
<a-date-picker placeholder="请选择时间" v-model:value="formData.time" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="责任人" v-bind="validateInfos.responsiblePerson">
<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" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="是否需要督办领导" v-bind="validateInfos.needSdwApproval">
<a-radio-group v-model:value="formData.needSdwApproval" class="radio-group">
<a-col :span="12">
<a-form-item label="企业负责同志批示情况" v-bind="validateInfos.elmComment" id="BgXiSpeakForm-elmComment" name="elmComment">
<a-input v-model:value="formData.elmComment" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="学习传达研究部署情况" v-bind="validateInfos.status" id="BgXiSpeakForm-status" name="status">
<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.needSdwApproval" id="BgXiSpeakForm-needSdwApproval" name="needSdwApproval">
<a-radio-group v-model:value="formData.needSdwApproval">
<a-radio :value="1">是</a-radio>
<a-radio :value="0">否</a-radio>
</a-radio-group>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.needSdwApproval === 1">
<a-form-item label="督导领导列表" v-bind="validateInfos.sdwLeaderList">
<a-col v-if="formData.needSdwApproval === 1" :span="12">
<a-form-item label="督导领导列表" v-bind="validateInfos.sdwLeaderList" id="BgXiSpeakForm-sdwLeaderList" name="sdwLeaderList">
<j-select-user v-model:value="formData.sdwLeaderList" :multiple="true" allow-clear placeholder="请选择督导领导" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="企业负责同志批示情况" v-bind="validateInfos.elmComment">
<a-input v-model:value="formData.elmComment" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="学习传达研究部署情况" v-bind="validateInfos.status">
<a-input v-model:value="formData.status" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="牵头部门" v-bind="validateInfos.leadDepartment">
<a-col :span="12">
<a-form-item label="牵头部门" v-bind="validateInfos.leadDepartment" id="BgXiSpeakForm-leadDepartment" name="leadDepartment">
<j-select-dept v-model:value="formData.leadDepartment" :multiple="true" checkStrictly allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实部门" v-bind="validateInfos.implDept">
<a-col :span="12">
<a-form-item label="落实部门" v-bind="validateInfos.implDept" id="BgXiSpeakForm-implDept" name="implDept">
<j-select-dept v-model:value="formData.implDept" :multiple="true" checkStrictly allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实方案" v-bind="validateInfos.implPlan">
<a-col :span="12">
<a-form-item label="落实方案" v-bind="validateInfos.implPlan" id="BgXiSpeakForm-implPlan" name="implPlan">
<a-input v-model:value="formData.implPlan" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="贯彻落实措施" v-bind="validateInfos.implMeasures">
<a-col :span="12">
<a-form-item label="贯彻落实措施" v-bind="validateInfos.implMeasures" id="BgXiSpeakForm-implMeasures" name="implMeasures">
<a-input v-model:value="formData.implMeasures" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="会议决策数" v-bind="validateInfos.numberOfResolutions">
<a-col :span="12">
<a-form-item label="会议决策数" v-bind="validateInfos.numberOfResolutions" id="BgXiSpeakForm-numberOfResolutions" name="numberOfResolutions">
<a-input-number v-model:value="formData.numberOfResolutions" placeholder="请输入" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实条数" v-bind="validateInfos.implCount">
<a-col :span="12">
<a-form-item label="落实条数" v-bind="validateInfos.implCount" id="BgXiSpeakForm-implCount" name="implCount">
<a-input-number v-model:value="formData.implCount" placeholder="请输入" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="已闭环数量" v-bind="validateInfos.closedCount">
<a-col :span="12">
<a-form-item label="已闭环数量" v-bind="validateInfos.closedCount" id="BgXiSpeakForm-closedCount" name="closedCount">
<a-input-number v-model:value="formData.closedCount" placeholder="请输入" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实情况" v-bind="validateInfos.implStatus">
<a-input v-model:value="formData.implStatus" placeholder="请输入" allow-clear></a-input>
<a-col :span="12">
<a-form-item label="落实情况" v-bind="validateInfos.implStatus" id="BgXiSpeakForm-implStatus" name="implStatus">
<a-textarea v-model:value="formData.implStatus" :rows="4" placeholder="请输入" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="报告反馈情况" v-bind="validateInfos.reportFeedbackStatus">
<a-col :span="12">
<a-form-item label="报告反馈情况" v-bind="validateInfos.reportFeedbackStatus" id="BgXiSpeakForm-reportFeedbackStatus" name="reportFeedbackStatus">
<a-input v-model:value="formData.reportFeedbackStatus" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="是否存在完成风险">
<a-radio-group v-model:value="formData.isCompletionRisk" class="radio-group">
<a-col :span="12">
<a-form-item label="是否存在完成风险" id="BgXiSpeakForm-isCompletionRisk" name="isCompletionRisk">
<a-radio-group v-model:value="formData.isCompletionRisk">
<a-radio :value="0">不存在</a-radio>
<a-radio :value="1">存在</a-radio>
</a-radio-group>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="完成状态">
<a-radio-group v-model:value="formData.completionStatus" class="radio-group">
<a-radio :value="0">推进中</a-radio>
<a-radio :value="1">已完成</a-radio>
</a-radio-group>
<a-col :span="12">
<a-form-item label="完成状态" id="BgXiSpeakForm-completionStatus" name="completionStatus">
<JDictSelectTag v-model:value="formData.completionStatus" dictCode="db_status" placeholder="请选择完成状态" type="radio" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="拖期风险应对措施" v-bind="validateInfos.delayRiskMitigation">
<a-col :span="12">
<a-form-item label="拖期风险应对措施" v-bind="validateInfos.delayRiskMitigation" id="BgXiSpeakForm-delayRiskMitigation" name="delayRiskMitigation">
<a-input v-model:value="formData.delayRiskMitigation" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="督办次数" v-bind="validateInfos.supervisionCount">
<a-col :span="12">
<a-form-item label="督办次数" v-bind="validateInfos.supervisionCount" id="BgXiSpeakForm-supervisionCount" name="supervisionCount">
<a-input-number v-model:value="formData.supervisionCount" placeholder="请输入" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="父级节点" v-bind="validateInfos.pid">
<a-col :span="12">
<a-form-item label="父级节点" v-bind="validateInfos.pid" id="BgXiSpeakForm-pid" name="pid">
<j-tree-select
v-model:value="formData.pid"
dict="bg_xi_speak,impl_status,id"
@@ -125,8 +122,8 @@
/>
</a-form-item>
</a-col>
<a-col v-if="showFlowSubmitButton" :span="24" class="submit-area">
<a-button preIcon="ant-design:check-outlined" style="width: 140px; height: 40px" type="primary" @click="submitForm">提 交</a-button>
<a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%; text-align: center">
<a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
</a-col>
</a-row>
</a-form>
@@ -142,6 +139,7 @@
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getValueType } from '/@/utils';
import { loadTreeData, saveOrUpdateDict } from '../BgXiSpeak.api';
import { Form } from 'ant-design-vue';
@@ -156,7 +154,6 @@
const emit = defineEmits(['register', 'ok']);
let model: Nullable<Recordable> = null;
// 1. 初始化值修改：needSdwApproval 默认为 0
const formData = reactive<Record<string, any>>({
id: '',
pid: '',
@@ -187,11 +184,10 @@
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 6 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 18 } });
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);
// 2. 表单验证：明确 needSdwApproval 的验证
const validatorRules = reactive({
needSdwApproval: [{ required: true, message: '请选择是否需要督办领导' }],
speakStatus: [{ required: true, message: '请输入指示批示情况' }],
@@ -244,7 +240,6 @@
const tmpData = {};
Object.keys(formData).forEach((key) => {
// 3. 赋值增强：处理后端返回 null 的情况
if (record.hasOwnProperty(key)) {
tmpData[key] = record[key] === null ? (key === 'needSdwApproval' ? 0 : '') : record[key];
}
@@ -278,7 +273,6 @@
return Promise.reject(errorFields);
}
// 4. 提交兜底：确保数值有效
if (formData.needSdwApproval === undefined || formData.needSdwApproval === null) {
formData.needSdwApproval = 0;
}
@@ -286,7 +280,6 @@
confirmLoading.value = true;
const isUpdate = !!formData.id;
// 拷贝一份数据进行转换，避免污染原始响应式对象
const params = { ...formData };
for (let key in params) {
@@ -323,43 +316,7 @@
</script>
<style lang="less" scoped>
/* 保持原有样式不变 */
.antd-modal-form {
padding: 20px;
.submit-area {
text-align: center;
padding-top: 16px;
margin-top: 8px;
border-top: 1px dashed #e8e8e8;
}
:deep(.ant-form-item-label > label) {
font-weight: 500;
color: #333;
}
:deep(.ant-radio-group.radio-group .ant-radio-wrapper) {
margin-right: 16px;
font-size: 14px;
}
:deep(.ant-input),
:deep(.ant-input-number),
:deep(.ant-select),
:deep(.ant-picker) {
border-radius: 6px;
transition: all 0.3s ease;
&:hover {
border-color: #40a9ff;
}
}
:deep(.ant-btn-primary) {
height: 40px;
padding: 0 32px;
border-radius: 6px;
background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
border: none;
font-size: 15px;
&:hover {
background: linear-gradient(135deg, #40a9ff 0%, #1890ff 100%);
}
}
padding: 14px;
}
</style>
src/views/bg/xispeak/components/FeedbackRightNowModal.vue
+55
View File
@@ -0,0 +1,55 @@
<template>
<JModal
title="发起督办计划收集流程"
:width="480"
:visible="visible"
:confirmLoading="confirming"
okText="确认"
cancelText="取消"
@ok="handleOk"
@cancel="handleCancel"
>
<a-form :label-col="{ style: { width: '100%' } }">
<a-form-item>
<a-radio-group v-model:value="feedbackRightNow">
<a-space direction="vertical">
<a-radio :value="1">督办计划收集流程结束后需要立即反馈</a-radio>
<a-radio :value="0">无需立即反馈</a-radio>
</a-space>
</a-radio-group>
</a-form-item>
</a-form>
</JModal>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const emit = defineEmits(['confirm']);
const visible = ref(false);
const confirming = ref(false);
const feedbackRightNow = ref(0);
const contextRecord = ref<any>(null);
function open(record: any) {
feedbackRightNow.value = 0;
contextRecord.value = record;
visible.value = true;
}
function handleCancel() {
visible.value = false;
}
function handleOk() {
emit('confirm', {
record: contextRecord.value,
feedbackRightNow: feedbackRightNow.value,
});
visible.value = false;
}
defineExpose({ open });
</script>