chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新胶料编码为胶料别名，调整相关字段和描述，新增数据库字段以支持胶料信息补全

Browse Source
This commit is contained in:
geht
2026-05-20 16:12:38 +08:00
parent 1a4027086c
commit 9f37292eea
5 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/MesXslOpenMillParam.data.ts
View File

@@ -2,7 +2,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
export const columns: BasicColumn[] = [
{ title: '胶料名称', align: 'center', dataIndex: 'materialName', width: 160 },
{ title: '胶料编码', align: 'center', dataIndex: 'materialCode', width: 130 },
{ title: '胶料别名', align: 'center', dataIndex: 'materialCode', width: 130 },
{ title: 'R0进胶时间(秒)', align: 'center', dataIndex: 'r0FeedTime', width: 120 },
{ title: 'R0成环时间(秒)', align: 'center', dataIndex: 'r0RingTime', width: 120 },
{ title: 'R0拉断时间(秒)', align: 'center', dataIndex: 'r0BreakTime', width: 120 },
@@ -27,7 +27,7 @@ export const searchFormSchema: FormSchema[] = [
},
colProps: { span: 6 },
},
{ label: '胶料编码', field: 'materialCode', component: 'JInput', colProps: { span: 6 } },
{ label: '胶料别名', field: 'materialCode', component: 'JInput', colProps: { span: 6 } },
{ label: '胶料名称', field: 'materialName', component: 'JInput', colProps: { span: 6 } },
];
@@ -47,10 +47,10 @@ export const formSchema: FormSchema[] = [
componentProps: { disabled: true, placeholder: '选择胶料后自动带出' },
},
{
label: '胶料编码',
label: '胶料别名',
field: 'materialCode',
component: 'Input',
componentProps: { disabled: true, placeholder: '选择胶料后自动带出' },
componentProps: { disabled: true, placeholder: '选择胶料后自动带出别名' },
},
{
label: 'R0进胶时间',
@@ -111,7 +111,7 @@ export const superQuerySchema = {
dictCode: 'id',
dictText: 'material_name',
},
materialCode: { title: '胶料编码', order: 1, view: 'text' },
materialCode: { title: '胶料别名', order: 1, view: 'text' },
materialName: { title: '胶料名称', order: 2, view: 'text' },
r0FeedTime: { title: 'R0进胶时间', order: 3, view: 'number' },
r0RingTime: { title: 'R0成环时间', order: 4, view: 'number' },

2
jeecgboot-vue3/src/views/xslmes/mesXslOpenMillParam/components/MesXslOpenMillParamModal.vue
View File

@@ -67,7 +67,7 @@
const row = (raw as Recordable)?.materialName != null ? raw : (raw as Recordable)?.result;
if (row) {
model.materialName = row.materialName ?? '';
model.materialCode = row.materialCode ?? '';
model.materialCode = row.aliasName ?? '';
}
} catch {
model.materialName = '';