diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts
index 5ed47e3..8363cac 100644
--- a/src/api/sys/user.ts
+++ b/src/api/sys/user.ts
@@ -23,6 +23,7 @@ enum Api {
GetPermCode = '/sys/permission/getPermCode',
//新加的获取图形验证码的接口
getInputCode = '/sys/randomImage',
+ randomCode = '/sys/randomInputCode',
//获取短信验证码的接口
getCaptcha = '/sys/sms',
//注册接口
@@ -114,6 +115,10 @@ export function getCodeInfo(currdatetime) {
let url = Api.getInputCode + `/${currdatetime}`;
return defHttp.get({ url: url });
}
+export function randomCode(currdatetime) {
+ let url = Api.randomCode + `/${currdatetime}`;
+ return defHttp.get({ url: url });
+}
/**
* @description: 获取短信验证码
*/
diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
index ea842d2..0b38416 100644
--- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
+++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
@@ -14,41 +14,49 @@ export const columns: BasicColumn[] = [
title: '机构负责人',
align: 'center',
dataIndex: 'orgLeader',
+ width: 120,
},
{
title: '机构负责人电话',
align: 'center',
dataIndex: 'orgLeaderPhone',
+ width: 120,
},
{
title: '申请日期',
align: 'center',
dataIndex: 'createTime',
+ width: 120,
},
{
title: '房屋性质',
align: 'center',
dataIndex: 'orgPropertyType',
+ width: 120,
},
{
title: '面积',
align: 'center',
dataIndex: 'orgBuildingArea',
+ width: 120,
},
{
title: '审核意见',
align: 'center',
dataIndex: 'status_dictText',
+ width: 120,
},
{
title: '当前阶段',
align: 'center',
dataIndex: 'buildStatus_dictText',
+ width: 120,
},
{
title: '工单状态',
align: 'center',
dataIndex: 'workOrderStatus_dictText',
+ width: 120,
},
];
diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
index 62c37be..8144f7b 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -51,7 +51,7 @@
- {{formData.orgProvince_dictText}}
+ {{cityViewValue}}
@@ -179,9 +179,9 @@
-
+
-
@@ -195,16 +195,11 @@
{{formData.auditTime}}
-
-
- {{formData.auditTime}}
+
@@ -226,17 +221,17 @@
-
+
-
+
{{formData.replyTime?formData.replyTime.substring(0,10):""}}
-
+
{{formData.replyContent}}
@@ -396,6 +391,7 @@ function edit(record) {
}
})
var lsbl = tmpData.status;
+ console.log("🚀 ~ edit ~ lsbl:", lsbl)
if (tmpData.status != '2' && tmpData.status != '3') {
tmpData.status = null
}
diff --git a/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue b/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
index 3e6fe81..659b1bb 100644
--- a/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
+++ b/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
@@ -1,10 +1,10 @@
-
+
-
-
+
+
审核通过
审核驳回
@@ -121,6 +121,7 @@ const filteredTableData = computed(() => {
&& item.d1 !== 'handleBy'
&& item.d1 !== 'workOrderStatus'
&& item.d1 !== 'workOrderId'
+ && item.d1 !== 'auditBy'
);
});
@@ -221,7 +222,7 @@ defineExpose({
\ No newline at end of file