Skip to content

W
weiqiao-vue
Commit 34aacec5 by 张恒
Options

feat(gxgl): 更新工序管理配置和数据模型 

- 移除默认报工人员字段配置
- 修改采集方案数据源从静态数据改为API接口
- 更新采集方案表格列组件类型为关联选择器
- 交换额定工时和备注字段的位置和组件类型
- 调整表单尺寸从small改为default
- 移除作业指导图片相关配置
- 添加产品/物料和采集项子表单配置
- 更新工作流权限配置中的字段映射
- 修改是否委外字段为额定工时并调整组件类型
- 调整有效字段配置和默认值
- 更新工序管理API模型定义
- 添加工序项目和工序产品数据模型
- 修复列表按钮配置格式问题
- 调整工作流权限组件中的字段配置
- 更新采集方案字段的默认选择值
- 优化表格组件的样式和交互配置
parent 0b2279f2
Showing with 857 additions and 281 deletions
xjrsoft-vue3/src/api/jcsj/gxgl/model/GxglModel.ts
...@@ -6,8 +6,6 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,8 +6,6 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface RokeProcessPageParams extends BasicPageParams { export interface RokeProcessPageParams extends BasicPageParams {
name: string; name: string;
defaultReporter: string;
categoryId: string; categoryId: string;
collectionSchemeId: string; collectionSchemeId: string;
...@@ -27,12 +25,239 @@ export interface RokeProcessPageModel { ...@@ -27,12 +25,239 @@ export interface RokeProcessPageModel {
collectionSchemeId: string; collectionSchemeId: string;
note: string;
ratedWorkingHours: string; ratedWorkingHours: string;
}
/**
* @description: RokeProcess表类型
*/
export interface RokeProcessModel {
id: string;
deleteMark: string;
messageMainAttachmentId: string;
name: string;
code: string;
categoryId: string;
processType: string;
internalCode: string;
active: string;
withoutWoProduce: string;
note: string; note: string;
ratedWorkingHours: string;
companyId: string;
isPress: string;
prepareWorkHours: string;
collectionSchemeId: string;
qualityMode: string;
qcSchemeId: string;
isQuality: string;
salaryType: string;
baseQty: string;
salaryUnit: string;
salary: string;
salaryCode: string;
qcSalaryBasis: string;
qcSalaryType: string;
qcBaseQty: string;
qcSalaryUnit: string;
qcSalary: string;
qcSalaryCode: string;
defaultReporter: string;
collectionItem: string;
inspectionCollectionItem: string;
inspectionScheme: string;
inspectionDepartment: string;
inspectionStaff: string;
defectProcessing: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
zyzdFile: string;
zyzdtpFile: string;
mesProcessItemList?: MesProcessItemModel;
mesProcessProductList?: MesProcessProductModel;
} }
0; /**
* @description: MesProcessItem表类型
*/
export interface MesProcessItemModel {
id: string;
processId: string;
code: string;
name: string;
required: string;
categoryId: string;
contentType: string;
dataType: string;
dictId: string;
relatedModelId: string;
relatedModelName: string;
relatedModelDomain: string;
standardValue: string;
upperValue: string;
lowerValue: string;
note: string;
companyId: string;
qualityCategoryId: string;
analysisMethod: string;
qualityMethodId: string;
destructive: string;
keyItem: string;
deleteMark: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
}
/**
* @description: MesProcessProduct表类型
*/
export interface MesProcessProductModel {
id: string;
deleteMark: string;
cpbh: string;
cpmc: string;
nbdm: string;
hjzt: string;
cptp: string;
kxs: string;
kcg: string;
wllx: string;
cplx: string;
gg: string;
xh: string;
fpl: string;
bzzl: string;
erpid: string;
zygf: string;
bz: string;
p1: string;
p2: string;
p3: string;
p4: string;
p5: string;
p6: string;
p7: string;
p8: string;
p9: string;
p10: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
processId: string;
isFeeding: string;
number: string;
}
/** /**
* @description: RokeProcess分页返回值结构 * @description: RokeProcess分页返回值结构
......
xjrsoft-vue3/src/views/jcsj/cjfa/components/workflowPermission.ts
...@@ -17,7 +17,7 @@ export const permissionList = [ ...@@ -17,7 +17,7 @@ export const permissionList = [
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
...@@ -34,7 +34,7 @@ export const permissionList = [ ...@@ -34,7 +34,7 @@ export const permissionList = [
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
......
xjrsoft-vue3/src/views/jcsj/gxgl/components/config.ts
...@@ -10,32 +10,6 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -10,32 +10,6 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
field: 'defaultReporter',
label: '默认报工人员',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/bmxx/getEmployeeList',
method: 'GET',
apiId: 'copy1765432049337d61208',
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 roke_employee where active = 1 and delete_mark = 0";\r\nreturn db.select(sql);',
},
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'categoryId', field: 'categoryId',
label: '工序类别', label: '工序类别',
defaultValue: undefined, defaultValue: undefined,
...@@ -56,8 +30,19 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -56,8 +30,19 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined, defaultValue: undefined,
component: 'XjrSelect', component: 'XjrSelect',
componentProps: { componentProps: {
datasourceType: 'staticData', datasourceType: 'api',
staticOptions: [{ key: 1, label: '无', value: '无' }], apiConfig: {
path: '/jcxx/getCollectionSchemeList',
method: 'GET',
apiId: 'copy1767064303024d70507',
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 mes_collection_scheme where delete_mark = 0";\r\nreturn db.select(sql);',
},
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
mode: 'multiple', mode: 'multiple',
...@@ -104,13 +89,7 @@ export const columns: BasicColumn[] = [ ...@@ -104,13 +89,7 @@ export const columns: BasicColumn[] = [
resizable: true, resizable: true,
dataIndex: 'collectionSchemeId', dataIndex: 'collectionSchemeId',
title: '采集方案', title: '采集方案',
componentType: 'select', componentType: 'associate-select',
customRender: ({ record }) => {
const staticOptions = [{ key: 1, label: '无', value: '无' }];
return staticOptions.filter((x) => x.value == record.collectionSchemeId)[0]?.label;
},
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -121,9 +100,9 @@ export const columns: BasicColumn[] = [ ...@@ -121,9 +100,9 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ratedWorkingHours', dataIndex: 'note',
title: '额定工时', title: '备注',
componentType: 'number', componentType: 'textarea',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -134,9 +113,9 @@ export const columns: BasicColumn[] = [ ...@@ -134,9 +113,9 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'note', dataIndex: 'ratedWorkingHours',
title: '备注', title: '额定工时',
componentType: 'textarea', componentType: 'number',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -214,7 +193,7 @@ export const formProps: FormProps = { ...@@ -214,7 +193,7 @@ export const formProps: FormProps = {
labelCol: { span: 3, offset: 0 }, labelCol: { span: 3, offset: 0 },
labelAlign: 'left', labelAlign: 'left',
layout: 'horizontal', layout: 'horizontal',
size: 'small', size: 'default',
schemas: [ schemas: [
{ {
key: '04fbf175bf2a4661a06e44126776617b', key: '04fbf175bf2a4661a06e44126776617b',
...@@ -240,7 +219,6 @@ export const formProps: FormProps = { ...@@ -240,7 +219,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '', placeholder: '',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -262,50 +240,28 @@ export const formProps: FormProps = { ...@@ -262,50 +240,28 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'aa72d19636d540078e40a0dae8b90e3c', key: 'f7c26bba94034dcdbc816e49607d64e9',
field: 'defaultReporter', field: 'zyzdFile',
label: '默认报工人员', label: '作业指导',
type: 'select', type: 'upload',
component: 'XjrSelect', component: 'Upload',
colProps: { span: 24 }, colProps: { span: 24 },
componentProps: { componentProps: {
width: '100%', api: uploadApi,
span: 7, span: 7,
placeholder: '', defaultValue: '',
accept: '',
maxNumber: 10,
maxSize: 100,
showLabel: true, showLabel: true,
showSearch: false, multiple: true,
isMultiple: false,
clearable: false,
disabled: 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: 'api',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
path: '/bmxx/getEmployeeList',
method: 'GET',
apiId: 'copy1765432049337d61208',
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 roke_employee where active = 1 and delete_mark = 0";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: false, required: false,
rules: [],
events: {},
isShow: true, isShow: true,
events: {},
listType: 'text',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
}, },
}, },
], ],
...@@ -334,7 +290,6 @@ export const formProps: FormProps = { ...@@ -334,7 +290,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
defaultSelect: null,
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2005547790246666242' }, params: { itemId: '2005547790246666242' },
labelField: 'name', labelField: 'name',
...@@ -352,7 +307,7 @@ export const formProps: FormProps = { ...@@ -352,7 +307,7 @@ export const formProps: FormProps = {
'var sql="select id as value,name as label from roke_process_category";\r\nreturn db.select(sql);', 'var sql="select id as value,name as label from roke_process_category";\r\nreturn db.select(sql);',
}, },
dicOptions: [], dicOptions: [],
required: false, required: true,
rules: [], rules: [],
events: {}, events: {},
isShow: true, isShow: true,
...@@ -362,26 +317,29 @@ export const formProps: FormProps = { ...@@ -362,26 +317,29 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'aabb539eede446daa35c754416cc50ae', key: 'ca8257a46070472e9639110b11f7f3bd',
field: 'prepareWorkHours', field: 'ratedWorkingHours',
label: '是否委外', label: '额定工时',
type: 'switch', type: 'number',
component: 'Switch', component: 'InputNumber',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: 0, defaultValue: 0,
componentProps: { componentProps: {
width: '100%',
span: 7, span: 7,
defaultValue: 0, defaultValue: 0,
checkedChildren: '', min: 0,
unCheckedChildren: '', step: 0.01,
checkedColor: '#303030',
unCheckedColor: '#bbbdbf',
showLabel: true,
disabled: false, disabled: false,
events: {}, showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true, isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: {}, style: { width: '100%' },
}, },
}, },
], ],
...@@ -390,79 +348,58 @@ export const formProps: FormProps = { ...@@ -390,79 +348,58 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: '55d03e0607bc4ea281a248fdcfc571bb', key: '6a8f658eb0e046e48c3dac472c0e51ae',
field: 'collectionSchemeId', field: 'collectionSchemeId',
label: '采集方案', label: '采集方案',
type: 'select', type: 'associate-select',
component: 'XjrSelect', component: 'AssociateSelect',
colProps: { span: 24 }, colProps: { span: 24 },
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
placeholder: '', placeholder: '请选择采集方案',
showLabel: true, showLabel: true,
showSearch: false, showSearch: true,
isMultiple: false,
clearable: false,
disabled: false, disabled: false,
staticOptions: [{ key: 1, label: '无', value: '无' }], datasourceType: 'api',
defaultSelect: '无',
datasourceType: 'staticData',
params: null,
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
apiConfig: {}, apiConfig: {
path: '/jcxx/getCollectionSchemeList',
method: 'GET',
apiId: 'copy1767064303024d70507',
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 mes_collection_scheme where delete_mark = 0";\r\nreturn db.select(sql);',
},
dicOptions: [], dicOptions: [],
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
isShow: true, isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
defaultSelect: '2005534898818441218',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
{ {
key: 'ca8257a46070472e9639110b11f7f3bd', key: 'c0730ef93c40445195dac1ed93677144',
field: 'ratedWorkingHours',
label: '额定工时',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: 0,
componentProps: {
width: '100%',
span: 7,
defaultValue: 0,
min: 0,
max: 100,
step: 0.01,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'e2c431530e954e53852f9a6026987e0d',
field: 'active', field: 'active',
label: '有效的', label: '有效',
type: 'switch', type: 'switch',
component: 'Switch', component: 'Switch',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: 1, defaultValue: 1,
componentProps: { componentProps: {
span: 5, span: 7,
defaultValue: 1, defaultValue: 1,
checkedChildren: '', checkedChildren: '',
unCheckedChildren: '', unCheckedChildren: '',
checkedColor: '#303030', checkedColor: '#5c7cff',
unCheckedColor: '#bbbdbf', unCheckedColor: '#bbbdbf',
showLabel: true, showLabel: true,
disabled: false, disabled: false,
...@@ -489,54 +426,82 @@ export const formProps: FormProps = { ...@@ -489,54 +426,82 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '24f0714c9f3a4242b1bcefff04bb7314', key: '6cf0d93568bf4236970c03902399e4c8',
field: '', field: '',
label: '', label: '',
type: 'tab', type: 'grid',
colProps: { span: 24 }, colProps: { span: 24 },
component: 'Tab', component: 'Grid',
children: [ children: [
{ {
span: 24, span: 24,
name: '作业规范',
prefix: '',
suffix: '',
activeColor: '#1c8dff',
folderId: '',
imageUrl: '',
conFolderId: '',
conImageUrl: '',
list: [ list: [
{ {
key: 'f7c26bba94034dcdbc816e49607d64e9', key: '037bf18717bf496f8a1fc0e8605a8a7d',
field: 'zyzdFile', field: 'note',
label: '作业指导', label: '备注',
type: 'upload', type: 'textarea',
component: 'Upload', component: 'InputTextArea',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
api: uploadApi, width: '100%',
span: '', span: 1,
defaultValue: '', defaultValue: '',
accept: 'pdf,png,jpg', placeholder: '请输入备注',
maxNumber: 10, rows: 4,
maxSize: 100, autoSize: false,
showLabel: true, showCount: false,
multiple: true,
disabled: false, disabled: false,
showLabel: true,
allowClear: false,
required: false, required: false,
isShow: true, isShow: true,
isShowAi: false,
rules: [],
events: {}, events: {},
listType: 'text',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
}, },
}, },
], ],
}, },
],
componentProps: {
gutter: 16,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: '03c19c5ac95b4d139d8380ede64f14ff',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 24,
list: [
{
key: '24f0714c9f3a4242b1bcefff04bb7314',
field: '',
label: '',
type: 'tab',
colProps: { span: 24 },
component: 'Tab',
children: [
{ {
span: 24, span: 24,
name: '作业指导图片', name: '产品/物料',
prefix: '', prefix: '',
suffix: '', suffix: '',
activeColor: '#1c8dff', activeColor: '#1c8dff',
...@@ -546,56 +511,175 @@ export const formProps: FormProps = { ...@@ -546,56 +511,175 @@ export const formProps: FormProps = {
conImageUrl: '', conImageUrl: '',
list: [ list: [
{ {
key: 'f0db1f4ee6254dd58b8f6e5f66ab7030', key: '7cb7c6cdf3ec417280dc49e19dd39ffa',
field: '',
label: '', label: '',
type: 'grid', field: 'mesProcessProductList',
type: 'form',
component: 'SubForm',
required: true,
colProps: { span: 24 }, colProps: { span: 24 },
component: 'Grid', componentProps: {
children: [ mainKey: 'mesProcessProductList',
columns: [
{ {
span: 12, key: '00c0e93b675841f48265b896515a5241',
list: [ title: '编号',
dataIndex: 'cpbh',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{ {
key: 'f40c42bc3b174f7589179a6b8976eb65', key: '91863c5a0ec24d76ade8735cd401059b',
field: 'zyzdtpFile', title: '名称',
label: '作业指导', dataIndex: 'cpmc',
type: 'upload', componentType: 'Input',
component: 'Upload', defaultValue: '',
colProps: { span: 24 },
componentProps: { componentProps: {
api: '#{upload}#', width: '100%',
span: 7, span: '',
defaultValue: '', defaultValue: '',
accept: '', placeholder: '',
maxNumber: 10, prefix: '',
maxSize: 50, suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true, showLabel: true,
multiple: false, required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '6c749d8f7bde474da082c659146f473c',
title: '数量',
dataIndex: 'number',
componentType: 'InputNumber',
defaultValue: 0,
componentProps: {
width: '100%',
span: '',
defaultValue: 0,
min: 0,
step: 1,
disabled: false, disabled: false,
showLabel: true,
controls: true,
required: false, required: false,
subTotal: false,
isShow: true, isShow: true,
rules: [],
events: {}, events: {},
listType: 'picture',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
}, },
}, },
], {
key: 'cb38672445b24eedb2b10addf520de2e',
title: '是否投料',
dataIndex: 'isFeeding',
componentType: 'Switch',
defaultValue: 1,
componentProps: {
span: '',
defaultValue: 1,
checkedChildren: '',
unCheckedChildren: '',
checkedColor: '#545454',
unCheckedColor: '#bbbdbf',
showLabel: true,
disabled: false,
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
}, },
{ span: 12, list: [] }, },
], {
key: '1084a7c39baf47ba9a0251cb4e2f8c14',
title: '备注',
dataIndex: 'bz',
componentType: 'InputTextArea',
defaultValue: '',
componentProps: { componentProps: {
gutter: 16, width: '100%',
justify: 'start', span: '',
align: 'top', defaultValue: '',
placeholder: '请输入备注',
rows: 2,
autoSize: false,
showCount: false,
disabled: false,
showLabel: true,
allowClear: false,
required: false,
isShow: true, isShow: true,
isShowAi: false,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{ title: '操作', key: 'action', fixed: 'right', width: '50px' },
],
span: '24',
preloadType: 'api',
apiConfig: {},
itemId: '',
dicOptions: [],
useSelectButton: false,
buttonName: '选择数据',
showLabel: true,
showComponentBorder: true,
showBorder: false, showBorder: false,
bordercolor: '#d9d9d9', bordercolor: '#f0f0f0',
bordershowtype: [true, true, true, true], bordershowtype: [true, true, true, true],
borderwidth: 1, borderwidth: 1,
padding: '10px', showIndex: false,
margin: '10px', isShow: true,
multipleHeads: [],
buttonList: [],
topButtonList: [],
isExport: false,
isImport: false,
isDeleteSelected: true,
isListView: false,
viewList: [],
isShowAdd: true,
isShowDelete: true,
hasCheckedCol: true,
events: {},
showPagenation: true,
}, },
}, },
], ],
...@@ -603,44 +687,148 @@ export const formProps: FormProps = { ...@@ -603,44 +687,148 @@ export const formProps: FormProps = {
{ {
span: 0, span: 0,
name: '采集项', name: '采集项',
prefix: null, list: [
suffix: null,
activeColor: null,
folderId: null,
imageUrl: null,
conFolderId: null,
conImageUrl: null,
list: [],
},
],
componentProps: { tabPosition: 'top', size: 'default', type: 'line', isShow: true },
},
{ {
key: '03c19c5ac95b4d139d8380ede64f14ff', key: '3fd474ce5f8c4bf78bd86dc701cbdc4f',
field: '',
label: '', label: '',
type: 'grid', field: 'mesProcessItemList',
type: 'form',
component: 'SubForm',
required: true,
colProps: { span: 24 }, colProps: { span: 24 },
component: 'Grid', componentProps: {
children: [ mainKey: 'mesProcessItemList',
columns: [
{ {
span: 24, key: '3999831fde0a4e879f64f33eb2a1edd1',
list: [ title: '编码',
dataIndex: 'code',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{ {
key: '04ae7a540acd4c46949c6fd53e652a45', key: 'ab6576e960ee44b4af09975e64088f05',
field: 'note', title: '名称',
label: '备注', dataIndex: 'name',
type: 'textarea', componentType: 'Input',
component: 'InputTextArea',
colProps: { span: 24 },
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 0, span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '',
maxlength: null, prefix: '',
rows: 4, suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '745cb3bb014d4dd9ba38139d17b2f305',
title: '数据类型',
dataIndex: 'dataType',
componentType: 'XjrSelect',
componentProps: {
width: '100%',
span: '',
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' },
],
datasourceType: 'dic',
params: { itemId: '2004076331787718658' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2004076331787718658',
listStyle: "return 'border: 0'",
},
},
{
key: '36a40652260d491e8a088ff843aab982',
title: '是否必填',
dataIndex: 'required',
componentType: 'Switch',
defaultValue: 0,
componentProps: {
span: '',
defaultValue: 0,
checkedChildren: '',
unCheckedChildren: '',
checkedColor: '#1C8DFF',
unCheckedColor: '#bbbdbf',
showLabel: true,
disabled: false,
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: 'f3ba1f809888475d925665668e2a1851',
title: '备注',
dataIndex: 'note',
componentType: 'InputTextArea',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '',
rows: 2,
autoSize: false, autoSize: false,
showCount: false, showCount: false,
disabled: false, disabled: false,
...@@ -652,12 +840,48 @@ export const formProps: FormProps = { ...@@ -652,12 +840,48 @@ export const formProps: FormProps = {
rules: [], rules: [],
events: {}, events: {},
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, },
},
{ title: '操作', key: 'action', fixed: 'right', width: '50px' },
],
span: '24',
preloadType: 'api',
apiConfig: {},
itemId: '',
dicOptions: [],
useSelectButton: false,
buttonName: '选择数据',
showLabel: true,
showComponentBorder: true,
showBorder: false,
bordercolor: '#f0f0f0',
bordershowtype: [true, true, true, true],
borderwidth: 1,
showIndex: false,
isShow: true,
multipleHeads: [],
buttonList: [],
topButtonList: [],
isExport: false,
isImport: false,
isDeleteSelected: false,
isListView: false,
viewList: [],
isShowAdd: false,
isShowDelete: true,
hasCheckedCol: false,
events: {},
showPagenation: true,
}, },
}, },
], ],
}, },
], ],
componentProps: { tabPosition: 'top', size: 'default', type: 'line', isShow: true },
},
],
},
],
componentProps: { componentProps: {
gutter: 1, gutter: 1,
justify: 'start', justify: 'start',
...@@ -682,11 +906,11 @@ export const formProps: FormProps = { ...@@ -682,11 +906,11 @@ export const formProps: FormProps = {
export const treeConfig = { export const treeConfig = {
id: '', id: '',
isMultiple: false,
name: '', name: '',
type: 1, type: 1,
configTip: '', configTip: '',
config: [], config: [],
isMultiple: false,
}; };
export const formButtons = [ export const formButtons = [
...@@ -699,7 +923,6 @@ export const formButtons = [ ...@@ -699,7 +923,6 @@ export const formButtons = [
isShow: true, isShow: true,
index: 2, index: 2,
type: 1, type: 1,
modal: null,
}, },
{ {
key: 'cancel', key: 'cancel',
...@@ -710,7 +933,6 @@ export const formButtons = [ ...@@ -710,7 +933,6 @@ export const formButtons = [
isShow: true, isShow: true,
index: 1, index: 1,
type: 1, type: 1,
modal: null,
}, },
{ {
key: 'reset', key: 'reset',
...@@ -721,6 +943,5 @@ export const formButtons = [ ...@@ -721,6 +943,5 @@ export const formButtons = [
isShow: true, isShow: true,
index: 0, index: 0,
type: 1, type: 1,
modal: null,
}, },
]; ];
xjrsoft-vue3/src/views/jcsj/gxgl/components/workflowPermission.ts
...@@ -23,17 +23,18 @@ export const permissionList = [ ...@@ -23,17 +23,18 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '默认报工人员', fieldName: '作业指导',
fieldId: 'defaultReporter', fieldId: 'zyzdFile',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'upload',
key: 'aa72d19636d540078e40a0dae8b90e3c', key: 'f7c26bba94034dcdbc816e49607d64e9',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: true,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
...@@ -55,12 +56,12 @@ export const permissionList = [ ...@@ -55,12 +56,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '是否委外', fieldName: '额定工时',
fieldId: 'prepareWorkHours', fieldId: 'ratedWorkingHours',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'switch', type: 'number',
key: 'aabb539eede446daa35c754416cc50ae', key: 'ca8257a46070472e9639110b11f7f3bd',
children: [], children: [],
options: {}, options: {},
defaultValue: 0, defaultValue: 0,
...@@ -76,11 +77,11 @@ export const permissionList = [ ...@@ -76,11 +77,11 @@ export const permissionList = [
fieldId: 'collectionSchemeId', fieldId: 'collectionSchemeId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'associate-select',
key: '55d03e0607bc4ea281a248fdcfc571bb', key: '6a8f658eb0e046e48c3dac472c0e51ae',
children: [], children: [],
options: {}, options: {},
defaultValue: '无', defaultValue: '2005534898818441218',
}, },
{ {
required: false, required: false,
...@@ -89,15 +90,15 @@ export const permissionList = [ ...@@ -89,15 +90,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '额定工时', fieldName: '有效',
fieldId: 'ratedWorkingHours', fieldId: 'active',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'switch',
key: 'ca8257a46070472e9639110b11f7f3bd', key: 'c0730ef93c40445195dac1ed93677144',
children: [], children: [],
options: {}, options: {},
defaultValue: 0, defaultValue: 1,
}, },
{ {
required: false, required: false,
...@@ -106,65 +107,194 @@ export const permissionList = [ ...@@ -106,65 +107,194 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '有效的', fieldName: '备注',
fieldId: 'active', fieldId: 'note',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'switch', type: 'textarea',
key: 'e2c431530e954e53852f9a6026987e0d', key: '037bf18717bf496f8a1fc0e8605a8a7d',
children: [], children: [],
options: {}, options: {},
defaultValue: 1, defaultValue: '',
}, },
{ {
required: false, required: true,
view: true,
edit: true,
disabled: false,
isSubTable: true,
showChildren: false,
tableName: 'mesProcessProductList',
fieldName: '',
fieldId: 'mesProcessProductList',
type: 'form',
key: '7cb7c6cdf3ec417280dc49e19dd39ffa',
children: [
{
required: true,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSubTable: false,
isSaveTable: false, isSaveTable: false,
tableName: '', showChildren: false,
fieldName: '作业指导', tableName: 'mesProcessProductList',
fieldId: 'zyzdFile', fieldName: '编号',
fieldId: 'cpbh',
type: 'Input',
key: '00c0e93b675841f48265b896515a5241',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false, isSubTable: false,
showChildren: true, isSaveTable: false,
type: 'upload', showChildren: false,
key: 'f7c26bba94034dcdbc816e49607d64e9', tableName: 'mesProcessProductList',
fieldName: '名称',
fieldId: 'cpmc',
type: 'Input',
key: '91863c5a0ec24d76ade8735cd401059b',
children: [], children: [],
options: {},
defaultValue: '',
}, },
{ {
required: false, required: true,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSubTable: false,
isSaveTable: false, isSaveTable: false,
tableName: '', showChildren: false,
fieldName: '作业指导', tableName: 'mesProcessProductList',
fieldId: 'zyzdtpFile', fieldName: '数量',
fieldId: 'number',
type: 'InputNumber',
key: '6c749d8f7bde474da082c659146f473c',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false, isSubTable: false,
showChildren: true, isSaveTable: false,
type: 'upload', showChildren: false,
key: 'f40c42bc3b174f7589179a6b8976eb65', tableName: 'mesProcessProductList',
fieldName: '是否投料',
fieldId: 'isFeeding',
type: 'Switch',
key: 'cb38672445b24eedb2b10addf520de2e',
children: [], children: [],
options: {},
defaultValue: '',
}, },
{ {
required: false, required: true,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSubTable: false,
isSaveTable: false, isSaveTable: false,
tableName: '', showChildren: false,
tableName: 'mesProcessProductList',
fieldName: '备注', fieldName: '备注',
fieldId: 'note', fieldId: 'bz',
type: 'InputTextArea',
key: '1084a7c39baf47ba9a0251cb4e2f8c14',
children: [],
},
],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: true,
showChildren: false,
tableName: 'mesProcessItemList',
fieldName: '',
fieldId: 'mesProcessItemList',
type: 'form',
key: '3fd474ce5f8c4bf78bd86dc701cbdc4f',
children: [
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false, isSubTable: false,
showChildren: true, isSaveTable: false,
type: 'textarea', showChildren: false,
key: '04ae7a540acd4c46949c6fd53e652a45', tableName: 'mesProcessItemList',
fieldName: '编码',
fieldId: 'code',
type: 'Input',
key: '3999831fde0a4e879f64f33eb2a1edd1',
children: [], children: [],
options: {}, },
defaultValue: '', {
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessItemList',
fieldName: '名称',
fieldId: 'name',
type: 'Input',
key: 'ab6576e960ee44b4af09975e64088f05',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessItemList',
fieldName: '数据类型',
fieldId: 'dataType',
type: 'XjrSelect',
key: '745cb3bb014d4dd9ba38139d17b2f305',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessItemList',
fieldName: '是否必填',
fieldId: 'required',
type: 'Switch',
key: '36a40652260d491e8a088ff843aab982',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessItemList',
fieldName: '备注',
fieldId: 'note',
type: 'InputTextArea',
key: 'f3ba1f809888475d925665668e2a1851',
children: [],
},
],
}, },
]; ];
xjrsoft-vue3/src/views/jcsj/gxgl/index.vue
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2005548723533832192","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2005548723533832193","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2005548723533832194","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2005548723533832195","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
......
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