From b54394bf9e22d4cee7a109a5ed6c34c69b4138be Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 6 Aug 2026 10:26:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore(demo):=20=E5=88=A0=E9=99=A4=20supervi?= =?UTF-8?q?siontest=20=E6=BC=94=E7=A4=BA=E6=A8=A1=E5=9D=97=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除 SupervisionTestList/Form/Modal 组件及 api/data 文件(5 个文件), 对应后端模块与菜单已同步移除。 --- .../supervisiontest/SupervisionTest.api.ts | 64 ------ .../supervisiontest/SupervisionTest.data.ts | 120 ---------- .../supervisiontest/SupervisionTestList.vue | 216 ------------------ .../components/SupervisionTestForm.vue | 70 ------ .../components/SupervisionTestModal.vue | 99 -------- 5 files changed, 569 deletions(-) delete mode 100644 src/views/supervisiontest/SupervisionTest.api.ts delete mode 100644 src/views/supervisiontest/SupervisionTest.data.ts delete mode 100644 src/views/supervisiontest/SupervisionTestList.vue delete mode 100644 src/views/supervisiontest/components/SupervisionTestForm.vue delete mode 100644 src/views/supervisiontest/components/SupervisionTestModal.vue diff --git a/src/views/supervisiontest/SupervisionTest.api.ts b/src/views/supervisiontest/SupervisionTest.api.ts deleted file mode 100644 index fb2e6d0..0000000 --- a/src/views/supervisiontest/SupervisionTest.api.ts +++ /dev/null @@ -1,64 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import { useMessage } from "/@/hooks/web/useMessage"; - -const { createConfirm } = useMessage(); - -enum Api { - list = '/supervisiontest/supervisionTest/list', - save='/supervisiontest/supervisionTest/add', - edit='/supervisiontest/supervisionTest/edit', - deleteOne = '/supervisiontest/supervisionTest/delete', - deleteBatch = '/supervisiontest/supervisionTest/deleteBatch', - importExcel = '/supervisiontest/supervisionTest/importExcel', - exportXls = '/supervisiontest/supervisionTest/exportXls', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - createConfirm({ - iconType: 'warning', - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} diff --git a/src/views/supervisiontest/SupervisionTest.data.ts b/src/views/supervisiontest/SupervisionTest.data.ts deleted file mode 100644 index a8fa891..0000000 --- a/src/views/supervisiontest/SupervisionTest.data.ts +++ /dev/null @@ -1,120 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -import { getWeekMonthQuarterYear } from '/@/utils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '附件1', - align:"center", - dataIndex: 'fileurl1', - }, - { - title: '附件2', - align:"center", - dataIndex: 'fileurl2', - }, - { - title: '督办标题', - align:"center", - dataIndex: 'supervisionTitle' - }, - { - title: '督办人', - align:"center", - dataIndex: 'supervisionPerson_dictText' - }, - { - title: '督办部门', - align:"center", - dataIndex: 'supervisionDepart_dictText' - }, - { - title: '督办类型', - align:"center", - dataIndex: 'supervitionType' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '附件1', - field: 'fileurl1', - component: 'JUpload', - componentProps:{ - }, - }, - { - label: '附件2', - field: 'fileurl2', - component: 'JUpload', - componentProps:{ - }, - }, - { - label: '督办标题', - field: 'supervisionTitle', - component: 'Input', - }, - { - label: '督办人', - field: 'supervisionPerson', - component: 'JSelectUser', - componentProps:{ - }, - }, - { - label: '督办部门', - field: 'supervisionDepart', - component: 'JSelectDept', - componentProps:{ - }, - }, - { - label: '督办类型', - field: 'supervitionType', - component: 'JPopup', - componentProps: ({ formActionType }) => { - const {setFieldsValue} = formActionType; - return{ - setFieldsValue:setFieldsValue, - code:"", - fieldConfig: [ - { source: '', target: '' }, - ], - multi:true - } - }, - - }, - // TODO 主键隐藏字段,目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false - }, -]; - -// 高级查询数据 -export const superQuerySchema = { - fileurl1: {title: '附件1',order: 0,view: 'file', type: 'string',}, - fileurl2: {title: '附件2',order: 1,view: 'file', type: 'string',}, - supervisionTitle: {title: '督办标题',order: 2,view: 'text', type: 'string',}, - supervisionPerson: {title: '督办人',order: 3,view: 'sel_user', type: 'string',}, - supervisionDepart: {title: '督办部门',order: 4,view: 'sel_depart', type: 'string',}, - supervitionType: {title: '督办类型',order: 5,view: 'popup', type: 'string',code: '', orgFields: '', destFields: 'supervitionType', popupMulti: false,}, -}; - -/** -* 流程表单调用这个方法获取formSchema -* @param param -*/ -export function getBpmFormSchema(_formData): FormSchema[]{ - // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema - return formSchema; -} diff --git a/src/views/supervisiontest/SupervisionTestList.vue b/src/views/supervisiontest/SupervisionTestList.vue deleted file mode 100644 index 2824153..0000000 --- a/src/views/supervisiontest/SupervisionTestList.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - - - diff --git a/src/views/supervisiontest/components/SupervisionTestForm.vue b/src/views/supervisiontest/components/SupervisionTestForm.vue deleted file mode 100644 index 709ad11..0000000 --- a/src/views/supervisiontest/components/SupervisionTestForm.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/src/views/supervisiontest/components/SupervisionTestModal.vue b/src/views/supervisiontest/components/SupervisionTestModal.vue deleted file mode 100644 index 3391e8e..0000000 --- a/src/views/supervisiontest/components/SupervisionTestModal.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - From 08ef8f4865d183ccc3ccdc4730cb94fd4f46f7ca Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Thu, 6 Aug 2026 10:36:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(fixcontact):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=AE=9A=E7=82=B9=E8=81=94=E7=B3=BB=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=B9=B6=E4=BF=AE=E5=A4=8D=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 查询筛选列由 xl=4 放宽为 xl=6,解决联系单位/主办部门多选框被遮挡 - 相关分管所领导筛选框改为常驻显示,展开/收起仅控制协办部门 - Form/BPMForm 宽标签列改为 6/18、7/17,避免长标签文字溢出 - FeedbackForm 修复 SzSelectUser 组件导入名并调整 labelCol/wrapperCol - 新增 FIXCONTACT_CHECKLIST.md 核对说明文档 Co-Authored-By: Claude Opus 4.7 --- .../bg/fixcontact/FIXCONTACT_CHECKLIST.md | 83 +++++++++++++++++++ .../fixcontact/FixedContact20260730List.vue | 20 ++--- .../FixedContact20260730BPMForm.vue | 4 +- .../FixedContact20260730FeedbackForm.vue | 6 +- .../components/FixedContact20260730Form.vue | 5 +- 5 files changed, 100 insertions(+), 18 deletions(-) create mode 100644 src/views/bg/fixcontact/FIXCONTACT_CHECKLIST.md diff --git a/src/views/bg/fixcontact/FIXCONTACT_CHECKLIST.md b/src/views/bg/fixcontact/FIXCONTACT_CHECKLIST.md new file mode 100644 index 0000000..9540d01 --- /dev/null +++ b/src/views/bg/fixcontact/FIXCONTACT_CHECKLIST.md @@ -0,0 +1,83 @@ +# 定点联系单(fixcontact)页面格式调整与前端核查说明 + +> 核对日期:2026-08-06 +> 核对范围:`src/views/bg/fixcontact/` 全部 9 个文件 +> 核对方式:静态代码审查(项目 package.json 未配置 lint / vue-tsc 脚本,故采用逐文件人工核查 + 引用存在性校验) + +--- + +## 一、格式调整记录(消除文字被输入框遮挡 / 对齐) + +### 1. `FixedContact20260730List.vue`(列表页 / 查询区) + +| 问题 | 调整 | +|------|------| +| 查询表单 3 个长标签(定点联系所领导 / 联系单位(部门) / 相关分管所领导,各 7-8 个字)在 `:xl="4"`(约占 1/6 屏宽)窄列内超出 label 列宽,文字被输入框遮挡/截断 | 标签文字缩短为 ≤5 字,完整含义保留在 tooltip 中:`定点联系所领导→联系所领导`、`联系单位(部门)→联系单位`、`相关分管所领导→分管所领导` | +| 筛选框(尤其 SzSelectDept 多选部门框)在 `:xl="4"` 窄列下只有约 90px 宽,输入框被压窄显得"被挡住" | 全部筛选列由 `:xl="4"`(每行 6 个)放宽为 `:xl="6"`(每行 4 个),输入框约 150px,`labelCol/wrapperCol` 恢复为 `10/14` | +| 「相关分管所领导」默认被「展开」折叠隐藏,用户期望常驻筛选 | 去掉 `relatedLeader` 的 `v-if="toggleSearchStatus"`,改为始终显示;「展开/收起」仅控制「协办部门」 | + +### 2. `FixedContact20260730Form.vue`(新增/编辑弹窗表单) + +| 问题 | 调整 | +|------|------| +| 整行字段的宽标签列 `span 3` 过窄:`定点联系所领导审批意见`(11字)/`相关分管所领导批示意见`(12字)在弹窗宽 1100 下溢出 | `wideLabelCol: span 3→6`,`wideWrapperCol: span 21→18`(6+18=24),标签单行完整显示 | +| 冗余导入 `SzUserSelect`(未使用) | 已删除 | + +### 3. `FixedContact20260730BPMForm.vue`(流程表单) + +| 问题 | 调整 | +|------|------| +| 宽标签列 `span 3` 过窄,整行字段(联系点建议诉求摘要 / 定点联系所领导审批意见 / 相关分管所领导批示意见)与半行流程办理字段(`是否需要所领导审批` 等)均会溢出 | `wideLabelCol: span 3→7`,`wideWrapperCol: span 21→17`(7+17=24),与常规标签列 `span 7` 对齐 | + +### 4. `FixedContact20260730FeedbackForm.vue`(反馈表单) + +| 问题 | 调整 | +|------|------| +| `formItemLayout` 为 `labelCol 5 + wrapperCol 16 = 21 ≠ 24`,整行控件右侧留空 3 格,且半行字段 6 字标签在 `span 5` 下贴边 | 改为 `labelCol span 6 + wrapperCol span 18 = 24`,控件填满整行、各行对齐 | + +### 5. 无需调整的文件 + +`FixedContact20260730Modal.vue`、`FixedContact20260730FeedbackModal.vue`(仅弹窗壳);`FixedContact20260730BPMFeedbackModal.vue`(`labelCol 7/17`、`wideLabelCol 5/19` 经核算标签均能单行放下);`FixedContact20260730.api.ts`、`FixedContact20260730.data.ts`(无布局)。 + +--- + +## 二、前端错误核查 + +### 发现并修复 2 处 + +| 级别 | 文件 | 问题 | 处理 | +|------|------|------|------| +| 功能 | `FixedContact20260730FeedbackForm.vue` | 模板使用 ``,但导入名是 `SzUserSelect`;`SzSelectUser` 未在 `registerGlobComp` 全局注册(已核对 `src/components/registerGlobComp.ts`),组件无法解析 → 「反馈人」选择器不渲染 | 导入名改为 `SzSelectUser`(与模板一致,与 Form/BPMForm 惯例一致) | +| 规范 | `FixedContact20260730Form.vue` | 重复导入同一文件且 `SzUserSelect` 未使用(eslint/TS no-unused-vars) | 删除冗余导入 | + +### 引用存在性校验(全部通过) + +| 引用 | 校验结果 | +|------|---------| +| `@/constant/supervision` → `PARTY_COMMITTEE_DEPT_ID / CHARGE_LEADER_ROLE_ID / SUOBAN_DEPT_ID / MEASURE_RES_LEADER_ROLE_ID` | `src/constant/supervision/index.ts` 存在 ✓ | +| `SzUserSelect.vue`(组件 name = `SzSelectUser`) | `src/components/semri/userComponent/SzUserSelect.vue` ✓ | +| `SzDeptUserModal.vue` | `src/components/semri/deptUserComponent/SzDeptUserModal.vue` ✓ | +| `SUploadFile.vue` | `src/components/semri/fileComponent/SUploadFile.vue` ✓ | +| `DeptRoleUserSelectDropDown.vue` / `SzSelectDept.vue` / `JInput.vue` | 均存在 ✓ | +| `FlowScheduleStartModalForBG.vue` / `BusinessProcessListModal.vue` | `src/components/semri/process/` 下存在 ✓ | +| `TaskHandleInnerContent.vue` | `src/views/super/bpm/process/.../TaskHandleInnerContent.vue` ✓ | +| `useSubApproveUserResolver` | `src/composables/useSubApproveUserResolver.ts` ✓ | +| `startProcessSchedules` | `src/api/common/api.ts` ✓ | +| `dateUtil` | `src/utils/dateUtil.ts` ✓ | +| `getValueType` | `src/utils/index.ts` ✓ | +| `showImportValidationErrors` | `src/utils/helper/importError.ts` ✓ | +| `api.ts` 导出的 list/deleteOne/batchDelete/saveOrUpdate/queryById/fixedContactFeedbackList/statusStats/saveBpmForm/setBpmVariableLocal/withDrawFixContact/saveSubApprove/setProcessVariable/getProcessVariable | 均在 List/BPMForm 中有引用且导出 ✓ | + +### 已核对、无异常 + +- 各组件 `defineExpose` / 模板 ref 调用(如 `registerModal.value.disableSubmit`)沿用本仓库既有模式。 +- 表单校验 `Form.useForm`、`validateInfos`、`resetFields` 用法正确。 +- 列表展开反馈子表、行状态着色(`status-row-1/2/3`)、导出/导入/模板校验回调均正常。 + +--- + +## 三、说明与假设 + +1. 查询表单标签做了**文字精简**(完整说明保留在 tooltip),这是在不改动列宽布局的前提下消除遮挡的最稳妥方式;如需完整标签,请按上文说明放宽列宽。 +2. `BPMForm.vue` 中 `是否需要所领导审批`(9字)在半行字段 + `span 7` 标签下,当表单容器宽度 ≥ 约 880px 时单行完整显示;流程表单在任务办理页为整页宽渲染,满足该条件。若后续将该表单嵌入更窄的弹窗,需再加大标签占比或改为整行字段。 +3. 项目未配置 lint/typecheck 脚本,本核对以静态审查为准;建议在开发环境实际打开各弹窗与查询区目视复核一遍最终效果。 diff --git a/src/views/bg/fixcontact/FixedContact20260730List.vue b/src/views/bg/fixcontact/FixedContact20260730List.vue index 9a23a21..7c97c13 100644 --- a/src/views/bg/fixcontact/FixedContact20260730List.vue +++ b/src/views/bg/fixcontact/FixedContact20260730List.vue @@ -4,7 +4,7 @@
- +