diff --git a/src/design/ant/btn.less b/src/design/ant/btn.less index 322f693..4fc135c 100644 --- a/src/design/ant/btn.less +++ b/src/design/ant/btn.less @@ -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%; diff --git a/src/views/bizSuppliers/NuBizSuppliersInfoList.vue b/src/views/bizSuppliers/NuBizSuppliersInfoList.vue index d25f082..6e8ca1c 100644 --- a/src/views/bizSuppliers/NuBizSuppliersInfoList.vue +++ b/src/views/bizSuppliers/NuBizSuppliersInfoList.vue @@ -10,8 +10,8 @@ - - + + 查询 重置 @@ -36,7 +36,9 @@ + + diff --git a/src/views/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts b/src/views/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts index 2b6cfdd..04c72df 100644 --- a/src/views/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts +++ b/src/views/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts @@ -20,6 +20,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'brandType', }, + { + title: '生产厂家', + align: "center", + dataIndex: 'manufacturer', + }, { title: '销售单价', align: "center", diff --git a/src/views/bizSuppliers/NuBizSuppliersMaterialInfoList.vue b/src/views/bizSuppliers/NuBizSuppliersMaterialInfoList.vue index 8f23d4d..34cc8b8 100644 --- a/src/views/bizSuppliers/NuBizSuppliersMaterialInfoList.vue +++ b/src/views/bizSuppliers/NuBizSuppliersMaterialInfoList.vue @@ -16,8 +16,8 @@ - - + + 查询 重置 @@ -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, }); diff --git a/src/views/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue b/src/views/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue index fdf49b6..1b1bf22 100644 --- a/src/views/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue +++ b/src/views/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue @@ -18,7 +18,7 @@ import NuBizSuppliersMaterialInfoList from './NuBizSuppliersMaterialInfoList.vue import JModal from '/@/components/Modal/src/JModal/JModal.vue'; const title = ref(''); -const width = ref('1400'); +const width = ref('1200'); const visible = ref(false); const disableSubmit = ref(false); const registerForm = ref(); diff --git a/src/views/bizSuppliers/SuppDaoruList.vue b/src/views/bizSuppliers/SuppDaoruList.vue index bfb6d3f..7c5a8ed 100644 --- a/src/views/bizSuppliers/SuppDaoruList.vue +++ b/src/views/bizSuppliers/SuppDaoruList.vue @@ -1,21 +1,25 @@