Merge branch 'feature_dev_20230105_ZDYBT'

# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/customizeList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue

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

@@ -215,7 +215,7 @@
       <a-table
         ref="table"
         :components="drag(columns,'columnsAll')"
-        class="tableList"
+        class="customizetable"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%',y:'calc(100vh - 356px)'}"
@@ -510,7 +510,7 @@
         listTitle: '',
         orderBy: '1',
         orderByField: '',
-        columnsAll: [
+        column: [
           {
             title: this.$t('standard'),
             align: 'left',
@@ -798,6 +798,7 @@
             scopedSlots: { customRender: 'operationOne' }
           }
         ],
+        columnsAll:[],
         columnsFileAll: [
           {
             title: this.$t('deliverableTemplate'),
@@ -1032,6 +1033,7 @@
     mounted() {
       // if (this.$route.query.studioEngineer == this.userInfo().id) {
       this.JLoading = true
+      this.getHeader()
       // this.getAndUserId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
@@ -1523,6 +1525,9 @@
         this.selectedRowKeys = []
         this.getList()
       },
+      customizeListForm(val){
+        this.getHeader()
+      },
       transferListForm(id){
         this.$refs.transferListvirtalRef.transferModel(id)
       },
@@ -1554,6 +1559,58 @@
         }
         this.getList()
       },
+      getHeader(){
+        getAction('head/headCustomEO/list', {
+          moduleFlag:'法规清单'
+        }).then((res) => {
+          if (res.success) {
+            console.log(res.result)
+            if(res.result.length != 0){
+              this.columnsAll = res.result
+            }else{
+              this.columnsAll = this.column
+            }
+            this.columnsAll.forEach((item,index) => {
+              if(item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认'){
+                item.width = 180
+                item.align = 'left'
+                if(item.title == '操作'){
+                  item.scopedSlots = {
+                    customRender: 'operationOne'
+                  }
+                }else if(item.title == '编号'){
+                  item.sorter = true
+                  item.scopedSlots = {
+                    customRender: 'standard'
+                  }
+                }else if(item.title == '标题'){
+                  item.scopedSlots = {
+                    customRender: 'titleName'
+                  }
+                }
+                else if(item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' ||
+                  item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人'){
+                  item.sorter = true
+                }
+              }else {
+                delete item.dataIndex
+                delete item.fixed
+                item.children.forEach((val,index) => {
+                  val.width = 180
+                  val.align = 'left'
+                  val.ellipsis = true
+                })
+              }
+            })
+            console.log(this.columnsAll)
+            this.loading = false
+            this.JLoading = false
+          } else {
+            this.JLoading = false
+            this.loading = false
+          }
+        })
+      },
       getList() {
         let roleCode
         if (this.isDisplay) {
@@ -2269,7 +2326,7 @@
         })
       },
       customizeClick(){
-        this.$refs.customizeListRef.transferModel()
+        this.$refs.customizeListRef.transferModel(this.columnsAll)
       },
       bringInRelevantPersonnelClick() {
         let _this = this
@@ -2615,12 +2672,18 @@
     width: 100% !important;
   }
 
-  .tableList .ant-table-thead > tr > th {
-    padding: 0px 16px !important;
+  //.customizetable .ant-table-thead > tr > th {
+  //  height: 46px !important;
+    //padding: 8px 8px !important;
     //font-weight: bold;
     //background: #f3f6f6;
+  //}
+  .ant-table-row-cell-ellipsis{
+     padding: 0!important;
+  }
+  .second{
+    padding: 0!important;
   }
-
   //.tableList .ant-table-tbody > tr > td{
   //  color: #040B29 ;
   //}