fix(inspectTask): 修复前端页面 QA 审查发现的问题
- 整改措施搜索改普通输入,避免 JInput like 双包裹导致无法命中 - 措施责任领导列解绑、流程操作菜单随状态显示 - 发起流程弹窗补充发起类型说明,高级查询字段去技术词 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -172,7 +172,7 @@ export const dqInspectProgressColumns: JVxeColumn[] = [
|
|||||||
|
|
||||||
// 高级查询数据
|
// 高级查询数据
|
||||||
export const superQuerySchema = {
|
export const superQuerySchema = {
|
||||||
problemId: {title: '具体问题ID',order: 0,view: 'text', type: 'string',},
|
problemId: {title: '具体问题',order: 0,view: 'text', type: 'string',},
|
||||||
secretLevel: {title: '密级',order: 1,view: 'list', type: 'string',dictCode: 'secret_level',},
|
secretLevel: {title: '密级',order: 1,view: 'list', type: 'string',dictCode: 'secret_level',},
|
||||||
improveMeasure: {title: '整改措施',order: 2,view: 'text', type: 'string',},
|
improveMeasure: {title: '整改措施',order: 2,view: 'text', type: 'string',},
|
||||||
deadline: {title: '完成时限',order: 3,view: 'date', type: 'string',},
|
deadline: {title: '完成时限',order: 3,view: 'date', type: 'string',},
|
||||||
@@ -186,7 +186,7 @@ export const superQuerySchema = {
|
|||||||
inspectionStatus: {title: '检查情况',order: 11,view: 'text', type: 'string',},
|
inspectionStatus: {title: '检查情况',order: 11,view: 'text', type: 'string',},
|
||||||
supervisoryOpinion: {title: '监督意见',order: 12,view: 'text', type: 'string',},
|
supervisoryOpinion: {title: '监督意见',order: 12,view: 'text', type: 'string',},
|
||||||
measureCount: {title: '措施数量',order: 13,view: 'number', type: 'number',},
|
measureCount: {title: '措施数量',order: 13,view: 'number', type: 'number',},
|
||||||
bpmProcessId: {title: '流程实例ID',order: 14,view: 'text', type: 'string',},
|
bpmProcessId: {title: '流程实例',order: 14,view: 'text', type: 'string',},
|
||||||
bpmStatus: {title: '流程状态',order: 15,view: 'list', type: 'string',dictCode: 'super_status',},
|
bpmStatus: {title: '流程状态',order: 15,view: 'list', type: 'string',dictCode: 'super_status',},
|
||||||
taskStatus: {title: '整改状态',order: 16,view: 'text', type: 'string',},
|
taskStatus: {title: '整改状态',order: 16,view: 'text', type: 'string',},
|
||||||
superviseCount: {title: '督办次数',order: 17,view: 'text', type: 'string',},
|
superviseCount: {title: '督办次数',order: 17,view: 'text', type: 'string',},
|
||||||
@@ -196,9 +196,9 @@ export const superQuerySchema = {
|
|||||||
title: '工作进展反馈',
|
title: '工作进展反馈',
|
||||||
view: 'table',
|
view: 'table',
|
||||||
fields: {
|
fields: {
|
||||||
feedbackDeptId: {title: '反馈部门ID',order: 0,view: 'text', type: 'string',},
|
feedbackDeptId: {title: '反馈部门',order: 0,view: 'text', type: 'string',},
|
||||||
feedbackDeptName: {title: '反馈部门名称',order: 1,view: 'text', type: 'string',},
|
feedbackDeptName: {title: '反馈部门名称',order: 1,view: 'text', type: 'string',},
|
||||||
feedbackPersonId: {title: '反馈人ID',order: 2,view: 'text', type: 'string',},
|
feedbackPersonId: {title: '反馈人',order: 2,view: 'text', type: 'string',},
|
||||||
feedbackPersonName: {title: '反馈人姓名',order: 3,view: 'text', type: 'string',},
|
feedbackPersonName: {title: '反馈人姓名',order: 3,view: 'text', type: 'string',},
|
||||||
actualTime: {title: '实际完成时间',order: 4,view: 'datetime', type: 'string',},
|
actualTime: {title: '实际完成时间',order: 4,view: 'datetime', type: 'string',},
|
||||||
workProgress: {title: '工作进展',order: 5,view: 'text', type: 'string',},
|
workProgress: {title: '工作进展',order: 5,view: 'text', type: 'string',},
|
||||||
@@ -254,7 +254,7 @@ export const ledgerColumns: BasicColumn[] = [
|
|||||||
{
|
{
|
||||||
title: '措施责任领导',
|
title: '措施责任领导',
|
||||||
align:"center",
|
align:"center",
|
||||||
dataIndex: 'measureResDept_dictText'
|
dataIndex: 'measureResLeader_dictText'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '密级',
|
title: '密级',
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :xl="6" :lg="6" :md="8" :sm="12">
|
<a-col :xl="6" :lg="6" :md="8" :sm="12">
|
||||||
<a-form-item label="整改措施" name="improveMeasure">
|
<a-form-item label="整改措施" name="improveMeasure">
|
||||||
<JInput v-model:value="queryParam.improveMeasure" type="like" placeholder="请输入整改措施" allow-clear trim @change="reload" />
|
<a-input v-model:value="queryParam.improveMeasure" placeholder="请输入整改措施" allow-clear @pressEnter="reload" @change="reload" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :xl="6" :lg="6" :md="8" :sm="12">
|
<a-col :xl="6" :lg="6" :md="8" :sm="12">
|
||||||
@@ -150,7 +150,6 @@
|
|||||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||||
import { useMessage } from '/@/hooks/web/useMessage';
|
import { useMessage } from '/@/hooks/web/useMessage';
|
||||||
import Icon from '/@/components/Icon/index';
|
import Icon from '/@/components/Icon/index';
|
||||||
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
|
|
||||||
import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
|
import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
|
||||||
import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
|
import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
|
||||||
import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
|
import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
|
||||||
@@ -386,12 +385,12 @@
|
|||||||
*/
|
*/
|
||||||
function getFlowMenuList(record) {
|
function getFlowMenuList(record) {
|
||||||
const list: any[] = [];
|
const list: any[] = [];
|
||||||
// if ((record.bpmStatus == '1' || !record.bpmStatus) && record.completedStage === 0) {
|
if ((record.bpmStatus == '1' || !record.bpmStatus) && record.completedStage === 0) {
|
||||||
list.push({ text: '发起巡视整改流程', icon: 'ant-design:play-circle-outlined', event: 'process', onClick: handleProcess.bind(null, record) });
|
list.push({ text: '发起巡视整改流程', icon: 'ant-design:play-circle-outlined', event: 'process', onClick: handleProcess.bind(null, record) });
|
||||||
// }
|
}
|
||||||
// if (record.bpmStatus && record.bpmStatus !== '1' && record.completedStage === 2) {
|
if (record.bpmStatus && record.bpmStatus !== '1' && record.completedStage === 2) {
|
||||||
list.push({ text: '发起销号流程', icon: 'ant-design:stop-outlined', event: 'deleteProcess', onClick: handleDeleteProcess.bind(null, record) });
|
list.push({ text: '发起销号流程', icon: 'ant-design:stop-outlined', event: 'deleteProcess', onClick: handleDeleteProcess.bind(null, record) });
|
||||||
// }
|
}
|
||||||
list.push({
|
list.push({
|
||||||
text: '查询督办流程',
|
text: '查询督办流程',
|
||||||
icon: 'ant-design:search-outlined',
|
icon: 'ant-design:search-outlined',
|
||||||
@@ -399,26 +398,26 @@
|
|||||||
divider: true,
|
divider: true,
|
||||||
onClick: handleQueryProcess.bind(null, record),
|
onClick: handleQueryProcess.bind(null, record),
|
||||||
});
|
});
|
||||||
// if (!record.bpmStatus || record.bpmStatus == '1') {
|
if (!record.bpmStatus || record.bpmStatus == '1') {
|
||||||
// list.push({
|
list.push({
|
||||||
// text: '调整为未发起巡视整改流程状态',
|
text: '调整为未发起巡视整改流程状态',
|
||||||
// icon: 'ant-design:rollback-outlined',
|
icon: 'ant-design:rollback-outlined',
|
||||||
// event: 'adj0',
|
event: 'adj0',
|
||||||
// onClick: () => adjustCompletedStage(record, 0),
|
onClick: () => adjustCompletedStage(record, 0),
|
||||||
// });
|
});
|
||||||
// list.push({
|
list.push({
|
||||||
// text: '调整为未发起销号流程状态',
|
text: '调整为未发起销号流程状态',
|
||||||
// icon: 'ant-design:check-circle-outlined',
|
icon: 'ant-design:check-circle-outlined',
|
||||||
// event: 'adj2',
|
event: 'adj2',
|
||||||
// onClick: () => adjustCompletedStage(record, 2),
|
onClick: () => adjustCompletedStage(record, 2),
|
||||||
// });
|
});
|
||||||
// list.push({
|
list.push({
|
||||||
// text: '调整为已完成销号流程状态',
|
text: '调整为已完成销号流程状态',
|
||||||
// icon: 'ant-design:check-circle-outlined',
|
icon: 'ant-design:check-circle-outlined',
|
||||||
// event: 'adj4',
|
event: 'adj4',
|
||||||
// onClick: () => adjustCompletedStage(record, 4),
|
onClick: () => adjustCompletedStage(record, 4),
|
||||||
// });
|
});
|
||||||
//}
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
<a-radio value="immediate">立即发起</a-radio>
|
<a-radio value="immediate">立即发起</a-radio>
|
||||||
<a-radio value="recurring">重复发起</a-radio>
|
<a-radio value="recurring">重复发起</a-radio>
|
||||||
</a-radio-group>
|
</a-radio-group>
|
||||||
|
<div style="color: #999; font-size: 12px; line-height: 1.6; margin-top: 4px">立即发起:仅发起一次;重复发起:按周期重复发起</div>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
||||||
<a-form-item v-if="deptOptions.length" label="牵头部门">
|
<a-form-item v-if="deptOptions.length" label="牵头部门">
|
||||||
|
|||||||
Reference in New Issue
Block a user