From fd5d2a9c3e30c4bb1997d0dc1444cc3769353a60 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 30 Jun 2025 10:05:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=BA=E6=9E=84=E5=8A=A0?=
 =?UTF-8?q?=E7=9B=9F/=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/orgapplyinfo/OrgApplyInfo.data.ts     |  34 ++--
 .../biz/orgapplyinfo/OrgApplyInfoList.vue     |  41 ++---
 .../components/OrgApplyInfoForm.vue           | 146 ++++++++----------
 .../biz/orgmodifyinfo/OrgModifyInfo.data.ts   |  34 ++--
 .../biz/orgmodifyinfo/OrgModifyInfoList.vue   |  40 ++---
 .../components/OrgHistoryForm.vue             |  12 +-
 .../components/OrgModifyInfoForm.vue          |   2 +-
 7 files changed, 137 insertions(+), 172 deletions(-)

diff --git a/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts
index 860baae..3113376 100644
--- a/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts
+++ b/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts
@@ -6,29 +6,14 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '姓名',
+    title: '企业名称',
     align: 'center',
-    dataIndex: 'name',
+    dataIndex: 'comName',
   },
   {
-    title: '性别',
+    title: '机构负责人',
     align: 'center',
-    dataIndex: 'sex',
-  },
-  {
-    title: '联系电话',
-    align: 'center',
-    dataIndex: 'tel',
-  },
-  {
-    title: '申请日期',
-    align: 'center',
-    dataIndex: 'createTime',
-  },
-  {
-    title: '机构地址',
-    align: 'center',
-    dataIndex: 'orgAddress',
+    dataIndex: 'orgLeader',
   },
   {
     title: '机构负责人电话',
@@ -36,17 +21,22 @@ export const columns: BasicColumn[] = [
     dataIndex: 'orgLeaderPhone',
   },
   {
-    title: '机构房屋性质',
+    title: '申请日期',
+    align: 'center',
+    dataIndex: 'createTime',
+  },
+  {
+    title: '房屋性质',
     align: 'center',
     dataIndex: 'orgPropertyType',
   },
   {
-    title: '机构建筑面积',
+    title: '面积',
     align: 'center',
     dataIndex: 'orgBuildingArea',
   },
   {
-    title: '审批状态',
+    title: '审批意见',
     align: 'center',
     dataIndex: 'status_dictText',
   },
diff --git a/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue b/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue
index 5a69226..9545137 100644
--- a/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue
+++ b/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue
@@ -6,28 +6,32 @@
         :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
-            <a-form-item name="name">
-              <template #label><span title="姓名">姓名</span></template>
-              <JInput v-model:value="queryParam.name" />
+            <a-form-item name="comName">
+              <template #label><span title="企业名称">企业名称</span></template>
+              <JInput v-model:value="queryParam.comName" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="tel">
-              <template #label><span title="联系电话">联系电话</span></template>
-              <JInput v-model:value="queryParam.tel" />
+            <a-form-item name="orgLeader">
+              <template #label><span title="机构负责人">机构负责人</span></template>
+              <JInput v-model:value="queryParam.orgLeader" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="createTime">
+              <template #label><span title="申请日期">申请日期</span></template>
+              <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.createTime"
+                class="query-group-cust" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="status">
-              <template #label><span title="审批状态">审批状态</span></template>
-              <j-dict-select-tag type="list" v-model:value="queryParam.status" dictCode="org_apply_status"
-                placeholder="请选择审批状态" allow-clear />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item name="orgBuildingArea">
-              <template #label><span title="建筑面积">建筑面积</span></template>
-              <JRangeNumber v-model:value="queryParam.orgBuildingArea" class="query-group-cust"></JRangeNumber>
+              <template #label><span title="审批意见">审批意见</span></template>
+              <a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审批意见">
+                <a-select-option value="1">待审核</a-select-option>
+                <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 :xl="6" :lg="7" :md="8" :sm="24">
@@ -211,11 +215,7 @@ function searchReset() {
   reload();
 }
 
-
-
-
-
-let rangeField = 'orgBuildingArea,'
+let rangeField = 'createTime,'
 
 /**
  * 设置范围查询条件
@@ -238,6 +238,7 @@ async function setRangeQuery() {
   }
   return queryParamClone;
 }
+
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
index 5c3d344..98ffd18 100644
--- a/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -5,55 +5,32 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="OrgApplyInfoForm">
           <a-row>
-            <a-col :span="24">
-              <SectionDivider :title="'基本信息'" />
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="咨询人姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
-                <a-input v-model:value="formData.name" placeholder="请输入咨询人姓名" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="联系电话" v-bind="validateInfos.tel" id="OrgApplyInfoForm-tel" name="tel">
-                <a-input v-model:value="formData.tel" placeholder="请输入联系电话" :readOnly="true"></a-input>
-              </a-form-item>
-            </a-col>
-            <!-- <a-col :span="12">
-              <a-form-item label="微信名称" v-bind="validateInfos.wechatName" id="OrgApplyInfoForm-wechatName"
-                name="wechatName">
-                <a-input v-model:value="formData.wechatName" placeholder="请输入微信名称" ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="微信id" v-bind="validateInfos.openId" id="OrgApplyInfoForm-openId" name="openId">
-                <a-input v-model:value="formData.openId" placeholder="请输入微信id" ></a-input>
-              </a-form-item>
-            </a-col> -->
-            <a-col :span="12">
-              <a-form-item label="申请日期" v-bind="validateInfos.createTime" id="OrgApplyInfoForm-createTime"
-                name="createTime">
-                <a-input placeholder="申请日期" v-model:value="formData.createTime" style="width: 100%" readOnly />
-              </a-form-item>
-            </a-col>
-            <!-- <a-col :span="12">
-              <a-form-item label="机构是否完成入驻" v-bind="validateInfos.izEntry" id="OrgApplyInfoForm-izEntry" name="izEntry">
-                <a-select v-model:value="formData.izEntry" placeholder="请选择机构是否入驻" allowClear :readOnly="true">
-                  <a-select-option value="0">未入驻</a-select-option>
-                  <a-select-option value="1">已入驻</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col> -->
             <a-col :span="24">
               <SectionDivider :title="'身份证'" />
             </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
+                name="cardZmPath">
+                <JImageUpload :fileMax="1" v-model:value="formData.cardZmPath" :disabled="true"></JImageUpload>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
+                <a-input v-model:value="formData.name" :readOnly="true"></a-input>
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
-                <a-input v-model:value="formData.sex" placeholder="请输入性别" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.sex" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national" name="national">
-                <a-input v-model:value="formData.national" placeholder="请输入民族" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.national" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -65,18 +42,28 @@
             <a-col :span="12">
               <a-form-item label="住址（身份证上）" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
                 name="idCardAddress">
-                <a-input v-model:value="formData.idCardAddress" placeholder="请输入住址（身份证上）" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.idCardAddress" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
-                <a-input v-model:value="formData.idCard" placeholder="请输入身份证号" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.idCard" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
+                name="cardFmPath">
+                <JImageUpload :fileMax="1" v-model:value="formData.cardFmPath" :disabled="true"></JImageUpload>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
             <a-col :span="12">
               <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgApplyInfoForm-issuingAuthority"
                 name="issuingAuthority">
-                <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.issuingAuthority" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -90,49 +77,40 @@
                 <a-input placeholder="申请日期" v-model:value="formData.endTime" style="width: 100%" readOnly />
               </a-form-item>
             </a-col>
-            <a-col :span="12">
-              <a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
-                name="cardZmPath">
-                <JImageUpload :fileMax="1" v-model:value="formData.cardZmPath" :disabled="true"></JImageUpload>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
-                name="cardFmPath">
-                <JImageUpload :fileMax="1" v-model:value="formData.cardFmPath" :disabled="true"></JImageUpload>
-              </a-form-item>
-            </a-col>
             <a-col :span="24">
-              <SectionDivider :title="'企业资质'" />
+              <SectionDivider :title="'营业执照'" />
             </a-col>
+          </a-row>
+          <a-row>
             <a-col :span="12">
               <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
                 id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
                 <JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true"></JImageUpload>
               </a-form-item>
             </a-col>
+          </a-row>
+          <a-row>
             <a-col :span="12">
               <a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                <a-input v-model:value="formData.comName" placeholder="请输入企业名称" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.comName" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="企业注册地址" v-bind="validateInfos.comRegisterAddress"
                 id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
-                <a-textarea v-model:value="formData.comRegisterAddress" placeholder="请输入企业注册地址"
-                  :readOnly="true"></a-textarea>
+                <a-textarea v-model:value="formData.comRegisterAddress" :readOnly="true"></a-textarea>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="企业信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
                 name="comCreditCode">
-                <a-input v-model:value="formData.comCreditCode" placeholder="请输入企业信用代码" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.comCreditCode" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
                 name="comLegalPerson">
-                <a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.comLegalPerson" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -147,53 +125,56 @@
             <a-col :span="12">
               <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                 name="orgAddress">
-                <a-textarea v-model:value="formData.orgAddress" placeholder="请输入机构地址" :readOnly="true"></a-textarea>
+                <a-textarea v-model:value="formData.orgAddress" :readOnly="true"></a-textarea>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                 name="orgLeader">
-                <a-input v-model:value="formData.orgLeader" placeholder="请输入机构负责人" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.orgLeader" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                 name="orgLeaderPhone">
-                <a-input v-model:value="formData.orgLeaderPhone" placeholder="请输入机构负责人电话" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.orgLeaderPhone" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
-            <!-- <a-col :span="12">
-              <a-form-item label="机构楼宇牌号" v-bind="validateInfos.orgBuildingNumber"
-                id="OrgApplyInfoForm-orgBuildingNumber" name="orgBuildingNumber">
-                <a-input v-model:value="formData.orgBuildingNumber" placeholder="请输入机构楼宇牌号" ></a-input>
-              </a-form-item>
-            </a-col> -->
             <a-col :span="12">
               <a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                 name="orgPropertyType">
-                <a-input v-model:value="formData.orgPropertyType" placeholder="请输入机构房屋性质" :readOnly="true"></a-input>
+                <a-input v-model:value="formData.orgPropertyType" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
                 name="orgBuildingArea">
-                <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="m²"
-                  style="width: 100%" readOnly />
+                <a-input v-model:value="formData.orgBuildingArea" addon-after="平方米" style="width: 100%" readOnly />
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <SectionDivider :title="'入驻审批'" />
+              <SectionDivider :title="'加盟审核'" />
             </a-col>
             <a-col :span="12">
-              <a-form-item label="审批结果" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
-                <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批结果">
-                  <a-select-option value="1">待审核</a-select-option>
-                  <a-select-option value="2">审核通过</a-select-option>
-                  <a-select-option value="3">驳回</a-select-option>
-                </a-select>
+              <a-form-item label="联系电话" v-bind="validateInfos.tel" id="OrgApplyInfoForm-tel" name="tel">
+                <a-input v-model:value="formData.tel" placeholder="请输入联系电话" :readOnly="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
+              <a-form-item label="申请日期" v-bind="validateInfos.createTime" id="OrgApplyInfoForm-createTime"
+                name="createTime">
+                <a-input placeholder="申请日期" v-model:value="formData.createTime" style="width: 100%" readOnly />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="审批意见" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="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-show="formData.status == '3'">
               <a-form-item label="驳回原因" v-bind="validateInfos.content" id="OrgApplyInfoForm-content" name="content">
                 <a-textarea :autosize="{ minRows: 3 }" maxlength="50" show-count v-model:value="formData.content"
                   allow-clear placeholder="请输入驳回原因"></a-textarea>
@@ -317,12 +298,15 @@ function add() {
 function edit(record) {
   nextTick(() => {
     resetFields();
-    const tmpData = {};
+    let tmpData = {};
     Object.keys(formData).forEach((key) => {
       if (record.hasOwnProperty(key)) {
         tmpData[key] = record[key]
       }
     })
+    if (tmpData.status != '2' && tmpData.status != '3') {
+      tmpData.status = null
+    }
     //赋值
     Object.assign(formData, tmpData);
   });
diff --git a/src/views/biz/orgmodifyinfo/OrgModifyInfo.data.ts b/src/views/biz/orgmodifyinfo/OrgModifyInfo.data.ts
index 0019448..20d52d9 100644
--- a/src/views/biz/orgmodifyinfo/OrgModifyInfo.data.ts
+++ b/src/views/biz/orgmodifyinfo/OrgModifyInfo.data.ts
@@ -6,29 +6,14 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '姓名',
+    title: '企业名称',
     align: 'center',
-    dataIndex: 'name',
+    dataIndex: 'comName',
   },
   {
-    title: '性别',
+    title: '机构负责人',
     align: 'center',
-    dataIndex: 'sex',
-  },
-  {
-    title: '联系电话',
-    align: 'center',
-    dataIndex: 'tel',
-  },
-  {
-    title: '申请日期',
-    align: 'center',
-    dataIndex: 'createTime',
-  },
-  {
-    title: '机构地址',
-    align: 'center',
-    dataIndex: 'orgAddress',
+    dataIndex: 'orgLeader',
   },
   {
     title: '机构负责人电话',
@@ -36,17 +21,22 @@ export const columns: BasicColumn[] = [
     dataIndex: 'orgLeaderPhone',
   },
   {
-    title: '机构房屋性质',
+    title: '申请日期',
+    align: 'center',
+    dataIndex: 'createTime',
+  },
+  {
+    title: '房屋性质',
     align: 'center',
     dataIndex: 'orgPropertyType',
   },
   {
-    title: '机构建筑面积',
+    title: '面积',
     align: 'center',
     dataIndex: 'orgBuildingArea',
   },
   {
-    title: '审批状态',
+    title: '审批意见',
     align: 'center',
     dataIndex: 'status_dictText',
   },
diff --git a/src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue b/src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue
index d07ef00..a191f5c 100644
--- a/src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue
+++ b/src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue
@@ -6,28 +6,32 @@
         :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
-            <a-form-item name="name">
-              <template #label><span title="姓名">姓名</span></template>
-              <JInput v-model:value="queryParam.name" />
+            <a-form-item name="comName">
+              <template #label><span title="企业名称">企业名称</span></template>
+              <JInput v-model:value="queryParam.comName" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="tel">
-              <template #label><span title="联系电话">联系电话</span></template>
-              <JInput v-model:value="queryParam.tel" />
+            <a-form-item name="orgLeader">
+              <template #label><span title="机构负责人">机构负责人</span></template>
+              <JInput v-model:value="queryParam.orgLeader" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="createTime">
+              <template #label><span title="申请日期">申请日期</span></template>
+              <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.createTime"
+                class="query-group-cust" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="status">
-              <template #label><span title="审批状态">审批状态</span></template>
-              <j-dict-select-tag type="list" v-model:value="queryParam.status" dictCode="org_apply_status"
-                placeholder="请选择审批状态" allow-clear />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item name="orgBuildingArea">
-              <template #label><span title="建筑面积">建筑面积</span></template>
-              <JRangeNumber v-model:value="queryParam.orgBuildingArea" class="query-group-cust"></JRangeNumber>
+              <template #label><span title="审批意见">审批意见</span></template>
+              <a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审批意见">
+                <a-select-option value="4">待审核</a-select-option>
+                <a-select-option value="2">审核通过</a-select-option>
+                <a-select-option value="5">审核驳回</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -217,11 +221,7 @@ function searchReset() {
   reload();
 }
 
-
-
-
-
-let rangeField = 'orgBuildingArea,'
+let rangeField = 'createTime,'
 
 /**
  * 设置范围查询条件
diff --git a/src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue b/src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue
index 0e3eb14..71a4efa 100644
--- a/src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue
+++ b/src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue
@@ -3,14 +3,14 @@
         <a-form 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-form-item label="审批意见" name="status" v-bind="validateInfos.status">
+                        <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批意见">
                             <a-select-option value="modifyPass">审核通过</a-select-option>
-                            <a-select-option value="modifyFail">驳回</a-select-option>
+                            <a-select-option value="modifyFail">审核驳回</a-select-option>
                         </a-select>
                     </a-form-item>
                 </a-col>
-                <a-col :span="12">
+                <a-col :span="12" v-if="formData.status == 'modifyFail'">
                     <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%" />
@@ -119,13 +119,13 @@ const columns = [
         ellipsis: true
     },
     {
-        title: '原始信息',
+        title: '变更前',
         dataIndex: 'd2',
         key: 'd2',
         ellipsis: true
     },
     {
-        title: '变更信息',
+        title: '变更后',
         dataIndex: 'd3',
         key: 'd3',
         ellipsis: true
diff --git a/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue b/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
index 47feb7c..79a31fa 100644
--- a/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
+++ b/src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
@@ -194,7 +194,7 @@
             <a-col :span="12">
               <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgModifyInfoForm-orgBuildingArea"
                 name="orgBuildingArea">
-                <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="m²" style="width: 100%" />
+                <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="平方米" style="width: 100%" />
               </a-form-item>
             </a-col>
           </a-row>