feat:【antd】【erp 系统】purchase/in 重构 4/4(bugfix)
This commit is contained in:
@@ -74,21 +74,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
|
||||
},
|
||||
rules: 'required',
|
||||
},
|
||||
{
|
||||
fieldName: 'purchaseUserId',
|
||||
label: '采购人员',
|
||||
component: 'ApiSelect',
|
||||
componentProps: {
|
||||
placeholder: '请选择采购人员',
|
||||
allowClear: true,
|
||||
showSearch: true,
|
||||
api: getSimpleUserList,
|
||||
fieldNames: {
|
||||
label: 'nickname',
|
||||
value: 'id',
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'remark',
|
||||
label: '备注',
|
||||
@@ -318,13 +303,6 @@ export function useFormItemColumns(
|
||||
];
|
||||
}
|
||||
|
||||
/** 采购订单项表格列(兼容旧代码) */
|
||||
export function usePurchaseOrderItemTableColumns(
|
||||
formData?: any[],
|
||||
): VxeTableGridOptions['columns'] {
|
||||
return useFormItemColumns(formData);
|
||||
}
|
||||
|
||||
/** 列表的搜索表单 */
|
||||
export function useGridFormSchema(): VbenFormSchema[] {
|
||||
return [
|
||||
@@ -543,6 +521,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
/** 列表的搜索表单 */
|
||||
export function useOrderGridFormSchema(): VbenFormSchema[] {
|
||||
return [
|
||||
|
||||
@@ -65,7 +65,7 @@ const summaries = computed(() => {
|
||||
/** 表格配置 */
|
||||
const [Grid, gridApi] = useVbenVxeGrid({
|
||||
gridOptions: {
|
||||
columns: useFormItemColumns(),
|
||||
columns: useFormItemColumns(tableData.value),
|
||||
data: tableData.value,
|
||||
minHeight: 250,
|
||||
autoResize: true,
|
||||
@@ -290,4 +290,4 @@ onMounted(async () => {
|
||||
</div>
|
||||
</template>
|
||||
</Grid>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
@@ -46,7 +46,7 @@ const [Grid] = useVbenVxeGrid({
|
||||
return await getPurchaseOrderPage({
|
||||
pageNo: page.currentPage,
|
||||
pageSize: page.pageSize,
|
||||
returnEnable: true,
|
||||
inEnable: true,
|
||||
...formValues,
|
||||
});
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user