diff --git a/src/main/resources/config/liquibase/changelog/20240325000005_added_entity_Dict.xml b/src/main/resources/config/liquibase/changelog/20240325000005_added_entity_Dict.xml index 71302ab..049ab64 100644 --- a/src/main/resources/config/liquibase/changelog/20240325000005_added_entity_Dict.xml +++ b/src/main/resources/config/liquibase/changelog/20240325000005_added_entity_Dict.xml @@ -39,8 +39,8 @@ diff --git a/src/main/resources/config/liquibase/data/dict.csv b/src/main/resources/config/liquibase/data/dict.csv index a48b09e..70f77c9 100644 --- a/src/main/resources/config/liquibase/data/dict.csv +++ b/src/main/resources/config/liquibase/data/dict.csv @@ -38,3 +38,9 @@ id;number;parent_number;name;property;remark;status;sort_no;organization;created 37;40;TRANSACTSTATUS;完成;;;1;0;ORG001;admin;2025-03-12 10:55:26.530744;admin;2025-03-12 10:55:26.530744;0 38;50;TRANSACTSTATUS;退回;;;1;0;ORG001;admin;2025-03-12 10:56:21.730067;admin;2025-03-12 10:56:21.730067;0 39;TRANSACTSTATUS;;生产状态;;;1;0;ORG001;admin;2025-03-12 10:59:24.971458;admin;2025-03-12 10:59:24.971458;0 +40;MATGROUP0;;物料大类;;;1;0;ORG001;admin;2025-03-16 16:10:39.916246;admin;2025-03-16 16:10:39.916246;0 +41;GD;MATGROUP0;黄金;;;1;0;ORG001;admin;2025-03-16 16:14:59.151541;admin;2025-03-16 16:14:59.151541;0 +42;AG;MATGROUP0;白银;;;1;0;ORG001;admin;2025-03-16 16:28:46.755507;admin;2025-03-16 16:28:46.755507;0 +43;CU;MATGROUP0;铜料;;;1;0;ORG001;admin;2025-03-16 16:31:02.516413;admin;2025-03-16 16:31:02.516413;0 +44;PT;MATGROUP0;铂金;;;1;0;ORG001;admin;2025-03-16 16:35:54.700282;admin;2025-03-16 16:35:54.700282;0 +45;AL;MATGROUP0;补口;;;1;0;ORG001;admin;2025-03-16 16:37:08.754443;admin;2025-03-16 16:37:08.754443;0 diff --git a/src/main/webapp/app/orders/order/order-print.component.ts b/src/main/webapp/app/orders/order/order-print.component.ts index 878ca11..c7a251c 100644 --- a/src/main/webapp/app/orders/order/order-print.component.ts +++ b/src/main/webapp/app/orders/order/order-print.component.ts @@ -112,7 +112,7 @@ export default defineComponent({ type: 'html', css: ['/content/css/bootstrap.min.css', '/content/css/print-styles.css'], documentTitle: `${$t('jewpmsApp.order.detail.title')} - ${order.value.number}`, - //header: ``, + header: ``, style: '@page { size: A4; margin: 10mm; }', onPrintDialogClose: () => { alertService.showInfo($t('entity.action.printSuccess'));