From 127ad2254e3a70891ff16187fde43f468f081a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 6 Apr 2023 11:57:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=A0=87=E5=8F=B7=E5=A2=9E=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=BA=93=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/virtualListDetails.vue         | 74 ++++++++++++++-
 .../views/documentTools/virtualList/index.vue | 10 +-
 .../components/listOfRegulations.vue          | 93 ++++++++++++++-----
 .../components/listOfRelevantPersonnel.vue    |  2 +-
 .../views/virtualAuthenticationList/index.vue | 10 +-
 5 files changed, 153 insertions(+), 36 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 348be5014..66e3f3afd 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -279,6 +279,22 @@
                 <!--              @click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{$t('viewFile')}}</a>-->
            <span v-else>--</span>
         </span>
+              <span slot="verifyDeliverableTemplate" slot-scope="text,record">
+                   <span class="viewFile"
+                         @click="viewFileClick(record.verifyDeliverableTemplate)"
+                         v-if="record.verifyDeliverableTemplate">
+                     {{$t('viewFile')}}
+                </span>
+                <span v-else>--</span>
+              </span>
+              <span slot="designDeliverableTemplate" slot-scope="text,record">
+                   <span class="viewFile"
+                         @click="viewFileClick(record.designDeliverableTemplate)"
+                         v-if="record.designDeliverableTemplate">
+                     {{$t('viewFile')}}
+                </span>
+                <span v-else>--</span>
+              </span>
             </a-table>
             <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
               {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
@@ -293,6 +309,7 @@
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef" @visible='sVisible'/>
     <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
     <batSetting :url="url" ref="batSettingRef" @batSettingList="batSettingList"/>
+    <viewFileModel ref="viewFileModelRef"/>
     <a-modal
       :title="$t('deliverableTemplate')"
       :width="600"
@@ -333,6 +350,7 @@
   import addModel from './addModel'
   import editModel from './editModel'
   import UpdateLog from '@/components/UpdateLog/index'
+  import viewFileModel from '@/components/viewFileModel/index'
   import batSetting from './batSetting'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
   import transferList from './transferList'
@@ -352,7 +370,8 @@
       editModel,
       UpdateLog,
       batSetting,
-      globalAdvancedQuery
+      globalAdvancedQuery,
+      viewFileModel
     },
     mixins: [ResizeColumnProvide, ResizeHeader],
     data() {
@@ -543,6 +562,14 @@
                 ellipsis: true,
                 scopedSlots: { customRender: 'designDeliverableTemplateName' }
               },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'designDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'designDeliverableTemplate' }
+              },
               // {
               //   title: this.$t('Sponsor'),
               //   dataIndex: 'designInitiatorName',
@@ -584,6 +611,14 @@
                 ellipsis: true,
                 scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
               },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'verifyDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'verifyDeliverableTemplate' }
+              },
               {
                 title: this.$t('personLiable'),
                 dataIndex: 'verifyDuty_dictText',
@@ -791,12 +826,22 @@
             key: 20,
             moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
           },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'),
+            headFieldCn: '交付物模板',
+            headFieldEn: 'Deliverable Template',
+            field: 'designDeliverableTemplate',
+            affirmFlag: '1',
+            key: 21,
+            moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
+          },
           {
             sort: '',
             name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
             headFieldCn: '责任人',
             headFieldEn: 'Assignee',
-            field: 'designDutyName',
+            field: 'designDuty_dictText',
             affirmFlag: '1',
             key: 22,
             moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
@@ -821,12 +866,22 @@
             key: 30,
             moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
           },
+          {
+            sort: '',
+            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'),
+            headFieldCn: '交付物模板',
+            headFieldEn: 'Deliverable Template',
+            field: 'verifyDeliverableTemplate',
+            affirmFlag: '3',
+            key: 31,
+            moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
+          },
           {
             sort: '',
             name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'),
             headFieldCn: '责任人',
             headFieldEn: 'Assignee',
-            field: 'verifyDutyName',
+            field: 'verifyDuty_dictText',
             affirmFlag: '3',
             key: 32,
             moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
@@ -1383,7 +1438,10 @@
           }
         })
         window.open(newUrl.href, '_blank')
-      }
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      },
     }
   }
 </script>
@@ -1619,6 +1677,14 @@
   ::v-deep .ant-table-thead > tr > th .ant-table-header-column {
     max-width: none !important;
   }
