From 474de2892abd939789f7203b464f982515572902 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 24 Mar 2026 16:03:47 +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

---
 .../bizSuppliers/NuBizSuppliersApplyList.vue  | 14 ++--
 .../bizSuppliers/NuBizSuppliersInfoList.vue   |  8 +-
 .../components/NuBizSuppliersApplyForm.vue    |  5 ++
 .../components/OrgApplyInfoForm.vue           | 82 +++++++++----------
 4 files changed, 57 insertions(+), 52 deletions(-)

diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersApplyList.vue b/src/views/admin/bizSuppliers/NuBizSuppliersApplyList.vue
index a56733a..c2853e7 100644
--- a/src/views/admin/bizSuppliers/NuBizSuppliersApplyList.vue
+++ b/src/views/admin/bizSuppliers/NuBizSuppliersApplyList.vue
@@ -13,7 +13,7 @@
         <a-col :lg="6">
             <a-form-item name="applyStatus">
               <template #label><span title="审核状态">审核状态</span></template>
-              <a-select v-model:value="queryParam.applyStatus" placeholder="请选择审核状态" style="width: 200px"
+              <a-select v-model:value="queryParam.applyStatus" placeholder="请选择审核状态" style="width: 100%"
                 :disabled="false">
                 <a-select-option value="1,2,3,4,5">全部</a-select-option>
                 <a-select-option value="1,4">待审核</a-select-option>
@@ -24,8 +24,8 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item name="rzrq">
-              <template #label><span title="入驻日期">申请日期</span></template>
-              <a-date-picker placeholder="请选择入驻日期"  v-model:value="queryParam.rzrq"  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+              <template #label><span title="申请日期">申请日期</span></template>
+              <a-date-picker placeholder="请选择申请日期"  v-model:value="queryParam.rzrq"  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="6" :md="6" :sm="24">
@@ -105,13 +105,13 @@
   const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
   const labelCol = reactive({
     xs:24,
-    sm:6,
-    xl:6,
-    xxl:6
+    sm:7,
+    xl:7,
+    xxl:7
   });
   const wrapperCol = reactive({
     xs: 24,
-    sm: 18,
+    sm: 17,
   });
 
   
diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue b/src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue
index c113459..756635f 100644
--- a/src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue
+++ b/src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
         <a-col :lg="6">
         <a-form-item name="suppliersName">
-        <template #label><span title="供应商名称">供应商名</span></template>
+        <template #label><span title="供应商名称">供应商名称</span></template>
             <JInput v-model:value="queryParam.suppliersName" placeholder="请输入供应商名称"/>
         </a-form-item>
         </a-col>
@@ -104,9 +104,9 @@
   const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
   const labelCol = reactive({
     xs:24,
-    sm:6,
-    xl:6,
-    xxl:6
+    sm:7,
+    xl:7,
+    xxl:7
   });
   const wrapperCol = reactive({
     xs: 24,
diff --git a/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue b/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue
index b3e1502..9a00651 100644
--- a/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue
+++ b/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue
@@ -195,6 +195,11 @@
         }
       }
     }
