From 2eb7b8deb7a89dcb49ab82f90b84cff7893e43c6 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 29 Oct 2025 09:19:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4-=E6=97=A5=E5=BF=97=20=E8=AF=A6=E6=83=85=E8=BE=B9?=
 =?UTF-8?q?=E8=B7=9D=E8=B0=83=E6=95=B4=202=E3=80=81=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4-=E6=8C=87=E4=BB=A4=E5=A4=87=E4=BB=BD=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E8=BE=B9=E8=B7=9D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../directivebk/DirectiveBkItemList.vue       |  4 +-
 .../ConfigServiceDirectiveList.vue            |  8 +-
 .../ConfigServiceDirectiveListModal.vue       | 99 ++++++++++---------
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/src/views/services/directivebk/DirectiveBkItemList.vue b/src/views/services/directivebk/DirectiveBkItemList.vue
index 06a3a4a..814282f 100644
--- a/src/views/services/directivebk/DirectiveBkItemList.vue
+++ b/src/views/services/directivebk/DirectiveBkItemList.vue
@@ -100,7 +100,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     useSearchForm: false,
     immediate: false,
     scroll: { y: '58vh' },
-    showActionColumn:false,
+    showActionColumn: false,
     actionColumn: {
       width: 100,
       fixed: 'right',
@@ -246,7 +246,7 @@ defineExpose({
 <style lang="less" scoped>
 .jeecg-basic-table-form-container {
   padding: 0;
-  padding-bottom: 14px;
+  margin-bottom: 14px;
 
   .table-page-search-submitButtons {
     display: block;
diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue
index 622d0e2..4ad4112 100644
--- a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
@@ -202,11 +202,11 @@ defineExpose({
 <style lang="less" scoped>
 .jeecg-basic-table-form-container {
   padding: 0;
-  margin-bottom: 18px;
+  margin-bottom: 14px;
 
   .table-page-search-submitButtons {
     display: block;
-    margin-bottom: 0px;
+    margin-bottom: 14px;
     white-space: nowrap;
   }
 
@@ -221,7 +221,7 @@ defineExpose({
   }
 
   .ant-form-item:not(.ant-form-item-with-help) {
-    margin-bottom: 18px;
+    margin-bottom: 14px;
     height: 32px;
   }
 
diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue
index 4a0892b..3f7cee3 100644
--- a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue
+++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveListModal.vue
@@ -2,9 +2,10 @@
   <!-- <j-modal :title="title" width="75vw" :visible="visible" @cancel="handleCancel" cancelText="关闭" :maskClosable="false">
     <ConfigServiceDirectiveList ref="registerForm"  v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigServiceDirectiveList>
   </j-modal> -->
-  <a-drawer :title="title" width="80vw"  v-model:visible="visible" v-if="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
-    <ConfigServiceDirectiveList ref="registerForm"  v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigServiceDirectiveList>
+  <a-drawer :title="title" width="80vw" v-model:visible="visible" v-if="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
+    <ConfigServiceDirectiveList ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit"
+      :formBpm="false"></ConfigServiceDirectiveList>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
     </template>
@@ -12,59 +13,59 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, nextTick, defineExpose , defineProps} from 'vue';
-  import ConfigServiceDirectiveList from './ConfigServiceDirectiveList.vue'
-  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
-  
-  const props = defineProps({
-    sysUrlValue: { type: String, default: '' },
+import { ref, nextTick, defineExpose, defineProps } from 'vue';
+import ConfigServiceDirectiveList from './ConfigServiceDirectiveList.vue'
+import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+
+const props = defineProps({
+  sysUrlValue: { type: String, default: '' },
+});
+const title = ref<string>('');
+const visible = ref<boolean>(false);
+const disableSubmit = ref<boolean>(false);
+const registerForm = ref();
+const emit = defineEmits(['register', 'success']);
+
+
+
+/**
+ * 编辑
+ * @param record
+ */
+function init(record) {
+  title.value = '详情';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.init(record);
   });
-  const title = ref<string>('');
-  const visible = ref<boolean>(false);
-  const disableSubmit = ref<boolean>(false);
-  const registerForm = ref();
-  const emit = defineEmits(['register', 'success']);
+}
 
 
-  
-  /**
-   * 编辑
-   * @param record
-   */
-  function init(record) {
-    title.value = '详情';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.init(record);
-    });
-  }
-  
+/**
+ * form保存回调事件
+ */
+function submitCallback() {
+  handleCancel();
+  emit('success');
+}
 
-  /**
-   * form保存回调事件
-   */
-  function submitCallback() {
-    handleCancel();
-    emit('success');
-  }
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
 
-  /**
-   * 取消按钮回调事件
-   */
-  function handleCancel() {
-    visible.value = false;
-  }
-
-  defineExpose({
-    init,
-    disableSubmit,
-  });
+defineExpose({
+  init,
+  disableSubmit,
+});
 </script>
 
 <style lang="less">
-  /**隐藏样式-modal确定按钮 */
-  .jee-hidden {
-    display: none !important;
-  }
+/**隐藏样式-modal确定按钮 */
+.jee-hidden {
+  display: none !important;
+}
 </style>
 <style lang="less" scoped></style>

From 98864ab58dd779ec9182e4259478ef7242a35c45 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 29 Oct 2025 10:22:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=EF=BC=88=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F=E3=80=81=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E4=BF=A1=E6=81=AF=EF=BC=89=E8=8F=9C=E5=8D=95=E4=B8=8B?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SectionDivider/SectionDivider.vue         |  13 +-
 .../orgInfo/components/OrgApplyInfoForm.vue   | 101 +++++++++----
 .../orgInfo/components/OrgApplyInfoModal.vue  |   2 +-
 .../components/OrgApplyInfoForm.vue           | 139 ++++++++++++------
 .../components/OrgApplyInfoModal.vue          |   2 +-
 5 files changed, 177 insertions(+), 80 deletions(-)

diff --git a/src/components/SectionDivider/SectionDivider.vue b/src/components/SectionDivider/SectionDivider.vue
index b1a2c39..76370b6 100644
--- a/src/components/SectionDivider/SectionDivider.vue
+++ b/src/components/SectionDivider/SectionDivider.vue
@@ -2,7 +2,8 @@
   <div class="section-divider">
     <!-- 左侧灰色横线 -->
     <!-- <div class="left-line"></div> -->
-    <img src="./section.svg" class="divider-icon" />
+    <!-- <img src="./section.svg" class="divider-icon" /> -->
+     <div class="left-icon"></div>
     <!-- 标题文字 -->
     <div class="divider-content">
       <slot>{{ title }}</slot>
@@ -26,7 +27,7 @@ export default {
 .section-divider {
   display: flex;
   align-items: center;
-  margin: 5px 0 30px 20px;
+  margin: 5px 0 14px 20px;
 }
 
 /* 蓝色竖线（带圆角） */
@@ -72,4 +73,12 @@ export default {
   background-color: #ddd; /* 灰色 */
   margin-left: 8px; /* 与文字的间距 */
 }
+
+.left-icon{
+  width: 8px;
+  height: 18px;
+  background-color: #1890ff;
+  margin-right: 8px;
+  border-radius: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue
index b5aa33d..e41c05a 100644
--- a/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue
+++ b/src/views/admin/orgInfo/components/OrgApplyInfoForm.vue
@@ -1,17 +1,14 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <JFormContainer>
+    <JFormContainer :disabled="disabled">
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="OrgApplyInfoForm">
 
-          <a-row>
-            <a-col :span="24">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'机构信息'" />
             </a-col>
-
-          </a-row>
-          <a-row>
             <a-col :span="12">
               <a-row>
                 <a-col :span="24">
@@ -24,24 +21,31 @@
                 <a-col :span="24">
                   <a-form-item label="信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
                     name="comCreditCode">
-                    {{ formData.comCreditCode }}
+                    <a-input v-model:value="formData.comCreditCode" placeholder="请输入信用代码" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.comCreditCode }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                    {{ formData.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">
-                    {{ formData.comLegalPerson }}
+                    <a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.comLegalPerson }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="注册地址" v-bind="validateInfos.comRegisterAddress"
                     id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
-                    {{ formData.comRegisterAddress }}
+                    <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled
+                      v-model:value="formData.comRegisterAddress" allow-clear></a-textarea>
+                    <!-- {{ formData.comRegisterAddress }} -->
                   </a-form-item>
                 </a-col>
 
@@ -52,49 +56,57 @@
                 <a-col :span="24">
                   <a-form-item label="机构所在地" v-bind="validateInfos.cityViewValue" id="OrgApplyInfoForm-cityViewValue"
                     name="cityViewValue">
-                    {{ cityViewValue }}
+                    <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="cityViewValue"
+                      allow-clear></a-textarea>
+                    <!-- {{ cityViewValue }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                     name="orgLeader">
-                    {{ formData.orgLeader }}
+                    <a-input v-model:value="formData.orgLeader" placeholder="请输入机构负责人" disabled allow-clear></a-input>
+                    <!-- {{ formData.orgLeader }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                     name="orgLeaderPhone">
-                    {{ formData.orgLeaderPhone }}
+                    <a-input v-model:value="formData.orgLeaderPhone" placeholder="请输入负责人电话" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.orgLeaderPhone }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                     name="orgPropertyType">
-                    {{ formData.orgPropertyType }}
+                    <a-input v-model:value="formData.orgPropertyType" placeholder="请输入房屋性质" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.orgPropertyType }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
-                  <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-input v-model:value="formData.orgBuildingArea" placeholder="请输入建筑面积" disabled 
+                      allow-clear></a-input>
+                    <!-- {{ formData.orgBuildingArea }} ㎡ -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                     name="orgAddress">
-                    {{ formData.orgAddress }}
+                    <a-input v-model:value="formData.orgAddress" placeholder="请输入机构地址" disabled allow-clear></a-input>
+                    <!-- {{ formData.orgAddress }} -->
                   </a-form-item>
                 </a-col>
               </a-row>
             </a-col>
           </a-row>
 
-          <a-row>
-            <a-col :span="24">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'申请人身份证'" />
             </a-col>
-          </a-row>
-          <a-row>
             <a-col :span="12">
               <a-row>
                 <a-col :span="24">
@@ -105,35 +117,43 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
-                    {{ formData.name }}
+                    <a-input v-model:value="formData.name" placeholder="请输入姓名" disabled allow-clear></a-input>
+                    <!-- {{ formData.name }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
-                    {{ formData.sex }}
+                    <a-input v-model:value="formData.sex" placeholder="请输入性别" disabled allow-clear></a-input>
+                    <!-- {{ formData.sex }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national"
                     name="national">
-                    {{ formData.national }}
+                    <a-input v-model:value="formData.national" placeholder="请输入民族" disabled allow-clear></a-input>
+                    <!-- {{ formData.national }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
                     name="birthDate">
-                    {{ formData.birthDate ? formData.birthDate.substring(0, 10) : "" }}
+                    <a-date-picker placeholder="请选择出生日期" v-model:value="formData.birthDate" disabled
+                      value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+                    <!-- {{ formData.birthDate ? formData.birthDate.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
-                    {{ formData.idCard }}
+                    <a-input v-model:value="formData.idCard" placeholder="请输入身份证号" disabled allow-clear></a-input>
+                    <!-- {{ formData.idCard }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
                     name="idCardAddress">
-                    {{ formData.idCardAddress }}
+                    <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled
+                      v-model:value="formData.idCardAddress" allow-clear></a-textarea>
+                    <!-- {{ formData.idCardAddress }} -->
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -149,21 +169,27 @@
                 <a-col :span="24">
                   <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
                     name="startTime">
-                    {{ formData.startTime ? formData.startTime.substring(0, 10) : "" }}
+                    <a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.startTime" disabled
+                      value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+                    <!-- {{ formData.startTime ? formData.startTime.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime"
                     name="endTime">
-                    {{ formData.endTime
+                    <a-date-picker placeholder="请选择有效结束日期" v-model:value="formData.endTime" disabled
+                      value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+                    <!-- {{ formData.endTime
                       ? (formData.endTime.substring(0, 10) == '9999-12-31' ? '长期' : formData.endTime.substring(0, 10))
-                      : "" }}
+                      : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority"
                     id="OrgApplyInfoForm-issuingAuthority" name="issuingAuthority">
-                    {{ formData.issuingAuthority }}
+                    <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.issuingAuthority }} -->
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -405,4 +431,17 @@ defineExpose({
 .antd-modal-form {
   padding: 14px;
 }
+
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
+}
 </style>
diff --git a/src/views/admin/orgInfo/components/OrgApplyInfoModal.vue b/src/views/admin/orgInfo/components/OrgApplyInfoModal.vue
index 8dc856b..2f62b01 100644
--- a/src/views/admin/orgInfo/components/OrgApplyInfoModal.vue
+++ b/src/views/admin/orgInfo/components/OrgApplyInfoModal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer :title="title" :width="`70vw`"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{padding:'0px'}" @close="handleCancel">
     <OrgApplyInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
     </OrgApplyInfoForm>
     <template #footer>
diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
index e2d7266..d3b8822 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -1,17 +1,14 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <JFormContainer>
+    <JFormContainer :disabled="disabled">
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="OrgApplyInfoForm">
 
-          <a-row>
-            <a-col :span="24">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'机构信息'" />
             </a-col>
-
-          </a-row>
-          <a-row>
             <a-col :span="12">
               <a-row>
                 <a-col :span="24">
@@ -24,24 +21,31 @@
                 <a-col :span="24">
                   <a-form-item label="信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
                     name="comCreditCode">
-                    {{ formData.comCreditCode }}
+                    <a-input v-model:value="formData.comCreditCode" placeholder="请输入信用代码" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.comCreditCode }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                    {{ formData.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">
-                    {{ formData.comLegalPerson }}
+                    <a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.comLegalPerson }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="注册地址" v-bind="validateInfos.comRegisterAddress"
                     id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
-                    {{ formData.comRegisterAddress }}
+                    <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled
+                      v-model:value="formData.comRegisterAddress" allow-clear></a-textarea>
+                    <!-- {{ formData.comRegisterAddress }} -->
                   </a-form-item>
                 </a-col>
 
@@ -52,49 +56,58 @@
                 <a-col :span="24">
                   <a-form-item label="机构所在地" v-bind="validateInfos.cityViewValue" id="OrgApplyInfoForm-cityViewValue"
                     name="cityViewValue">
-                    {{ cityViewValue }}
+                    <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="cityViewValue"
+                      allow-clear></a-textarea>
+                    <!-- {{ cityViewValue }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                     name="orgLeader">
-                    {{ formData.orgLeader }}
+                    <a-input v-model:value="formData.orgLeader" placeholder="请输入机构负责人" disabled allow-clear></a-input>
+                    <!-- {{ formData.orgLeader }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                     name="orgLeaderPhone">
-                    {{ formData.orgLeaderPhone }}
+                    <a-input v-model:value="formData.orgLeaderPhone" placeholder="请输入负责人电话" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.orgLeaderPhone }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                     name="orgPropertyType">
-                    {{ formData.orgPropertyType }}
+                    <a-input v-model:value="formData.orgPropertyType" placeholder="请输入房屋性质" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.orgPropertyType }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
-                  <a-form-item label="建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
-                    name="orgBuildingArea">
-                    {{ formData.orgBuildingArea }} ㎡
+                  <a-form-item label="建筑面积(㎡)" v-bind="validateInfos.orgBuildingArea"
+                    id="OrgApplyInfoForm-orgBuildingArea" name="orgBuildingArea">
+                    <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入建筑面积" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.orgBuildingArea }} ㎡ -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                     name="orgAddress">
-                    {{ formData.orgAddress }}
+                    <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="formData.orgAddress"
+                      allow-clear></a-textarea>
+                    <!-- {{ formData.orgAddress }} -->
                   </a-form-item>
                 </a-col>
               </a-row>
             </a-col>
           </a-row>
 
-          <a-row>
-            <a-col :span="24">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'申请人身份证'" />
             </a-col>
-          </a-row>
-          <a-row>
             <a-col :span="12">
               <a-row>
                 <a-col :span="24">
@@ -105,35 +118,43 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
-                    {{ formData.name }}
+                    <a-input v-model:value="formData.name" placeholder="请输入姓名" disabled allow-clear></a-input>
+                    <!-- {{ formData.name }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
-                    {{ formData.sex }}
+                    <a-input v-model:value="formData.sex" placeholder="请输入性别" disabled allow-clear></a-input>
+                    <!-- {{ formData.sex }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national"
                     name="national">
-                    {{ formData.national }}
+                    <a-input v-model:value="formData.national" placeholder="请输入民族" disabled allow-clear></a-input>
+                    <!-- {{ formData.national }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
                     name="birthDate">
-                    {{ formData.birthDate ? formData.birthDate.substring(0, 10) : "" }}
+                    <a-date-picker placeholder="请选择出生日期" v-model:value="formData.birthDate" disabled
+                      value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+                    <!-- {{ formData.birthDate ? formData.birthDate.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
-                    {{ formData.idCard }}
+                    <a-input v-model:value="formData.idCard" placeholder="请输入身份证号" disabled allow-clear></a-input>
+                    <!-- {{ formData.idCard }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
                     name="idCardAddress">
-                    {{ formData.idCardAddress }}
+                    <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled
+                      v-model:value="formData.idCardAddress" allow-clear></a-textarea>
+                    <!-- {{ formData.idCardAddress }} -->
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -149,33 +170,37 @@
                 <a-col :span="24">
                   <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
                     name="startTime">
-                    {{ formData.startTime ? formData.startTime.substring(0, 10) : "" }}
+                    <a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.startTime" disabled
+                      value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+                    <!-- {{ formData.startTime ? formData.startTime.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime"
                     name="endTime">
-                    {{ formData.endTime
+                    <a-date-picker placeholder="请选择有效结束日期" v-model:value="formData.endTime" disabled
+                      value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+                    <!-- {{ formData.endTime
                       ? (formData.endTime.substring(0, 10) == '9999-12-31' ? '长期' : formData.endTime.substring(0, 10))
-                      : "" }}
+                      : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority"
                     id="OrgApplyInfoForm-issuingAuthority" name="issuingAuthority">
-                    {{ formData.issuingAuthority }}
+                    <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.issuingAuthority }} -->
                   </a-form-item>
                 </a-col>
               </a-row>
             </a-col>
           </a-row>
 
-          <a-row>
-            <a-col :span="24">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'加盟审核'" />
             </a-col>
-          </a-row>
-          <a-row>
             <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="请选择审核意见"
@@ -193,12 +218,15 @@
             </a-col>
             <a-col :span="12" v-if="formData.auditBy">
               <a-form-item label="审核人" v-bind="validateInfos.auditBy" id="OrgApplyInfoForm-auditBy">
-                {{ formData.auditBy }}
+                <a-input v-model:value="formData.auditBy" disabled allow-clear></a-input>
+                <!-- {{ formData.auditBy }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12" v-if="formData.auditBy">
               <a-form-item label="审核时间" v-bind="validateInfos.auditTime" id="OrgApplyInfoForm-auditTime">
-                {{ formData.auditTime }}
+                <a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.auditTime" showTime disabled
+                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
+                <!-- {{ formData.auditTime }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12" v-show="formData.contract">
@@ -209,22 +237,26 @@
             </a-col>
             <a-col :span="12" v-if="formData.contractNote">
               <a-form-item label="备注信息" v-bind="validateInfos.contractNote" id="OrgApplyInfoForm-contractNote">
-                {{ formData.contractNote }}
+                <a-textarea v-model:value="formData.contractNote" :autosize="{ minRows: 1 }" maxlength="50" allow-clear
+                  placeholder="请输入备注信息"></a-textarea>
+                <!-- {{ formData.contractNote }} -->
               </a-form-item>
             </a-col>
           </a-row>
-          <a-row v-show="formData.workOrderStatus != '0'">
-            <a-col :span="24">
+          <a-row v-show="formData.workOrderStatus != '0'" 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="工单状态">
-                {{ formData.workOrderStatus_dictText }}
+                <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="处理人">
-                {{ formData.handleBy }}
+                <a-input v-model:value="formData.handleBy" disabled allow-clear></a-input>
+                <!-- {{ formData.handleBy }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -234,12 +266,16 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="反馈时间">
-                {{ formData.replyTime ? formData.replyTime.substring(0, 10) : "" }}
+                <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="反馈内容">
-                {{ formData.replyContent }}
+                <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>
@@ -478,4 +514,17 @@ defineExpose({
 .antd-modal-form {
   padding: 14px;
 }
+
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
+}
 </style>
diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
index 3bb91fa..3b7dd0d 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer :title="title" :width="`70vw`"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{padding:'0px'}" @close="handleCancel">
     <OrgApplyInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
     </OrgApplyInfoForm>
     <template #footer>

From d3ed8e7411ba528c110f1d94698e2900b5b8ea9b Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 29 Oct 2025 10:50:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E4=B8=8A=E4=BC=A0=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OrgApplyInfoModal.vue          |  2 +-
 .../components/OrgUpContractForm.vue          | 54 +++++++++++++------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
index 3b7dd0d..d72bb9e 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoModal.vue
@@ -10,7 +10,7 @@
   </a-drawer>
 
   <a-drawer :title="title" :width="`70vw`"  v-model:visible="contractVisible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{padding:'0px'}" @close="handleCancel">
     <OrgUpContractForm ref="upContractForm" @ok="submitContractCallback" :formBpm="false"></OrgUpContractForm>
     <template #footer>
       <a-button @click="handleContractCancel" style="margin-right: 8px">关闭</a-button>
diff --git a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
index fa136ac..2ce400e 100644
--- a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue
@@ -4,60 +4,69 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="OrgApplyInfoForm">
-          <a-row>
-            <a-col :span="24">
+          <a-row 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="机构所在地">
-                {{ cityViewValue }}
+                <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="cityViewValue"
+                  allow-clear></a-textarea>
+                <!-- {{ cityViewValue }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                {{ formData.comName }}
+                <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="formData.comName"
+                  allow-clear></a-textarea>
+                <!-- {{ formData.comName }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                 name="orgLeader">
-                {{ formData.orgLeader }}
+                <a-input v-model:value="formData.orgLeader" disabled allow-clear></a-input>
+                <!-- {{ formData.orgLeader }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                 name="orgLeaderPhone">
-                {{ formData.orgLeaderPhone }}
+                <a-input v-model:value="formData.orgLeaderPhone" disabled allow-clear></a-input>
+                <!-- {{ formData.orgLeaderPhone }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                 name="orgPropertyType">
-                {{ formData.orgPropertyType }}
+                <a-input v-model:value="formData.orgPropertyType" disabled allow-clear></a-input>
+                <!-- {{ 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-input v-model:value="formData.orgBuildingArea" disabled allow-clear></a-input>
+                <!-- {{ formData.orgBuildingArea }}㎡ -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                 name="orgAddress">
-                {{ formData.orgAddress }}
+                <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="formData.orgAddress"
+                  allow-clear></a-textarea>
+                <!-- {{ formData.orgAddress }} -->
               </a-form-item>
             </a-col>
           </a-row>
-          <a-row v-if="formData.buildStatus == '3'">
-            <a-col :span="24">
+          <a-row v-if="formData.buildStatus == '3'" class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'加盟合同'" />
             </a-col>
-          </a-row>
-          <a-row v-if="formData.buildStatus == '3'">
             <a-col :span="12">
               <a-form-item label="加盟合同" v-bind="validateInfos.contract" id="OrgApplyInfoForm-contract">
-                <JUpload v-model:value="formData.contract" :maxCount="1" accept=".pdf" :beforeUpload="checkFileType"></JUpload>
+                <JUpload v-model:value="formData.contract" :maxCount="1" accept=".pdf" :beforeUpload="checkFileType">
+                </JUpload>
               </a-form-item>
               <div style="margin-top: 15px;margin-left:20%;color:#8e8e8e;font-size:12px;">说明：请上传pdf文件，并且只能上传一份文件</div>
             </a-col>
@@ -81,7 +90,7 @@ import { defHttp } from '/@/utils/http/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import { getValueType } from '/@/utils';
-import { saveOrUpdate, submitContract,editCg } from '../OrgApplyInfo.api';
+import { saveOrUpdate, submitContract, editCg } from '../OrgApplyInfo.api';
 import { Form } from 'ant-design-vue';
 import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
 import TencentMap from '/@/components/TencentMap/TencentMap.vue';
@@ -306,4 +315,17 @@ defineExpose({
 .antd-modal-form {
   padding: 14px;
 }
+
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
+}
 </style>