From 5d3e10e1cd8637d923853cf1b759007a10ae07be Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 29 Jul 2025 17:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts      |  2 +-
 .../admin/orgapplyinfo/components/OrgApplyInfoForm.vue | 10 +++++-----
 .../orgapplyinfo/components/OrgUpContractForm.vue      |  6 +++---
 src/views/admin/orgmodifyinfo/OrgModifyInfoList.vue    |  4 ++--
 .../admin/orgmodifyinfo/components/OrgHistoryForm.vue  | 10 +++++++++-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
index 0b38416..e939070 100644
--- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
+++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts
@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '面积',
+    title: '面积(㎡)',
     align: 'center',
     dataIndex: 'orgBuildingArea',
     width: 120,
diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
index 8144f7b..374d786 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -195,16 +195,16 @@
                 {{formData.auditTime}}
               </a-form-item>
             </a-col>
-            <!-- <a-col :span="12" v-if="formData.auditBy">
-              <a-form-item label="驳回原因" v-bind="validateInfos.content" id="OrgApplyInfoForm-content">
-                {{formData.content}}
-              </a-form-item>
-            </a-col> -->
             <a-col :span="12" v-show="formData.contract">
               <a-form-item label="加盟合同" v-bind="validateInfos.contract" id="OrgApplyInfoForm-contract">
                 <JUpload v-model:value="formData.contract" :maxCount="1" :buttonVisible="false" disabled="true" fileType="pdf"></JUpload>
               </a-form-item>
             </a-col>
+            <a-col :span="12" v-if="formData.contractNote">
+              <a-form-item label="备注信息" v-bind="validateInfos.contractNote" id="OrgApplyInfoForm-contractNote">
+                {{formData.contractNote}}
+              </a-form-item>
+            </a-col>
           </a-row>
           <a-row v-show="formData.workOrderStatus != '0'">
             <a-col :span="24">
diff --git a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
index 0df379e..ae079ec 100644
--- a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
@@ -25,19 +25,19 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
+              <a-form-item label="负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                 name="orgLeaderPhone">
                 {{ formData.orgLeaderPhone }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
+              <a-form-item label="房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                 name="orgPropertyType">
                 {{ formData.orgPropertyType }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
+              <a-form-item label="建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
                 name="orgBuildingArea">
                 {{ formData.orgBuildingArea }}㎡
               </a-form-item>
diff --git a/src/views/admin/orgmodifyinfo/OrgModifyInfoList.vue b/src/views/admin/orgmodifyinfo/OrgModifyInfoList.vue
index 0585aa8..bc2ae4b 100644
--- a/src/views/admin/orgmodifyinfo/OrgModifyInfoList.vue
+++ b/src/views/admin/orgmodifyinfo/OrgModifyInfoList.vue
@@ -24,7 +24,7 @@
                 class="query-group-cust" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <!-- <a-col :lg="6">
             <a-form-item name="status">
               <template #label><span title="审核意见">审核意见</span></template>
               <a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审核意见">
@@ -33,7 +33,7 @@
                 <a-select-option value="5">审核驳回</a-select-option>
               </a-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
diff --git a/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue b/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
index 659b1bb..e35ab84 100644
--- a/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
+++ b/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
@@ -22,7 +22,7 @@
         <a-row>
             <a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;">
                 <a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small"
-                    :scroll="{ y: '45vh' }" :rowClassName="setRowClassName">
+                     :rowClassName="setRowClassName">
                     <template #bodyCell="{ column, record }">
                         <template v-if="column.dataIndex === 'd1'">
                             <span>{{ applyObj[record.d1] }}</span>
@@ -41,6 +41,14 @@
                             v-if="column.dataIndex === 'd3' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
                             <span>{{ provinceOptions[record.d3] }}</span>
                         </template>
+                        <template
+                            v-if="column.dataIndex === 'd2' && record.d1 == 'orgBuildingArea' ">
+                            <span>{{ record.d2 }}㎡</span>
+                        </template>
+                        <template
+                            v-if="column.dataIndex === 'd3'  && record.d1 == 'orgBuildingArea' ">
+                            <span>{{ record.d3 }}㎡</span>
+                        </template>
                     </template>
                 </a-table>
             </a-col>