Commit 0e127f3e by 张恒

refactor(jcsj/gylx): 重构工艺路线组件配置和数据模型

- 移除公司字段和批次号字段
- 添加备注字段替换批次号功能
- 将表单布局从垂直改为水平
- 调整网格列宽配置
- 更新工作流程权限配置中的字段映射
- 修改子表字段配置,将工序名称从弹窗改为输入框
- 交换工序类别和采集方案字段配置
- 添加排序字段和工序ID字段
- 更新API参数模型接口定义
- 优化子表表格配置和列设置
parent bd405549
...@@ -6,11 +6,7 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,11 +6,7 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface RokeRoutingPageParams extends BasicPageParams { export interface RokeRoutingPageParams extends BasicPageParams {
code: string; code: string;
companyId: string;
name: string; name: string;
lotRuleId: string;
} }
/** /**
...@@ -21,11 +17,9 @@ export interface RokeRoutingPageModel { ...@@ -21,11 +17,9 @@ export interface RokeRoutingPageModel {
code: string; code: string;
companyId: string;
name: string; name: string;
lotRuleId: string; note: string;
} }
/** /**
...@@ -170,6 +164,10 @@ export interface RokeRoutingProcessModel { ...@@ -170,6 +164,10 @@ export interface RokeRoutingProcessModel {
routingId: string; routingId: string;
processId: string; processId: string;
px: string;
processName: string;
} }
/** /**
......
...@@ -16,22 +16,6 @@ export const permissionList = [ ...@@ -16,22 +16,6 @@ export const permissionList = [
options: {}, options: {},
}, },
{ {
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '公司',
fieldId: 'companyId',
isSubTable: false,
showChildren: true,
type: 'select',
key: '62dc90bd2b2548f39626c59222f2c208',
children: [],
options: {},
},
{
required: true, required: true,
view: true, view: true,
edit: true, edit: true,
...@@ -51,22 +35,6 @@ export const permissionList = [ ...@@ -51,22 +35,6 @@ export const permissionList = [
{ {
required: false, required: false,
view: true, 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, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
...@@ -121,9 +89,9 @@ export const permissionList = [ ...@@ -121,9 +89,9 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'rokeRoutingProcessList', tableName: 'rokeRoutingProcessList',
fieldName: '名称', fieldName: '名称',
fieldId: 'processId', fieldId: 'processName',
type: 'MultiplePopup', type: 'Input',
key: '9e9467d976174786a67851ccb34bb8f7', key: 'bffa8112410f4112b3e5fcd32ac28f0e',
children: [], children: [],
}, },
{ {
...@@ -150,10 +118,10 @@ export const permissionList = [ ...@@ -150,10 +118,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'rokeRoutingProcessList', tableName: 'rokeRoutingProcessList',
fieldName: '工序类别', fieldName: '采集方案',
fieldId: 'categoryId', fieldId: 'collectionSchemeId',
type: 'XjrSelect', type: 'XjrSelect',
key: 'a56d6b8d54aa4d7c8246feb647f8da8b', key: 'bfdf4979bec74654ae607c3339e56ef2',
children: [], children: [],
}, },
{ {
...@@ -165,10 +133,10 @@ export const permissionList = [ ...@@ -165,10 +133,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'rokeRoutingProcessList', tableName: 'rokeRoutingProcessList',
fieldName: '采集方案', fieldName: '工序类别',
fieldId: 'collectionSchemeId', fieldId: 'categoryId',
type: 'XjrSelect', type: 'XjrSelect',
key: 'bfdf4979bec74654ae607c3339e56ef2', key: 'a56d6b8d54aa4d7c8246feb647f8da8b',
children: [], children: [],
}, },
{ {
...@@ -186,6 +154,36 @@ export const permissionList = [ ...@@ -186,6 +154,36 @@ export const permissionList = [
key: 'd7f88b9a824042b8b717ba4ffc0aa729', key: 'd7f88b9a824042b8b717ba4ffc0aa729',
children: [], children: [],
}, },
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingProcessList',
fieldName: '排序',
fieldId: 'px',
type: 'InputNumber',
key: '750b63c0c1804f27abd10e748d7d15f3',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'rokeRoutingProcessList',
fieldName: '工序ID',
fieldId: 'processId',
type: 'Input',
key: '8534d25739fe413788dea3fc99ac7580',
children: [],
},
], ],
}, },
]; ];
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment