From 1023a04f936fcb4329b001ccef53921ec050163c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 5 Feb 2026 09:43:57 +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.api.ts | 4 ++++ .../NuConfigSuppliersApply.data.ts | 8 +++---- .../NuConfigSuppliersAuditHistoryList.vue | 14 ++++++++++++ .../components/NuConfigSuppliersApplyForm.vue | 22 ++++++++++++++----- .../NuConfigSuppliersApplyHistoryForm.vue | 16 ++++++++++---- .../NuConfigSuppliersApplyModal.vue | 6 ++--- .../NuConfigSuppliersApplyUpInfoForm.vue | 6 ++--- 7 files changed, 56 insertions(+), 20 deletions(-) diff --git a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.api.ts b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.api.ts index 82add4a..927456d 100644 --- a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.api.ts +++ b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.api.ts @@ -13,6 +13,7 @@ enum Api { importExcel = '/configSuppliersApply/nuConfigSuppliersApply/importExcel', exportXls = '/configSuppliersApply/nuConfigSuppliersApply/exportXls', getModifyInfo = '/configSuppliersApply/nuConfigSuppliersApply/getModifyInfo', + getModifyHistoryInfo = '/configSuppliersApply/nuConfigSuppliersApply/getModifyHistoryInfo', audit = '/configSuppliersApply/nuConfigSuppliersApply/audit', } @@ -82,6 +83,9 @@ export const saveOrUpdate = (params, isUpdate) => { export const getModifyInfo = (params) => { return defHttp.post({ url: Api.getModifyInfo, params }); }; +export const getModifyHistoryInfo = (params) => { + return defHttp.post({ url: Api.getModifyHistoryInfo, params }); +}; /** * 审批提交 diff --git a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.data.ts b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.data.ts index 4ab8936..3ffcf52 100644 --- a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.data.ts +++ b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersApply.data.ts @@ -74,7 +74,7 @@ export const columns: BasicColumn[] = [ width: 100, }, { - title: '审核备注', + title: '驳回原因', align: 'center', dataIndex: 'applyContent', width: 150, @@ -121,7 +121,7 @@ export const columns2: BasicColumn[] = [ dataIndex: 'openingBankNo', }, { - title: '资质照片', + title: '营业执照', align: 'center', dataIndex: 'imgPath', customRender: ({ text }) => { @@ -150,7 +150,7 @@ export const columns2: BasicColumn[] = [ width: 100, }, { - title: '审核备注', + title: '驳回原因', align: 'center', dataIndex: 'applyContent', width: 150, @@ -220,7 +220,7 @@ export const applyObj = { contactNumber: '联系电话', openingBank: '开户行', openingBankNo: '开户行账号', - imgPath: '资质照片', + imgPath: '营业执照', }; // 高级查询数据 diff --git a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersAuditHistoryList.vue b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersAuditHistoryList.vue index 0d23849..e67eb70 100644 --- a/src/views/invoicing/configSuppliersApply/NuConfigSuppliersAuditHistoryList.vue +++ b/src/views/invoicing/configSuppliersApply/NuConfigSuppliersAuditHistoryList.vue @@ -58,6 +58,7 @@ + @@ -69,17 +70,21 @@ 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'; const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS +import { useMessage } from '/@/hooks/web/useMessage'; const formRef = ref(); const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); +const registerDetailModal = ref(); const suppliersId = ref(''); const userStore = useUserStore(); +const { createMessage } = useMessage(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -129,8 +134,17 @@ function handleSuperQuery(params) { * 详情 */ function handleDetail(record: Recordable) { + console.log("🚀 ~ handleDetail ~ record:", record) + if(record.optType == '变更'){ registerModal.value.disableSubmit = true; registerModal.value.edit(record); + }else if(record.optType == '入驻'){ + registerDetailModal.value.disableSubmit = true; + registerDetailModal.value.edit(record); + }else{ + createMessage.error('错误数据，请联系管员'); + + } } /** diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyForm.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyForm.vue index d908d45..0886c24 100644 --- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyForm.vue +++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyForm.vue @@ -51,9 +51,9 @@ - - + @@ -67,7 +67,6 @@ - 待审核 审核通过 审核驳回 - + @@ -136,6 +134,17 @@ const wrapperCol2 = ref({ xs: { span: 24 }, sm: { span: 20 } }); const confirmLoading = ref(false); //表单验证 const validatorRules = reactive({ + applyStatus: [{ required: true, message: '请选择审核状态!' },], + applyContent: [ + { + validator: async (_rule, value) => { + if (formData.status === 'modifyFail' && !value) { + return Promise.reject('请输入驳回原因!'); + } + return Promise.resolve(); + }, + }, + ], }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); @@ -171,6 +180,7 @@ function edit(record) { tmpData[key] = record[key] } }) + tmpData.applyStatus = null; //赋值 Object.assign(formData, tmpData); }); diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryForm.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryForm.vue index f8690bd..9801d9b 100644 --- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryForm.vue +++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyHistoryForm.vue @@ -49,8 +49,8 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - - + + 审核通过 审核驳回 @@ -74,7 +74,7 @@ import { ref, reactive, computed, onMounted } from 'vue'; import { Table as ATable, Input, Row, Col, Form } from 'ant-design-vue'; import { applyObj } from '../NuConfigSuppliersApply.data' import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue'; -import { getModifyInfo, auditSubmit } from '../NuConfigSuppliersApply.api'; +import { getModifyHistoryInfo, auditSubmit } from '../NuConfigSuppliersApply.api'; import { useMessage } from '/@/hooks/web/useMessage'; import { initDictOptions } from '/@/utils/dict'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; @@ -117,6 +117,14 @@ const filteredTableData = computed(() => { && item.d1 !== 'sysOrgCode' && item.d1 !== 'izEnabled' && item.d1 !== 'sourceType' + + && item.d1 !== 'applyStatus' + && item.d1 !== 'applyContent' + && item.d1 !== 'applyId' + && item.d1 !== 'suppliersId' + && item.d1 !== 'izHistory' + && item.d1 !== 'applyOrg' + && item.d1 !== 'optType' ); }); @@ -157,7 +165,7 @@ const fieldMap = { async function show(record) { console.log("🚀 ~ show ~ record:", record) - let data = await getModifyInfo({ id: record.id }) + let data = await getModifyHistoryInfo({ id: record.id }) formData.id = record.id formData.suppliersId = record.suppliersId diff --git a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyModal.vue b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyModal.vue index 7620dad..4c856f0 100644 --- a/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyModal.vue +++ b/src/views/invoicing/configSuppliersApply/components/NuConfigSuppliersApplyModal.vue @@ -11,7 +11,7 @@ -