diff --git a/src/views/gh/improvementProposal/ImprovementProposal.data.ts b/src/views/gh/improvementProposal/ImprovementProposal.data.ts index e810b03..b7a4a28 100644 --- a/src/views/gh/improvementProposal/ImprovementProposal.data.ts +++ b/src/views/gh/improvementProposal/ImprovementProposal.data.ts @@ -327,41 +327,4 @@ export const superQuerySchema = { improvementMethod: {title: '改善方法及措施',order: 10,view: 'textarea', type: 'string',}, finalAward: {title: '最终奖项',order: 14,view: 'text', type: 'string',}, bpmStatus: {title: '流程状态',order: 15,view: 'text', type: 'string',}, - //子表高级查询 - improvementDeptScore: { - title: '部门评议评分表', - view: 'table', - fields: { - mainId: {title: '改善提案主表ID',order: 0,view: 'text', type: 'string',}, - processTaskId: {title: '流程任务ID',order: 1,view: 'text', type: 'string',}, - scorerId: {title: '评委ID',order: 2,view: 'text', type: 'string',}, - scorerName: {title: '评委姓名',order: 3,view: 'text', type: 'string',}, - scoreStatus: {title: '评分状态:pending/completed',order: 4,view: 'text', type: 'string',}, - safetyScore: {title: '安全得分',order: 5,view: 'number', type: 'number',}, - qualityScore: {title: '质量得分',order: 6,view: 'number', type: 'number',}, - efficiencyScore: {title: '效率得分',order: 7,view: 'number', type: 'number',}, - costScore: {title: '成本得分',order: 8,view: 'number', type: 'number',}, - effectScore: {title: '改善效果平均得分',order: 9,view: 'number', type: 'number',}, - promotionScore: {title: '可推广度得分',order: 10,view: 'number', type: 'number',}, - originalityScore: {title: '独创性得分',order: 11,view: 'number', type: 'number',}, - effortScore: {title: '努力度得分',order: 12,view: 'number', type: 'number',}, - totalScore: {title: '加权总分',order: 13,view: 'number', type: 'number',}, - scoreOpinion: {title: '评分意见',order: 14,view: 'textarea', type: 'string',}, - scoreTime: {title: '评分时间',order: 15,view: 'datetime', type: 'string',}, - } - }, - improvementInstituteVote: { - title: '所级评议投票表', - view: 'table', - fields: { - mainId: {title: '改善提案主表ID',order: 0,view: 'text', type: 'string',}, - processTaskId: {title: '流程任务ID',order: 1,view: 'text', type: 'string',}, - voterId: {title: '投票人ID',order: 2,view: 'text', type: 'string',}, - voterName: {title: '投票人姓名',order: 3,view: 'text', type: 'string',}, - voteStatus: {title: '投票状态:pending/voted',order: 4,view: 'text', type: 'string',}, - voteResult: {title: '投票结果:agree/disagree',order: 5,view: 'text', type: 'string',}, - voteOpinion: {title: '投票意见',order: 6,view: 'textarea', type: 'string',}, - voteTime: {title: '投票时间',order: 7,view: 'datetime', type: 'string',}, - } - }, }; diff --git a/src/views/gh/improvementProposal/ImprovementProposalList.vue b/src/views/gh/improvementProposal/ImprovementProposalList.vue index 4ba9b99..56274dc 100644 --- a/src/views/gh/improvementProposal/ImprovementProposalList.vue +++ b/src/views/gh/improvementProposal/ImprovementProposalList.vue @@ -16,7 +16,7 @@ - + @@ -50,13 +50,13 @@ - +