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

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

@@ -1724,7 +1724,7 @@ module.exports = {
   cantTransferToYourself:"Can't transfer to yourself",
   theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
   dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
-  reasonForReturnOfDesignCompliance:'Reason for compliance return',
+  reasonForReturnOfDesignCompliance:'Reason for the return by the regulation engineer',
   noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10',
   notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n',
   notethree:'Provide supporting materials',

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

@@ -1827,7 +1827,7 @@ module.exports = {
   notecsv: '注:支持CSV格式，大小20M以内',
   theDataYouInitiate: '您所选的数据，均不符合流程发起条件，请重新检查后发起',
   dataWithProcessReleasedCannotBeReset: '流程状态为清单待发布的数据不能被重置',
-  reasonForReturnOfDesignCompliance: '符合性退回原因',
+  reasonForReturnOfDesignCompliance: '法规工程师退回原因',
   notetwo: '\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
   notethree: '\n提供证明材料\n',
   verifyComplianceConfirmReturnReason: '验证符合性确认退回原因',

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

@@ -680,6 +680,7 @@
             align: 'left',
             dataIndex: 'wvtaId',
             width: 120,
+            sorter: true,
             ellipsis: true
           },
           {
@@ -696,6 +697,7 @@
             align: 'left',
             dataIndex: 'dutyTerritoryName',
             width: 120,
+            sorter: true,
             ellipsis: true
           },
           {
@@ -703,6 +705,7 @@
             align: 'left',
             dataIndex: 'sdtName',
             width: 120,
+            sorter: true,
             ellipsis: true
           },
           {
@@ -710,6 +713,7 @@
             align: 'left',
             dataIndex: 'dutyPersonName',
             width: 120,
+            sorter: true,
             ellipsis: true
           },
           {
@@ -780,6 +784,7 @@
             title: this.$t('CertificationProgress'),
             align: 'left',
             dataIndex: 'certificationProgress',
+            sorter: true,
             width: localStorage.getItem('language') == 'zh-cn' ? 180 : 200,
             ellipsis: true,
             scopedSlots: { customRender: 'CertificationProgress' }