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

!27 refactor(xispeak): 改造列表页搜索框为表单式搜索区域

Browse Source 
* refactor(xispeak): 改造列表页搜索框为表单式搜索区域
* Merge branch 'master' into feature/20260610
* fix(inspectTask): BPM表单移除措施数量/流程实例ID/流程状态/督办次数/排序字段，调整具体问题和整改措施label宽度对齐
* refactor(inspectTask): 合并基本信息与状态与统计为一个区域
* fix(inspectTask): 台账列表移除措施数量/流程状态/督办次数/排序列
* fix(inspectTask): 移除反馈数量和督办次数字段，措施数量/督办次数设为不可编辑
* fix(inspectTask): 党群领导条件显示，移除流程实例ID/流程状态/排序字段
* fix(inspectTask): 修复编辑时子表数据未回传导致反馈记录被清空
This commit is contained in:
new_new_new
2026-06-10 08:31:25 +00:00
parent 2b61314ae8
commit 67b60231ba
5 changed files with 121 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/dq/inspectTask/BPM_NODE_PERMISSIONS.md
+5 -5
View File
@@ -68,7 +68,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
* **showEditFeedback** `0` —— 编辑/删除操作列
* **showDeptFeedback** `0` —— 按部门过滤反馈
* **showJiJianFields** `0` —— 纪检字段列
* dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1
* dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1
---
### 节点: <党群经办人审查>
@@ -82,7 +82,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
* **showEditFeedback** `0` —— 编辑/删除操作列
* **showDeptFeedback** `0` —— 按部门过滤反馈
* **showJiJianFields** `0` —— 纪检字段列
* dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1&showFeedbackInfo=1
* dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1&showFeedbackInfo=1
* 可驳回
---
@@ -98,7 +98,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
* **showEditFeedback** `0` —— 编辑/删除操作列
* **showDeptFeedback** `0` —— 按部门过滤反馈
* **showJiJianFields** `0` —— 纪检字段列
* dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1&showIsNeedLeaderApprove=1&showSelnextUser=1
* dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1&showIsNeedLeaderApprove=1&showSelnextUser=1
---
### 节点: <分管所领导审批>
@@ -112,7 +112,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
* **showEditFeedback** `0` —— 编辑/删除操作列
* **showDeptFeedback** `0` —— 按部门过滤反馈
* **showJiJianFields** `0` —— 纪检字段列
* dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1
* dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1
---
### 节点: <所党委书记审批>
@@ -126,5 +126,5 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头）
* **showEditFeedback** `0` —— 编辑/删除操作列
* **showDeptFeedback** `0` —— 按部门过滤反馈
* **showJiJianFields** `0` —— 纪检字段列
* dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1
* dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1
---
src/views/dq/inspectTask/DqInspectTask.data.ts
-20
View File
@@ -290,29 +290,9 @@ export const ledgerColumns: BasicColumn[] = [
align:"center",
dataIndex: 'supervisoryOpinion'
},
{
title: '措施数量',
align:"center",
dataIndex: 'measureCount'
},
{
title: '流程状态',
align:"center",
dataIndex: 'bpmStatus_dictText'
},
{
title: '整改状态',
align:"center",
dataIndex: 'taskStatus'
},
{
title: '督办次数',
align:"center",
dataIndex: 'superviseCount'
},
{
title: '排序',
align:"center",
dataIndex: 'sortNo'
},
];
src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue
+2 -27
View File
@@ -29,7 +29,7 @@
</div>
<a-row class="base-info-row" :gutter="[12, 4]">
<a-col :span="24">
<a-form-item label="具体问题" name="problemId">
<a-form-item label="具体问题" name="problemId" :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }">
<a-tree-select
v-model:value="mainForm.problemId"
:tree-data="problemTreeData"
@@ -43,7 +43,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="整改措施" name="improveMeasure">
<a-form-item label="整改措施" name="improveMeasure" :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 20 } }">
<a-textarea v-model:value="mainForm.improveMeasure" :auto-size="{ minRows: 1, maxRows: 4 }" :disabled="mainDisabled" allow-clear />
</a-form-item>
</a-col>
@@ -109,36 +109,11 @@
<a-input v-model:value="mainForm.supervisoryOpinion" :disabled="mainDisabled" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="措施数量" name="measureCount">
<a-input-number v-model:value="mainForm.measureCount" :disabled="mainDisabled" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="流程实例ID" name="bpmProcessId">
<a-input v-model:value="mainForm.bpmProcessId" :disabled="mainDisabled" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="流程状态" name="bpmStatus">
<j-dict-select-tag v-model:value="mainForm.bpmStatus" dictCode="super_status" placeholder="请选择流程状态" :disabled="mainDisabled" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="整改状态" name="taskStatus">
<a-input v-model:value="mainForm.taskStatus" :disabled="mainDisabled" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="督办次数" name="superviseCount">
<a-input v-model:value="mainForm.superviseCount" :disabled="mainDisabled" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="排序" name="sortNo">
<a-input-number v-model:value="mainForm.sortNo" :disabled="mainDisabled" style="width: 100%" />
</a-form-item>
</a-col>
</template>
</a-row>
</a-form>
src/views/dq/inspectTask/components/DqInspectTaskForm.vue
+29 -48
View File
@@ -40,6 +40,21 @@
<a-input v-model:value="formData.targetNode" placeholder="请输入目标节点" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="检查情况" v-bind="validateInfos.inspectionStatus" id="DqInspectTaskForm-inspectionStatus" name="inspectionStatus">
<a-input v-model:value="formData.inspectionStatus" placeholder="请输入检查情况" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="监督意见" v-bind="validateInfos.supervisoryOpinion" id="DqInspectTaskForm-supervisoryOpinion" name="supervisoryOpinion">
<a-input v-model:value="formData.supervisoryOpinion" placeholder="请输入监督意见" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="整改状态" v-bind="validateInfos.taskStatus" id="DqInspectTaskForm-taskStatus" name="taskStatus">
<a-input v-model:value="formData.taskStatus" placeholder="请输入整改状态" allow-clear></a-input>
</a-form-item>
</a-col>
</a-row>
<!-- 责任与监督 -->
@@ -75,57 +90,12 @@
<j-dict-select-tag type='radio' v-model:value="formData.isNeedAppro" dictCode="yn" placeholder="请选择是否需要党群领导审批" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col v-if="formData.isNeedAppro === '1'" :span="12">
<a-form-item label="党群领导" v-bind="validateInfos.supDeptleaderid" id="DqInspectTaskForm-supDeptleaderid" name="supDeptleaderid">
<j-select-user v-model:value="formData.supDeptleaderid" 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="检查情况" v-bind="validateInfos.inspectionStatus" id="DqInspectTaskForm-inspectionStatus" name="inspectionStatus">
<a-input v-model:value="formData.inspectionStatus" placeholder="请输入检查情况" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="监督意见" v-bind="validateInfos.supervisoryOpinion" id="DqInspectTaskForm-supervisoryOpinion" name="supervisoryOpinion">
<a-input v-model:value="formData.supervisoryOpinion" placeholder="请输入监督意见" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="措施数量" v-bind="validateInfos.measureCount" id="DqInspectTaskForm-measureCount" name="measureCount">
<a-input-number v-model:value="formData.measureCount" placeholder="请输入措施数量" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="流程实例ID" v-bind="validateInfos.bpmProcessId" id="DqInspectTaskForm-bpmProcessId" name="bpmProcessId">
<a-input v-model:value="formData.bpmProcessId" placeholder="请输入流程实例ID" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="流程状态" v-bind="validateInfos.bpmStatus" id="DqInspectTaskForm-bpmStatus" name="bpmStatus">
<j-dict-select-tag v-model:value="formData.bpmStatus" dictCode="super_status" placeholder="请选择流程状态" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="整改状态" v-bind="validateInfos.taskStatus" id="DqInspectTaskForm-taskStatus" name="taskStatus">
<a-input v-model:value="formData.taskStatus" placeholder="请输入整改状态" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="督办次数" v-bind="validateInfos.superviseCount" id="DqInspectTaskForm-superviseCount" name="superviseCount">
<a-input v-model:value="formData.superviseCount" placeholder="请输入督办次数" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="排序" v-bind="validateInfos.sortNo" id="DqInspectTaskForm-sortNo" name="sortNo">
<a-input-number v-model:value="formData.sortNo" placeholder="请输入排序" style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
</JFormContainer>
@@ -336,8 +306,19 @@
async function submitForm() {
const mainData = await getFormData();
// 工作进展子表当前未渲染时 ref 为空，提交主表即可；后续恢复子表时仍走原校验取数逻辑。
const subData = dqInspectProgressTableRef.value ? await getSubFormAndTableData() : {};
// 工作进展子表当前未渲染时 ref 为空，此时需回查已有子表数据一并提交，
// 否则后端 updateMain 的 deleteByMainId + re-insert 模式会清空全部反馈记录及附件。
let subData: Record<string, any> = {};
if (dqInspectProgressTableRef.value) {
subData = await getSubFormAndTableData();
} else if (formData.id) {
try {
const existingList = await queryDqInspectProgressListByMainId(formData.id);
if (existingList && existingList.length > 0) {
subData = { dqInspectProgressList: existingList };
}
} catch {}
}
const values = Object.assign({}, dbData, mainData, subData);
console.log('表单提交数据', values)
const isUpdate = values.id ? true : false