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

jero-web/src/views/parameter/managementdetails/index.vue

@@ -101,8 +101,9 @@
         {{$t('CustomExport')}}
       </div>
       <!--        列表设置-->
+<!--      v-if="!this.$route.query.it"-->
       <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmClassName"
-                    placement="bottomRight" v-if="!this.$route.query.it">
+                    placement="bottomRight" >
         <template slot="title" id="popconfirmmize">
           <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
             <a-checkbox

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -272,11 +272,14 @@
           this.textColor(this.$t('listOfRegulations'))
           this.textTitle = this.$t('listOfRegulations')
         } else if (this.$route.query.type == '103') {
-          this.textColor(this.$t('taskList'))
+          // this.textColor(this.$t('taskList'))
-          this.textTitle = this.$t('taskList')
+          // this.textTitle = this.$t('taskList')
+          this.$router.push({
+              path:'/projectRegulationTasks',
+          })
         } else if (this.$route.query.type == '104') {
-          this.textColor(this.$t('nonConformance'))
+          // this.textColor(this.$t('nonConformance'))
-          this.textTitle = this.$t('nonConformance')
+          // this.textTitle = this.$t('nonConformance')
         } else if (this.$route.query.type == '105') {
           this.textColor(this.$t('TaskParameterCollection'))
           this.textTitle = this.$t('TaskParameterCollection')

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

@@ -269,8 +269,9 @@
               {{$t('CompulsoryWithdrawal')}}
             </div>
             <!--        列表设置-->
+<!--            v-if="!this.$route.query.it"-->
             <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmIndex"
-                          placement="bottomRight" v-if="!this.$route.query.it">
+                          placement="bottomRight" >
               <template slot="title" id="popconfirmmize">
                 <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
                   <a-checkbox

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

@@ -572,6 +572,12 @@
             value: 'wvtaId',
             text: 'WVTA ID'
           },
+          {
+            type: 'list_multi',
+            value: 'attestationTypeName',
+            text: this.$t('certificationType'),
+            dictCode: 'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
           {
             type: 'string',
             value: 'serialNumber',
@@ -593,7 +599,7 @@
             type: 'date',
             value: 'endTime',
             text: this.$t('closingDate')
-          }
+          },
         ],
         disabled: false,
         queryParamQuery: {},
@@ -665,21 +671,21 @@
             title: this.$t('configurationItem'),
             align: 'left',
             dataIndex: 'configItem',
-            width: 100,
+            width: 75,
             ellipsis: true
           },
           {
             title: this.$t('certificationType'),
             align: 'left',
             dataIndex: 'attestationTypeName',
-            width: 120,
+            width: 100,
             ellipsis: true
           },
           {
             title: 'WVTA ID',
             align: 'left',
             dataIndex: 'wvtaId',
-            width: 120,
+            width: 75,
             sorter: true,
             ellipsis: true
           },
@@ -687,7 +693,7 @@
             title: this.$t('standardNo'),
             align: 'left',
             dataIndex: 'serialNumber',
-            width: 180,
+            width: 150,
             ellipsis: true,
             sorter: true,
             scopedSlots: { customRender: 'serialNumber' }
@@ -696,7 +702,7 @@
             title: this.$t('areaOfResponsibility'),
             align: 'left',
             dataIndex: 'dutyTerritoryName',
-            width: 120,
+            width: 100,
             sorter: true,
             ellipsis: true
           },
@@ -704,7 +710,7 @@
             title: this.$t('engineeringInterfacePerson'),
             align: 'left',
             dataIndex: 'sdtName',
-            width: 120,
+            width: 90,
             sorter: true,
             ellipsis: true
           },
@@ -744,7 +750,7 @@
             title: this.$t('closingDate'),
             align: 'left',
             dataIndex: 'endTime',
-            width: 120,
+            width: 100,
             sorter: true,
             ellipsis: true
           },

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

@@ -143,9 +143,10 @@
           {{ $t('copy') }}
         </div>
         <!--        列表设置-->
+<!--        v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
         <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
                       placement="bottomRight"
-                      v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'">
+                      >
           <template slot="title" id="popconfirmmize">
             <div style="max-height:360px;overflow:scroll;overflow-x: auto;">
               <a-checkbox

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -335,7 +335,7 @@
             title: this.$t('certificationType'),
             align: 'left',
             dataIndex: 'attestationTypeName',
-            width: 180,
+            width: 100,
             ellipsis: true
           },
           {
@@ -343,7 +343,7 @@
             align: 'left',
             sorter: true,
             dataIndex: 'wvtaId',
-            width: 200,
+            width: 75,
             ellipsis: true
           },
           {
@@ -359,7 +359,7 @@
             title: this.$t('areaOfResponsibility'),
             align: 'left',
             dataIndex: 'dutyTerritoryName',
-            width: 200,
+            width: 150,
             sorter: true,
             ellipsis: true
           },