修改供应商流程及页面

This commit is contained in:
yangjun 2026-03-20 15:33:58 +08:00
parent 079a16571d
commit 1bb8c1576c
7 changed files with 54 additions and 22 deletions

View File

@ -371,6 +371,7 @@
color: white;
border-color: white;
}
&.ant-btn-default:not(.ant-btn-link) {
border-radius: 8px;
color: white;
@ -402,7 +403,11 @@
&.ant-btn-default:not(.ant-btn-link):hover::before {
animation: light-sweep 1.5s forwards;
}
@media (min-width: 1200px) {
:where(.css-dev-only-do-not-override-9m98ij).ant-col-xl-6 {
margin-top: 5px !important;
}
}
@keyframes light-sweep {
to {
left: 100%;

View File

@ -10,8 +10,8 @@
<JInput v-model:value="queryParam.suppliersName" placeholder="请输入供应商名称"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="18" :md="18" :sm="24">
<span style="float: right; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
@ -36,7 +36,9 @@
</BasicTable>
<!-- 表单区域 -->
<NuBizSuppliersInfoModal ref="registerModal" @success="handleSuccess"></NuBizSuppliersInfoModal>
<!-- 物料信息 -->
<NuBizSuppliersMateriallInfoModal ref="wlRegisterModal" @success="handleSuccess"></NuBizSuppliersMateriallInfoModal>
<!-- 物料导入区域 -->
<SuppDaoruModal ref="daoruModal" @success="handleSuccess"></SuppDaoruModal>
</div>
</template>

View File

@ -20,6 +20,11 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'brandType',
},
{
title: '生产厂家',
align: "center",
dataIndex: 'manufacturer',
},
{
title: '销售单价',
align: "center",

View File

@ -16,8 +16,8 @@
<JInput placeholder="请输入物料名称" v-model:value="queryParam.materialName" allow-clear ></JInput>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :xl="16" :lg="16" :md="16" :sm="24">
<span style="float: right; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
@ -97,13 +97,13 @@
const [registerTable, { reload }, { selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs:24,
sm:4,
xl:6,
xxl:4
sm:8,
xl:8,
xxl:8
});
const wrapperCol = reactive({
xs: 24,
sm: 20,
sm: 16,
});

View File

@ -18,7 +18,7 @@ import NuBizSuppliersMaterialInfoList from './NuBizSuppliersMaterialInfoList.vue
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('1400');
const width = ref<string>('1200');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

View File

@ -1,21 +1,25 @@
<template>
<div >
<a-row>
<a-col :span="24">
<SectionDivider :title="'第一步:选择供应商'" />
</a-col>
</a-row>
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<div class="jeecg-basic-table-form-container" style="margin-top:14px;">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-col :lg="8">
<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>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-col :lg="16" :sm="24">
<span style="overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="24" style="text-align: right;display: block;margin-top:6px; ">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<span style="margin-left: 8px"><j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button></span>
</a-col>
</span>
</a-col>
@ -23,8 +27,11 @@
</a-form>
</div>
<!-- <div style="width:100%;"> -->
<a-row :span="24">
<a-col v-for="item in dataList" :key="item.id" :span="8" class="radio-item">
<a-row :span="24" style="justify-content: space-between;margin-top:-14px;">
<a-col :span="24" style="margin-top:14px;">
<div style="font-weight: 700;">供应商列表</div>
</a-col>
<a-col v-for="item in dataList" :key="item.id" :span="8" class="radio-item" style="max-width: 32.5% !important;">
<a-radio-group v-model:value="suppliersId" @change="handleChangeRadio" class="radio-group">
<a-radio :value="item.id" >
{{ item.suppliersName }}
@ -44,7 +51,12 @@
@change="onPageChange"
/>
</a-col>
<a-col :span="24">
<SectionDivider :title="'第二步:导入供应商物料信息'" />
</a-col>
<a-col style="margin-top:14px;">
<span style="margin-left: 8px"><j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button></span>
</a-col>
</a-row>
<!-- </div> -->
</div>
@ -64,13 +76,14 @@ const suppliersId = ref<string>('');
},
importConfig: {
url: () => `/bizSuppliers/nuBizSuppliersMaterialInfo/importExcel?supplierId=${suppliersId.value}`,
success: searchQuery,
success: headClose,
},
});
const formRef = ref();
const queryParam = reactive<any>({});
const dataList = ref<any>([]);
const emit = defineEmits(['register', 'ok']);
const myActiveKey = ref('1');
let pageNo = ref(1);
const pageSize = ref(20);
@ -93,6 +106,12 @@ const suppliersId = ref<string>('');
async function onPageChange(e) {
await reload();
}
function headClose(record) {
if(record.success){
emit('ok');
}
}
/**
* 查询
*/
@ -159,6 +178,7 @@ const suppliersId = ref<string>('');
background-color: white;
height: 64px;
border-radius: 8px;
margin-top: 15px;
}
.radio-group{
display: flex;

View File

@ -17,7 +17,7 @@ import SuppDaoruList from './SuppDaoruList.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('1400');
const width = ref<string>('1200');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();