diff --git a/src/api/ship/OpsPurInt/index.ts b/src/api/ship/OpsPurInt/index.ts
index 9946023..8213783 100644
--- a/src/api/ship/OpsPurInt/index.ts
+++ b/src/api/ship/OpsPurInt/index.ts
@@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
- Page = '/ship/opsPurInt/page',
+ // Page = '/ship/opsPurInt/page',
+ Page = '/magic-api/ship/opsPurIntPageList',
List = '/ship/opsPurInt/list',
Info = '/ship/opsPurInt/info',
LngOpsPurInt = '/ship/opsPurInt',
diff --git a/src/router/routes/basic.ts b/src/router/routes/basic.ts
index 0b95b9f..2c40371 100644
--- a/src/router/routes/basic.ts
+++ b/src/router/routes/basic.ts
@@ -310,7 +310,7 @@ export const PAGE_CUSTOM_ROUTE: AppRouteRecordRaw[] = [{
title: (route) => ('管道气采购合同详情')
}
},
- {
+ {
path: '/ship/ShipSchedule/createForm',
name: 'ShipSchedule',
component: () => import('/@/views/ship/ShipSchedule/components/createForm.vue'),
@@ -318,6 +318,14 @@ export const PAGE_CUSTOM_ROUTE: AppRouteRecordRaw[] = [{
title: (route) => route.query.formName
}
},
+ {
+ path: '/ship/OpsPurInt/createForm',
+ name: 'OpsPurInt',
+ component: () => import('/@/views/ship/OpsPurInt/components/createForm.vue'),
+ meta: {
+ title: (route) => route.query.formName
+ }
+ },
]
diff --git a/src/views/ship/OpsPurInt/components/config.ts b/src/views/ship/OpsPurInt/components/config.ts
index b6427ca..518aa4d 100644
--- a/src/views/ship/OpsPurInt/components/config.ts
+++ b/src/views/ship/OpsPurInt/components/config.ts
@@ -6,96 +6,68 @@ export const formConfig = {
};
export const searchFormSchema: FormSchema[] = [
- {
- field: 'id',
- label: 'id',
- component: 'Input',
- },
{
field: 'ssNo',
label: '船期编号',
component: 'Input',
},
{
- field: 'kId',
+ field: 'kN',
label: '合同',
component: 'Input',
},
- {
- field: 'longSpotCode',
- label: '长协/现货',
- component: 'Input',
- },
- {
- field: 'comId',
- label: '交易主体',
- component: 'Input',
- },
{
field: 'dateEta',
label: '卸港ETA',
component: 'Input',
},
- {
- field: 'staCode',
- label: '接收站',
- component: 'Input',
- },
+
{
field: 'suName',
label: '供应商',
component: 'Input',
},
{
- field: 'ssTypeCode',
- label: '业务类型',
+ field: 'staName',
+ label: '接收站',
component: 'Input',
},
];
export const columns: BasicColumn[] = [
- {
- dataIndex: 'id',
- title: 'id',
- componentType: 'input',
- align: 'left',
-
- sorter: true,
- },
-
{
dataIndex: 'ssNo',
title: '船期编号',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
{
- dataIndex: 'kId',
+ dataIndex: 'kName',
title: '合同',
componentType: 'input',
align: 'left',
-
+ width: 150,
sorter: true,
},
{
- dataIndex: 'longSpotCode',
+ dataIndex: 'longSpotName',
title: '长协/现货',
componentType: 'input',
align: 'left',
-
+ width: 100,
sorter: true,
},
{
- dataIndex: 'comId',
+ dataIndex: 'comName',
title: '交易主体',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
@@ -104,16 +76,16 @@ export const columns: BasicColumn[] = [
title: '卸港ETA',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
{
- dataIndex: 'staCode',
+ dataIndex: 'staName',
title: '接收站',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
@@ -122,16 +94,16 @@ export const columns: BasicColumn[] = [
title: '供应商',
componentType: 'input',
align: 'left',
-
+ width: 150,
sorter: true,
},
{
- dataIndex: 'ssTypeCode',
+ dataIndex: 'ssTypeName',
title: '业务类型',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
];
diff --git a/src/views/ship/OpsPurInt/components/createForm.vue b/src/views/ship/OpsPurInt/components/createForm.vue
new file mode 100644
index 0000000..adca31b
--- /dev/null
+++ b/src/views/ship/OpsPurInt/components/createForm.vue
@@ -0,0 +1,648 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.fullName }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.fullName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ship/OpsPurInt/index.vue b/src/views/ship/OpsPurInt/index.vue
index 67b563c..a02a5dc 100644
--- a/src/views/ship/OpsPurInt/index.vue
+++ b/src/views/ship/OpsPurInt/index.vue
@@ -51,6 +51,7 @@
import Icon from '/@/components/Icon/index';
import useEventBus from '/@/hooks/event/useEventBus';
import { cloneDeep } from 'lodash-es';
+ import dayjs from 'dayjs';
const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
@@ -89,8 +90,9 @@
formIdComputedRef.value = currentRoute.value.meta.formId
const schemaIdComputedRef = ref();
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
+ const defaultDate = ref([dayjs().startOf('year').format('YYYY-MM-DD'), dayjs().add(1, 'year').endOf('year').format('YYYY-MM-DD')]);
const [registerModal, { openModal }] = useModal();
- const formName='采购执行';
+ const formName=currentRoute.value.meta?.title;
const [registerTable, { reload, }] = useTable({
title: '' || (formName + '列表'),
api: getLngOpsPurIntPage,
@@ -100,10 +102,38 @@
rowProps: {
gutter: 16,
},
- schemas: customSearchFormSchema,
- fieldMapToTime: [],
- showResetButton: false,
+ schemas: [
+ {
+ field: 'dateEta',
+ label: '卸港ETA',
+ component: 'RangePicker',
+ defaultValue: defaultDate.value,
+ componentProps: {
+ format: 'YYYY-MM-DD',
+ style: { width: '100%' },
+ getPopupContainer: () => document.body,
+ },
+ },
+ {
+ field: 'ssNo',
+ label: '船期编号',
+ component: 'Input',
+ },
+ {
+ field: 'suName',
+ label: '供应商',
+ component: 'Input',
+ },
+ {
+ field: 'staName',
+ label: '接收站',
+ component: 'Input',
+ },
+ ],
+ fieldMapToTime: [['dateEta', ['startDate', 'endDate'], 'YYYY-MM-DD']],
+ showResetButton: true,
},
+ immediate: false,
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
},
@@ -180,10 +210,10 @@
});
} else {
router.push({
- path: '/form/OpsPurInt/0/createForm',
+ path: '/ship/OpsPurInt/createForm',
query: {
formPath: 'ship/OpsPurInt',
- formName: formName,
+ formName: '新建'+formName,
formId:currentRoute.value.meta.formId
}
});
@@ -237,7 +267,7 @@
}
onMounted(() => {
-
+ reload({ searchInfo: { startDate: defaultDate.value[0], endDate: defaultDate.value[1] }});
if (schemaIdComputedRef.value) {
bus.on(FLOW_PROCESSED, handleRefresh);
bus.on(CREATE_FLOW, handleRefresh);
@@ -305,4 +335,18 @@
.hide{
display: none !important;
}
+ :deep( .ant-col-8:nth-child(1)) {
+ width: 320px !important;
+ max-width: 320px !important;;
+ }
+ :deep(.ant-col-8:nth-child(1) .ant-form-item-label) {
+ width: 80px !important;
+ }
+ :deep( .ant-col-8:nth-child(4)) {
+ width: 320px !important;
+ max-width: 320px !important;;
+ }
+ :deep(.ant-col-8:nth-child(4) .ant-form-item-label) {
+ width: 80px !important;
+ }
\ No newline at end of file
diff --git a/src/views/ship/ShipSchedule/components/createForm.vue b/src/views/ship/ShipSchedule/components/createForm.vue
index 9883d22..86c23ff 100644
--- a/src/views/ship/ShipSchedule/components/createForm.vue
+++ b/src/views/ship/ShipSchedule/components/createForm.vue
@@ -197,7 +197,7 @@
-
+