From 51599c38651ba4a993c058460ec9585634765f5c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 30 Jul 2025 14:50:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/orgapplyinfo/OrgApplyInfo.data.ts | 16 ++++++------- .../admin/orgapplyinfo/OrgApplyInfoList.vue | 24 +++++++++++++++++++ .../components/OrgUpContractForm.vue | 4 ++-- .../admin/orgmodifyinfo/OrgModifyInfo.data.ts | 10 ++++++-- 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts index e939070..7f46cc6 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts @@ -14,49 +14,49 @@ export const columns: BasicColumn[] = [ title: '机构负责人', align: 'center', dataIndex: 'orgLeader', - width: 120, + width: '8%' }, { title: '机构负责人电话', align: 'center', dataIndex: 'orgLeaderPhone', - width: 120, + width: '8%' }, { title: '申请日期', align: 'center', dataIndex: 'createTime', - width: 120, + width: '8%' }, { title: '房屋性质', align: 'center', dataIndex: 'orgPropertyType', - width: 120, + width: '8%' }, { title: '面积(㎡)', align: 'center', dataIndex: 'orgBuildingArea', - width: 120, + width: '8%' }, { title: '审核意见', align: 'center', dataIndex: 'status_dictText', - width: 120, + width: '8%' }, { title: '当前阶段', align: 'center', dataIndex: 'buildStatus_dictText', - width: 120, + width: '8%' }, { title: '工单状态', align: 'center', dataIndex: 'workOrderStatus_dictText', - width: 120, + width: '8%' }, ]; diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue b/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue index fe84d6d..1275bc8 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue +++ b/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue @@ -60,6 +60,16 @@ + + + +
+

账号初始化成功!

+

{{zhcshMessage}}

+
+
@@ -88,6 +98,8 @@ const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); const userStore = useUserStore(); +const zhcshVisible = ref(false); +const zhcshMessage = ref(''); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -207,11 +219,19 @@ 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 @@ -344,4 +364,8 @@ async function setRangeQuery() { width: 100%; } } + +.jee-hidden-zhcsh { + display: none !important; +} diff --git a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue index ae079ec..fa136ac 100644 --- a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue @@ -146,8 +146,8 @@ const formData = reactive>({ }); const tempNullVal = ref('') const { createMessage } = useMessage(); -const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); -const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 17 } }); +const labelCol = ref({ xs: { span: 24 }, sm: { span: 8 } }); +const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 14 } }); const confirmLoading = ref(false); //表单验证 const validatorRules = reactive({ diff --git a/src/views/admin/orgmodifyinfo/OrgModifyInfo.data.ts b/src/views/admin/orgmodifyinfo/OrgModifyInfo.data.ts index 9c5933e..d3d88b4 100644 --- a/src/views/admin/orgmodifyinfo/OrgModifyInfo.data.ts +++ b/src/views/admin/orgmodifyinfo/OrgModifyInfo.data.ts @@ -14,31 +14,37 @@ export const columns: BasicColumn[] = [ title: '机构负责人', align: 'center', dataIndex: 'orgLeader', + width: '12%' }, { - title: '机构负责人电话', + title: '负责人电话', align: 'center', dataIndex: 'orgLeaderPhone', + width: '12%' }, { title: '申请日期', align: 'center', dataIndex: 'createTime', + width: '12%' }, { title: '房屋性质', align: 'center', dataIndex: 'orgPropertyType', + width: '12%' }, { - title: '面积', + title: '面积(㎡)', align: 'center', dataIndex: 'orgBuildingArea', + width: '12%' }, { title: '审核意见', align: 'center', dataIndex: 'status_dictText', + width: '12%' }, ]; From f77ac895861e4fb9e4643ec60f171afdfc20f1b6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 30 Jul 2025 16:28:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts index 7f46cc6..fe7f9a3 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts @@ -17,7 +17,7 @@ export const columns: BasicColumn[] = [ width: '8%' }, { - title: '机构负责人电话', + title: '负责人电话', align: 'center', dataIndex: 'orgLeaderPhone', width: '8%'