diff --git a/src/main/resources/config/liquibase/data/cost.csv b/src/main/resources/config/liquibase/data/cost.csv index 57a1390..376f415 100644 --- a/src/main/resources/config/liquibase/data/cost.csv +++ b/src/main/resources/config/liquibase/data/cost.csv @@ -1,4 +1,5 @@ id;number;name;mat_group;mat_type;process;quality;depart;product_type;style_no;order_no;lost_type;lost_rate;unit_labor;unit_hour;property;remark;status;sort_no;organization;created_by;created_date;updated_by;updated_date;version -1;C001;18K金石料;GD;RM;FL;LQ;d005;RN;S001;O001;1;0.02;100;1.5;{"color":"yellow"};测试数据;1;1;ORG001;admin;2024-01-24 10:00:00;admin;2025-04-04 09:54:30;5 -2;C002;PT950石料;PT;RM;抛光;NQ;d006;项链;S002;O002;2;0.025;150;2.5;{"purity":"95%"};测试数据;1;2;ORG001;admin;2024-01-24 10:00:00;admin;2025-04-04 09:55:08;5 -3;C003;925银石料;SL;RP;打磨;HQ;d004;手链;S003;O003;3;0.015;80;2.3;{"finish":"high"};测试数据;1;3;ORG001;admin;2024-01-24 10:00:00;admin;2025-04-04 09:55:35;2 +1;C001;18K金石料;GD;RM;FL;LQ;d005;RN;S001;O001;1;0.02;100;1.5;{"color":"yellow"};测试数据;1;1;ORG001;admin;2024-01-24 10:00:00;admin;2025-04-12 22:26:01;6 +2;C002;PT950石料;PT;RM;PL;NQ;d006;项链;S002;O002;2;0.025;150;2.5;{"purity":"95%"};测试数据;1;2;ORG001;admin;2024-01-24 10:00:00;admin;2025-04-12 22:26:12;6 +3;C003;925银石料;SL;RP;ST;HQ;d004;手链;S003;O003;3;0.015;80;2.3;{"finish":"high"};测试数据;1;3;ORG001;admin;2024-01-24 10:00:00;admin;2025-04-12 22:26:29;3 +4;NDD1STNQ00001;爪镶钻石D1;ND;D1;ST;NQ;d001;RN;;;;0;0;0;;;1;0;ORG001;admin;2025-04-12 22:30:59;admin;2025-04-12 22:30:59;0 diff --git a/src/main/resources/config/liquibase/data/dict.csv b/src/main/resources/config/liquibase/data/dict.csv index ddaeb35..b37e6e1 100644 --- a/src/main/resources/config/liquibase/data/dict.csv +++ b/src/main/resources/config/liquibase/data/dict.csv @@ -172,3 +172,13 @@ id;number;parent_number;name;property;remark;status;sort_no;organization;created 184;E;DataScope;修改;;EDIT;1;5;ORG001;admin;2025-04-07 11:31:17;admin;2025-04-07 11:31:17;0 185;D;DataScope;删除;{"color":"danger"};DELETE;1;5;ORG001;admin;2025-04-07 11:31:17;admin;2025-04-07 11:31:17;0 186;P;DataScope;打印;;PRINT;1;5;ORG001;admin;2025-04-07 11:31:17;admin;2025-04-07 11:31:17;0 +187;*;ProductType;*;;;1;0;ORG001;admin;2025-04-12 22:33:11;admin;2025-04-12 22:33:11;0 +188;SettingType;;镶嵌类别;;;1;0;ORG001;admin;2025-04-12 22:34:14;admin;2025-04-12 22:34:14;0 +189;PR;SettingType;爪镶;;;1;0;ORG001;admin;2025-04-12 22:37:04;admin;2025-04-12 22:37:04;0 +190;BZ;SettingType;包镶;;;1;0;ORG001;admin;2025-04-12 22:37:20;admin;2025-04-12 22:37:20;0 +191;MP;SettingType;微镶;;;1;0;ORG001;admin;2025-04-12 22:37:32;admin;2025-04-12 22:37:32;0 +192;CS;SettingType;钉镶;;;1;0;ORG001;admin;2025-04-12 22:38:00;admin;2025-04-12 22:38:00;0 +193;CH;SettingType;迫镶;;;1;0;ORG001;admin;2025-04-12 22:38:52;admin;2025-04-12 22:38:52;0 +194;GS;SettingType;粘镶;;;1;0;ORG001;admin;2025-04-12 22:39:21;admin;2025-04-12 22:39:21;0 +195;IS;SettingType;无边镶;;;1;0;ORG001;admin;2025-04-12 22:39:43;admin;2025-04-12 22:39:43;0 +196;FS;SettingType;面镶;;;1;0;ORG001;admin;2025-04-12 22:42:14;admin;2025-04-12 22:42:14;0 diff --git a/src/main/resources/config/liquibase/data/serial.csv b/src/main/resources/config/liquibase/data/serial.csv index a9101b3..5cef66f 100644 --- a/src/main/resources/config/liquibase/data/serial.csv +++ b/src/main/resources/config/liquibase/data/serial.csv @@ -4,3 +4,4 @@ id;number;name;serial_number;property;remark;status;sort_no;organization;created 3;SER003;物料流水号;1;;物料编号;1;3;ORG001;system;2024-03-25 00:00:00;;;0 4;SER004;成本流水号;1;;成本编号;1;4;ORG001;system;2024-03-25 00:00:00;;;0 5;SER005;交收流水号;1;;交收编号;1;5;ORG001;system;2024-03-25 00:00:00;;;0 +6;NDD1STNQ;NDD1STNQ;1;;;1;;ORG001;admin;2025-04-12 22:30:59;admin;2025-04-12 22:30:59;0 diff --git a/src/main/webapp/app/admin/role/role-edit.vue b/src/main/webapp/app/admin/role/role-edit.vue index d613014..ac5a66a 100644 --- a/src/main/webapp/app/admin/role/role-edit.vue +++ b/src/main/webapp/app/admin/role/role-edit.vue @@ -57,7 +57,7 @@ - + - 内容2 + 内容2 diff --git a/src/main/webapp/app/orders/style/style-edit.component.ts b/src/main/webapp/app/orders/style/style-edit.component.ts index e998c3b..c3d6db0 100644 --- a/src/main/webapp/app/orders/style/style-edit.component.ts +++ b/src/main/webapp/app/orders/style/style-edit.component.ts @@ -19,6 +19,8 @@ export default defineComponent({ const loading = ref(false); const isSaving = ref(false); const productTypes = ref([]); + const processTypes = ref([]); + const settingTypes = ref([]); const baseDtls = ref([]); const settingDtls = ref([]); const activeTab = ref('base'); @@ -86,8 +88,11 @@ export default defineComponent({ try { const { data } = await axios.get('api/dicts', { params: { - parentNumber: 'PRODUCTTYPE', - status: '1', + number: { name: '' }, + name: { name: '' }, + property: { name: '' }, + parentNumber: { op: '=', value: 'ProductType' }, + status: { op: '=', value: '1' }, }, }); productTypes.value = data; @@ -99,7 +104,38 @@ export default defineComponent({ const loadData = async () => { loading.value = true; try { - await loadProductTypes(); + const [productTypesRes, processTypesRes, settingTypesRes] = await Promise.all([ + axios.get('api/dicts', { + params: { + number: { name: '' }, + name: { name: '' }, + property: { name: '' }, + parentNumber: { op: '=', value: 'ProductType' }, + status: { op: '=', value: '1' }, + }, + }), + axios.get('api/dicts', { + params: { + number: { name: '' }, + name: { name: '' }, + property: { name: '' }, + parentNumber: { op: '=', value: 'ProcessType' }, + status: { op: '=', value: '1' }, + }, + }), + axios.get('api/dicts', { + params: { + number: { name: '' }, + name: { name: '' }, + property: { name: '' }, + parentNumber: { op: '=', value: 'SettingType' }, + status: { op: '=', value: '1' }, + }, + }), + ]); + productTypes.value = productTypesRes.data; + processTypes.value = processTypesRes.data; + settingTypes.value = settingTypesRes.data; const id = route.params?.id; if (id) { const { data } = await axios.get(`api/styles/${id}`); @@ -224,6 +260,8 @@ export default defineComponent({ isSaving, style, productTypes, + processTypes, + settingTypes, baseDtls, settingDtls, styleForm, diff --git a/src/main/webapp/app/orders/style/style-edit.vue b/src/main/webapp/app/orders/style/style-edit.vue index 7ef83ee..d908558 100644 --- a/src/main/webapp/app/orders/style/style-edit.vue +++ b/src/main/webapp/app/orders/style/style-edit.vue @@ -128,7 +128,7 @@ - + + > + + + - + + > + + +