From 2553d595c6559e2ab667263408bfbf84f41d6c9c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 1 Feb 2023 14:04:42 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=A4=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 459 +++++++++++++++++- 1 file changed, 453 insertions(+), 6 deletions(-) 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; //} From 03644065daca0f6e14155e17eb9e94a5535c4d93 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 1 Feb 2023 16:48:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 6d9bbbb10..3def79693 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -161,7 +161,7 @@ ...{{ $t('more') }}
- + -
+
{{ $t('customize') }}
@@ -868,6 +869,7 @@ isDisplay: true, selectedRowKeys: [], visible: false, + customizevisible: false, formInline: {}, rules: { inventoryAffirmDueDate: [ @@ -1976,9 +1978,16 @@ }) } }) - this.columnsAll.forEach(item => { - this.checkedList.push(item.dataIndex) + this.columnsAll.forEach((item) => { + if(item.children){ + item.children.forEach((val) => { + this.checkedList.push(item.dataIndex,val.dataIndex) + }) + }else { + this.checkedList.push(item.dataIndex) + } }) + console.log(this.checkedList) this.loading = false this.JLoading = false } else { @@ -2061,6 +2070,13 @@ console.log(this.selectedValue,'console.log(this.selectedValue)') this.selectedValue = this.checkedList }, + getcustomize(){ + console.log(11111) + this.customizevisible = true + }, + cancel(){ + this.customizevisible = false + }, handleSubmit(){ let list = [] let uniqueArray = this.selectedValue.filter((item, index, array) => { @@ -2083,10 +2099,12 @@ if (res.success) { this.confirmLoading = false this.$message.success(this.$t('OperationSuccessful')) + this.customizevisible = false this.getHeader() } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false + this.customizevisible = false } }) }, @@ -2948,6 +2966,7 @@ align-items: flex-start; } .customize-text-title{ + margin-left: 0; font-size: 14px; font-weight: 400; color: #040B29; From e5a2b3df4a50fa0ce739b897cb44fd1a92d99075 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 2 Feb 2023 13:56:36 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/listOfRegulations.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3def79693..89cd9dd7e 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -2064,14 +2064,12 @@ onCheckAllChange(e) { this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : []; this.selectedValue = this.checkedList - this.indeterminate = false; + this.indeterminate = false }, onChange(){ - console.log(this.selectedValue,'console.log(this.selectedValue)') this.selectedValue = this.checkedList }, getcustomize(){ - console.log(11111) this.customizevisible = true }, cancel(){ From 6bbe9b2fd79d3faca3fa65f07e1cdb3d002301b1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 3 Feb 2023 11:23:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 935 ++++++++++++++---- .../components/listOfRegulations.vue | 7 +- 2 files changed, 732 insertions(+), 210 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 63f07166b..348266d90 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -126,6 +126,33 @@ {{$t('batSetting')}}
+ + + +
+ + {{ $t('customize') }} +
+
{ + 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 + }) + } + }) + this.columnsAll.forEach((item) => { + if(item.children){ + item.children.forEach((val) => { + this.checkedList.push(item.dataIndex,val.dataIndex) + }) + }else { + this.checkedList.push(item.dataIndex) + } + }) + console.log(this.checkedList) + this.loading = false + this.JLoading = false + } else { + this.JLoading = false + this.loading = false + } + }) + }, getList() { let query = { ...this.queryParam, @@ -820,6 +1255,51 @@ } }) }, + onCheckAllChange(e) { + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : []; + this.selectedValue = this.checkedList + this.indeterminate = false + }, + onChange(){ + this.selectedValue = this.checkedList + }, + getcustomize(){ + this.customizevisible = true + }, + cancel(){ + this.customizevisible = false + }, + 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.customizevisible = false + this.getHeader() + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + this.customizevisible = false + } + }) + }, getPersonnelList() { this.getList() }, @@ -997,7 +1477,6 @@ display: flex; } } - .Virtual-detail-content { padding: 0 32px 0 32px; box-sizing: border-box; @@ -1017,7 +1496,31 @@ } } } - + .customize-text{ + height: 1533px; + display: flex; + flex-direction: column; + align-items: flex-start; + } + .customize-text-title{ + margin-left: 0; + 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; + } .box-title-text { line-height: 1.4; display: flex; @@ -1160,6 +1663,30 @@ font-weight: bold!important; } +