From 1aa30fa1aec5e09059e28a90e9e3f505068e4971 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 6 Feb 2026 14:12:08 +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

---
 .../NuConfigSuppliersApply.data.ts            |  6 +--
 .../NuConfigSuppliersAuditHistoryList.vue     |  6 +--
 .../NuConfigSuppliersApplyDetailForm.vue      |  2 +-
 .../NuConfigSuppliersApplyHistoryModal.vue    | 21 ++++++++++
 .../NuConfigSuppliersApplyModal.vue           | 40 ++++++++++++++++---
 5 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.data.ts b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.data.ts
index 3ffcf52..c12b6b7 100644
--- a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.data.ts
+++ b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.data.ts
@@ -45,7 +45,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'openingBankNo',
   },
   {
-    title: '资质照片',
+    title: '营业执照',
     align: 'center',
     dataIndex: 'imgPath',
     customRender: ({ text }) => {
@@ -201,7 +201,7 @@ export const upColumns: BasicColumn[] = [
     dataIndex: 'openingBankNo',
   },
   {
-    title: '资质照片',
+    title: '营业执照',
     align: 'center',
     dataIndex: 'imgPath',
     customRender: ({ text }) => {
@@ -234,7 +234,7 @@ export const superQuerySchema = {
   openingBank: { title: '开户行', order: 6, view: 'text', type: 'string' },
   openingBankNo: { title: '开户行账号', order: 7, view: 'text', type: 'string' },
   wechartId: { title: '微信账号', order: 8, view: 'text', type: 'string' },
-  imgPath: { title: '资质照片', order: 9, view: 'text', type: 'string' },
+  imgPath: { title: '营业执照', order: 9, view: 'text', type: 'string' },
   applyStatus: { title: '审核状态', order: 10, view: 'text', type: 'string' },
   applyContent: { title: '审核备注', order: 11, view: 'text', type: 'string' },
 };
diff --git a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersAuditHistoryList.vue b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersAuditHistoryList.vue
index 11fa6e7..1a2a552 100644
--- a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersAuditHistoryList.vue
+++ b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersAuditHistoryList.vue
@@ -58,7 +58,6 @@
     </BasicTable>
     <!-- 表单区域 -->
     <NuConfigSuppliersApplyHistoryModal ref="registerModal" @success="handleSuccess"></NuConfigSuppliersApplyHistoryModal>
-    <NuConfigSuppliersApplyModal ref="registerDetailModal" @success="handleSuccess"></NuConfigSuppliersApplyModal>
   </div>
 </template>
 
@@ -70,7 +69,6 @@ import { columns2, superQuerySchema } from './NuConfigSuppliersApply.data';
 import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuConfigSuppliersApply.api';
 import { downloadFile } from '/@/utils/common/renderUtils';
 import NuConfigSuppliersApplyHistoryModal from './components/NuConfigSuppliersApplyHistoryModal.vue'
-import NuConfigSuppliersApplyModal from './components/NuConfigSuppliersApplyModal.vue'
 import { useUserStore } from '/@/store/modules/user';
 import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
 import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
@@ -139,8 +137,8 @@ function handleDetail(record: Recordable) {
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }else if(record.optType == '入驻'){
-    registerDetailModal.value.disableSubmit = true;
-    registerDetailModal.value.edit(record);
+    registerModal.value.disableSubmit = true;
+    registerModal.value.editDitail(record);
   }else{
     createMessage.error('错误数据，请联系管员');
     
diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyDetailForm.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyDetailForm.vue
index eba30ac..321deac 100644
--- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyDetailForm.vue
+++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyDetailForm.vue
@@ -6,7 +6,7 @@
           name="NuConfigSuppliersApplyForm">
           <a-row>
             <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
-              <SectionDivider :title="'基本信息1'" />
+              <SectionDivider :title="'基本信息'" />
             </a-col>
             <a-col :span="24">
               <a-form-item label="供应商名称" v-bind="validateInfos.suppliersName"
diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryModal.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryModal.vue
index 4688efe..27354fc 100644
--- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryModal.vue
+++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryModal.vue
@@ -10,18 +10,31 @@
     </template>
   </a-drawer>
 
+
+  <a-drawer :title="title" :width="width" v-model:visible="visibleDetail" :closable="true"
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
+    <NuConfigSuppliersApplyDetailForm ref="registerFormDetail" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </NuConfigSuppliersApplyDetailForm>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关2闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
 import { ref, nextTick, defineExpose } from 'vue';
 import NuConfigSuppliersApplyHistoryForm from './NuConfigSuppliersApplyHistoryForm.vue'
+import NuConfigSuppliersApplyDetailForm from './NuConfigSuppliersApplyDetailForm.vue'
 import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 
 const title = ref<string>('');
 const width = ref<string>('800');
 const visible = ref<boolean>(false);
+const visibleDetail = ref<boolean>(false);
 const disableSubmit = ref<boolean>(false);
 const registerForm = ref();
+const registerFormDetail = ref();
 const upInfoForm = ref();
 const upInfoVisible = ref<boolean>(false);
 const emit = defineEmits(['register', 'success']);
@@ -38,6 +51,13 @@ function edit(record) {
     registerForm.value.show(record);
   });
 }
+function editDitail(record) {
+  title.value = "详情";
+  visibleDetail.value = true;
+  nextTick(() => {
+    registerFormDetail.value.edit(record);
+  });
+}
 
 
 /**
@@ -72,6 +92,7 @@ function handleUpInfoOk() {
 
 defineExpose({
   edit,
+  editDitail,
   disableSubmit,
 });
 </script>
diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyModal.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyModal.vue
index a13b604..4c856f0 100644
--- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyModal.vue
+++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyModal.vue
@@ -2,20 +2,30 @@
 
   <a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
-    <NuConfigSuppliersApplyDetailForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
-    </NuConfigSuppliersApplyDetailForm>
+    <NuConfigSuppliersApplyForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </NuConfigSuppliersApplyForm>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
       <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
     </template>
   </a-drawer>
 
- 
+  <!-- 信息变更审核 -->
+  <a-drawer :title="title" width="900" :visible="upInfoVisible" :closable="true" :footer-style="{ textAlign: 'right' }"
+    :bodyStyle="{ padding: '14px' }" @close="handleUpInfoCancel">
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleUpInfoCancel">关闭</a-button>
+      <a-button type="primary" @click="handleUpInfoOk">确认</a-button>
+    </template>
+    <NuConfigSuppliersApplyUpInfoForm v-if="upInfoVisible" ref="upInfoForm" @ok="handleUpInfoCancel" :formBpm="false">
+    </NuConfigSuppliersApplyUpInfoForm>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
 import { ref, nextTick, defineExpose } from 'vue';
-import NuConfigSuppliersApplyDetailForm from './NuConfigSuppliersApplyDetailForm.vue'
+import NuConfigSuppliersApplyForm from './NuConfigSuppliersApplyForm.vue'
+import NuConfigSuppliersApplyUpInfoForm from './NuConfigSuppliersApplyUpInfoForm.vue'
 import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 
 const title = ref<string>('');
@@ -50,7 +60,18 @@ function edit(record) {
   });
 }
 
- 
+/**
+ * 编辑
+ * @param record
+ */
+function upInfoEdit(record) {
+  title.value = disableSubmit.value ? '详情' : '信息变更审核';
+  upInfoVisible.value = true;
+  nextTick(() => {
+    upInfoForm.value.show(record);
+  });
+}
+
 /**
  * 确定按钮点击事件
  */
@@ -81,11 +102,18 @@ function handleUpInfoCancel() {
   upInfoVisible.value = false
   emit('success');
 }
- 
+
+/**
+ * 信息变更确认
+ */
+function handleUpInfoOk() {
+  upInfoForm.value.submitForm();
+}
 
 defineExpose({
   add,
   edit,
+  upInfoEdit,
   disableSubmit,
 });
 </script>