From 368716a2697e63b095e23fa577c014e56bcf721f Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 16 Apr 2022 16:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90review=E3=80=91=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=20=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95WVTAID=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=E6=94=B9=E4=B8=BA=E5=92=8C=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=20=E3=80=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91=E6=90=9C=E7=B4=A2=E6=A1=86=E5=AD=90?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=95=BF=E5=BA=A6=E4=B8=8D=E5=A4=9F=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java     |  1 +
 .../components/virtualListDetails.vue          | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index b409d9806..0bbd6570b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -315,6 +315,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		try {
+			//TODO 切换成枚举，不要在代码里出现魔数
 			if(StringUtils.equals(operatorType,"0")){
 				QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
 				if(StringUtils.isNotEmpty(ids)){
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 641e121d3..144db82dd 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -63,7 +63,7 @@
               </a-col>
               <a-col :md="6" :sm="8">
                 <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>
                   </div>
                   <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
@@ -182,14 +182,6 @@
         loading: false,
         dataSource: [],
         columnsAll: [
-          {
-            title: 'WVTA ID',
-            align: 'center',
-            dataIndex: 'wvtaId',
-            width: 100,
-            ellipsis: true,
-            fixed: 'left'
-          },
           {
             title: this.$t('standard'),
             align: 'center',
@@ -250,6 +242,13 @@
             ellipsis: true,
             dataIndex: 'implementTime'
           },
+          {
+            title: 'WVTA ID',
+            align: 'center',
+            dataIndex: 'wvtaId',
+            width: 100,
+            ellipsis: true
+          },
           {
             title: this.$t('certificationType'),
             align: 'center',
@@ -285,6 +284,7 @@
             title: this.$t('confirmationOfDesignConformity'),
             children: [
               {
+                // TODO 未按要求实现，该列分为上下行，上行显示交付物类型，下行显示交付物模板名称，且交付物模板名称点击可下载。其他2个流程同理
                 title: this.$t('Deliverables'),
                 dataIndex: 'designDeliverableTemplateName',
                 ellipsis: true,