+
+    if(formData.status == 'modifyFail' && !formData.applyContent){
+        createMessage.warning('请填写驳回原因');
+        return;
+    }
     
   await auditSubmit(formData)
     .then((res) => {
diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
index 7f27e73..8609dbe 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -57,49 +57,58 @@
                   <SectionDivider :title="'机构信息'" />
                 </a-col>
                 <a-col :span="24">
-                  <a-form-item label="机构所在地" v-bind="validateInfos.cityViewValue" id="OrgApplyInfoForm-cityViewValue"
-                    name="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">
-                    <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">
-                    <a-input v-model:value="formData.orgLeaderPhone" placeholder="请输入负责人电话" disabled
-                      allow-clear></a-input>
-                    <!-- {{ formData.orgLeaderPhone }} -->
-                  </a-form-item>
+                  <a-row>
+                    <a-col :span="16">
+                      <a-col :span="24">
+                        <a-form-item label="机构位置" v-bind="validateInfos.cityViewValue" id="OrgApplyInfoForm-cityViewValue"
+                          name="cityViewValue" :labelCol="labelCol4" :wrapperCol="wrapperCol4">
+                          <a-textarea :autosize="{ minRows: 1 }" maxlength="50" disabled v-model:value="cityViewValue"
+                            allow-clear></a-textarea>
+                        </a-form-item>
+                      </a-col>
+                      <a-col :span="24">
+                        <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
+                          name="orgLeader" :labelCol="labelCol4" :wrapperCol="wrapperCol4">
+                          <a-input v-model:value="formData.orgLeader" placeholder="请输入机构负责人" disabled allow-clear></a-input>
+                        </a-form-item>
+                      </a-col>
+                      <a-col :span="24">
+                        <a-form-item label="负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
+                          name="orgLeaderPhone" :labelCol="labelCol4" :wrapperCol="wrapperCol4">
+                          <a-input v-model:value="formData.orgLeaderPhone" disabled
+                            allow-clear></a-input>
+                        </a-form-item>
+                      </a-col>
+                    </a-col>
+                    <a-col :span="8">
+                      <a-col :span="24">
+                      <a-form-item label="" v-bind="validateInfos.headPath" id="OrgApplyInfoForm-headPath"
+                        name="headPath" style="margin-left: 40px;">
+                        <JImageUpload :fileMax="1" text="无" v-model:value="formData.headPath" :disabled="true"></JImageUpload>
+                      </a-form-item>
+                    </a-col>
+                    </a-col>
+                  </a-row>
                 </a-col>
+                
                 <a-col :span="24">
                   <a-form-item label="房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                     name="orgPropertyType">
-                    <a-input v-model:value="formData.orgPropertyType" placeholder="请输入房屋性质" disabled
+                    <a-input v-model:value="formData.orgPropertyType" 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">
-                    <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入建筑面积" disabled
+                    <a-input v-model:value="formData.orgBuildingArea" 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"
+                  <a-form-item label="详细地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                     name="orgAddress">
-                    <a-input v-model:value="formData.orgAddress" placeholder="请输入机构地址" disabled allow-clear></a-input>
-                    <!-- {{ formData.orgAddress }} -->
+                    <a-input v-model:value="formData.orgAddress" disabled allow-clear></a-input>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -200,12 +209,7 @@
                     <!-- {{ formData.issuingAuthority }} -->
                   </a-form-item>
                 </a-col>
-                <a-col :span="24">
-                  <a-form-item label="头像" v-bind="validateInfos.headPath" id="OrgApplyInfoForm-headPath"
-                    name="headPath">
-                    <JImageUpload :fileMax="1" text="无" v-model:value="formData.headPath" :disabled="true"></JImageUpload>
-                  </a-form-item>
-                </a-col>
+                
               </a-row>
             </a-col>
           </a-row>
@@ -305,12 +309,6 @@
                   placeholder="" allow-clear />
               </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>
-              </a-form-item>
-            </a-col> -->
           </a-row>
           <a-row v-show="!!formData.netUrl" class="card-class">
             <a-col :span="22" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
@@ -442,6 +440,8 @@ const sfsh = ref<string>('0');
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
 const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const labelCol4 = ref<any>({ xs: { span: 24 }, sm: { span: 12 } });
+const wrapperCol4 = ref<any>({ xs: { span: 24 }, sm: { span: 12 } });
 const confirmLoading = ref<boolean>(false);
 //表单验证
 const validatorRules = reactive({
@@ -452,7 +452,7 @@ const validatorRules = reactive({
         if (formData.status === '3' && !value) {
           return Promise.reject('请输入驳回原因!');
         }
-        return Promise.resolve();
+        // return Promise.resolve();
       },
     },
   ],