From b7687e034b13c294c8a8170baf020e37b8bc05e6 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 24 Feb 2026 13:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/IssueInfo/IssueInfo.data.ts   |  2 +-
 src/views/admin/IssueInfo/IssueInfoList.vue   |  2 +-
 .../components/IssueInfoDetailForm.vue        |  3 ++-
 .../orgInfo/components/OrgApplyInfoForm.vue   |  3 ++-
 .../admin/orgapplyinfo/OrgApplyInfo.data.ts   |  2 +-
 .../admin/orgapplyinfo/OrgInfoAuditList.vue   |  1 +
 .../components/OrgApplyInfoForm.vue           | 19 ++++++++-----------
 .../components/OrgApplyInfoModal.vue          |  1 +
 .../components/OrgAuditHisList.vue            |  1 +
 9 files changed, 18 insertions(+), 16 deletions(-)

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 @@
           <a-col :lg="6">
             <a-form-item name="orgName">
               <template #label><span title="机构名称">机构名称</span></template>
-                <j-dict-select-tag type='list' v-model:value="queryParam.orgName" dictCode="sys_depart,depart_name,depart_name"
+                <j-dict-select-tag type='list' v-model:value="queryParam.orgName" dictCode="sys_depart,depart_name,id"
                   placeholder="请选择机构名称" allow-clear />
             </a-form-item>
           </a-col>
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 @@
             <a-col :span="24" style="text-align: center;">
               <p>
                 <span>机构名称：</span>
-                <span>{{ formData.orgName }}</span>
+                <span>{{ formData.orgName_dictText }}</span>
               </p>
               <p>
                 <span>发版类型：</span>
@@ -51,6 +51,7 @@ const formData = reactive<Record<string, any>>({
   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 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                    <a-input v-model:value="formData.comName" placeholder="请输入机构名称" disabled allow-clear></a-input>
+                    <a-input v-model:value="formData.departName" placeholder="请输入机构名称" disabled allow-clear></a-input>
                     <!-- {{ formData.comName }} -->
                   </a-form-item>
                 </a-col>
@@ -289,6 +289,7 @@ const formData = reactive<Record<string, any>>({
   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 @@
                     </JImageUpload>
                   </a-form-item>
                 </a-col>
+                <a-col :span="24">
+                  <a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
+                    <a-input v-model:value="formData.comName" placeholder="请输入机构名称" disabled allow-clear></a-input>
+                    <!-- {{ formData.comName }} -->
+                  </a-form-item>
+                </a-col>
                 <a-col :span="24">
                   <a-form-item label="信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
                     name="comCreditCode">
@@ -26,12 +32,6 @@
                     <!-- {{ formData.comCreditCode }} -->
                   </a-form-item>
                 </a-col>
-                <a-col :span="24">
-                  <a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                    <a-input v-model:value="formData.comName" placeholder="请输入机构名称" disabled allow-clear></a-input>
-                    <!-- {{ formData.comName }} -->
-                  </a-form-item>
-                </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
                     name="comLegalPerson">
@@ -252,20 +252,18 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <a-row v-show="formData.workOrderStatus != '0' && !izApplyAudit" class="card-class">
+          <a-row v-show="formData.workOrderStatus != '0' && !izApplyAudit && formData.izHistory == 'N'" class="card-class">
             <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'工单回执'" />
             </a-col>
             <a-col :span="12">
               <a-form-item label="工单状态">
                 <a-input v-model:value="formData.workOrderStatus_dictText" disabled allow-clear></a-input>
-                <!-- {{ formData.workOrderStatus_dictText }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="处理人">
                 <a-input v-model:value="formData.handleBy" disabled allow-clear></a-input>
-                <!-- {{ formData.handleBy }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -277,14 +275,12 @@
               <a-form-item label="反馈时间">
                 <a-date-picker v-model:value="formData.replyTime" disabled value-format="YYYY-MM-DD" style="width: 100%"
                   allow-clear />
-                <!-- {{ formData.replyTime ? formData.replyTime.substring(0, 10) : "" }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="反馈内容">
                 <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="formData.replyContent"
                   allow-clear></a-textarea>
-                <!-- {{ formData.replyContent }} -->
               </a-form-item>
             </a-col>
           </a-row>
@@ -362,6 +358,7 @@ const formData = reactive<Record<string, any>>({
   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);
 }