From 881f460393f81b83a8cc00485f01116ed17c9075 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 12 Feb 2026 13:28:50 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E7=BC=BA=E5=B0=91=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9C=E5=85=A5=E9=A9=BB=E2=80=9D=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=8F=AF=E6=9F=A5=E7=9C=8B=E5=BD=93=E6=AC=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E5=86=85=E5=AE=B9=203=E3=80=81pc-?= =?UTF-8?q?=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1=E6=A0=B8-?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E2=80=9C=E5=8F=98=E6=9B=B4=E2=80=9D=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=BA=E2=80=9C=E5=BD=93=E6=AC=A1=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=BF=A1=E6=81=AF=E2=80=9D=E5=92=8C=E2=80=9C=E5=85=B6?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E6=AC=A1=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E2=80=9D=E5=81=9A=E5=AF=B9=E6=AF=94=204=E3=80=81pc-?= =?UTF-8?q?=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1=E6=A0=B8-?= =?UTF-8?q?=E5=90=84=E7=95=8C=E9=9D=A2=E4=B8=AD=E5=AE=A1=E6=A0=B8=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=94=B9=E4=B8=BA=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=205=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E8=B0=83=E6=95=B4=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E5=92=8C=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=E4=B8=AD=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=B7=E5=BC=8F=206?= =?UTF-8?q?=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E6=89=80=E6=9C=89=E4=BC=81=E4=B8=9AXX=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9C=BA=E6=9E=84XX=207=E3=80=81pc-=E6=9C=BA=E6=9E=84?= =?UTF-8?q?-=E6=9C=BA=E6=9E=84=E5=AE=A1=E6=A0=B8-=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E5=AE=A1=E6=A0=B8=E7=95=8C=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E5=8D=95=E5=9B=9E=E6=89=A7=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=86=85=E5=AE=B9=208=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=AE=A1=E6=A0=B8-pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=AE=A1=E6=A0=B8-=E8=B0=83=E6=95=B4=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=90=88=E5=90=8C=E7=95=8C=E9=9D=A2=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E5=8F=AA=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=85=B3=E9=97=AD=E5=92=8C=E6=8F=90=E4=BA=A4=209?= =?UTF-8?q?=E3=80=81pc-=E6=9C=BA=E6=9E=84-=E6=9C=BA=E6=9E=84=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8-=E5=88=97=E8=A1=A8=E9=A1=B5=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E5=8F=AA=E4=BF=9D=E7=95=99=E5=BE=85=E5=9B=9E?= =?UTF-8?q?=E6=89=A7=E3=80=81=E5=B7=B2=E5=9B=9E=E6=89=A7=E4=B8=A4=E7=A7=8D?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E5=85=B6=E4=BD=99=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/orgapplyinfo/OrgApplyInfo.data.ts | 29 ++-- .../admin/orgapplyinfo/OrgInfoAuditList.vue | 4 +- .../admin/orgapplyinfo/OrgModifyInfo.api.ts | 10 ++ .../components/OrgApplyInfoForm.vue | 42 +++--- .../components/OrgApplyInfoModal.vue | 33 ++++- .../components/OrgAuditHisList.vue | 126 ++---------------- .../components/OrgHistoryForm.vue | 37 ++++- .../components/OrgUpContractForm.vue | 16 +-- 8 files changed, 137 insertions(+), 160 deletions(-) diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts index 37f5ac2..341fb18 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts @@ -41,7 +41,7 @@ export const columns: BasicColumn[] = [ width: '8%', }, { - title: '审核意见', + title: '审核状态', align: 'center', dataIndex: 'status_dictText', width: '8%', @@ -57,6 +57,17 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'workOrderStatus_dictText', width: '8%', + customRender: ({ record }) => { + if (record.workOrderStatus == '0') { + return ''; + } else if (record.workOrderStatus == '1') { + return '待回执'; + } else if (record.workOrderStatus == '2') { + return '已回执'; + } else { + return ''; + } + }, }, ]; @@ -71,43 +82,43 @@ export const hisColumns: BasicColumn[] = [ title: '机构负责人', align: 'center', dataIndex: 'orgLeader', - width:100 + width: 100, }, { title: '负责人电话', align: 'center', dataIndex: 'orgLeaderPhone', - width:120 + width: 120, }, { title: '申请日期', align: 'center', dataIndex: 'createTime', - width:150 + width: 150, }, { title: '房屋性质', align: 'center', dataIndex: 'orgPropertyType', - width:100 + width: 100, }, { title: '面积(㎡)', align: 'center', dataIndex: 'orgBuildingArea', - width:100 + width: 100, }, { title: '类型', align: 'center', dataIndex: 'optTypeName', - width:100 + width: 100, }, { - title: '审核意见', + title: '审核状态', align: 'center', dataIndex: 'status_dictText', - width:100 + width: 100, }, ]; diff --git a/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue b/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue index 676b555..9e53b1d 100644 --- a/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue +++ b/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue @@ -26,8 +26,8 @@ - - + + 待审核 审核通过 审核驳回 diff --git a/src/views/admin/orgapplyinfo/OrgModifyInfo.api.ts b/src/views/admin/orgapplyinfo/OrgModifyInfo.api.ts index 4dccff4..e303d47 100644 --- a/src/views/admin/orgapplyinfo/OrgModifyInfo.api.ts +++ b/src/views/admin/orgapplyinfo/OrgModifyInfo.api.ts @@ -12,6 +12,7 @@ enum Api { importExcel = '/admin/orgapplyinfo/orgApplyInfo/importExcel', exportXls = '/admin/orgapplyinfo/orgApplyInfo/exportXls', getModifyInfo = '/admin/orgapplyinfo/orgApplyInfo/getModifyInfo', + getHisModifyInfo = '/admin/orgapplyinfo/orgApplyInfo/getHisModifyInfo', upInfoAudit = '/admin/orgapplyinfo/orgApplyInfo/upInfoAudit', } @@ -84,3 +85,12 @@ export const upInfoAudit = (params) => { export const getModifyInfo = (params) => { return defHttp.post({ url: Api.getModifyInfo, params }); }; + +/** + * 返回当次审核信息和上一次使用的信息 + * @param params + * @returns + */ +export const getHisModifyInfo = (params) => { + return defHttp.post({ url: Api.getHisModifyInfo, params }); +}; \ No newline at end of file diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue index a274565..fd23cfc 100644 --- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue @@ -5,14 +5,14 @@ - - - - + + + + - @@ -53,6 +53,9 @@ + + + @@ -95,8 +98,7 @@ - + @@ -106,7 +108,7 @@ - + @@ -139,7 +141,9 @@ + value-format="YYYY-MM-DD" style="width: 100%" suffix-icon="" /> + @@ -171,16 +175,17 @@ + value-format="YYYY-MM-DD" style="width: 100%" suffix-icon="" /> - + + suffix-icon="" /> @@ -203,8 +208,8 @@ - - + 历史数据 待审核 @@ -247,7 +252,7 @@ - + @@ -426,11 +431,16 @@ function handleView(record) { function add() { edit({}); } - +const izApplyAudit = ref(true) /** * 编辑 */ function edit(record) { + if (record.optType == 'rz' && record.status == '1') { + izApplyAudit.value = true; + } else { + izApplyAudit.value = false; + } nextTick(() => { resetFields(); let tmpData = {}; diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue index c8f1a84..3a04faf 100644 --- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue +++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue @@ -14,8 +14,8 @@ @@ -27,7 +27,13 @@ - + + + + diff --git a/src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue b/src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue index f452bf9..b8f2f18 100644 --- a/src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue +++ b/src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue @@ -26,8 +26,8 @@ - - + + 审核通过 审核驳回 @@ -145,51 +145,19 @@ const wrapperCol = reactive({ }); /** - * 高级查询事件 + * 详情 */ -function handleSuperQuery(params) { - Object.keys(params).map((k) => { - queryParam[k] = params[k]; - }); - searchQuery(); -} - -/** - * 新增事件 - */ -function handleAdd() { - registerModal.value.disableSubmit = false; - registerModal.value.add(); -} - -/** - * 编辑事件 - */ -function handleEdit(record: Recordable) { - registerModal.value.disableSubmit = false; +function handleRzDetail(record: Recordable) { + registerModal.value.disableSubmit = true; registerModal.value.edit(record); } /** * 详情 */ -function handleDetail(record: Recordable) { +function handleBgDetail(record: Recordable) { registerModal.value.disableSubmit = true; - registerModal.value.edit(record); -} - -/** - * 删除事件 - */ -async function handleDelete(record) { - await deleteOne({ id: record.id }, handleSuccess); -} - -/** - * 批量删除事件 - */ -async function batchHandleDelete() { - await batchDelete({ ids: selectedRowKeys.value }, handleSuccess); + registerModal.value.showHis(record); } /** @@ -199,55 +167,11 @@ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } -/** - * 上传合同 - */ -function handleUpContract(record) { - registerModal.value.editContract(record); -} - -/** - * 通知运维平台搭建业务平台 - */ -function handleBuildPlat(record) { - -} - -/** - * 账户初始化 - * @param record - */ -function handleInitAccount(record) { - var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id } - console.log("🚀 ~ handleInitAccount ~ userInfo:", userInfo) - defHttp.post({ url: '/sys/user/initialization', params: userInfo }).then(res => { - console.log("🚀 ~ handleInitAccount ~ res:", res) - zhcshVisible.value = true; - zhcshMessage.value = res.message; - handleSuccess(); - }) - -} - function handleCshCancel() { zhcshVisible.value = false; zhcshMessage.value = ''; } -/** - * 信息推送 - * @param record - */ -function handlePushInfo(record) { - console.log("🚀 ~ handlePushInfo ~ record:", record) - var params = { openId: record.openId, id: record.id } - console.log("🚀 ~ handlePushInfo ~ params:", params) - defHttp.get({ url: '/weixinMini/sendOrgAuthInfo', params }).then(res => { - handleSuccess(); - }) -} - - /** * 操作栏 */ @@ -255,46 +179,14 @@ function getTableAction(record) { return [ { label: '详情', - onClick: handleDetail.bind(null, record), + onClick: handleRzDetail.bind(null, record), ifShow: record.optType == 'rz' }, { label: '详情', - onClick: handleDetail.bind(null, record), + onClick: handleBgDetail.bind(null, record), ifShow: record.optType == 'bg' }, - { - label: '加盟审核', - onClick: handleEdit.bind(null, record), - auth: 'orgapplyinfo:nu_org_apply_info:edit', - ifShow: record.status == '1' - }, - { - label: '上传合同', - onClick: handleUpContract.bind(null, record), - auth: 'orgapplyinfo:nu_org_apply_info:edit', - ifShow: record.buildStatus == '3' - }, - // { - // label: '运维平台进行搭建', - // onClick: handleBuildPlat.bind(null, record), - // auth: 'orgapplyinfo:nu_org_apply_info:edit', - // ifShow: () => { - // return record.buildStatus == '3' && !!record.contract - // } - // }, - { - label: '账号初始化', - onClick: handleInitAccount.bind(null, record), - auth: 'orgapplyinfo:nu_org_apply_info:edit', - ifShow: record.workOrderStatus == '2' && record.buildStatus == '4' - }, - // { - // label: '信息推送', - // onClick: handlePushInfo.bind(null, record), - // auth: 'orgapplyinfo:nu_org_apply_info:edit', - // ifShow: record.buildStatus == '5'n - // }, ]; } diff --git a/src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue b/src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue index 4e26c5e..c9931fc 100644 --- a/src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue @@ -1,7 +1,7 @@