+  .viewFile {
+    color: #00B3BE;
+    cursor: pointer;
+  }
+  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
+    text-align: left;
+    padding-left: 16px!important;
+  }
 </style>
 <style lang="less">
   .popconfirm {
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index 86038148a..e9d09badb 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -48,10 +48,10 @@
     </div>
     <div>
       <!--       :components="drag(columns)"   bordered-->
+<!--             :components="drag(columns,'columns')"-->
       <a-table
         ref="table"
         size="middle"
-        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -62,7 +62,7 @@
         :columns="columns"
       >
         <span slot="VirtualListName" slot-scope="text,record">
-          <a @click="VirtualListNameClick(record)">{{text}}</a>
+          <a @click="VirtualListNameClick(record)" :title="text">{{text}}</a>
         </span>
         <span slot="operation" slot-scope="text,record">
 <!--          v-if="record.createBy == userData.username || administrators"-->
@@ -221,21 +221,21 @@
             title: this.$t('VirtualListName'),
             align: 'left',
             dataIndex: 'name',
-            width: 484,
+            width: '40',
             ellipsis: true,
             scopedSlots: { customRender: 'VirtualListName' }
           },
           {
             title: this.$t('listStatus'),
             align: 'left',
-            width: 540,
+            width: '20%',
             ellipsis: true,
             dataIndex: 'state_dictText'
           },
           {
             title: this.$t('creater'),
             align: 'left',
-            width: 260,
+            width: '20%',
             ellipsis: true,
             dataIndex: 'createBy'
           },
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 53823f392..cd2525ac9 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -347,9 +347,22 @@
               :title="text">{{text}}</a>
         </span>
       </a-table>
-      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
-        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
+      <div class="page" v-if="dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :pageSizeOptions="['50','100','200','300']"
+          :current="pageNo"
+          @change="onChangeSize"
+          @showSizeChange="SizeChange"
+        />
       </div>
+      <!--      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+      <!--        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}-->
+      <!--      </div>-->
     </div>
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -590,6 +603,9 @@
         toggleSearchStatus: false,
         visibleQuestion: false,
         confirmLoadingQuestion: false,
