From bfe42f22440857a6e94ad80b81e0d753b2864d4b Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 18 Mar 2026 13:34:03 +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

---
 .../Container/src/ScrollContainer.vue         |  1 -
 src/components/SimpleMenu/src/SimpleMenu.vue  |  5 +----
 .../SimpleMenu/src/components/menu.less       |  2 +-
 .../NuBizSuppliersAuditHistoryList.vue        |  6 ++++--
 .../NuBizSuppliersApplyHistoryForm.vue        | 19 ++++++-------------
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/components/Container/src/ScrollContainer.vue b/src/components/Container/src/ScrollContainer.vue
index 9b08dcb..65c71ed 100644
--- a/src/components/Container/src/ScrollContainer.vue
+++ b/src/components/Container/src/ScrollContainer.vue
@@ -84,7 +84,6 @@
     .scrollbar__wrap {
       margin-bottom: 18px !important;
       overflow-x: hidden;
-	  padding:0 18px;
     }
 
     .scrollbar__view {
diff --git a/src/components/SimpleMenu/src/SimpleMenu.vue b/src/components/SimpleMenu/src/SimpleMenu.vue
index 72a277a..c86e020 100644
--- a/src/components/SimpleMenu/src/SimpleMenu.vue
+++ b/src/components/SimpleMenu/src/SimpleMenu.vue
@@ -214,13 +214,11 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   cursor: pointer;
-  padding: 8px;
-  padding-left: 10px !important;
+  margin: 0px 5px;
 }
 .jeecg-menu-item-active>.jeecg-menu-submenu-title{
 	background: #f7f8fa;
 	border-radius: 6px;
-	padding-left: 10px !important;
 }
 .ant-drawer-close {
   position: absolute;
@@ -247,7 +245,6 @@ position: relative;
 	>li{
 		width: 92%;
 		margin:5px auto;
-		padding-left: 10px !important;
 	}
 }
 </style>
diff --git a/src/components/SimpleMenu/src/components/menu.less b/src/components/SimpleMenu/src/components/menu.less
index 4d25785..f99e797 100644
--- a/src/components/SimpleMenu/src/components/menu.less
+++ b/src/components/SimpleMenu/src/components/menu.less
@@ -262,7 +262,7 @@
           width: 3px;
           height: 100%;
           background-color: @primary-color;
-          content: '';
+          // content: '';
         }
       }
     }
diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersAuditHistoryList.vue b/src/views/admin/bizSuppliers/NuBizSuppliersAuditHistoryList.vue
index fe263b5..597118e 100644
--- a/src/views/admin/bizSuppliers/NuBizSuppliersAuditHistoryList.vue
+++ b/src/views/admin/bizSuppliers/NuBizSuppliersAuditHistoryList.vue
@@ -81,6 +81,7 @@ const toggleSearchStatus = ref<boolean>(false);
 const registerModal = ref();
 const registerDetailModal = ref();
 const suppliersId = ref<any>('');
+const openId = ref<any>('');
 const userStore = useUserStore();
 const { createMessage } = useMessage();
 //注册table数据
@@ -170,7 +171,7 @@ function getTableAction(record) {
  * 查询
  */
 function searchQuery() {
-  queryParam.suppliersId = suppliersId.value;
+  queryParam.openId = openId.value;
   reload();
 }
 
@@ -188,7 +189,8 @@ function searchReset() {
 function init(record) {
   console.log("🚀 ~ init ~ record:", record)
   suppliersId.value = record.suppliersId;
-  queryParam.suppliersName = record.suppliersName;
+  openId.value = record.openId;
+  // queryParam.suppliersName = record.suppliersName;
   searchQuery();
 } 
 
diff --git a/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyHistoryForm.vue b/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyHistoryForm.vue
index fe9475a..fcebc90 100644
--- a/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyHistoryForm.vue
+++ b/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyHistoryForm.vue
@@ -48,23 +48,14 @@
         <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-col :span="12" v-if="formData.applyBy">
               <a-form-item label="审核人" name="applyBy" v-bind="validateInfos.applyBy">
                 <a-input v-model:value="formData.applyBy" placeholder="审核人"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :span="12">
-              <a-form-item label="审核人" name="applyTime" v-bind="validateInfos.applyTime">
-                <a-input v-model:value="formData.applyTime" placeholder="审核人"></a-input>
-              </a-form-item>
-            </a-col>
-            <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="modifyStatus">待审核</a-select-option>
-                  <a-select-option value="modifyPass">审核通过</a-select-option>
-                  <a-select-option value="modifyFail">审核驳回</a-select-option>
-                </a-select>
+            <a-col :span="12" v-if="formData.applyTime">
+              <a-form-item label="审核时间" name="applyTime" v-bind="validateInfos.applyTime">
+                <a-input v-model:value="formData.applyTime" placeholder="审核时间"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -193,6 +184,8 @@ async function show(record) {
 
   formData.id = record.id
   formData.suppliersId = record.suppliersId
+  formData.applyBy = record.applyBy
+  formData.applyTime = record.applyTime
 
 if(record.applyStatus == '5' || record.applyStatus == '3'){
   formData.status = 'modifyFail'