Skip to content

W
weiqiao-vue
Commit ac30f4d4 by 史雅文
Options

Merge branch 'weiqiao-vue3' of https://git.rokedata.com/jinmin/weiqiao-vue into weiqiao-vue3

parents e2cc78b7 34aacec5
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';
export interface RokeProcessPageParams extends BasicPageParams {
name: string;
defaultReporter: string;
categoryId: string;
collectionSchemeId: string;
......@@ -27,12 +25,239 @@ export interface RokeProcessPageModel {
collectionSchemeId: string;
note: 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;
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分页返回值结构
......
xjrsoft-vue3/src/views/jcsj/cjfa/components/workflowPermission.ts
......@@ -17,7 +17,7 @@ export const permissionList = [
defaultValue: '',
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
......@@ -34,7 +34,7 @@ export const permissionList = [
defaultValue: '',
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
......
xjrsoft-vue3/src/views/jcsj/gxgl/components/config.ts
......@@ -10,32 +10,6 @@ export const searchFormSchema: FormSchema[] = [
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',
label: '工序类别',
defaultValue: undefined,
......@@ -56,8 +30,19 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'staticData',
staticOptions: [{ key: 1, label: '无', value: '无' }],
datasourceType: 'api',
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',
valueField: 'value',
mode: 'multiple',
......@@ -104,13 +89,7 @@ export const columns: BasicColumn[] = [
resizable: true,
dataIndex: 'collectionSchemeId',
title: '采集方案',
componentType: 'select',
customRender: ({ record }) => {
const staticOptions = [{ key: 1, label: '无', value: '无' }];
return staticOptions.filter((x) => x.value == record.collectionSchemeId)[0]?.label;
},
componentType: 'associate-select',
fixed: false,
sorter: true,
......@@ -121,9 +100,9 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'ratedWorkingHours',
title: '额定工时',
componentType: 'number',
dataIndex: 'note',
title: '备注',
componentType: 'textarea',
fixed: false,
sorter: true,
......@@ -134,9 +113,9 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'note',
title: '备注',
componentType: 'textarea',
dataIndex: 'ratedWorkingHours',
title: '额定工时',
componentType: 'number',
fixed: false,
sorter: true,
......@@ -214,7 +193,7 @@ export const formProps: FormProps = {
labelCol: { span: 3, offset: 0 },
labelAlign: 'left',
layout: 'horizontal',
size: 'small',
size: 'default',
schemas: [
{
key: '04fbf175bf2a4661a06e44126776617b',
......@@ -240,7 +219,6 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -262,50 +240,28 @@ export const formProps: FormProps = {
},
},
{
key: 'aa72d19636d540078e40a0dae8b90e3c',
field: 'defaultReporter',
label: '默认报工人员',
type: 'select',
component: 'XjrSelect',
key: 'f7c26bba94034dcdbc816e49607d64e9',
field: 'zyzdFile',
label: '作业指导',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
width: '100%',
api: uploadApi,
span: 7,
placeholder: '',
defaultValue: '',
accept: '',
maxNumber: 10,
maxSize: 100,
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
multiple: true,
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,
rules: [],
events: {},
isShow: true,
events: {},
listType: 'text',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
......@@ -334,7 +290,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2005547790246666242' },
labelField: 'name',
......@@ -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);',
},
dicOptions: [],
required: false,
required: true,
rules: [],
events: {},
isShow: true,
......@@ -362,26 +317,29 @@ export const formProps: FormProps = {
},
},
{
key: 'aabb539eede446daa35c754416cc50ae',
field: 'prepareWorkHours',
label: '是否委外',
type: 'switch',
component: 'Switch',
key: 'ca8257a46070472e9639110b11f7f3bd',
field: 'ratedWorkingHours',
label: '额定工时',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: 0,
componentProps: {
width: '100%',
span: 7,
defaultValue: 0,
checkedChildren: '',
unCheckedChildren: '',
checkedColor: '#303030',
unCheckedColor: '#bbbdbf',
showLabel: true,
min: 0,
step: 0.01,
disabled: false,
events: {},
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
style: {},
style: { width: '100%' },
},
},
],
......@@ -390,79 +348,58 @@ export const formProps: FormProps = {
span: 8,
list: [
{
key: '55d03e0607bc4ea281a248fdcfc571bb',
key: '6a8f658eb0e046e48c3dac472c0e51ae',
field: 'collectionSchemeId',
label: '采集方案',
type: 'select',
component: 'XjrSelect',
type: 'associate-select',
component: 'AssociateSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '',
placeholder: '请选择采集方案',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
showSearch: true,
disabled: false,
staticOptions: [{ key: 1, label: '无', value: '无' }],
defaultSelect: '无',
datasourceType: 'staticData',
params: null,
datasourceType: 'api',
labelField: 'label',
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: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
defaultSelect: '2005534898818441218',
style: { width: '100%' },
},
},
{
key: 'ca8257a46070472e9639110b11f7f3bd',
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',
key: 'c0730ef93c40445195dac1ed93677144',
field: 'active',
label: '有效的',
label: '有效',
type: 'switch',
component: 'Switch',
colProps: { span: 24 },
defaultValue: 1,
componentProps: {
span: 5,
span: 7,
defaultValue: 1,
checkedChildren: '',
unCheckedChildren: '',
checkedColor: '#303030',
checkedColor: '#5c7cff',
unCheckedColor: '#bbbdbf',
showLabel: true,
disabled: false,
......@@ -489,54 +426,82 @@ export const formProps: FormProps = {
},
},
{
key: '24f0714c9f3a4242b1bcefff04bb7314',
key: '6cf0d93568bf4236970c03902399e4c8',
field: '',
label: '',
type: 'tab',
type: 'grid',
colProps: { span: 24 },
component: 'Tab',
component: 'Grid',
children: [
{
span: 24,
name: '作业规范',
prefix: '',
suffix: '',
activeColor: '#1c8dff',
folderId: '',
imageUrl: '',
conFolderId: '',
conImageUrl: '',
list: [
{
key: 'f7c26bba94034dcdbc816e49607d64e9',
field: 'zyzdFile',
label: '作业指导',
type: 'upload',
component: 'Upload',
key: '037bf18717bf496f8a1fc0e8605a8a7d',
field: 'note',
label: '备注',
type: 'textarea',
component: 'InputTextArea',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
api: uploadApi,
span: '',
width: '100%',
span: 1,
defaultValue: '',
accept: 'pdf,png,jpg',
maxNumber: 10,
maxSize: 100,
showLabel: true,
multiple: true,
placeholder: '请输入备注',
rows: 4,
autoSize: false,
showCount: false,
disabled: false,
showLabel: true,
allowClear: false,
required: false,
isShow: true,
isShowAi: false,
rules: [],
events: {},
listType: 'text',
sourceType: 'album,camera',
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,
name: '作业指导图片',
name: '产品/物料',
prefix: '',
suffix: '',
activeColor: '#1c8dff',
......@@ -546,56 +511,175 @@ export const formProps: FormProps = {
conImageUrl: '',
list: [
{
key: 'f0db1f4ee6254dd58b8f6e5f66ab7030',
field: '',
key: '7cb7c6cdf3ec417280dc49e19dd39ffa',
label: '',
type: 'grid',
field: 'mesProcessProductList',
type: 'form',
component: 'SubForm',
required: true,
colProps: { span: 24 },
component: 'Grid',
children: [
componentProps: {
mainKey: 'mesProcessProductList',
columns: [
{
span: 12,
list: [
key: '00c0e93b675841f48265b896515a5241',
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',
field: 'zyzdtpFile',
label: '作业指导',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
key: '91863c5a0ec24d76ade8735cd401059b',
title: '名称',
dataIndex: 'cpmc',
componentType: 'Input',
defaultValue: '',
componentProps: {
api: '#{upload}#',
span: 7,
width: '100%',
span: '',
defaultValue: '',
accept: '',
maxNumber: 10,
maxSize: 50,
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
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,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
listType: 'picture',
sourceType: 'album,camera',
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: {
gutter: 16,
justify: 'start',
align: 'top',
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入备注',
rows: 2,
autoSize: false,
showCount: false,
disabled: false,
showLabel: true,
allowClear: false,
required: false,
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,
bordercolor: '#d9d9d9',
bordercolor: '#f0f0f0',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
showIndex: false,
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 = {
{
span: 0,
name: '采集项',
prefix: null,
suffix: null,
activeColor: null,
folderId: null,
imageUrl: null,
conFolderId: null,
conImageUrl: null,
list: [],
},
],
componentProps: { tabPosition: 'top', size: 'default', type: 'line', isShow: true },
},
list: [
{
key: '03c19c5ac95b4d139d8380ede64f14ff',
field: '',
key: '3fd474ce5f8c4bf78bd86dc701cbdc4f',
label: '',
type: 'grid',
field: 'mesProcessItemList',
type: 'form',
component: 'SubForm',
required: true,
colProps: { span: 24 },
component: 'Grid',
children: [
componentProps: {
mainKey: 'mesProcessItemList',
columns: [
{
span: 24,
list: [
key: '3999831fde0a4e879f64f33eb2a1edd1',
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',
field: 'note',
label: '备注',
type: 'textarea',
component: 'InputTextArea',
colProps: { span: 24 },
key: 'ab6576e960ee44b4af09975e64088f05',
title: '名称',
dataIndex: 'name',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: 0,
span: '',
defaultValue: '',
placeholder: '请输入备注',
maxlength: null,
rows: 4,
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: '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,
showCount: false,
disabled: false,
......@@ -652,12 +840,48 @@ export const formProps: FormProps = {
rules: [],
events: {},
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: {
gutter: 1,
justify: 'start',
......@@ -682,11 +906,11 @@ export const formProps: FormProps = {
export const treeConfig = {
id: '',
isMultiple: false,
name: '',
type: 1,
configTip: '',
config: [],
isMultiple: false,
};
export const formButtons = [
......@@ -699,7 +923,6 @@ export const formButtons = [
isShow: true,
index: 2,
type: 1,
modal: null,
},
{
key: 'cancel',
......@@ -710,7 +933,6 @@ export const formButtons = [
isShow: true,
index: 1,
type: 1,
modal: null,
},
{
key: 'reset',
......@@ -721,6 +943,5 @@ export const formButtons = [
isShow: true,
index: 0,
type: 1,
modal: null,
},
];
xjrsoft-vue3/src/views/jcsj/gxgl/components/workflowPermission.ts
......@@ -23,17 +23,18 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '默认报工人员',
fieldId: 'defaultReporter',
fieldName: '作业指导',
fieldId: 'zyzdFile',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'aa72d19636d540078e40a0dae8b90e3c',
type: 'upload',
key: 'f7c26bba94034dcdbc816e49607d64e9',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
required: true,
view: true,
edit: true,
disabled: false,
......@@ -55,12 +56,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '是否委外',
fieldId: 'prepareWorkHours',
fieldName: '额定工时',
fieldId: 'ratedWorkingHours',
isSubTable: false,
showChildren: true,
type: 'switch',
key: 'aabb539eede446daa35c754416cc50ae',
type: 'number',
key: 'ca8257a46070472e9639110b11f7f3bd',
children: [],
options: {},
defaultValue: 0,
......@@ -76,11 +77,11 @@ export const permissionList = [
fieldId: 'collectionSchemeId',
isSubTable: false,
showChildren: true,
type: 'select',
key: '55d03e0607bc4ea281a248fdcfc571bb',
type: 'associate-select',
key: '6a8f658eb0e046e48c3dac472c0e51ae',
children: [],
options: {},
defaultValue: '无',
defaultValue: '2005534898818441218',
},
{
required: false,
......@@ -89,15 +90,15 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '额定工时',
fieldId: 'ratedWorkingHours',
fieldName: '有效',
fieldId: 'active',
isSubTable: false,
showChildren: true,
type: 'number',
key: 'ca8257a46070472e9639110b11f7f3bd',
type: 'switch',
key: 'c0730ef93c40445195dac1ed93677144',
children: [],
options: {},
defaultValue: 0,
defaultValue: 1,
},
{
required: false,
......@@ -106,65 +107,194 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '有效的',
fieldId: 'active',
fieldName: '备注',
fieldId: 'note',
isSubTable: false,
showChildren: true,
type: 'switch',
key: 'e2c431530e954e53852f9a6026987e0d',
type: 'textarea',
key: '037bf18717bf496f8a1fc0e8605a8a7d',
children: [],
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,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
tableName: '',
fieldName: '作业指导',
fieldId: 'zyzdFile',
showChildren: false,
tableName: 'mesProcessProductList',
fieldName: '编号',
fieldId: 'cpbh',
type: 'Input',
key: '00c0e93b675841f48265b896515a5241',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
showChildren: true,
type: 'upload',
key: 'f7c26bba94034dcdbc816e49607d64e9',
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessProductList',
fieldName: '名称',
fieldId: 'cpmc',
type: 'Input',
key: '91863c5a0ec24d76ade8735cd401059b',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
tableName: '',
fieldName: '作业指导',
fieldId: 'zyzdtpFile',
showChildren: false,
tableName: 'mesProcessProductList',
fieldName: '数量',
fieldId: 'number',
type: 'InputNumber',
key: '6c749d8f7bde474da082c659146f473c',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
showChildren: true,
type: 'upload',
key: 'f40c42bc3b174f7589179a6b8976eb65',
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessProductList',
fieldName: '是否投料',
fieldId: 'isFeeding',
type: 'Switch',
key: 'cb38672445b24eedb2b10addf520de2e',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
tableName: '',
showChildren: false,
tableName: 'mesProcessProductList',
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,
showChildren: true,
type: 'textarea',
key: '04ae7a540acd4c46949c6fd53e652a45',
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessItemList',
fieldName: '编码',
fieldId: 'code',
type: 'Input',
key: '3999831fde0a4e879f64f33eb2a1edd1',
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 @@
//展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]);
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);
})
......
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