Commit c4924f07 by 金民

refactor(scgl): 优化生产计划配置和数据模型

- 更新物料编号等字段的绑定字段名,从长命名改为简短命名
- 调整组件ID映射关系,统一使用新的组件标识符
- 修改生产计划产品关联表的绑定表名
- 更新字段的可编辑状态,将disabled从true改为false
- 调整字段保存配置,将isSave从true改为false
- 移除多余的prestrainField字段配置
- 更新工作流权限配置中的字段ID和组件key映射
- 在ScjhModel中添加新的产品相关字段定义
- 调整数量输入组件的步长精度,从1改为0.1
- 优化字段标题显示,移除单位后缀
parent 07a92d0a
...@@ -99,6 +99,16 @@ export interface MesProductionPlanProductModel { ...@@ -99,6 +99,16 @@ export interface MesProductionPlanProductModel {
cpid: string; cpid: string;
cpbh: string;
nbdm: string;
hjzt: string;
gg: string;
xh: string;
sl: string; sl: string;
zl: string; zl: string;
......
...@@ -549,47 +549,47 @@ export const formProps: FormProps = { ...@@ -549,47 +549,47 @@ export const formProps: FormProps = {
{ {
name: 'cpbh', name: 'cpbh',
tableTitle: '物料编号', tableTitle: '物料编号',
bindField: 'wuLiaoBianHao8001', bindField: 'cpbh',
show: true, show: true,
width: 150, width: 150,
component: '1d4bb53150224ab99e0705074b984a4c', component: 'cd0038f42bc64c189b3821f0e2061321',
bindTable: 'mes_production_plan_product_rela', bindTable: 'mes_production_plan_product',
}, },
{ {
name: 'nbdm', name: 'nbdm',
tableTitle: '内部代码', tableTitle: '内部代码',
bindField: 'naBuDaiMa1765', bindField: 'nbdm',
show: true, show: true,
width: 150, width: 150,
component: 'f77bfa3a61294647affb810b83b79d79', component: '6ce71ecb0b6e4d14ae65be4029b179fd',
bindTable: 'mes_production_plan_product_rela', bindTable: 'mes_production_plan_product',
}, },
{ {
name: 'xh', name: 'xh',
tableTitle: '型号', tableTitle: '型号',
bindField: 'xingHao5094', bindField: 'xh',
show: true, show: true,
width: 150, width: 150,
component: 'ebc1972119a6406b90b205247861559c', component: '0c075736898c431ea3f5bca58ec65af6',
bindTable: 'mes_production_plan_product_rela', bindTable: 'mes_production_plan_product',
}, },
{ {
name: 'gg', name: 'gg',
tableTitle: '规格', tableTitle: '规格',
bindField: 'guiGe(ChiCun)9562', bindField: 'gg',
show: true, show: true,
width: 150, width: 150,
component: '0973f42360874c6e86f425a363afd8ad', component: '2f56d9297a9c49d59d3b43f62e2946f2',
bindTable: 'mes_production_plan_product_rela', bindTable: 'mes_production_plan_product',
}, },
{ {
name: 'hjzt', name: 'hjzt',
tableTitle: '合金状态', tableTitle: '合金状态',
bindField: 'heJinZhuangTai4056', bindField: 'hjzt',
show: true, show: true,
width: 150, width: 150,
component: 'e466da29e7544bdba302b4829996f478', component: '697829b6aed54b8cbaa853c62619831a',
bindTable: 'mes_production_plan_product_rela', bindTable: 'mes_production_plan_product',
}, },
], ],
}, },
...@@ -602,9 +602,9 @@ export const formProps: FormProps = { ...@@ -602,9 +602,9 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '1d4bb53150224ab99e0705074b984a4c', key: 'cd0038f42bc64c189b3821f0e2061321',
title: '物料编号', title: '物料编号',
dataIndex: 'wuLiaoBianHao8001', dataIndex: 'cpbh',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
...@@ -616,26 +616,25 @@ export const formProps: FormProps = { ...@@ -616,26 +616,25 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: true, isSave: false,
isShow: true, isShow: true,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: '',
}, },
}, },
{ {
key: 'f77bfa3a61294647affb810b83b79d79', key: '6ce71ecb0b6e4d14ae65be4029b179fd',
title: '内部代码', title: '内部代码',
dataIndex: 'naBuDaiMa1765', dataIndex: 'nbdm',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
...@@ -647,26 +646,25 @@ export const formProps: FormProps = { ...@@ -647,26 +646,25 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: true, isSave: false,
isShow: true, isShow: true,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: '',
}, },
}, },
{ {
key: 'ebc1972119a6406b90b205247861559c', key: '0c075736898c431ea3f5bca58ec65af6',
title: '型号', title: '型号',
dataIndex: 'xingHao5094', dataIndex: 'xh',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
...@@ -678,26 +676,25 @@ export const formProps: FormProps = { ...@@ -678,26 +676,25 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: true, isSave: false,
isShow: true, isShow: true,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: '',
}, },
}, },
{ {
key: 'e466da29e7544bdba302b4829996f478', key: '697829b6aed54b8cbaa853c62619831a',
title: '合金状态', title: '合金状态',
dataIndex: 'heJinZhuangTai4056', dataIndex: 'hjzt',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
...@@ -709,26 +706,25 @@ export const formProps: FormProps = { ...@@ -709,26 +706,25 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: true, isSave: false,
isShow: true, isShow: true,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: '',
}, },
}, },
{ {
key: '0973f42360874c6e86f425a363afd8ad', key: '2f56d9297a9c49d59d3b43f62e2946f2',
title: '规格(尺寸)', title: '规格(尺寸)',
dataIndex: 'guiGe(ChiCun)9562', dataIndex: 'gg',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
...@@ -740,25 +736,24 @@ export const formProps: FormProps = { ...@@ -740,25 +736,24 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: true, isSave: false,
isShow: true, isShow: true,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: '',
}, },
}, },
{ {
key: '79621370aa1449eda7ccc3d6d710766c', key: '6a93c6d77ce1428c9fbba62a02afd6d0',
title: '数量/件', title: '数量',
dataIndex: 'sl', dataIndex: 'sl',
componentType: 'InputNumber', componentType: 'InputNumber',
defaultValue: 0, defaultValue: 0,
...@@ -767,7 +762,7 @@ export const formProps: FormProps = { ...@@ -767,7 +762,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: 0, defaultValue: 0,
min: 0, min: 0,
step: 1, step: 0.1,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -777,12 +772,11 @@ export const formProps: FormProps = { ...@@ -777,12 +772,11 @@ export const formProps: FormProps = {
rules: [], rules: [],
events: {}, events: {},
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: '',
listStyle: "return 'width:100%'", listStyle: "return 'width:100%'",
}, },
}, },
{ {
key: '9af5e86eea4f4d39b9ad48203e69b92d', key: '3b80cb19086e49e1a746cf9ace3f938e',
title: '质量/KG', title: '质量/KG',
dataIndex: 'zl', dataIndex: 'zl',
componentType: 'InputNumber', componentType: 'InputNumber',
...@@ -802,7 +796,6 @@ export const formProps: FormProps = { ...@@ -802,7 +796,6 @@ export const formProps: FormProps = {
rules: [], rules: [],
events: {}, events: {},
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: '',
listStyle: "return 'width:100%'", listStyle: "return 'width:100%'",
}, },
}, },
......
...@@ -187,9 +187,9 @@ export const permissionList = [ ...@@ -187,9 +187,9 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesProductionPlanProductList', tableName: 'mesProductionPlanProductList',
fieldName: '物料编号', fieldName: '物料编号',
fieldId: 'wuLiaoBianHao8001', fieldId: 'cpbh',
type: 'Input', type: 'Input',
key: '1d4bb53150224ab99e0705074b984a4c', key: 'cd0038f42bc64c189b3821f0e2061321',
children: [], children: [],
}, },
{ {
...@@ -202,9 +202,9 @@ export const permissionList = [ ...@@ -202,9 +202,9 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesProductionPlanProductList', tableName: 'mesProductionPlanProductList',
fieldName: '内部代码', fieldName: '内部代码',
fieldId: 'naBuDaiMa1765', fieldId: 'nbdm',
type: 'Input', type: 'Input',
key: 'f77bfa3a61294647affb810b83b79d79', key: '6ce71ecb0b6e4d14ae65be4029b179fd',
children: [], children: [],
}, },
{ {
...@@ -217,9 +217,9 @@ export const permissionList = [ ...@@ -217,9 +217,9 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesProductionPlanProductList', tableName: 'mesProductionPlanProductList',
fieldName: '型号', fieldName: '型号',
fieldId: 'xingHao5094', fieldId: 'xh',
type: 'Input', type: 'Input',
key: 'ebc1972119a6406b90b205247861559c', key: '0c075736898c431ea3f5bca58ec65af6',
children: [], children: [],
}, },
{ {
...@@ -232,9 +232,9 @@ export const permissionList = [ ...@@ -232,9 +232,9 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesProductionPlanProductList', tableName: 'mesProductionPlanProductList',
fieldName: '合金状态', fieldName: '合金状态',
fieldId: 'heJinZhuangTai4056', fieldId: 'hjzt',
type: 'Input', type: 'Input',
key: 'e466da29e7544bdba302b4829996f478', key: '697829b6aed54b8cbaa853c62619831a',
children: [], children: [],
}, },
{ {
...@@ -247,9 +247,9 @@ export const permissionList = [ ...@@ -247,9 +247,9 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesProductionPlanProductList', tableName: 'mesProductionPlanProductList',
fieldName: '规格(尺寸)', fieldName: '规格(尺寸)',
fieldId: 'guiGe(ChiCun)9562', fieldId: 'gg',
type: 'Input', type: 'Input',
key: '0973f42360874c6e86f425a363afd8ad', key: '2f56d9297a9c49d59d3b43f62e2946f2',
children: [], children: [],
}, },
{ {
...@@ -261,10 +261,10 @@ export const permissionList = [ ...@@ -261,10 +261,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesProductionPlanProductList', tableName: 'mesProductionPlanProductList',
fieldName: '数量/件', fieldName: '数量',
fieldId: 'sl', fieldId: 'sl',
type: 'InputNumber', type: 'InputNumber',
key: '79621370aa1449eda7ccc3d6d710766c', key: '6a93c6d77ce1428c9fbba62a02afd6d0',
children: [], children: [],
}, },
{ {
...@@ -279,7 +279,7 @@ export const permissionList = [ ...@@ -279,7 +279,7 @@ export const permissionList = [
fieldName: '质量/KG', fieldName: '质量/KG',
fieldId: 'zl', fieldId: 'zl',
type: 'InputNumber', type: 'InputNumber',
key: '9af5e86eea4f4d39b9ad48203e69b92d', key: '3b80cb19086e49e1a746cf9ace3f938e',
children: [], children: [],
}, },
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment