【review】代码审核
【修改】虚拟清单WVTAID字段的位置改为和需求保持一致 【修改】搜索框子标题长度不够,进行修改
This commit is contained in:
+1
@@ -315,6 +315,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
}
|
}
|
||||||
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
try {
|
try {
|
||||||
|
//TODO 切换成枚举,不要在代码里出现魔数
|
||||||
if(StringUtils.equals(operatorType,"0")){
|
if(StringUtils.equals(operatorType,"0")){
|
||||||
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
|
||||||
if(StringUtils.isNotEmpty(ids)){
|
if(StringUtils.isNotEmpty(ids)){
|
||||||
|
|||||||
@@ -63,7 +63,7 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="6" :sm="8">
|
<a-col :md="6" :sm="8">
|
||||||
<div class="box-title-text">
|
<div class="box-title-text">
|
||||||
<div class="title-text" style="width: 50px" :title="$t('subtitle')">
|
<div class="title-text" style="width: 60px" :title="$t('subtitle')">
|
||||||
<span>{{$t('subtitle')}}</span>
|
<span>{{$t('subtitle')}}</span>
|
||||||
</div>
|
</div>
|
||||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
|
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
|
||||||
@@ -182,14 +182,6 @@
|
|||||||
loading: false,
|
loading: false,
|
||||||
dataSource: [],
|
dataSource: [],
|
||||||
columnsAll: [
|
columnsAll: [
|
||||||
{
|
|
||||||
title: 'WVTA ID',
|
|
||||||
align: 'center',
|
|
||||||
dataIndex: 'wvtaId',
|
|
||||||
width: 100,
|
|
||||||
ellipsis: true,
|
|
||||||
fixed: 'left'
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: this.$t('standard'),
|
title: this.$t('standard'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
@@ -250,6 +242,13 @@
|
|||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'implementTime'
|
dataIndex: 'implementTime'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: 'WVTA ID',
|
||||||
|
align: 'center',
|
||||||
|
dataIndex: 'wvtaId',
|
||||||
|
width: 100,
|
||||||
|
ellipsis: true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('certificationType'),
|
title: this.$t('certificationType'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
@@ -285,6 +284,7 @@
|
|||||||
title: this.$t('confirmationOfDesignConformity'),
|
title: this.$t('confirmationOfDesignConformity'),
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
|
// TODO 未按要求实现,该列分为上下行,上行显示交付物类型,下行显示交付物模板名称,且交付物模板名称点击可下载。其他2个流程同理
|
||||||
title: this.$t('Deliverables'),
|
title: this.$t('Deliverables'),
|
||||||
dataIndex: 'designDeliverableTemplateName',
|
dataIndex: 'designDeliverableTemplateName',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user