修改bug

This commit is contained in:
yangjun 2026-02-06 14:12:08 +08:00
parent 59632e2bcc
commit 1aa30fa1ae
5 changed files with 61 additions and 14 deletions

View File

@ -45,7 +45,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'openingBankNo', dataIndex: 'openingBankNo',
}, },
{ {
title: '资质照片', title: '营业执照',
align: 'center', align: 'center',
dataIndex: 'imgPath', dataIndex: 'imgPath',
customRender: ({ text }) => { customRender: ({ text }) => {
@ -201,7 +201,7 @@ export const upColumns: BasicColumn[] = [
dataIndex: 'openingBankNo', dataIndex: 'openingBankNo',
}, },
{ {
title: '资质照片', title: '营业执照',
align: 'center', align: 'center',
dataIndex: 'imgPath', dataIndex: 'imgPath',
customRender: ({ text }) => { customRender: ({ text }) => {
@ -234,7 +234,7 @@ export const superQuerySchema = {
openingBank: { title: '开户行', order: 6, view: 'text', type: 'string' }, openingBank: { title: '开户行', order: 6, view: 'text', type: 'string' },
openingBankNo: { title: '开户行账号', order: 7, view: 'text', type: 'string' }, openingBankNo: { title: '开户行账号', order: 7, view: 'text', type: 'string' },
wechartId: { title: '微信账号', order: 8, 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' }, applyStatus: { title: '审核状态', order: 10, view: 'text', type: 'string' },
applyContent: { title: '审核备注', order: 11, view: 'text', type: 'string' }, applyContent: { title: '审核备注', order: 11, view: 'text', type: 'string' },
}; };

View File

@ -58,7 +58,6 @@
</BasicTable> </BasicTable>
<!-- 表单区域 --> <!-- 表单区域 -->
<NuConfigSuppliersApplyHistoryModal ref="registerModal" @success="handleSuccess"></NuConfigSuppliersApplyHistoryModal> <NuConfigSuppliersApplyHistoryModal ref="registerModal" @success="handleSuccess"></NuConfigSuppliersApplyHistoryModal>
<NuConfigSuppliersApplyModal ref="registerDetailModal" @success="handleSuccess"></NuConfigSuppliersApplyModal>
</div> </div>
</template> </template>
@ -70,7 +69,6 @@ import { columns2, superQuerySchema } from './NuConfigSuppliersApply.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuConfigSuppliersApply.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuConfigSuppliersApply.api';
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import NuConfigSuppliersApplyHistoryModal from './components/NuConfigSuppliersApplyHistoryModal.vue' import NuConfigSuppliersApplyHistoryModal from './components/NuConfigSuppliersApplyHistoryModal.vue'
import NuConfigSuppliersApplyModal from './components/NuConfigSuppliersApplyModal.vue'
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue'; import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.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.disableSubmit = true;
registerModal.value.edit(record); registerModal.value.edit(record);
}else if(record.optType == '入驻'){ }else if(record.optType == '入驻'){
registerDetailModal.value.disableSubmit = true; registerModal.value.disableSubmit = true;
registerDetailModal.value.edit(record); registerModal.value.editDitail(record);
}else{ }else{
createMessage.error('错误数据,请联系管员'); createMessage.error('错误数据,请联系管员');

View File

@ -6,7 +6,7 @@
name="NuConfigSuppliersApplyForm"> name="NuConfigSuppliersApplyForm">
<a-row> <a-row>
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;"> <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
<SectionDivider :title="'基本信息1'" /> <SectionDivider :title="'基本信息'" />
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="供应商名称" v-bind="validateInfos.suppliersName" <a-form-item label="供应商名称" v-bind="validateInfos.suppliersName"

View File

@ -10,18 +10,31 @@
</template> </template>
</a-drawer> </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> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue'; import { ref, nextTick, defineExpose } from 'vue';
import NuConfigSuppliersApplyHistoryForm from './NuConfigSuppliersApplyHistoryForm.vue' import NuConfigSuppliersApplyHistoryForm from './NuConfigSuppliersApplyHistoryForm.vue'
import NuConfigSuppliersApplyDetailForm from './NuConfigSuppliersApplyDetailForm.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue'; import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>(''); const title = ref<string>('');
const width = ref<string>('800'); const width = ref<string>('800');
const visible = ref<boolean>(false); const visible = ref<boolean>(false);
const visibleDetail = ref<boolean>(false);
const disableSubmit = ref<boolean>(false); const disableSubmit = ref<boolean>(false);
const registerForm = ref(); const registerForm = ref();
const registerFormDetail = ref();
const upInfoForm = ref(); const upInfoForm = ref();
const upInfoVisible = ref<boolean>(false); const upInfoVisible = ref<boolean>(false);
const emit = defineEmits(['register', 'success']); const emit = defineEmits(['register', 'success']);
@ -38,6 +51,13 @@ function edit(record) {
registerForm.value.show(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({ defineExpose({
edit, edit,
editDitail,
disableSubmit, disableSubmit,
}); });
</script> </script>

View File

@ -2,20 +2,30 @@
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" <a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
:footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel"> :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
<NuConfigSuppliersApplyDetailForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"> <NuConfigSuppliersApplyForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
</NuConfigSuppliersApplyDetailForm> </NuConfigSuppliersApplyForm>
<template #footer> <template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button> <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button> <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
</template> </template>
</a-drawer> </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> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue'; 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'; import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>(''); 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 upInfoVisible.value = false
emit('success'); emit('success');
} }
/**
* 信息变更确认
*/
function handleUpInfoOk() {
upInfoForm.value.submitForm();
}
defineExpose({ defineExpose({
add, add,
edit, edit,
upInfoEdit,
disableSubmit, disableSubmit,
}); });
</script> </script>