From c86db8b08fce34ef6930c18e678aa0b10a3d2564 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 27 Feb 2026 10:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=AE=A1=E6=A0=B8-=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=8E=86=E5=8F=B2-=E5=8F=98=E6=9B=B4=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=9A=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E5=8F=8A=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OrgHistoryForm.vue             | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue b/src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue
index c9931fc..668bb9d 100644
--- a/src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgHistoryForm.vue
@@ -38,25 +38,29 @@
                 </a-table>
             </a-col>
         </a-row>
-        <a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData"
-            :label-col="labelCol" :wrapper-col="wrapperCol">
-            <a-row :gutter="16">
-                <a-col :span="12">
-                    <a-form-item label="审核状态" name="status" v-bind="validateInfos.status">
-                        <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
-                            <a-select-option value="2">审核通过</a-select-option>
-                            <a-select-option value="3">审核驳回</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12" v-if="formData.status == '3'">
-                    <a-form-item label="驳回原因" name="content" v-bind="validateInfos.content">
-                        <a-textarea :maxlength="50" show-count v-model:value="formData.content"
-                            placeholder="请输入驳回原因（如驳回）" style="width: 100%" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
+        <JFormContainer :disabled="izAuditHis">
+            <template #detail>
+                <a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData"
+                    :label-col="labelCol" :wrapper-col="wrapperCol">
+                    <a-row :gutter="16">
+                        <a-col :span="12">
+                            <a-form-item label="审核状态" name="status" v-bind="validateInfos.status">
+                                <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
+                                    <a-select-option value="2">审核通过</a-select-option>
+                                    <a-select-option value="3">审核驳回</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12" v-if="formData.status == '3'">
+                            <a-form-item label="驳回原因" name="content" v-bind="validateInfos.content">
+                                <a-textarea :maxlength="50" show-count v-model:value="formData.content"
+                                    placeholder="请输入驳回原因（如驳回）" style="width: 100%" />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
+            </template>
+        </JFormContainer>
     </div>
 </template>
 
@@ -65,6 +69,7 @@ import { ref, reactive, computed, onMounted } from 'vue';
 import { Table as ATable, Input, Row, Col, Form } from 'ant-design-vue';
 import { applyObj } from '../OrgModifyInfo.data'
 import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
+import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
 import { upInfoAudit, getHisModifyInfo } from '../OrgModifyInfo.api';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { initDictOptions } from '/@/utils/dict';
@@ -169,9 +174,10 @@ const setRowClassName = (record) => {
     return record.d2 !== record.d3 && record.d1 !== 'createTime' ? 'highlight-row' : '';
 };
 
-function show(data) {
-    console.log("🌊 ~ show ~ data:", data)
+const izAuditHis = ref(true)
 
+function show(data) {
+    izAuditHis.value = false
     // 存储id和pkId到formData
     const idRecord = data.find(item => item.d1 === 'id');
     const pkIdRecord = data.find(item => item.d1 === 'pkId');
@@ -194,8 +200,8 @@ function show(data) {
 }
 
 async function hisShow(record) {
+    izAuditHis.value = true
     let data = await getHisModifyInfo(record)
-    console.log("🌊 ~ show ~ data:", data)
 
     // 存储id和pkId到formData
     const idRecord = data.find(item => item.d1 === 'id');
@@ -210,6 +216,9 @@ async function hisShow(record) {
     }
     formData.comName = data.find(item => item.d1 === 'comName').d2;
     formData.openId = data.find(item => item.d1 === 'openId').d2;
+    //审核历史
+    formData.status = data.find(item => item.d1 === 'status').d3;
+    formData.content = data.find(item => item.d1 === 'content').d3;
     tableData.value = data.map(item => ({
         ...item,
         // 处理null/undefined显示为空字符串