Commit f9746644 by sunguoxiang

refactor(zlgl):修改不合格品页面字段

parent 5372490c
...@@ -6,19 +6,15 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,19 +6,15 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface MesQualityUnqualifiedWorkflowPageParams extends BasicPageParams { export interface MesQualityUnqualifiedWorkflowPageParams extends BasicPageParams {
bhgid: string; bhgid: string;
jyrq: string; djbh: string;
hjph: string;
lch: string;
jyy: string; lydjlx: string;
gkmc: string; clr: string;
qxmc: string; jyrq: string;
qxms: string; lch: string;
qxmssfss: string; qxmssfss: string;
...@@ -43,18 +39,8 @@ export interface MesQualityUnqualifiedWorkflowPageModel { ...@@ -43,18 +39,8 @@ export interface MesQualityUnqualifiedWorkflowPageModel {
jyrq: string; jyrq: string;
hjph: string;
lch: string; lch: string;
jyy: string;
gkmc: string;
qxmc: string;
qxms: string;
qxmssfss: string; qxmssfss: string;
jzyfcsyz1: string; jzyfcsyz1: string;
...@@ -66,6 +52,12 @@ export interface MesQualityUnqualifiedWorkflowPageModel { ...@@ -66,6 +52,12 @@ export interface MesQualityUnqualifiedWorkflowPageModel {
jzyfcs: string; jzyfcs: string;
gbyyfx: string; gbyyfx: string;
djbh: string;
lydjlx: string;
clr: string;
} }
/** /**
...@@ -84,8 +76,6 @@ export interface MesQualityUnqualifiedWorkflowModel { ...@@ -84,8 +76,6 @@ export interface MesQualityUnqualifiedWorkflowModel {
gbyyfx: string; gbyyfx: string;
spr: string;
jzcsyz2: string; jzcsyz2: string;
jzyfcsyz1: string; jzyfcsyz1: string;
...@@ -94,18 +84,10 @@ export interface MesQualityUnqualifiedWorkflowModel { ...@@ -94,18 +84,10 @@ export interface MesQualityUnqualifiedWorkflowModel {
images: string; images: string;
qxms: string; clr: string;
qxmc: string;
gkmc: string;
jyy: string;
lch: string; lch: string;
hjph: string;
jyrq: string; jyrq: string;
createDate: string; createDate: string;
...@@ -115,6 +97,10 @@ export interface MesQualityUnqualifiedWorkflowModel { ...@@ -115,6 +97,10 @@ export interface MesQualityUnqualifiedWorkflowModel {
modifyDate: string; modifyDate: string;
modifyUserId: string; modifyUserId: string;
lydjlx: string;
djbh: string;
} }
/** /**
......
...@@ -40,55 +40,38 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -40,55 +40,38 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'jyrq', field: 'djbh',
label: '检验日期', label: '单据编号',
defaultValue: undefined, defaultValue: undefined,
component: 'RangePicker', component: 'Input',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
}, },
{ {
field: 'hjph', field: 'lydjlx',
label: '合金牌号', label: '来源单据',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
{ {
field: 'lch', field: 'clr',
label: '炉次号', label: '检验员',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
{ {
field: 'jyy', field: 'jyrq',
label: '检验', label: '检验日期',
defaultValue: undefined, defaultValue: undefined,
component: 'User', component: 'RangePicker',
componentProps: { componentProps: {
suffix: 'ant-design:setting-outlined', format: 'YYYY-MM-DD HH:mm:ss',
placeholder: '请选择', style: { width: '100%' },
getPopupContainer: () => document.body,
}, },
}, },
{ {
field: 'gkmc', field: 'lch',
label: '顾客名称', label: '炉次号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'qxmc',
label: '缺陷名称',
defaultValue: undefined,
component: 'Input',
},
{
field: 'qxms',
label: '缺陷描述',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
...@@ -195,19 +178,6 @@ export const columns: BasicColumn[] = [ ...@@ -195,19 +178,6 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'hjph',
title: '合金牌号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'lch', dataIndex: 'lch',
title: '炉次号', title: '炉次号',
componentType: 'input', componentType: 'input',
...@@ -221,58 +191,6 @@ export const columns: BasicColumn[] = [ ...@@ -221,58 +191,6 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'jyy',
title: '检验员',
componentType: 'user',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'gkmc',
title: '顾客名称',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'qxmc',
title: '缺陷名称',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'qxms',
title: '缺陷描述',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'qxmssfss', dataIndex: 'qxmssfss',
title: '缺陷描述是否属实', title: '缺陷描述是否属实',
componentType: 'select', componentType: 'select',
...@@ -375,6 +293,45 @@ export const columns: BasicColumn[] = [ ...@@ -375,6 +293,45 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: '',
}, },
{
resizable: true,
dataIndex: 'djbh',
title: '单据编号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'lydjlx',
title: '来源单据',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'clr',
title: '检验员',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -498,36 +455,9 @@ export const formProps: FormProps = { ...@@ -498,36 +455,9 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'e3ddb10b34544215939acd3c8e5ac645', key: '1d828f089157445fbb5434ab99aedaea',
field: 'jyrq', field: 'djbh',
label: '检验日期', label: '单据编号',
type: 'date',
component: 'DatePicker',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
span: '',
defaultValue: '',
width: '100%',
placeholder: '请选择检验日期',
format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true,
allowClear: false,
disabled: false,
required: true,
isShow: true,
rules: [],
events: {},
isGetCurrent: false,
tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
style: { width: '100%' },
},
},
{
key: '928a3689145b40068812ae200ef4192e',
field: 'hjph',
label: '合金牌号',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -536,8 +466,7 @@ export const formProps: FormProps = { ...@@ -536,8 +466,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入合金牌号', placeholder: '请输入单据编号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -545,7 +474,7 @@ export const formProps: FormProps = { ...@@ -545,7 +474,7 @@ export const formProps: FormProps = {
disabled: false, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: true, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
...@@ -559,9 +488,9 @@ export const formProps: FormProps = { ...@@ -559,9 +488,9 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'f27565fe96154a06b5e68bd5e738f22e', key: '504f107faad1420988e91ce9a5a10db9',
field: 'lch', field: 'lydjlx',
label: '炉次号', label: '来源单据',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -570,8 +499,7 @@ export const formProps: FormProps = { ...@@ -570,8 +499,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入炉次号', placeholder: '请输入来源单据',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -579,7 +507,7 @@ export const formProps: FormProps = { ...@@ -579,7 +507,7 @@ export const formProps: FormProps = {
disabled: false, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: true, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
...@@ -593,35 +521,9 @@ export const formProps: FormProps = { ...@@ -593,35 +521,9 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '086ea409b1834b86a61bf38537d80ce4', key: '3f2ffa3c09a74bf897bd34a317832c41',
field: 'jyy', field: 'clr',
label: '检验员', label: '检验员',
type: 'user',
component: 'User',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
span: '',
width: '100%',
defaultValue: '',
placeholder: '请选择人员',
userType: 0,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true,
disabled: false,
required: true,
multiple: true,
isShow: true,
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'e689f5cfe2804ebc9582de1743bb493e',
field: 'gkmc',
label: '顾客名称',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -630,8 +532,7 @@ export const formProps: FormProps = { ...@@ -630,8 +532,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入顾客名称', placeholder: '请输入检验员',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -639,7 +540,7 @@ export const formProps: FormProps = { ...@@ -639,7 +540,7 @@ export const formProps: FormProps = {
disabled: false, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: true, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
...@@ -653,34 +554,36 @@ export const formProps: FormProps = { ...@@ -653,34 +554,36 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '5945de2c060e43d99d44bac3c8a9e30c', key: 'e3ddb10b34544215939acd3c8e5ac645',
field: 'images', field: 'jyrq',
label: '附件', label: '检验日期',
type: 'upload', type: 'date',
component: 'Upload', component: 'DatePicker',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
api: uploadApi,
span: '', span: '',
defaultValue: '', defaultValue: '',
accept: '', width: '100%',
maxNumber: 5, placeholder: '请选择检验日期',
maxSize: 5, format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true, showLabel: true,
multiple: false, allowClear: false,
disabled: false, disabled: false,
required: false, required: false,
isShow: true, isShow: true,
rules: [],
events: {}, events: {},
listType: 'text', isGetCurrent: false,
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
style: { width: '100%' },
}, },
}, },
{ {
key: '9f2b5aa4478e4dc38f97f2aecc70f5e7', key: 'f27565fe96154a06b5e68bd5e738f22e',
field: 'qxmc', field: 'lch',
label: '缺陷名称', label: '炉次号',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -689,8 +592,7 @@ export const formProps: FormProps = { ...@@ -689,8 +592,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入缺陷名称', placeholder: '请输入炉次号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -698,7 +600,7 @@ export const formProps: FormProps = { ...@@ -698,7 +600,7 @@ export const formProps: FormProps = {
disabled: false, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: true, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
...@@ -712,37 +614,28 @@ export const formProps: FormProps = { ...@@ -712,37 +614,28 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '8e00995380d0400b8873d5f598f12616', key: '5945de2c060e43d99d44bac3c8a9e30c',
field: 'qxms', field: 'images',
label: '缺陷描述', label: '附件',
type: 'input', type: 'upload',
component: 'Input', component: 'Upload',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%', api: uploadApi,
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入缺陷描述', accept: '',
maxlength: null, maxNumber: 5,
prefix: '', maxSize: 5,
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
multiple: false,
disabled: false,
required: false, required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true, isShow: true,
scan: false, events: {},
bordered: true, listType: 'text',
isShowAi: false, sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
}, },
}, },
{ {
...@@ -767,7 +660,6 @@ export const formProps: FormProps = { ...@@ -767,7 +660,6 @@ export const formProps: FormProps = {
], ],
defaultSelect: '', defaultSelect: '',
datasourceType: 'staticData', datasourceType: 'staticData',
params: null,
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
apiConfig: { apiConfig: {
...@@ -806,7 +698,6 @@ export const formProps: FormProps = { ...@@ -806,7 +698,6 @@ export const formProps: FormProps = {
], ],
defaultSelect: '', defaultSelect: '',
datasourceType: 'staticData', datasourceType: 'staticData',
params: null,
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
apiConfig: { apiConfig: {
...@@ -845,7 +736,6 @@ export const formProps: FormProps = { ...@@ -845,7 +736,6 @@ export const formProps: FormProps = {
], ],
defaultSelect: '', defaultSelect: '',
datasourceType: 'staticData', datasourceType: 'staticData',
params: null,
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
apiConfig: { apiConfig: {
...@@ -875,7 +765,6 @@ export const formProps: FormProps = { ...@@ -875,7 +765,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入纠正措施实施有效性验证', placeholder: '请输入纠正措施实施有效性验证',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -909,7 +798,6 @@ export const formProps: FormProps = { ...@@ -909,7 +798,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入纠正预防措施', placeholder: '请输入纠正预防措施',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -943,7 +831,6 @@ export const formProps: FormProps = { ...@@ -943,7 +831,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入根本原因分析', placeholder: '请输入根本原因分析',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
...@@ -16,86 +16,86 @@ export const permissionList = [ ...@@ -16,86 +16,86 @@ export const permissionList = [
options: {}, options: {},
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '检验日期', fieldName: '单据编号',
fieldId: 'jyrq', fieldId: 'djbh',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'input',
key: 'e3ddb10b34544215939acd3c8e5ac645', key: '1d828f089157445fbb5434ab99aedaea',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '合金牌号', fieldName: '来源单据',
fieldId: 'hjph', fieldId: 'lydjlx',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'input',
key: '928a3689145b40068812ae200ef4192e', key: '504f107faad1420988e91ce9a5a10db9',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '炉次号', fieldName: '检验员',
fieldId: 'lch', fieldId: 'clr',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'input',
key: 'f27565fe96154a06b5e68bd5e738f22e', key: '3f2ffa3c09a74bf897bd34a317832c41',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '检验', fieldName: '检验日期',
fieldId: 'jyy', fieldId: 'jyrq',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'user', type: 'date',
key: '086ea409b1834b86a61bf38537d80ce4', key: 'e3ddb10b34544215939acd3c8e5ac645',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '顾客名称', fieldName: '炉次号',
fieldId: 'gkmc', fieldId: 'lch',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'input',
key: 'e689f5cfe2804ebc9582de1743bb493e', key: 'f27565fe96154a06b5e68bd5e738f22e',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -124,40 +124,6 @@ export const permissionList = [ ...@@ -124,40 +124,6 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '缺陷名称',
fieldId: 'qxmc',
isSubTable: false,
showChildren: true,
type: 'input',
key: '9f2b5aa4478e4dc38f97f2aecc70f5e7',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '缺陷描述',
fieldId: 'qxms',
isSubTable: false,
showChildren: true,
type: 'input',
key: '8e00995380d0400b8873d5f598f12616',
children: [],
options: {},
defaultValue: '',
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '缺陷描述是否属实', fieldName: '缺陷描述是否属实',
fieldId: 'qxmssfss', fieldId: 'qxmssfss',
isSubTable: false, isSubTable: false,
......
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2026191505324105728","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2026191505324105729","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2026191505324105730","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2026191505324105731","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment