develop #10

Merged
zsq merged 5 commits from develop into main 2026-04-15 16:07:16 +08:00
5 changed files with 51 additions and 17 deletions
Showing only changes of commit 7c73791787 - Show all commits

View File

@ -17,8 +17,8 @@ export default defineConfig({
}, },
proxy: { proxy: {
'/api/': { '/api/': {
target: 'http://10.39.13.78:8002/', // target: 'http://10.39.13.78:8002/',
// target: 'https://test-company.linyikj.com.cn/', target: 'http://test-company.linyikj.com.cn/',
// target: 'https://company.linyikj.com.cn/', // target: 'https://company.linyikj.com.cn/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { '^': '' }, pathRewrite: { '^': '' },

View File

@ -319,13 +319,13 @@ export const Selects = {
valueType: 'select', valueType: 'select',
hideInTable: hideInTable, hideInTable: hideInTable,
formItemProps: { ...(required ? rulesHelper.number : {}) }, formItemProps: { ...(required ? rulesHelper.number : {}) },
request: async (params) => { request: async (params) =>
let res = await Apis.Asset.AssetProjects.Select({ (
keywords: params?.keyWords, await Apis.Asset.AssetProjects.Select({
...params, keywords: params?.keyWords,
}); ...params,
return res?.data; })
}, ).data,
...rest, ...rest,
fieldProps: { fieldProps: {
showSearch: true, showSearch: true,
@ -961,4 +961,40 @@ export const Selects = {
}, },
}; };
}, },
//获取班次
AttendanceShiftsSelect(props?: PropsType): ReturnType {
const {
title = '选择班次',
key = 'attendance_shifts_id',
required = false,
hideInTable = true,
...rest
} = props ?? {};
return {
title: title,
key: key,
valueType: 'select',
dataIndex: key,
hideInTable: hideInTable,
formItemProps: { ...(required ? rulesHelper.number : {}) },
request: async (params) => {
let res = await Apis.Attendance.AttendanceShifts.Select({
...params,
name: params?.keyWords || undefined,
});
return res?.data;
},
...rest,
fieldProps: {
showSearch: true,
fieldNames: {
label: 'name',
value: 'id',
},
...rest?.fieldProps,
},
};
},
}; };

View File

@ -44,7 +44,7 @@ export default function Index({ title = '补充协议' }) {
/>, />,
]; ];
let permissionsSpace = [ let permissionsSpace: any = [
<UseSeal <UseSeal
key="UseSeal" key="UseSeal"
item={{ ...item, disabled: true }} item={{ ...item, disabled: true }}

View File

@ -20,11 +20,7 @@ import Update from './modals/Update';
export default function Index({ title = '品质核查' }) { export default function Index({ title = '品质核查' }) {
const getCurrentPermissions = useCurrentPermissions(); const getCurrentPermissions = useCurrentPermissions();
let toolBarRender = (action: any) => {
return getCurrentPermissions({
create: <Create key="Create" reload={action?.reload} title={title} />,
});
};
let tableRender = (item: any, action: any) => { let tableRender = (item: any, action: any) => {
return getCurrentPermissions({ return getCurrentPermissions({
show: <Show item={item} />, show: <Show item={item} />,
@ -58,7 +54,9 @@ export default function Index({ title = '品质核查' }) {
Apis.QualityCheck.QualityChecks.List, Apis.QualityCheck.QualityChecks.List,
) )
} }
toolBarRender={(action) => [toolBarRender(action)]} toolBarRender={(action) => [
<Create key="Create" reload={() => action?.reload()} title={title} />,
]}
columns={[ columns={[
MyColumns.ID({ search: false }), MyColumns.ID({ search: false }),
Selects?.AssetProjects({ Selects?.AssetProjects({

View File

@ -26,7 +26,7 @@ export default function Create(props: MyBetaModalFormProps) {
form={form} form={form}
onOpenChange={(open: any) => { onOpenChange={(open: any) => {
if (open) { if (open) {
form.resetFields(); // 清空表单数据 // form.resetFields(); // 清空表单数据
} }
}} }}
onFinish={async (values) => onFinish={async (values) =>