Skip to content

W
weiqiao-vue
Commit eae3c96a by 张恒
Options

refactor(jcsj): 优化工艺类型组件配置和字段映射 

- 将名称字段改为编号字段，调整字段映射关系
- 更改公司选择下拉框的数据源接口和SQL查询语句
- 移除扣料依据字段，新增批次号字段配置
- 调整表格列配置，将名称列改为编号列并使用自动编码组件
- 更新表单布局，将内部标识字段改为名称字段并设为必填
- 添加备注字段的文本域组件配置
- 修改子表单配置，将工序相关字段改为工艺流程字段
- 移除质检设置和自动扣料相关的表单分组配置
- 更新环境配置文件中的代理设置和接口地址配置
parent 26c03b64
Showing with 734 additions and 1384 deletions
xjrsoft-vue3/.env.development
# 是否开启mock数据，关闭时需要自行对接后台接口
VITE_USE_MOCK=false
VITE_USE_MOCK = false
# 资源公共路径,需要以 /开头和结尾
VITE_PUBLIC_PATH=/
VITE_PUBLIC_PATH = /
# 本地开发代理（解决跨域）
# 所有匹配前缀的请求将被代理到目标服务器
VITE_PROXY=[["/system","http://192.168.8.136:8080"],["/language","http://192.168.8.136:8080"],["/api","http://192.168.8.136:8080"]]
# 本地开发代理，可以解决跨域及多地址代理
# 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
# 可以有多个，注意多个不能换行，否则代理将会失效
# VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
# VITE_PROXY=[["/api","https://vvbin.cn/test"]]
# 是否删除Console.log
VITE_DROP_CONSOLE=false
VITE_DROP_CONSOLE = false
# 接口地址（用于代码中生成 baseURL）
VITE_GLOB_API_URL=http://192.168.8.136:8080
# 接口地址
# 如果没有跨域问题，直接在这里配置即可
# VITE_GLOB_API_URL=http://192.168.8.73:8080
VITE_GLOB_API_URL=http://localhost:8080
# 文件上传接口
VITE_GLOB_UPLOAD_URL=/system/oss/upload
# 文件上传接口 可选
VITE_GLOB_UPLOAD_URL = /system/oss/upload
# 文件预览接口
VITE_GLOB_UPLOAD_PREVIEW=http://114.116.210.204:8013/onlinePreview?url=
# 文件预览接口 可选
VITE_GLOB_UPLOAD_PREVIEW = http://114.116.210.204:8013/onlinePreview?url=
# 外部url地址
VITE_GLOB_OUT_LINK_URL=http://localhost:4100
#外部url地址
VITE_GLOB_OUT_LINK_URL = http://localhost:4100
# 打印项目地址
VITE_GLOB_PRINT_BASE_URL=http://vue.xjrsoft.com:3300
#打印项目地址
VITE_GLOB_PRINT_BASE_URL = http://vue.xjrsoft.com:3300
# IM URL 地址
VITE_GLOB_IM_LINK_URL=http://localhost:8827
#IM URL 地址
VITE_GLOB_IM_LINK_URL = http://localhost:8827
# 调查问卷地址
VITE_GLOB_QN_LINK_URL=http://localhost:3100
#调查问卷地址
VITE_GLOB_QN_LINK_URL = http://localhost:3100
# 接口地址前缀（如统一加 /prefix）
VITE_GLOB_API_URL_PREFIX=
# 接口地址前缀，有些系统所有接口地址都有前缀，可以在这里统一加，方便切换
VITE_GLOB_API_URL_PREFIX =
# 是否启用官网代码
VITE_GLOB_PRODUCTION=false
VITE_GLOB_PRODUCTION = false
xjrsoft-vue3/src/api/jcsj/gylx/model/GylxModel.ts
......@@ -4,33 +4,173 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: RokeRouting分页参数 模型
*/
export interface RokeRoutingPageParams extends BasicPageParams {
code: string;
companyId: string;
name: string;
lotRuleId: string;
}
internalCode: string;
/**
* @description: RokeRouting分页返回值模型
*/
export interface RokeRoutingPageModel {
id: string;
deductionBasis: string;
code: string;
note: string;
companyId: string;
name: string;
lotRuleId: string;
}
/**
* @description: RokeRouting分页返回值模型
* @description: RokeRouting表类型
*/
export interface RokeRoutingPageModel {
export interface RokeRoutingModel {
id: string;
messageMainAttachmentId: string;
name: string;
code: string;
internalCode: string;
active: string;
note: string;
companyId: string;
lotRuleId: string;
autoDeduction: string;
deductionAutoConfirm: string;
deductionMoment: string;
deductionBasis: string;
note: string;
deductionWorkCenter: string;
documentId: string;
productId: string;
routingQualityMode: string;
deleteMark: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
rokeRoutingProcessList?: RokeRoutingProcessModel;
}
0;
/**
* @description: RokeRoutingProcess表类型
*/
export interface RokeRoutingProcessModel {
id: string;
deleteMark: 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;
routingId: string;
processId: string;
}
/**
* @description: RokeRouting分页返回值结构
......
xjrsoft-vue3/src/api/jcsj/ryxx/model/RyxxModel.ts
......@@ -6,19 +6,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface RokeEmployeePageParams extends BasicPageParams {
name: string;
code: string;
phone: string;
skillLevelId: string;
jobNumber: string;
positionId: string;
gender: string;
departmentId: string;
phone: string;
gender: string;
idNumber: string;
note: string;
isOnJob: string;
companyId: string;
}
/**
......@@ -33,15 +39,7 @@ export interface RokeEmployeePageModel {
positionId: string;
gender: string;
departmentId: string;
phone: string;
age: string;
note: string;
}
0;
......
xjrsoft-vue3/src/views/jcsj/gylx/components/config.ts
......@@ -3,29 +3,29 @@ import { BasicColumn } from '/@/components/Table';
export const searchFormSchema: FormSchema[] = [
{
field: 'name',
label: '名称',
field: 'code',
label: '编号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'lotRuleId',
label: '单件/批次号规则',
field: 'companyId',
label: '公司',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/jcxx/getLot',
path: '/bmxx/getCompanyList',
method: 'GET',
apiId: 'c2c9e271bd684ba3bf4e57ff94f82e54',
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 roke_lot_rule where delete_mark = 0";\r\nreturn db.select(sql);',
'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
},
labelField: 'label',
valueField: 'value',
......@@ -35,32 +35,14 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'internalCode',
label: '内部标识',
field: 'name',
label: '名称',
defaultValue: undefined,
component: 'Input',
},
{
field: 'deductionBasis',
label: '扣料依据',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'staticData',
staticOptions: [
{ key: 1, label: '产品MOD', value: '产品MOD' },
{ key: 2, label: '工艺MOD', value: '工艺MO' },
],
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'note',
label: '备注',
field: 'lotRuleId',
label: '批次号',
defaultValue: undefined,
component: 'Input',
},
......@@ -69,21 +51,21 @@ export const searchFormSchema: FormSchema[] = [
export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'name',
title: '名称',
componentType: 'input',
dataIndex: 'code',
title: '编号',
componentType: 'auto-code',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'lotRuleId',
title: '单件/批次号规则',
dataIndex: 'companyId',
title: '公司',
componentType: 'select',
fixed: false,
......@@ -95,31 +77,22 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'deductionBasis',
title: '扣料依据',
componentType: 'select',
customRender: ({ record }) => {
const staticOptions = [
{ key: 1, label: '产品MOD', value: '产品MOD' },
{ key: 2, label: '工艺MOD', value: '工艺MO' },
];
return staticOptions.filter((x) => x.value == record.deductionBasis)[0]?.label;
},
dataIndex: 'name',
title: '名称',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'note',
title: '备注',
componentType: 'textarea',
dataIndex: 'lotRuleId',
title: '批次号',
componentType: 'auto-code',
fixed: false,
sorter: true,
......@@ -211,55 +184,39 @@ export const formProps: FormProps = {
span: 6,
list: [
{
key: '8d9ef135306242729fb4673b9e2dd918',
field: 'name',
label: '名称',
type: 'input',
component: 'Input',
key: '536715321b4c49df8b63b2fcb7cc14ab',
field: 'code',
label: '编号',
type: 'auto-code',
component: 'AutoCodeRule',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入名称',
maxlength: null,
placeholder: '自动生成',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
required: true,
rules: [],
events: {},
listStyle: '',
isSave: false,
autoCodeRule: 'GYBH',
required: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
{
span: 6,
list: [
{
key: '097aabe7380a49f5a691ed3b0613ab26',
field: 'lotRuleId',
label: '单件/批次号规则',
key: '62dc90bd2b2548f39626c59222f2c208',
field: 'companyId',
label: '公司',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 16,
placeholder: '请选择下拉选择单件/批次号规则',
span: 7,
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: false,
isMultiple: false,
......@@ -270,22 +227,21 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
defaultSelect: '',
datasourceType: 'api',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
path: '/jcxx/getLot',
path: '/bmxx/getCompanyList',
method: 'GET',
apiId: 'c2c9e271bd684ba3bf4e57ff94f82e54',
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 roke_lot_rule where delete_mark = 0";\r\nreturn db.select(sql);',
'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: false,
......@@ -302,19 +258,18 @@ export const formProps: FormProps = {
span: 6,
list: [
{
key: '8a507b277c4d46fb9c3dacc18f98a41b',
field: 'internalCode',
label: '内部标识',
key: '8d9ef135306242729fb4673b9e2dd918',
field: 'name',
label: '名称',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 11,
span: 7,
defaultValue: '',
placeholder: '请输入内部标识',
maxlength: null,
placeholder: '请输入名称',
prefix: '',
suffix: '',
addonBefore: '',
......@@ -322,7 +277,7 @@ export const formProps: FormProps = {
disabled: false,
allowClear: false,
showLabel: true,
required: false,
required: true,
rules: [],
events: {},
listStyle: '',
......@@ -341,6 +296,34 @@ export const formProps: FormProps = {
span: 6,
list: [
{
key: '2a666ef333114556a7e018a75573fd92',
field: 'lotRuleId',
label: '批次号',
type: 'auto-code',
component: 'AutoCodeRule',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '自动生成',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
showLabel: true,
autoCodeRule: 'GYPC',
required: false,
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
{
span: 6,
list: [
{
key: '6636f959cd3a4c239aeb3ab43505a27b',
field: 'active',
label: '有效的',
......@@ -380,6 +363,61 @@ export const formProps: FormProps = {
},
},
{
key: 'b7ea8bb6e83b42129ec31ca2cb3716e4',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 24,
list: [
{
key: '08fea1146775468ba1b3ba1193710e09',
field: 'note',
label: '备注',
type: 'textarea',
component: 'InputTextArea',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入备注备注',
rows: 4,
autoSize: false,
showCount: false,
disabled: false,
showLabel: true,
allowClear: false,
required: false,
isShow: true,
isShowAi: false,
rules: [],
events: {},
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: 'e64fff4326284f16aa6d86acb8678b89',
field: '',
label: '',
......@@ -410,125 +448,108 @@ export const formProps: FormProps = {
conImageUrl: '',
list: [
{
key: '3c2b6278f4114cbc86780eec1f980f0c',
key: 'e75eeef314c4485c922588bb979d0b04',
label: '',
field: 'rokeRoutingLineList',
field: 'rokeRoutingProcessList',
type: 'form',
component: 'SubForm',
required: true,
colProps: { span: 24 },
componentProps: {
mainKey: 'rokeRoutingLineList',
mainKey: 'rokeRoutingProcessList',
columns: [
{
key: '9432fa26a1e44a25b1d68d28eed7372a',
title: '工序',
key: '9e9467d976174786a67851ccb34bb8f7',
title: '名称',
dataIndex: 'processId',
componentType: 'XjrSelect',
componentType: 'MultiplePopup',
componentProps: {
popupType: 'associate',
width: '100%',
span: '',
placeholder: '请选择下拉选择工序',
placeholder: '请选择工序',
showLabel: true,
showSearch: true,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: '毛胚原料', value: '毛胚原料' },
{ key: 2, label: '车床', value: '车床' },
],
defaultSelect: '',
datasourceType: 'api',
params: null,
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '选择工序',
apiConfig: {
path: '/jcxx/getProcessList',
path: '/jcxx/gxlb',
method: 'GET',
apiId: 'copy1766022481900d48902',
apiId: '8a735bb14d5f4a709efb65b34691acd3',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'processType',
value: '1',
description: null,
required: true,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
},
{ 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_process where process_type = #{processType} and delete_mark = 0";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: false,
rules: [],
events: {
change:
"// 取第一行，统一引用，避免多处硬编码 [0]\nconst row = formModel.roke_routing_lineList?.[0];\n\nif (!row || !row.process_id) {\n console.warn('工序行或 process_id 不存在', row);\n return;\n}\n\nformActionType.httpRequest({\n requestType: 'get',\n requestUrl: '/magic-api/jcxx/getProcess',\n params: {\n id: row.process_id\n },\n errorMessageMode: 'none'\n}).then(res => {\n\n // 兼容 magic-api 常见返回结构\n const list = res?.data || res;\n\n if (Array.isArray(list) && list.length > 0) {\n row.rated_working_hours = list[0].rated_working_hours;\n } else {\n formActionType.showMessage('未查询到工序信息');\n }\n\n}).catch(err => {\n console.error('接口请求异常：', err);\n formActionType.showMessage('接口请求异常');\n});\n",
'var sql="select * from roke_process where delete_mark = 0";\r\nreturn db.select(sql);',
outputParams: [
{
name: 'code',
tableTitle: '编码',
bindField: 'code',
show: true,
width: 150,
component: '8f0c524797e64b40bc4124837d406cdb',
bindTable: 'roke_routing_process',
},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'border: 0'",
{ name: 'name', tableTitle: '名称', show: true, width: 150 },
{
name: 'collection_scheme_id',
tableTitle: '',
bindField: 'collectionSchemeId',
show: false,
width: 150,
component: 'bfdf4979bec74654ae607c3339e56ef2',
bindTable: 'roke_routing_process',
},
{
name: 'category_id',
tableTitle: '',
bindField: 'categoryId',
show: false,
width: 150,
component: 'a56d6b8d54aa4d7c8246feb647f8da8b',
bindTable: 'roke_routing_process',
},
{
key: 'c8785464a8a24157abeb102aa6637d0e',
title: '工序提前/预产期',
dataIndex: 'inAdvTime',
componentType: 'InputNumber',
defaultValue: 1,
componentProps: {
width: '100%',
span: 6,
defaultValue: 1,
min: 0,
max: 100,
step: 0.01,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
name: 'rated_working_hours',
tableTitle: '',
bindField: 'ratedWorkingHours',
show: false,
width: 150,
component: 'd7f88b9a824042b8b717ba4ffc0aa729',
bindTable: 'roke_routing_process',
},
],
},
dicOptions: [],
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: 'dbafb88382df488696722e143ff1b9b3',
title: '计薪规则',
dataIndex: 'salaryRule',
key: '8f0c524797e64b40bc4124837d406cdb',
title: '编码',
dataIndex: 'code',
componentType: 'Input',
defaultValue: '每 1.0 产品单位 0.0 元',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '每 1.0 产品单位 0.0 元',
placeholder: '请输入计薪规则计薪规则',
maxlength: null,
defaultValue: '',
placeholder: '请输入编码',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
disabled: true,
allowClear: false,
showLabel: true,
required: false,
......@@ -544,110 +565,39 @@ export const formProps: FormProps = {
},
},
{
key: '63b9efd0597a4b73b381e31b2b0ec874',
title: '工序报工数',
dataIndex: 'workQty',
componentType: 'InputNumber',
defaultValue: 1,
componentProps: {
width: '100%',
span: '',
defaultValue: 1,
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: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: 'd7a9c539183d43a29ff1689e2cbe87e2',
title: '最终成品数',
dataIndex: 'finishedQty',
componentType: 'InputNumber',
defaultValue: 1,
componentProps: {
width: '100%',
span: '',
defaultValue: 1,
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: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: 'e20b853140d143e7a90cf447ce0df137',
title: '消耗工序',
dataIndex: 'consumeProcessId',
key: 'a56d6b8d54aa4d7c8246feb647f8da8b',
title: '工序类别',
dataIndex: 'categoryId',
componentType: 'XjrSelect',
componentProps: {
width: '100%',
span: '',
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
disabled: true,
staticOptions: [
{ key: 1, label: '毛胚原料', value: '毛胚原料' },
{ key: 2, label: '车床', value: '车床' },
{ 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: '1',
datasourceType: 'api',
params: null,
labelField: 'label',
datasourceType: 'dic',
params: { itemId: '2005547790246666242' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: '/jcxx/getProcessList',
path: '/jcxx/getCollectionSchemeList',
method: 'GET',
apiId: 'copy1766022481900d48902',
apiId: 'copy1767064303024d70507',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'processType',
value: '1',
description: null,
required: true,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
},
{ 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_process where process_type = #{processType} and delete_mark = 0";\r\nreturn db.select(sql);',
'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,
......@@ -655,37 +605,12 @@ export const formProps: FormProps = {
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2005547790246666242',
listStyle: "return 'border: 0'",
},
},
{
key: '6dad49cc96da4279a8eca463be7ee3b3',
title: '额定工时',
dataIndex: 'ratedWorkingHours',
componentType: 'InputNumber',
defaultValue: 1,
componentProps: {
width: '100%',
span: '',
defaultValue: 1,
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: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: '7133da67da6f450a921a6aaa37d05364',
key: 'bfdf4979bec74654ae607c3339e56ef2',
title: '采集方案',
dataIndex: 'collectionSchemeId',
componentType: 'XjrSelect',
......@@ -694,54 +619,30 @@ export const formProps: FormProps = {
span: '',
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [{ key: 1, label: '无', value: '无' }],
disabled: true,
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: '',
datasourceType: 'staticData',
params: null,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
path: '/jcxx/getCollectionSchemeList',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'border: 0'",
},
},
{
key: 'd806a68e571c47ecbc653755cd908b0b',
title: '采集项',
dataIndex: 'collectionItemId',
componentType: 'XjrSelect',
componentProps: {
width: '100%',
span: '',
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: true,
isMultiple: true,
clearable: false,
disabled: false,
staticOptions: [{ key: 1, label: '环境温度', value: '环境温度' }],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2001194974510096385' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
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,
......@@ -749,128 +650,20 @@ export const formProps: FormProps = {
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2001194974510096385',
listStyle: "return 'border: 0'",
},
},
{
key: 'df36ce1665194f998c7f7b43bdf3e730',
title: '作业规范',
dataIndex: 'standardItemsNumber',
componentType: 'InputNumber',
defaultValue: 0,
componentProps: {
width: '100%',
span: '',
defaultValue: 0,
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: true,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: 'cce7f159869e44d7b7243b7f0b9544ed',
title: '作业指导',
dataIndex: 'documentNumber',
componentType: 'InputNumber',
defaultValue: 0,
componentProps: {
width: '100%',
span: '',
defaultValue: 0,
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: true,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: '569b4f85f2a243d4bf69d190a7d299ba',
title: '关键物料',
dataIndex: 'pBomNumber',
componentType: 'InputNumber',
defaultValue: 0,
componentProps: {
width: '100%',
span: '',
defaultValue: 0,
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: true,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: '8be06556e4864b0eb89a97477f9f8644',
title: '子工序',
dataIndex: 'childProcessNumber',
componentType: 'InputNumber',
defaultValue: 0,
componentProps: {
width: '100%',
span: '',
defaultValue: 0,
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: true,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: '23a0c5a0303840fd81f65f6fa36d3526',
title: '工作中心',
dataIndex: 'workCenterNumber',
key: 'd7f88b9a824042b8b717ba4ffc0aa729',
title: '额定工时',
dataIndex: 'ratedWorkingHours',
componentType: 'InputNumber',
defaultValue: 0,
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: 0,
min: 0,
max: 100,
step: 1,
maxlength: null,
defaultValue: '',
step: 0.01,
disabled: true,
showLabel: true,
controls: true,
......@@ -885,7 +678,7 @@ export const formProps: FormProps = {
},
{ title: '操作', key: 'action', fixed: 'right', width: '50px' },
],
span: '24',
span: 7,
preloadType: 'api',
apiConfig: {},
itemId: '',
......@@ -917,297 +710,9 @@ export const formProps: FormProps = {
},
],
},
{
span: 24,
name: '质检设置',
prefix: '',
suffix: '',
activeColor: '#1c8dff',
folderId: '',
imageUrl: '',
conFolderId: '',
conImageUrl: '',
list: [
{
key: '2b6470174fb74ea1b7ebcf0a745cc90a',
field: 'routingQualityMode',
label: '质检方式',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '20%',
span: 12,
placeholder: '请选择下拉选择质检方式质检方式',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: '工单质检', value: '工单质检' },
{ key: 3, label: '质检单', value: '质检单' },
],
defaultSelect: '',
datasourceType: 'staticData',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: true,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '20%' },
},
},
],
},
{
span: 24,
name: '自动扣料',
prefix: '',
suffix: '',
activeColor: '#1c8dff',
folderId: '',
imageUrl: '',
conFolderId: '',
conImageUrl: '',
list: [
{
key: '810345b81a7540a4917ef3c8ab8dea1a',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 6,
list: [
{
key: '7d2104a70396450485eb4225debf924f',
field: 'autoDeduction',
label: '自动扣料',
type: 'switch',
component: 'Switch',
colProps: { span: 24 },
defaultValue: 0,
componentProps: {
span: 17,
defaultValue: 0,
checkedChildren: '',
unCheckedChildren: '',
checkedColor: '#1C8DFF',
unCheckedColor: '#bbbdbf',
showLabel: true,
disabled: false,
events: {
change:
"let value = formModel.auto_deduction;\nvar fieldConfigs = [\n {field: 'deduction_work_center'},\n {field: 'deduction_auto_confirm'},\n {field: 'deduction_moment'},\n {field: 'deduction_basis'}\n];\nfieldConfigs.forEach(function(config) {\n var isDisabled = false;\n var isRequired = false;\n if (value == 1) {\n isDisabled = false; \n if (config.field === 'deduction_moment' || config.field === 'deduction_basis') {\n isRequired = true;\n }\n } else {\n isDisabled = true;\n isRequired = false;\n }\n formActionType.updateSchema({\n field: config.field,\n componentProps: {\n disabled: isDisabled,\n required: isRequired\n }\n });\n});",
},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: {},
},
},
{
key: 'fdc20894032645628350fa8df3a515f3',
field: 'deductionWorkCenter',
label: '分车间扣料',
type: 'switch',
component: 'Switch',
colProps: { span: 24 },
defaultValue: 0,
componentProps: {
span: 11,
defaultValue: 0,
checkedChildren: '',
unCheckedChildren: '',
checkedColor: '#1C8DFF',
unCheckedColor: '#bbbdbf',
showLabel: true,
disabled: true,
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: {},
},
},
],
},
{
span: 6,
list: [
{
key: '82efccd1f14a4a43b60f35ad75939c03',
field: 'deductionAutoConfirm',
label: '自动确认扣料',
type: 'switch',
component: 'Switch',
colProps: { span: 24 },
defaultValue: 0,
componentProps: {
span: 19,
defaultValue: 0,
checkedChildren: '',
unCheckedChildren: '',
checkedColor: '#1C8DFF',
unCheckedColor: '#bbbdbf',
showLabel: true,
disabled: true,
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: {},
},
},
],
},
{
span: 6,
list: [
{
key: '1684c8eba06c45c1a0e4df9bcbe4eaf2',
field: 'deductionMoment',
label: ' 扣料节点',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 17,
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: true,
staticOptions: [
{ key: 1, label: '首道扣料', value: '首道扣料' },
{ key: 2, label: '末道扣料', value: '末道扣料' },
{ key: 3, label: '入库扣料', value: '入库扣料' },
{ key: 4, label: '分步扣料', value: '分步扣料' },
],
defaultSelect: '',
datasourceType: 'staticData',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
{
span: 6,
list: [
{
key: 'f529e8bc463f4811983593cf2987e15e',
field: 'deductionBasis',
label: '扣料依据',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 17,
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: true,
staticOptions: [
{ key: 1, label: '产品MOD', value: '产品MOD' },
{ key: 2, label: '工艺MOD', value: '工艺MO' },
],
defaultSelect: '',
datasourceType: 'staticData',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
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',
},
},
],
},
],
componentProps: { tabPosition: 'top', size: 'default', type: 'line', isShow: true },
},
{
key: '16cce9dceb104efc9af33d84f3734488',
field: 'note',
label: '备注',
type: 'textarea',
component: 'InputTextArea',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入备注',
maxlength: null,
rows: 4,
autoSize: false,
showCount: false,
disabled: false,
showLabel: true,
allowClear: false,
required: false,
isShow: true,
isShowAi: false,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
],
......@@ -1243,7 +748,6 @@ export const formButtons = [
isShow: true,
index: 2,
type: 1,
modal: null,
},
{
key: 'cancel',
......@@ -1254,7 +758,6 @@ export const formButtons = [
isShow: true,
index: 1,
type: 1,
modal: null,
},
{
key: 'reset',
......@@ -1265,6 +768,5 @@ export const formButtons = [
isShow: true,
index: 0,
type: 1,
modal: null,
},
];
xjrsoft-vue3/src/views/jcsj/gylx/components/workflowPermission.ts
export const permissionList = [
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
edit: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '名称',
fieldId: 'name',
fieldName: '编号',
fieldId: 'code',
isSubTable: false,
showChildren: true,
type: 'input',
key: '8d9ef135306242729fb4673b9e2dd918',
type: 'auto-code',
key: '536715321b4c49df8b63b2fcb7cc14ab',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -23,28 +22,28 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '单件/批次号规则',
fieldId: 'lotRuleId',
fieldName: '公司',
fieldId: 'companyId',
isSubTable: false,
showChildren: true,
type: 'select',
key: '097aabe7380a49f5a691ed3b0613ab26',
key: '62dc90bd2b2548f39626c59222f2c208',
children: [],
options: {},
},
{
required: false,
required: true,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '内部标识',
fieldId: 'internalCode',
fieldName: '名称',
fieldId: 'name',
isSubTable: false,
showChildren: true,
type: 'input',
key: '8a507b277c4d46fb9c3dacc18f98a41b',
key: '8d9ef135306242729fb4673b9e2dd918',
children: [],
options: {},
defaultValue: '',
......@@ -52,6 +51,22 @@ export const permissionList = [
{
required: false,
view: true,
edit: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '批次号',
fieldId: 'lotRuleId',
isSubTable: false,
showChildren: true,
type: 'auto-code',
key: '2a666ef333114556a7e018a75573fd92',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
......@@ -67,63 +82,35 @@ export const permissionList = [
defaultValue: 1,
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: true,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '',
fieldId: 'rokeRoutingLineList',
type: 'form',
key: '3c2b6278f4114cbc86780eec1f980f0c',
children: [
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '工序',
fieldId: 'processId',
type: 'XjrSelect',
key: '9432fa26a1e44a25b1d68d28eed7372a',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
tableName: '',
fieldName: '备注',
fieldId: 'note',
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '工序提前/预产期',
fieldId: 'inAdvTime',
type: 'InputNumber',
key: 'c8785464a8a24157abeb102aa6637d0e',
showChildren: true,
type: 'textarea',
key: '08fea1146775468ba1b3ba1193710e09',
children: [],
options: {},
defaultValue: '',
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
isSubTable: true,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '计薪规则',
fieldId: 'salaryRule',
type: 'Input',
key: 'dbafb88382df488696722e143ff1b9b3',
children: [],
},
tableName: 'rokeRoutingProcessList',
fieldName: '',
fieldId: 'rokeRoutingProcessList',
type: 'form',
key: 'e75eeef314c4485c922588bb979d0b04',
children: [
{
required: true,
view: true,
......@@ -132,11 +119,11 @@ export const permissionList = [
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '工序报工数',
fieldId: 'workQty',
type: 'InputNumber',
key: '63b9efd0597a4b73b381e31b2b0ec874',
tableName: 'rokeRoutingProcessList',
fieldName: '名称',
fieldId: 'processId',
type: 'MultiplePopup',
key: '9e9467d976174786a67851ccb34bb8f7',
children: [],
},
{
......@@ -147,11 +134,11 @@ export const permissionList = [
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '最终成品数',
fieldId: 'finishedQty',
type: 'InputNumber',
key: 'd7a9c539183d43a29ff1689e2cbe87e2',
tableName: 'rokeRoutingProcessList',
fieldName: '编码',
fieldId: 'code',
type: 'Input',
key: '8f0c524797e64b40bc4124837d406cdb',
children: [],
},
{
......@@ -162,11 +149,11 @@ export const permissionList = [
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '消耗工序',
fieldId: 'consumeProcessId',
tableName: 'rokeRoutingProcessList',
fieldName: '工序类别',
fieldId: 'categoryId',
type: 'XjrSelect',
key: 'e20b853140d143e7a90cf447ce0df137',
key: 'a56d6b8d54aa4d7c8246feb647f8da8b',
children: [],
},
{
......@@ -177,56 +164,11 @@ export const permissionList = [
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '额定工时',
fieldId: 'ratedWorkingHours',
type: 'InputNumber',
key: '6dad49cc96da4279a8eca463be7ee3b3',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
tableName: 'rokeRoutingProcessList',
fieldName: '采集方案',
fieldId: 'collectionSchemeId',
type: 'XjrSelect',
key: '7133da67da6f450a921a6aaa37d05364',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '采集项',
fieldId: 'collectionItemId',
type: 'XjrSelect',
key: 'd806a68e571c47ecbc653755cd908b0b',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '作业规范',
fieldId: 'standardItemsNumber',
type: 'InputNumber',
key: 'df36ce1665194f998c7f7b43bdf3e730',
key: 'bfdf4979bec74654ae607c3339e56ef2',
children: [],
},
{
......@@ -237,174 +179,13 @@ export const permissionList = [
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '作业指导',
fieldId: 'documentNumber',
type: 'InputNumber',
key: 'cce7f159869e44d7b7243b7f0b9544ed',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '关键物料',
fieldId: 'pBomNumber',
type: 'InputNumber',
key: '569b4f85f2a243d4bf69d190a7d299ba',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '子工序',
fieldId: 'childProcessNumber',
type: 'InputNumber',
key: '8be06556e4864b0eb89a97477f9f8644',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingLineList',
fieldName: '工作中心',
fieldId: 'workCenterNumber',
tableName: 'rokeRoutingProcessList',
fieldName: '额定工时',
fieldId: 'ratedWorkingHours',
type: 'InputNumber',
key: '23a0c5a0303840fd81f65f6fa36d3526',
key: 'd7f88b9a824042b8b717ba4ffc0aa729',
children: [],
},
],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '质检方式',
fieldId: 'routingQualityMode',
isSubTable: false,
showChildren: true,
type: 'select',
key: '2b6470174fb74ea1b7ebcf0a745cc90a',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '自动扣料',
fieldId: 'autoDeduction',
isSubTable: false,
showChildren: true,
type: 'switch',
key: '7d2104a70396450485eb4225debf924f',
children: [],
options: {},
defaultValue: 0,
},
{
required: false,
view: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '分车间扣料',
fieldId: 'deductionWorkCenter',
isSubTable: false,
showChildren: true,
type: 'switch',
key: 'fdc20894032645628350fa8df3a515f3',
children: [],
options: {},
defaultValue: 0,
},
{
required: false,
view: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '自动确认扣料',
fieldId: 'deductionAutoConfirm',
isSubTable: false,
showChildren: true,
type: 'switch',
key: '82efccd1f14a4a43b60f35ad75939c03',
children: [],
options: {},
defaultValue: 0,
},
{
required: false,
view: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: ' 扣料节点',
fieldId: 'deductionMoment',
isSubTable: false,
showChildren: true,
type: 'select',
key: '1684c8eba06c45c1a0e4df9bcbe4eaf2',
children: [],
options: {},
},
{
required: false,
view: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '扣料依据',
fieldId: 'deductionBasis',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'f529e8bc463f4811983593cf2987e15e',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '备注',
fieldId: 'note',
isSubTable: false,
showChildren: true,
type: 'textarea',
key: '16cce9dceb104efc9af33d84f3734488',
children: [],
options: {},
defaultValue: '',
},
];
xjrsoft-vue3/src/views/jcsj/gylx/index.vue
......@@ -133,7 +133,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":"2006195708167311360","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2006195708171505664","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2006195708171505665","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2006195708171505666","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list);
})
......
xjrsoft-vue3/src/views/jcsj/ryxx/components/config.ts
......@@ -9,20 +9,26 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
},
{
field: 'jobNumber',
label: '工号',
field: 'code',
label: '编号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'positionId',
label: '职位',
field: 'phone',
label: '电话',
defaultValue: undefined,
component: 'Input',
},
{
field: 'skillLevelId',
label: '技能等级',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'staticData',
staticOptions: [{ key: 1, label: '工程师', value: '1' }],
labelField: 'label',
datasourceType: 'dic',
params: { itemId: '2006238300988784641' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
......@@ -30,17 +36,20 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'gender',
label: '性别',
field: 'jobNumber',
label: '工号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'positionId',
label: '职位',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'staticData',
staticOptions: [
{ key: 1, label: '男', value: '男' },
{ key: 2, label: '女', value: '女' },
],
labelField: 'label',
datasourceType: 'dic',
params: { itemId: '2006236571274592257' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
......@@ -74,10 +83,22 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'phone',
label: '电话',
field: 'gender',
label: '性别',
defaultValue: undefined,
component: 'Input',
component: 'XjrSelect',
componentProps: {
datasourceType: 'staticData',
staticOptions: [
{ key: 1, label: '男', value: '男' },
{ key: 2, label: '女', value: '女' },
],
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'idNumber',
......@@ -86,10 +107,45 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
},
{
field: 'note',
label: '备注',
field: 'isOnJob',
label: '在职情况',
defaultValue: undefined,
component: 'Input',
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2006237055246942210' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'companyId',
label: '公司',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'api',
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);',
},
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
];
......@@ -126,34 +182,6 @@ export const columns: BasicColumn[] = [
title: '职位',
componentType: 'select',
customRender: ({ record }) => {
const staticOptions = [{ key: 1, label: '工程师', value: '1' }];
return staticOptions.filter((x) => x.value == record.positionId)[0]?.label;
},
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'gender',
title: '性别',
componentType: 'select',
customRender: ({ record }) => {
const staticOptions = [
{ key: 1, label: '男', value: '男' },
{ key: 2, label: '女', value: '女' },
];
return staticOptions.filter((x) => x.value == record.gender)[0]?.label;
},
fixed: false,
sorter: true,
......@@ -173,45 +201,6 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'phone',
title: '电话',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'age',
title: '年龄',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'note',
title: '备注',
componentType: 'textarea',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
];
//表头合并配置
export const headerMergingData = [];
......@@ -332,7 +321,7 @@ export const formProps: FormProps = {
width: '100%',
span: 11,
defaultValue: '',
placeholder: '请输入人员名称人员名称人员名称',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
......@@ -412,9 +401,32 @@ export const formProps: FormProps = {
span: 6,
list: [
{
key: 'bae97ad7fefb4f8aa692e678934e8f97',
key: '552fd440728b449eb2e2ed15bf8eb068',
field: 'code',
label: '编号',
type: 'auto-code',
component: 'AutoCodeRule',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '自动生成',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
showLabel: true,
autoCodeRule: 'RYBH',
required: false,
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: '488d22332deb4f2abf4a9423122d98f7',
field: 'phone',
label: '电话',
type: 'input',
component: 'Input',
colProps: { span: 24 },
......@@ -423,7 +435,7 @@ export const formProps: FormProps = {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入编号人员编号',
placeholder: '请输入电话',
maxlength: null,
prefix: '',
suffix: '',
......@@ -432,7 +444,7 @@ export const formProps: FormProps = {
disabled: false,
allowClear: false,
showLabel: true,
required: true,
required: false,
rules: [],
events: {},
listStyle: '',
......@@ -446,29 +458,57 @@ export const formProps: FormProps = {
},
},
{
key: 'b8f4cac721c84e4e8202cc66b54a6795',
field: 'teamId',
label: '班组',
key: '6b94c3e5675b4202bb9aeb73f30c9306',
field: 'teamWeighted',
label: '班组报工权重',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: 1,
componentProps: {
width: '100%',
span: 13,
defaultValue: 1,
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: '7126b5787dc647bda9c3b05d626a2cf2',
field: 'skillLevelId',
label: '技能等级',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择下拉选择班组',
placeholder: '请选择下拉选择技能等级技能等级',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: '一班', value: '1' },
{ key: 2, label: '二班', value: '2' },
{ key: 1, label: '一级', value: '1' },
{ key: 2, label: '二级', value: '2' },
],
defaultSelect: '',
datasourceType: 'staticData',
params: null,
labelField: 'label',
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2006238300988784641' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
......@@ -481,38 +521,16 @@ export const formProps: FormProps = {
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2006238300988784641',
style: { width: '100%' },
},
},
{
key: '6b94c3e5675b4202bb9aeb73f30c9306',
field: 'teamWeighted',
label: '班组报工权重',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: 1,
componentProps: {
width: '100%',
span: 13,
defaultValue: 1,
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%' },
},
],
},
{
span: 6,
list: [
{
key: '1ef1b726c6f34f4fa0d704afac0aac7a',
field: 'jobNumber',
label: '工号',
......@@ -524,7 +542,7 @@ export const formProps: FormProps = {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入工号人员名称',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
......@@ -546,11 +564,6 @@ export const formProps: FormProps = {
style: { width: '100%' },
},
},
],
},
{
span: 6,
list: [
{
key: 'ea8630c3055b4a28a85ef1fbefadfc75',
field: 'positionId',
......@@ -568,49 +581,10 @@ export const formProps: FormProps = {
clearable: false,
disabled: false,
staticOptions: [{ key: 1, label: '工程师', value: '1' }],
defaultSelect: '',
datasourceType: 'staticData',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'b5eb1855dc6d409280dbb7c4a333ae07',
field: 'gender',
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: '男', value: '男' },
{ key: 2, label: '女', value: '女' },
],
defaultSelect: '',
datasourceType: 'staticData',
params: null,
labelField: 'label',
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2006236571274592257' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
......@@ -623,6 +597,7 @@ export const formProps: FormProps = {
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2006236571274592257',
style: { width: '100%' },
},
},
......@@ -669,25 +644,30 @@ export const formProps: FormProps = {
style: { width: '100%' },
},
},
],
},
{
key: '7126b5787dc647bda9c3b05d626a2cf2',
field: 'skillLevelId',
label: '技能等级',
span: 6,
list: [
{
key: 'b5eb1855dc6d409280dbb7c4a333ae07',
field: 'gender',
label: '性别',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 11,
placeholder: '请选择下拉选择技能等级',
span: 7,
placeholder: '请选择下拉选择性别',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: '一级', value: '1' },
{ key: 2, label: '二级', value: '2' },
{ key: 1, label: '男', value: '男' },
{ key: 2, label: '女', value: '女' },
],
defaultSelect: '',
datasourceType: 'staticData',
......@@ -708,45 +688,6 @@ export const formProps: FormProps = {
style: { width: '100%' },
},
},
],
},
{
span: 6,
list: [
{
key: '488d22332deb4f2abf4a9423122d98f7',
field: 'phone',
label: '电话',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入电话',
maxlength: null,
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: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'dc946f68a78148c3bedd3cc361899726',
field: 'idNumber',
......@@ -759,7 +700,7 @@ export const formProps: FormProps = {
width: '100%',
span: 10,
defaultValue: '',
placeholder: '请输入身份证号人员名称',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
......@@ -793,7 +734,7 @@ export const formProps: FormProps = {
width: '100%',
span: 14,
defaultValue: '',
placeholder: '请输入户口所在地人员名称',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
......@@ -815,49 +756,6 @@ export const formProps: FormProps = {
style: { width: '100%' },
},
},
{
key: 'dfb0639d444c4449b11f26cf210feac5',
field: 'companyId',
label: '公司',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 9,
placeholder: '请选择下拉选择公司',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [{ key: 1, label: '和利时', value: '1' }],
defaultSelect: null,
datasourceType: 'api',
params: null,
labelField: 'label',
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: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
{
......@@ -907,7 +805,7 @@ export const formProps: FormProps = {
componentProps: {
width: '100%',
span: 13,
placeholder: '请选择下拉选择在职情况',
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: false,
isMultiple: false,
......@@ -917,10 +815,10 @@ export const formProps: FormProps = {
{ key: 1, label: '在职', value: '在职' },
{ key: 2, label: '离职', value: '离职' },
],
defaultSelect: '',
datasourceType: 'staticData',
params: null,
labelField: 'label',
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2006237055246942210' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
......@@ -933,6 +831,50 @@ export const formProps: FormProps = {
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2006237055246942210',
style: { width: '100%' },
},
},
{
key: 'dfb0639d444c4449b11f26cf210feac5',
field: 'companyId',
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: '和利时', value: '1' }],
defaultSelect: null,
datasourceType: 'api',
params: null,
labelField: 'label',
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: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
......
xjrsoft-vue3/src/views/jcsj/ryxx/components/workflowPermission.ts
......@@ -51,21 +51,20 @@ export const permissionList = [
defaultValue: 1,
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
edit: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '编号',
fieldId: 'code',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'bae97ad7fefb4f8aa692e678934e8f97',
type: 'auto-code',
key: '552fd440728b449eb2e2ed15bf8eb068',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -74,14 +73,15 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '班组',
fieldId: 'teamId',
fieldName: '电话',
fieldId: 'phone',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'b8f4cac721c84e4e8202cc66b54a6795',
type: 'input',
key: '488d22332deb4f2abf4a9423122d98f7',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -107,15 +107,14 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工号',
fieldId: 'jobNumber',
fieldName: '技能等级',
fieldId: 'skillLevelId',
isSubTable: false,
showChildren: true,
type: 'input',
key: '1ef1b726c6f34f4fa0d704afac0aac7a',
type: 'select',
key: '7126b5787dc647bda9c3b05d626a2cf2',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -124,14 +123,15 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '职位',
fieldId: 'positionId',
fieldName: '工号',
fieldId: 'jobNumber',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'ea8630c3055b4a28a85ef1fbefadfc75',
type: 'input',
key: '1ef1b726c6f34f4fa0d704afac0aac7a',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -140,12 +140,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '性别',
fieldId: 'gender',
fieldName: '职位',
fieldId: 'positionId',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'b5eb1855dc6d409280dbb7c4a333ae07',
key: 'ea8630c3055b4a28a85ef1fbefadfc75',
children: [],
options: {},
},
......@@ -172,31 +172,14 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '技能等级',
fieldId: 'skillLevelId',
fieldName: '性别',
fieldId: 'gender',
isSubTable: false,
showChildren: true,
type: 'select',
key: '7126b5787dc647bda9c3b05d626a2cf2',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '电话',
fieldId: 'phone',
isSubTable: false,
showChildren: true,
type: 'input',
key: '488d22332deb4f2abf4a9423122d98f7',
key: 'b5eb1855dc6d409280dbb7c4a333ae07',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -239,14 +222,15 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '公司',
fieldId: 'companyId',
fieldName: '年龄',
fieldId: 'age',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'dfb0639d444c4449b11f26cf210feac5',
type: 'input',
key: '8c0ea91bdee24d40aa94110ab9f19eae',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -255,15 +239,14 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '年龄',
fieldId: 'age',
fieldName: '在职情况',
fieldId: 'isOnJob',
isSubTable: false,
showChildren: true,
type: 'input',
key: '8c0ea91bdee24d40aa94110ab9f19eae',
type: 'select',
key: 'a1494eb3af92444bb256d4781a46a52c',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -272,12 +255,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '在职情况',
fieldId: 'isOnJob',
fieldName: '公司',
fieldId: 'companyId',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'a1494eb3af92444bb256d4781a46a52c',
key: 'dfb0639d444c4449b11f26cf210feac5',
children: [],
options: {},
},
......
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