Skip to content

W
weiqiao-vue
Commit 925bd006 by 张恒
Options

feat(gdgl): 更新字段配置将铸次号替换为炉次号 

- 将dataIndex从zch更改为lch，标题从铸次号更改为炉次号
- 在表单配置中将field从zch更改为lch，label从铸次号更改为炉次号
- 移除熔次号相关配置并添加业务组织下拉选择组件
- 更新工作流权限配置中的字段名称和ID
- 统一所有相关组件中的字段映射关系

fix(scrw): 同步更新生产任务字段配置

- 将dataIndex从zch和rch统一更改为lch，标题从铸次号和熔次号更改为炉次号
- 在搜索表单中更新字段标识符和标签
- 添加业务组织下拉选择组件并调整布局配置
- 更新工作流权限配置中的字段名称和ID
- 清理冗余的组件配置代码
parent 95ef29f9
Showing with 116 additions and 126 deletions
xjrsoft-vue3/src/views/scgl/gdgl/components/config.ts
......@@ -100,8 +100,8 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'zch',
title: '铸次号',
dataIndex: 'lch',
title: '炉次号',
componentType: 'input',
fixed: false,
......@@ -909,8 +909,8 @@ export const formProps: FormProps = {
list: [
{
key: 'fada4c1222a94076a8e811c6489ce593',
field: 'zch',
label: '铸次号',
field: 'lch',
label: '炉次号',
type: 'input',
component: 'Input',
colProps: { span: 24 },
......@@ -919,7 +919,7 @@ export const formProps: FormProps = {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入铸次号',
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
......@@ -973,7 +973,7 @@ export const formProps: FormProps = {
style: { width: '100%' },
},
},
{
/*{
key: 'dca82bcd3e7b44dfa96df1bc5a8d3ff3',
field: 'rch',
label: '熔次号',
......@@ -1005,6 +1005,54 @@ export const formProps: FormProps = {
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},*/
{
key: 'lkajsldjaljdla',
field: 'ywzz',
label: '业务组织',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择下拉选择业务组织',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: '/bmxx/getCompanyList',
method: 'GET',
apiId: 'copy1765431632890d13798',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: true,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2015724355955159041' },
itemId: '2015724355955159041',
style: { width: '100%' },
},
},
{
key: 'dc5d1cdc42b34094a3d6af5ee787e0df',
......@@ -1093,54 +1141,7 @@ export const formProps: FormProps = {
{
span: 8,
list: [
{
key: 'lkajsldjaljdla',
field: 'ywzz',
label: '业务组织',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择下拉选择业务组织',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: '/bmxx/getCompanyList',
method: 'GET',
apiId: 'copy1765431632890d13798',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: true,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2015724355955159041' },
itemId: '2015724355955159041',
style: { width: '100%' },
},
},
],
},
],
......
xjrsoft-vue3/src/views/scgl/gdgl/components/workflowPermission.ts
......@@ -302,8 +302,8 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '铸次号',
fieldId: 'zch',
fieldName: '炉次号',
fieldId: 'lch',
isSubTable: false,
showChildren: true,
type: 'input',
......
xjrsoft-vue3/src/views/scgl/scrw/components/config.ts
......@@ -99,29 +99,17 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'rch',
title: '熔次号',
dataIndex: 'lch',
title: '炉次号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'zch',
title: '铸次号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
......@@ -273,6 +261,54 @@ export const formProps: FormProps = {
},
},
{
key: 'lkajsldjaljdla',
field: 'ywzz',
label: '业务组织',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择下拉选择业务组织',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: '/bmxx/getCompanyList',
method: 'GET',
apiId: 'copy1765431632890d13798',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: true,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2015724355955159041' },
itemId: '2015724355955159041',
style: { width: '100%' },
},
},
/* {
key: 'b22f0a133613428f84ee08c70c61311b',
field: 'zch',
label: '铸次号',
......@@ -304,7 +340,7 @@ export const formProps: FormProps = {
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
},*/
{
key: '25e30bcce47a437fb5674d9dbce3523a',
field: 'zl',
......@@ -686,9 +722,9 @@ export const formProps: FormProps = {
span: 6,
list: [
{
key: '3c95be972e5b4ebfb6fc32a629199a07',
field: 'rch',
label: '熔次号',
key: 'fsdfsdf',
field: 'lch',
label: '炉次号',
type: 'input',
component: 'Input',
colProps: { span: 24 },
......@@ -810,54 +846,7 @@ export const formProps: FormProps = {
{
span: 6,
list: [
{
key: 'lkajsldjaljdla',
field: 'ywzz',
label: '业务组织',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择下拉选择业务组织',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: '/bmxx/getCompanyList',
method: 'GET',
apiId: 'copy1765431632890d13798',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: true,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2015724355955159041' },
itemId: '2015724355955159041',
style: { width: '100%' },
},
},
],
},
],
......
xjrsoft-vue3/src/views/scgl/scrw/components/workflowPermission.ts
......@@ -220,12 +220,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '熔次号',
fieldId: 'rch',
fieldName: '炉次号',
fieldId: 'lch',
isSubTable: false,
showChildren: true,
type: 'input',
key: '3c95be972e5b4ebfb6fc32a629199a07',
key: 'fsdfsdf',
children: [],
options: {},
defaultValue: '',
......
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