diff --git a/src/views/admin/IssueInfo/IssueInfo.data.ts b/src/views/admin/IssueInfo/IssueInfo.data.ts index 22eaf87..cbf0d77 100644 --- a/src/views/admin/IssueInfo/IssueInfo.data.ts +++ b/src/views/admin/IssueInfo/IssueInfo.data.ts @@ -8,7 +8,7 @@ export const columns: BasicColumn[] = [ { title: '机构名称', align: "center", - dataIndex: 'orgName', + dataIndex: 'orgName_dictText', width: 240, }, { diff --git a/src/views/admin/IssueInfo/IssueInfoList.vue b/src/views/admin/IssueInfo/IssueInfoList.vue index 647ca0e..d24f025 100644 --- a/src/views/admin/IssueInfo/IssueInfoList.vue +++ b/src/views/admin/IssueInfo/IssueInfoList.vue @@ -8,7 +8,7 @@ - diff --git a/src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue b/src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue index 0c99b7b..7584a04 100644 --- a/src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue +++ b/src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue @@ -8,7 +8,7 @@

机构名称: - {{ formData.orgName }} + {{ formData.orgName_dictText }}

发版类型: @@ -51,6 +51,7 @@ const formData = reactive>({ createTime:'', issueType: '', orgName:'', + orgName_dictText:'', issueType_dictText: '', content: '', }); diff --git a/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue index 847fe7a..4afe55b 100644 --- a/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue +++ b/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue @@ -28,7 +28,7 @@ - + @@ -289,6 +289,7 @@ const formData = reactive>({ workOrderStatus_dictText: '', auditBy: '', auditTime: '', + departName: '', }); const tempNullVal = ref(''); diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts index e0a3ae3..a6e6174 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts @@ -8,7 +8,7 @@ export const columns: BasicColumn[] = [ { title: '机构名称', align: 'center', - dataIndex: 'comName', + dataIndex: 'departName', }, { title: '机构负责人', diff --git a/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue b/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue index 998d059..b7b0b3d 100644 --- a/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue +++ b/src/views/admin/orgapplyinfo/OrgInfoAuditList.vue @@ -189,6 +189,7 @@ function handleUpAudit(record) { * 详情 */ function handleDetail(record: Recordable) { + record.isHistory = "N"; registerModal.value.disableSubmit = true; registerModal.value.edit(record); } diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue index f147ba9..7c32c6f 100644 --- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue @@ -18,6 +18,12 @@ + + + + + + @@ -26,12 +32,6 @@ - - - - - - @@ -252,20 +252,18 @@ - + - - @@ -277,14 +275,12 @@ - - @@ -362,6 +358,7 @@ const formData = reactive>({ updateTime: '', izEntry: '', name: '', + izHistory:'', sex: '', national: '', birthDate: '', diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue index 8710043..f4afe40 100644 --- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue +++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue @@ -150,6 +150,7 @@ function submitContract() { */ function showAuditHis(record) { auditHisVisible.value = true + record.isHis = true nextTick(() => { auditHisRef.value.init(record); }); diff --git a/src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue b/src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue index b8f2f18..bb7da21 100644 --- a/src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue +++ b/src/views/admin/orgapplyinfo/components/OrgAuditHisList.vue @@ -148,6 +148,7 @@ const wrapperCol = reactive({ * 详情 */ function handleRzDetail(record: Recordable) { + record.izHistory = "Y"; registerModal.value.disableSubmit = true; registerModal.value.edit(record); }