+        pageNo: 1,
+        pageSize: 50,
+        total: 0,
         roleSwitchingList: [],
         formInlineQuestion: {},
         rulesRoleQuestion: {
@@ -693,12 +709,14 @@
           },
           {
             title: this.$t('confirmationOfDesignConformity'),
+            align: 'left',
             children: [
               {
                 title: this.$t('personLiable'),
                 dataIndex: 'designDutyIdName',
                 align: 'left',
                 width: 180,
+                sorter: true,
                 ellipsis: true
               },
               {
@@ -706,6 +724,7 @@
                 dataIndex: 'designDueDate',
                 align: 'left',
                 ellipsis: true,
+                sorter: true,
                 width: 140
               },
               {
@@ -714,6 +733,7 @@
                 align: 'left',
                 ellipsis: true,
                 width: 140,
+                sorter: true,
                 scopedSlots: { customRender: 'designFlowStatusName' }
               },
               {
@@ -728,20 +748,23 @@
           },
           {
             title: this.$t('verificationAndConformityconfirmation'),
+            align: 'left',
             children: [
               {
                 title: this.$t('personLiable'),
                 dataIndex: 'verifyDutyIdName',
                 align: 'left',
                 width: 180,
-                ellipsis: true
+                ellipsis: true,
+                sorter: true
               },
               {
                 title: this.$t('TaskCutOffTime'),
                 dataIndex: 'verifyDueDate',
                 align: 'left',
                 ellipsis: true,
-                width: 140
+                width: 140,
+                sorter: true
               },
               {
                 title: this.$t('ProcessStatus'),
@@ -749,6 +772,7 @@
                 align: 'left',
                 ellipsis: true,
                 width: 180,
+                sorter: true,
                 scopedSlots: { customRender: 'verifyFlowStatusName' }
               },
               {
@@ -1030,7 +1054,7 @@
         url: {
           addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
           queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
-          list: '/project/projectLawsInventoryEO/list',
+          list: '/project/projectLawsInventoryEO/page',
           addModel: 'project/projectLawsInventoryEO/add',
           editModel: '/project/projectLawsInventoryEO/edit',
           deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
@@ -1118,8 +1142,8 @@
           },
           {
             value: 'designFlowStatus',
-            text: this.$t('designComplianceReview')+this.$t('ProcessStatus'),
-            options:[
+            text: this.$t('designComplianceReview') + this.$t('ProcessStatus'),
+            options: [
               {
                 value: 'List to be released',
                 key: 'List to be released',
@@ -1165,12 +1189,12 @@
                 key: 'NA',
                 label: this.$t('NA')
               }
-            ],
+            ]
           },
           {
             value: 'verifyFlowStatus',
-            text: this.$t('verificationAndConformityconfirmation')+this.$t('ProcessStatus'),
-            options:[
+            text: this.$t('verificationAndConformityconfirmation') + this.$t('ProcessStatus'),
+            options: [
               {
                 value: 'List to be released',
                 key: 'List to be released',
@@ -1216,8 +1240,8 @@
                 key: 'NA',
                 label: this.$t('NA')
               }
-            ],
-          },
+            ]
+          }
         ],
         listOptions: [
           {
@@ -1729,15 +1753,17 @@
             }
           }
           if (detailedWarningList && detailedWarningList.length > 0) {
-            if (this.roleSwitchingCode == 0){
+            if (this.roleSwitchingCode == 0) {
               this.questionWarning.push(
               < div > {
-                detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')
+                detailedWarningList
+                .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')
               } < /div>)
-            }else if(this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30){
+            } else if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30) {
               this.questionWarning.push(
               < div > {
-                detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')+this.$t('andTheProcessStatusTheList')
+                detailedWarningList
+                .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') + this.$t('andTheProcessStatusTheList')
               } < /div>)
             }
           }
@@ -2029,7 +2055,15 @@
         }
         this.getList()
       },
-
+      onChangeSize(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
       getList() {
         let roleCode = this.roleSwitchingCode
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -2048,12 +2082,20 @@
           projectLibraryId: this.$route.query.id,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          roleCode: roleCode
+          roleCode: roleCode,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            this.dataSource = res.result || []
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
             this.loading = false
             this.JLoading = false
             if (this.dataSource.length == 0) {
@@ -2501,9 +2543,9 @@
 
         }
         if (this.requestsNum == 0) {
-          if (_this.detailedWarningList && _this.detailedWarningList.length > 0){
+          if (_this.detailedWarningList && _this.detailedWarningList.length > 0) {
             _this.promptInformation(_this.detailedWarningList)
-          }else{
+          } else {
             this.$message.warning(_this.$t('theDataYouInitiate'))
           }
           this.JTextLoading = false
@@ -2819,6 +2861,7 @@
   .page {
     text-align: right;
     margin-top: 20px;
+    margin-bottom: 20px;
   }
 
   .operator-text-left {
@@ -2986,6 +3029,14 @@
     max-width: none !important;
   }
 
+  ::v-deep .page .ant-select-selection__rendered {
+    height: 32px!important;
+    line-height: 32px!important;
+  }
+  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
+    text-align: left;
+    padding-left: 16px!important;
+  }
 </style>
 <style lang="less">
   .box-input .ant-select-selection {
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index d2bf32a73..a1cfd846e 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -14,7 +14,7 @@
               <div class="title-text-search" :title="$t('areaOfResponsibility')">
                 <span>{{$t('areaOfResponsibility')}}</span>
               </div>
-              <j-dict-select-tag class="box-input-search" v-model="queryParam.dutyTerritory"
+              <j-multi-select-tag class="box-input-search" v-model="queryParam.dutyTerritory"
                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 62d806967..193be25b0 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -42,10 +42,10 @@
         {{$t('BatchDelete')}}
       </div>
     </div>
+<!--    :components="drag(columns,'columns')"-->
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
@@ -56,7 +56,7 @@
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
     >
       <span slot="CertificationListName" slot-scope="text,record">
-          <a @click="CertificationListNameClick(record)">{{text}}</a>
+          <a @click="CertificationListNameClick(record)" :title="text">{{text}}</a>
       </span>
       <span slot="operation" slot-scope="text,record">
 <!--          v-if="record.createBy == userData.username || administrators"-->
@@ -215,21 +215,21 @@
             title: this.$t('CertificationListName'),
             align: 'left',
             dataIndex: 'name',
-            width: 480,
+            width: '40%',
             ellipsis: true,
             scopedSlots: { customRender: 'CertificationListName' }
           },
           {
             title: this.$t('listStatus'),
             align: 'left',
-            width: 536,
+            width: '20%',
             ellipsis: true,
             dataIndex: 'state_dictText'
           },
           {
             title: this.$t('creater'),
             align: 'left',
-            width: 260,
+            width: '20%',
             ellipsis: true,
             dataIndex: 'createBy'
           },

From 901eb60eaa0153c624770530e592d1553e9bcaad Mon Sep 17 00:00:00 2001
From: cuijiaming <1410452759@qq.com>
Date: Thu, 6 Apr 2023 12:08:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug67735=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AuthDummyInventoryInfoEOServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
index 1cbd1987d..b0132be73 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
@@ -1744,17 +1744,17 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
 				title = "*类别,*检验项目,*配置项,*WVTA ID," +
-						"*编号,*责任领域,交付物模板,*交付物类型,";
+						"*编号,*责任领域,*交付物类型,交付物模板,";
 			}else{
 				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
-						"*Number,*Responsible Field,Deliverable Template,*Deliverable Type,";
+						"*Number,*Responsible Field,*Deliverable Type,Deliverable Template,";
 			}
 			List<String> list = Arrays.asList(title.split(","));
 			int index = 0;
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				index = list.indexOf("*交付物类型") + 1;
+				index = list.indexOf("交付物模板") + 1;
 			}else{
-				index = list.indexOf("*Deliverable Type") + 1;
+				index = list.indexOf("Deliverable Template") + 1;
 			}
 
 			//创建临时文件夹