diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index fe26a1264..6d9bbbb10 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -161,10 +161,35 @@ ...{{ $t('more') }} -
- - {{ $t('customize') }} -
+ + +
+ + {{ $t('customize') }} +
+
+ + + +
{{ $t('bringInRelevantPersonnel') }} @@ -862,6 +887,350 @@ }, queryParam: {}, fileTitle: '', + parkingList: [], + indeterminate: false, + checkAll: false, + disabled:false, + checkedList: ['serialNumber','title','operation'], + selectedValue:[], + customizeList: [ + { + sort: '1', + name: this.$t('standard'), + disabled:true, + headFieldCn:'编号', + headFieldEn:'Number', + field: 'serialNumber', + key: 1, + moduleFlag:'法规清单', + status:1, + }, + { + sort: '2', + disabled:true, + name: this.$t('title'), + headFieldCn:'标题', + headFieldEn:'title', + field: 'title', + key: 2, + moduleFlag:'法规清单', + status:2, + }, + { + sort: '', + name: this.$t('subtitle'), + headFieldCn:'子标题', + headFieldEn:'Sub-title', + field: 'subtitle', + key: 3, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('listConfirmationStatus'), + headFieldCn:'清单确认状态', + headFieldEn:'List Confirmation Status', + field: 'inventoryAffirmStatusName', + key: 4, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('taskAffirmStatus'), + headFieldCn:'任务确认状态', + headFieldEn:'Task Confirmation Status', + field: 'taskAffirmStatusName', + key: 5, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('zoneOfApplication'), + headFieldCn:'适用地区', + headFieldEn:'Area', + field: 'region_dictText', + key: 6, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('correspondingStandard'), + headFieldCn:'对应标准', + headFieldEn:'Compare EU/CN', + field: 'correspondingStandard', + key: 7, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('implementationCategory'), + headFieldCn:'实施类别', + headFieldEn:'Usage', + field: 'implementType_dictText', + key: 8, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('ImplementationDate'), + headFieldCn:'标准实施日期', + headFieldEn:'New Type Execution Date', + field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', + key: 9, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('vehicleInProductionDate'), + headFieldCn:'在产车实施日期', + headFieldEn:'New Vehicle Execution Date', + field: 'implementTime', + key: 10, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('certificationType'), + headFieldCn:'认证类型', + headFieldEn:'Certification Type', + field: 'attestationType_dictText', + key: 11, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('certificationLevel'), + headFieldCn:'认证级别', + headFieldEn:'Certification Level', + field: 'attestationRank_dictText', + key: 12, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('applicableSupplement'), + headFieldCn:'适用增补件', + headFieldEn:'Applicable Supplement', + field: 'applicableSupplement', + key: 13, + moduleFlag:'法规清单', + }, + { + sort: '', + name: 'WVTA ID', + headFieldCn:'WVTA ID', + headFieldEn:'WVTA ID', + field: 'wvtaId', + key: 14, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('areaOfResponsibility'), + headFieldCn:'责任领域', + headFieldEn:'Responsible Field', + field: 'dutyTerritory_dictText', + key: 15, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('regulatoryEngineer'), + headFieldCn:'法规工程师', + headFieldEn:'Regulation Engineer', + field: 'regulationOwnerName', + key: 16, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('certifiedEngineer'), + headFieldCn:'认证工程师', + headFieldEn:'Homo Engineer', + field: 'homologationEngineerName', + key: 17, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('engineeringInterfacePerson'), + headFieldCn:'工程接口人', + headFieldEn:'Eng. Interface', + field: 'engineeringInterfacePersonName', + key: 18, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('remarks'), + headFieldCn:'备注', + headFieldEn:'Comments', + field: 'remark', + key: 19, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Deliverables'), + headFieldCn:'交付物', + headFieldEn:'Deliverables', + field: 'designDeliverableTemplateName', + affirmFlag:'1', + key: 20, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Sponsor'), + headFieldCn:'发起人', + headFieldEn:'Creator', + field: 'designInitiatorName', + affirmFlag:'1', + key: 21, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'), + headFieldCn:'责任人', + headFieldEn:'Assignee', + field: 'designDutyName', + affirmFlag:'1', + key: 22, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'), + headFieldCn:'截止时间', + headFieldEn:'Due Date', + field: 'designDueDate', + affirmFlag:'1', + key: 23, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('descriptionDeliverables'), + headFieldCn:'交付物说明', + headFieldEn:'Instruction', + field: 'designRemark', + affirmFlag:'1', + key: 24, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('PrehomoConfirmation') + '/' + this.$t('Deliverables'), + headFieldCn:'交付物', + headFieldEn:'Deliverables', + field: 'prehomoDeliverableTemplateName', + affirmFlag:'2', + key: 25, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('PrehomoConfirmation') + '/' + this.$t('Sponsor'), + headFieldCn:'发起人', + headFieldEn:'Creator', + field: 'prehomoInitiatorName', + affirmFlag:'2', + key:26, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('PrehomoConfirmation') + '/' + this.$t('personLiable'), + headFieldCn:'责任人', + headFieldEn:'Assignee', + field: 'prehomoDutyName', + affirmFlag:'2', + key: 27, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('PrehomoConfirmation') + '/' + this.$t('TaskCutOffTime'), + headFieldCn:'截止时间', + headFieldEn:'Due Date', + field: 'prehomoDueDate', + affirmFlag:'2', + key: 28, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('PrehomoConfirmation') + '/' + this.$t('descriptionDeliverables'), + headFieldCn:'交付物说明', + headFieldEn:'Instruction', + field: 'prehomoRemark', + affirmFlag:'2', + key: 29, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Deliverables'), + headFieldCn:'交付物', + headFieldEn:'Deliverables', + field: 'verifyDeliverableTemplateName', + affirmFlag:'3', + key: 30, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Sponsor'), + headFieldCn:'发起人', + headFieldEn:'Creator', + field: 'verifyInitiatorName', + affirmFlag:'3', + key: 31, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'), + headFieldCn:'责任人', + headFieldEn:'Assignee', + field: 'verifyDutyName', + affirmFlag:'3', + key: 32, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'), + headFieldCn:'截止时间', + headFieldEn:'Due Date', + field: 'verifyDueDate', + affirmFlag:'3', + key: 33, + moduleFlag:'法规清单', + }, + { + sort: '', + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('descriptionDeliverables'), + headFieldCn:'交付物说明', + headFieldEn:'Instruction', + field: 'verifyRemark', + affirmFlag:'3', + key: 34, + moduleFlag:'法规清单', + }, + { + sort: '', + disabled:true, + name: this.$t('operation'), + headFieldCn:'操作', + headFieldEn:'Operation', + key: 35, + field:'operation', + moduleFlag:'法规清单', + status:2, + }, + ], url: { addModelList: '/project/projectLawsInventoryEO/queryPageDummy', queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory', @@ -1034,6 +1403,11 @@ // if (this.$route.query.studioEngineer == this.userInfo().id) { this.JLoading = true this.getHeader() + this.customizeList.forEach(item => { + if(item.field == 'serialNumber' || item.field == 'title' || item.field == 'operation'){ + this.disabled = true + } + }) // this.getAndUserId() this.getRoleByUserId(() => { this.getAndUserId() @@ -1602,7 +1976,9 @@ }) } }) - console.log(this.columnsAll) + this.columnsAll.forEach(item => { + this.checkedList.push(item.dataIndex) + }) this.loading = false this.JLoading = false } else { @@ -1676,6 +2052,44 @@ } }) }, + onCheckAllChange(e) { + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : []; + this.selectedValue = this.checkedList + this.indeterminate = false; + }, + onChange(){ + console.log(this.selectedValue,'console.log(this.selectedValue)') + this.selectedValue = this.checkedList + }, + handleSubmit(){ + let list = [] + let uniqueArray = this.selectedValue.filter((item, index, array) => { + return array.indexOf(item) === index + }) + uniqueArray.forEach(item => { + this.customizeList.forEach((val,index) => { + if(item == val.field){ + val.sort = index + 1 + list.push(val) + } + }) + }) + this.confirmLoading = true + let headCustomEOList = JSON.parse(JSON.stringify(list)) + let query ={ + headCustomEOList :headCustomEOList + } + postAction('head/headCustomEO/add', query).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.getHeader() + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + } + }) + }, getPersonnelList() { this.getList() }, @@ -2527,7 +2941,30 @@ color: #040B29; margin-bottom: 22px; } - + .customize-text{ + height: 1533px; + display: flex; + flex-direction: column; + align-items: flex-start; + } + .customize-text-title{ + font-size: 14px; + font-weight: 400; + color: #040B29; + margin-bottom: 22px; + } + .drawer-bootom-button { + position: absolute; + bottom: 0; + z-index: 100; + width: 100%; + border-top: 1px solid #e8e8e8; + padding: 10px 16px; + text-align: right; + left: 0; + background: #fff; + border-radius: 0 0 2px 2px; + } .itemModelComment { width: calc(100% - 64px); display: inline-block; @@ -2654,7 +3091,17 @@ .popconfirm .anticon-exclamation-circle { display: none !important; } + popconfirmmize { + z-index: 999; + } + .popconfirmmize .ant-popover-buttons { + display: none !important; + } + + .popconfirmmize .anticon-exclamation-circle { + display: none !important; + } //.popconfirm .ant-popover-inner-content{ // padding: 0px 16px; //}