Skip to content

W
weiqiao-vue
Commit 8f4d5f25 by 张恒
Options

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

- 将工单编号字段统一改为工单编码
- 为工单编码字段配置自动生成规则组件
- 添加状态字段及其选择器配置
- 在数据模型中新增状态、产品编号、生产产线等字段
- 添加工序ID、开始时间、结束时间等流程相关字段
- 更新工作流权限配置中的字段类型和禁用状态
- 移除多余的工序配置项并重新组织配置结构
- 清理组件配置中不必要的属性如maxlength等
parent 5f63520a
Showing with 172 additions and 119 deletions
xjrsoft-vue3/src/api/scgl/gdgl/model/GdglModel.ts
......@@ -30,6 +30,8 @@ export interface MesProductionGongdanPageModel {
jhksrq: string;
jhjsrq: string;
zt: string;
}
/**
......@@ -291,6 +293,8 @@ export interface MesGongdanReportModel {
zch: string;
cpbh: string;
hj: string;
cplb: string;
......@@ -362,6 +366,20 @@ export interface MesGongdanReportModel {
modifyDate: string;
modifyUserId: string;
sccx: string;
sccj: string;
gzzx: string;
gxId: string;
kssj: string;
jssj: string;
hgs: string;
}
/**
......
xjrsoft-vue3/src/views/scgl/gdgl/components/config.ts
......@@ -5,7 +5,7 @@ import { uploadApi } from '/@/api/sys/upload';
export const searchFormSchema: FormSchema[] = [
{
field: 'bh',
label: '工单编号',
label: '工单编码',
defaultValue: undefined,
component: 'Input',
},
......@@ -21,8 +21,8 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'bh',
title: '工单编号',
componentType: 'input',
title: '工单编码',
componentType: 'auto-code',
fixed: false,
sorter: true,
......@@ -121,6 +121,19 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'zt',
title: '状态',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
];
//表头合并配置
export const headerMergingData = [];
......@@ -205,35 +218,24 @@ export const formProps: FormProps = {
span: 8,
list: [
{
key: 'e439465000834adeb3e48c8cacb93715',
key: 'eb63605a152f43fb8fc9097207768b4e',
field: 'bh',
label: '工单编号',
type: 'input',
component: 'Input',
label: '工单编码',
type: 'auto-code',
component: 'AutoCodeRule',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
autoCodeRule: 'GDBH',
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
......@@ -450,52 +452,6 @@ export const formProps: FormProps = {
},
},
{
key: 'e8cd7b3390074ec5b4367e1ceb30d78d',
field: 'gxId',
label: '工序',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
apiConfig: {
path: '/jcxx/gxlb',
method: 'GET',
apiId: '8a735bb14d5f4a709efb65b34691acd3',
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_process where delete_mark = 0";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2003761375221407745',
style: { width: '100%' },
},
},
{
key: '7a484b03fd52412f8698284631cfefc4',
field: 'jsyq',
label: '技术要求',
......@@ -792,6 +748,52 @@ export const formProps: FormProps = {
},
},
{
key: 'e8cd7b3390074ec5b4367e1ceb30d78d',
field: 'gxId',
label: '工序',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
apiConfig: {
path: '/jcxx/gxlb',
method: 'GET',
apiId: '8a735bb14d5f4a709efb65b34691acd3',
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_process where delete_mark = 0";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2003761375221407745',
style: { width: '100%' },
},
},
{
key: 'aa95a59b384344b4bb16cf546092d6cc',
field: 'sfnbdd',
label: '是否内部订单',
......@@ -825,6 +827,54 @@ export const formProps: FormProps = {
style: {},
},
},
{
key: 'd74b7755d2b3467aba348c7b55a94fc6',
field: 'zt',
label: '状态',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
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' },
],
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: '/jcxx//cjcx/getAllGzzx',
method: 'GET',
apiId: 'cf582f4ea9814b769291c318c35cbb96',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
"var sql = 'select *,id as value,gzzxmc as label from mes_base_gzzx where delete_mark=0';\r\nreturn db.select(sql)",
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: false,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2011260635030495233' },
defaultSelect: '未开始',
itemId: '2011260635030495233',
style: { width: '100%' },
},
},
],
},
{
......@@ -984,7 +1034,7 @@ export const formProps: FormProps = {
},
},
{
key: 'd01e9984dad44089b367e932f00cbd7f',
key: '32d66a3f683c4cb482f439d0619412fd',
field: 'bz',
label: '备注',
type: 'textarea',
......@@ -1068,7 +1118,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1099,7 +1148,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1124,15 +1172,11 @@ export const formProps: FormProps = {
title: '完工数',
dataIndex: 'wgs',
componentType: 'InputNumber',
defaultValue: null,
componentProps: {
width: '100%',
span: '',
defaultValue: null,
min: 0,
max: null,
step: 0.01,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......@@ -1150,15 +1194,11 @@ export const formProps: FormProps = {
title: '工时',
dataIndex: 'gs',
componentType: 'InputNumber',
defaultValue: null,
componentProps: {
width: '100%',
span: '',
defaultValue: null,
min: 0,
max: null,
step: 0.01,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......@@ -1206,7 +1246,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1237,7 +1276,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1268,7 +1306,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1299,7 +1336,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1385,7 +1421,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1416,7 +1451,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1447,7 +1481,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1478,7 +1511,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1564,7 +1596,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1595,7 +1626,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1626,7 +1656,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1681,7 +1710,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1760,7 +1788,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1791,7 +1818,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1822,9 +1848,7 @@ export const formProps: FormProps = {
span: '',
defaultValue: 0,
min: 0,
max: null,
step: 0.01,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......@@ -1848,7 +1872,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1879,7 +1902,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1958,7 +1980,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -1989,7 +2010,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -2020,7 +2040,6 @@ export const formProps: FormProps = {
span: '',
defaultValue: '',
placeholder: '',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......
xjrsoft-vue3/src/views/scgl/gdgl/components/workflowPermission.ts
......@@ -3,18 +3,17 @@ export const permissionList = [
required: false,
view: true,
edit: false,
disabled: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '工单编号',
fieldName: '工单编码',
fieldId: 'bh',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'e439465000834adeb3e48c8cacb93715',
type: 'auto-code',
key: 'eb63605a152f43fb8fc9097207768b4e',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -123,22 +122,6 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工序',
fieldId: 'gxId',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'e8cd7b3390074ec5b4367e1ceb30d78d',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '技术要求',
fieldId: 'jsyq',
isSubTable: false,
......@@ -253,6 +236,22 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工序',
fieldId: 'gxId',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'e8cd7b3390074ec5b4367e1ceb30d78d',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '是否内部订单',
fieldId: 'sfnbdd',
isSubTable: false,
......@@ -266,6 +265,23 @@ export const permissionList = [
{
required: false,
view: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '状态',
fieldId: 'zt',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'd74b7755d2b3467aba348c7b55a94fc6',
children: [],
options: {},
defaultValue: '未开始',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
......@@ -360,7 +376,7 @@ export const permissionList = [
isSubTable: false,
showChildren: true,
type: 'textarea',
key: 'd01e9984dad44089b367e932f00cbd7f',
key: '32d66a3f683c4cb482f439d0619412fd',
children: [],
options: {},
defaultValue: '',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment