Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java

@@ -86,7 +86,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String inventoryAffirmStatus;
 
     @TableField(exist = false)
-    @Excel(name = "清单确认状态", width = 20)
+    // @Excel(name = "清单确认状态", width = 20)
     @ApiModelProperty(value = "清单确认状态名称")
     private String inventoryAffirmStatusName;//清单确认状态名称
 
@@ -96,7 +96,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "任务发布状态名称")
-    @Excel(name = "任务确认状态", width = 20)
+    // @Excel(name = "任务确认状态", width = 20)
     private String taskAffirmStatusName;//任务发布状态名称
 
     /**适用地区*/
@@ -274,7 +274,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String designRemark;
 
 	/**prehomo确认-交付物类型*/
-	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认")
+//	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认")
     @ApiModelProperty(value = "prehomo确认-1")
     ////@Dict(dicCode ="deliverable_template")
     private String prehomoDeliverableType;
@@ -289,7 +289,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     /**prehomo确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认")
+//    @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认")
     private String prehomoDeliverableTemplateName;
 
 	/**prehomo确认-发起人角色*/
@@ -305,7 +305,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoInitiatorId;
 
     /**prehomo确认-发起人名称*/
-    @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认")
+//    @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认")
     @TableField(exist = false)
     private String prehomoInitiatorName;
 
@@ -322,12 +322,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoDutyId;
 
     /**prehomo确认-责任人名称*/
-    @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认")
+//    @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认")
     @TableField(exist = false)
     private String prehomoDutyName;
 
 	/**prehomo确认-截止时间*/
-	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认")
+//	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "prehomo确认-截止时间")
@@ -337,7 +337,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoDueDateString;
 
     //prehomo确认-交付物说明
-    @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认")
+//    @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认")
     private String prehomoRemark;
 
 	/**验证符合性确认-交付物类型*/
@@ -488,12 +488,14 @@ public class ProjectLawsInventoryEO implements Serializable {
     @ApiModelProperty(value = "设计符合性确认-流程状态")
     private String designFlowStatus;
     @TableField(exist = false)
+    @Excel(name = "流程状态", width = 20,groupName = "设计符合性确认")
     private String designFlowStatusName;
 
     /**验证符合性确认-流程状态*/
     @ApiModelProperty(value = "验证符合性确认-流程状态")
     private String verifyFlowStatus;
     @TableField(exist = false)
+    @Excel(name = "流程状态", width = 20,groupName = "验证符合性确认")
     private String verifyFlowStatusName;
 
     /**验证符合性确认-流程实例id*/

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java

@@ -85,7 +85,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String inventoryAffirmStatus;
 
     @TableField(exist = false)
-    @Excel(name = "List Confirmation Status", width = 30)
+//    @Excel(name = "List Confirmation Status", width = 30)
     @ApiModelProperty(value = "清单确认状态名称")
     private String inventoryAffirmStatusName;//清单确认状态名称
 
@@ -95,7 +95,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "任务发布状态名称")
-    @Excel(name = "Task Confirmation Status", width = 30)
+//    @Excel(name = "Task Confirmation Status", width = 30)
     private String taskAffirmStatusName;//任务发布状态名称
 
     /**适用地区*/
@@ -245,7 +245,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String designRemark;
 
 	/**prehomo确认-交付物类型*/
-	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check")
+//	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check")
     @ApiModelProperty(value = "prehomo确认-1")
     @Dict(dicCode ="deliverable_template")
     private String prehomoDeliverableType;
@@ -256,7 +256,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
 
     /**prehomo确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check")
+//    @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check")
     private String prehomoDeliverableTemplateName;
 
 	/**prehomo确认-发起人角色*/
@@ -269,7 +269,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoInitiatorId;
 
     /**prehomo确认-发起人名称*/
-    @Excel(name = "Reviewer", width = 25,groupName = "Pre-homo Check")
+//    @Excel(name = "Reviewer", width = 25,groupName = "Pre-homo Check")
     @TableField(exist = false)
     private String prehomoInitiatorName;
 
@@ -283,12 +283,12 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoDutyId;
 
     /**prehomo确认-责任人名称*/
-    @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check")
+//    @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check")
     @TableField(exist = false)
     private String prehomoDutyName;
 
 	/**prehomo确认-截止时间*/
-	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check")
+//	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "prehomo确认-截止时间")
@@ -297,7 +297,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoDueDateString;
 
     //prehomo确认-交付物说明
-    @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check")
+//    @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check")
     private String prehomoRemark;
 
 	/**验证符合性确认-交付物类型*/
@@ -411,5 +411,14 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     @ApiModelProperty(value = "调取虚拟清单,虚拟清单中维护数据为空时,进行二次确认")
     private String flag;
 
+    /**设计符合性确认-流程状态*/
+    @TableField(exist = false)
+    @Excel(name = "Process Status", width = 25,groupName = "Design Compliance Check")
+    private String designFlowStatusName;
+
+    /**验证符合性确认-流程状态*/
+    @TableField(exist = false)
+    @Excel(name = "Process Status", width = 25,groupName = "Validation Compliance Check")
+    private String verifyFlowStatusName;
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -3732,11 +3732,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				projectLawsInventoryEO.setHomologationEngineerSubmitStatus(null);
 				projectLawsInventoryEO.setSendMsgFlag(null);
 				projectLawsInventoryEO.setSendMsgCurrentFlag(null);
-				projectLawsInventoryEO.setDesignDueDate(null);
+				// 2023-03-27 修改禅道67149问题，复制的时候将符合性流程的截至时间复制上。
+				/*projectLawsInventoryEO.setDesignDueDate(null);
 				projectLawsInventoryEO.setPrehomoDueDate(null);
-				projectLawsInventoryEO.setVerifyDueDate(null);
+				projectLawsInventoryEO.setVerifyDueDate(null);*/
 				projectLawsInventoryEO.setInventoryAffirmDueDate(null);
 				projectLawsInventoryEO.setTaskAffirmDueDate(null);
+				projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 
 				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
 				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
@@ -5143,6 +5146,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		//数据转换(文件名称,对应标准)
 		dataTransition(dataList, fileInfos,sysUserList,projectLawsInventoryEO);
 
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		this.dataDispose(dataList,currentUser,Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()),projectLawsInventoryEO.getCut());
 		OutputStream os = null;
 		try {
 			response.setContentType("application/force-download");

jero-web/src/common/lang/en-us.js

@@ -1713,5 +1713,6 @@ module.exports = {
   onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted',
   implementationDateTwo:'Implementation Date',
   reasonForReturn:'Reason For Return',
-  pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process'
+  pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process',
+  complianceReporting:'Compliance Reporting',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1812,6 +1812,7 @@ module.exports = {
   implementationrecords:'故障处置措施和应急响应实施记录',
   onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据',
   implementationDateTwo:'实施日期',
-  reasonForReturn:'Reason For Return',
+  reasonForReturn:'退回原因',
-  pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程'
+  pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程',
+  complianceReporting:'合规报告',
 }

jero-web/src/components/SelectedBy/index.vue

@@ -47,6 +47,10 @@
       title: {
         type: String,
         default: ''
+      },
+      isSingleChoice: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -98,6 +102,12 @@
         this.visibleTree = false
       },
       handleSubmit() {
+        if (this.isSingleChoice) {
+          if (this.userIds.length > 1) {
+            this.$message.warning(this.$t('onlyOnePersonCanBeSelected'))
+            return
+          }
+        }
         if (this.userIds && this.userIds.length > 0) {
           this.submitLoading = true
           this.$emit('SelectedByForm', this.userIds.join(','))
@@ -131,11 +141,13 @@
         this.confirmLoading = true
         postAction('sys/user/queryDepartUserTreeList', {
           departId: this.departId,
-          json: gData
+          json: gData,
+          flag:'1'
         }).then((res) => {
           this.confirmLoading = false
           if (res.success) {
             this.gData = res.result
+            this.gData = [...this.gData]
             this.defaultExpandedKeys = [this.departId]
             this.visibleTree = true
           } else {

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -399,7 +399,8 @@
     <uploadFile ref="uploadFile" :isMultiple="true" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
     <TaskListModel @TaskListModelList="transferListForm" ref="TaskListModelRef"/>
     <referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
-    <SelectedBy ref="SelectedByRef" :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
+    <SelectedBy ref="SelectedByRef" :isSingleChoice="true"
+                :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
     <viewFileModel ref="viewFileModelRef"/>
     <!--    <a-modal-->
     <!--      :title="listTitle"-->

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -502,6 +502,39 @@
         </a-row>
       </a-form-model>
     </a-modal>
+    <a-modal
+      :title="fileTitle"
+      :width="600"
+      :visible="visibleFile"
+      :maskClosable="false"
+      @cancel="visibleFile = false"
+    >
+      <template slot="footer">
+        <a-button key="back" @click="visibleFile = false">
+          {{ $t('cancel') }}
+        </a-button>
+      </template>
+      <a-table
+        class="table"
+        :columns="columnsFile"
+        :pagination="false"
+        :scroll="{x:500,y: 400}"
+        :data-source="dataSourceFile"
+        :loading="loading"
+      >
+        <span slot="fileOperation" slot-scope="record">
+           <a class="text" @click="pdfPreview(record)"
+              :disabled="record.fileSuffix == '.pdf' || record.fileSuffix == '.docx' || record.fileSuffix == '.doc'
+              || record.fileSuffix == '.jpg' || record.fileSuffix == '.png' || record.fileSuffix == '.gif'|| record.fileSuffix == '.jpeg'
+              || record.fileSuffix == '.xlsx' || record.fileSuffix == '.xls' ? false : true">
+                {{ $t('See') }}
+          </a>
+          <a class="text" @click="download(record)">
+                {{ $t('download') }}
+          </a>
+        </span>
+      </a-table>
+    </a-modal>
     <JLoading :loading="JLoading">{{ $t('dataLoading') }}</JLoading>
     <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
     <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
@@ -1357,7 +1390,7 @@
           this.$message.warning(this.$t('OnlyOneSelected'))
         } else {
           let serialNumber = this.selectedRowKeysList[0].serialNumber
-          downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('compliancereport') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') })
+          downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') })
         }
       },
 
@@ -2503,7 +2536,30 @@
       },
       viewFileClick(item) {
         this.$refs.viewFileModelRef.clickButtonToUpload(item)
-      }
+      },
+      pdfPreview(fileQuery) {
+        let fileName = fileQuery.fileName
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix == '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+        }
+      },
+      download(item) {
+        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
+      },
     }
   }
 </script>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue

@@ -88,7 +88,8 @@
     </a-form-model>
     <uploadFile ref="uploadFile"
                 @uploadSuccess="uploadSuccess"/>
-    <SelectedBy ref="SelectedByRef" :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
+    <SelectedBy ref="SelectedByRef" :isSingleChoice="true"
+                :title="$t('turnToDo')" @SelectedByForm="SelectedByForm"></SelectedBy>
   </div>
 </template>