diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 18b50827b..6fca58452 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -390,7 +390,7 @@ module.exports = {
check: 'check',
enName: 'English name',
selectLeastOne: 'Please select at least one piece of data',
- selectFileType:'Please select a file type',
+ selectFileType: 'Please select a file type',
sureVerified: 'Are you sure this file is not verified?',
sureSynchronize: 'The file has not been verified. Are you sure you want to synchronize to the document library?',
UploadFile: 'Upload file',
@@ -591,70 +591,75 @@ module.exports = {
confirmationOfDesignConformity: 'Confirmation of design conformity',
Deliverables: 'Deliverables',
personLiable: 'person liable',
- PrehomoConfirmation:'Prehomo confirmation',
- verificationAndConformityconfirmation:'Verification and conformity confirmation',
- StandardImplementationDate:'Standard implementation date',
- regulatoryEngineer:'Regulatory Engineer',
- certifiedEngineer:'Certified Engineer',
- engineeringInterfacePerson:'Engineering interface person',
- typeOfDeliverables:'Type of deliverables',
- deliverableTemplate:'Deliverable template',
- entryName:'entry name',
- targetMarket:'target market',
- projectStatus:'Project status',
- StudioEngineer:'Studio engineer',
- CertificationTime:'Certification time',
- NTplatform:'NT platform',
- NPplatform:'NP platform',
- IPDInformation:'IPD information',
- certificationProgramInformation:'Certification program information',
- taskReleaseStatus:'Task release status',
- task:'task',
- TaskCutOffTime:'Task cut-off time',
- Transfer:'Transfer',
- CertificationDirectory:'Certification directory',
- TaskRequirements:'Task requirements',
- CertificationProgress:'Certification progress',
- CurrentProjectStatusEvaluation:'Current project status evaluation',
- NiONumber:'NiO number',
- ParameterName:'Parameter name',
- ParameterDescription:'Parameter description',
- Version:'Version',
- certificationProgramTime:'Certification program time',
- ArchitecturePlatform:'Architecture platform',
- ModelPlatform:'Model platform',
- ListOfRelevantPersonnel:'List of relevant personnel',
- DeliverableStatus:'Deliverable status',
- CurrentStatusOfTheProject:'Current status of the project',
- NonConformance:'Non conformance',
- listSubclauses:'list subclauses',
- fileType:'file type',
- view:'view',
- KMVSS_Table:'KMVSS Table',
- KMVSS_Article:'KMVSS Article',
- America:'America',
- Europe:'Europe',
- Japan_one:'Japan Attachment',
- Japan_two:'Japan Article',
- China:'China',
- onlyOnefileUploaded:'only one file can be uploaded',
- typeCannotUploaded:'this type of file cannot be uploaded',
- confirmWithdraw:'confirm Withdraw ?',
- OperationDetails:'Operation details',
- OperationTime:'Operation time',
- oneTableAdded:'only one table can be added',
- addATable:'please add a table',
- pleaseUploadSplitFile:'please upload split file',
- release:'release',
- confirmRelease:'confirm Release ?',
- UploadMost:'You can only upload 20 at most',
- FileUploadFailed:'File upload failed',
- FileUploadedSuccessfully:'File uploaded successfully',
- DeletedSuccessfully:'Deleted successfully',
- confirmCopy:'confirm Copy ?',
- DigitalPlatform:'Digital platform',
- dehicleDevelopmentPlan:'Vehicle development plan',
- certificationProgram:'certificationProgram',
- DocumentStandard:'Document standard',
- standardName:'标准名称',
+ PrehomoConfirmation: 'Prehomo confirmation',
+ verificationAndConformityconfirmation: 'Verification and conformity confirmation',
+ StandardImplementationDate: 'Standard implementation date',
+ regulatoryEngineer: 'Regulatory Engineer',
+ certifiedEngineer: 'Certified Engineer',
+ engineeringInterfacePerson: 'Engineering interface person',
+ typeOfDeliverables: 'Type of deliverables',
+ deliverableTemplate: 'Deliverable template',
+ entryName: 'entry name',
+ targetMarket: 'target market',
+ projectStatus: 'Project status',
+ StudioEngineer: 'Studio engineer',
+ CertificationTime: 'Certification time',
+ NTplatform: 'NT platform',
+ NPplatform: 'NP platform',
+ IPDInformation: 'IPD information',
+ certificationProgramInformation: 'Certification program information',
+ taskReleaseStatus: 'Task release status',
+ task: 'task',
+ TaskCutOffTime: 'Task cut-off time',
+ Transfer: 'Transfer',
+ CertificationDirectory: 'Certification directory',
+ TaskRequirements: 'Task requirements',
+ CertificationProgress: 'Certification progress',
+ CurrentProjectStatusEvaluation: 'Current project status evaluation',
+ NiONumber: 'NiO number',
+ ParameterName: 'Parameter name',
+ ParameterDescription: 'Parameter description',
+ Version: 'Version',
+ certificationProgramTime: 'Certification program time',
+ ArchitecturePlatform: 'Architecture platform',
+ ModelPlatform: 'Model platform',
+ ListOfRelevantPersonnel: 'List of relevant personnel',
+ DeliverableStatus: 'Deliverable status',
+ CurrentStatusOfTheProject: 'Current status of the project',
+ NonConformance: 'Non conformance',
+ listSubclauses: 'list subclauses',
+ fileType: 'file type',
+ view: 'view',
+ KMVSS_Table: 'KMVSS Table',
+ KMVSS_Article: 'KMVSS Article',
+ America: 'America',
+ Europe: 'Europe',
+ Japan_one: 'Japan Attachment',
+ Japan_two: 'Japan Article',
+ China: 'China',
+ onlyOnefileUploaded: 'only one file can be uploaded',
+ typeCannotUploaded: 'this type of file cannot be uploaded',
+ confirmWithdraw: 'confirm Withdraw ?',
+ OperationDetails: 'Operation details',
+ OperationTime: 'Operation time',
+ oneTableAdded: 'only one table can be added',
+ addATable: 'please add a table',
+ pleaseUploadSplitFile: 'please upload split file',
+ release: 'release',
+ confirmRelease: 'confirm Release ?',
+ UploadMost: 'You can only upload 20 at most',
+ FileUploadFailed: 'File upload failed',
+ FileUploadedSuccessfully: 'File uploaded successfully',
+ DeletedSuccessfully: 'Deleted successfully',
+ confirmCopy: 'confirm Copy ?',
+ DigitalPlatform: 'Digital platform',
+ dehicleDevelopmentPlan: 'Vehicle development plan',
+ certificationProgram: 'certificationProgram',
+ DocumentStandard: 'Document standard',
+ standardName: 'standard Name',
+ initiateListConfirmation: 'Initiate list confirmation',
+ initiateTaskConfirmation: 'Initiate task confirmation',
+ alteration: 'alteration',
+ fixedPlate: 'Fixed plate',
+ taskAffirmStatus: 'task Affirm Status'
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 1c8614f89..30582fcae 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -652,13 +652,18 @@ module.exports = {
release: '发布',
confirmRelease: '确认发布?',
UploadMost: '最多只能上传二十个',
- FileUploadFailed:'文件上传失败',
- FileUploadedSuccessfully:'文件上传成功',
- DeletedSuccessfully:'删除成功',
+ FileUploadFailed: '文件上传失败',
+ FileUploadedSuccessfully: '文件上传成功',
+ DeletedSuccessfully: '删除成功',
confirmCopy: '确定复制?',
- DigitalPlatform:'数字平台',
- dehicleDevelopmentPlan:'整车开发计划',
- certificationProgram:'认证计划',
- DocumentStandard:'文档标准',
- standardName:'Standard name',
+ DigitalPlatform: '数字平台',
+ dehicleDevelopmentPlan: '整车开发计划',
+ certificationProgram: '认证计划',
+ DocumentStandard: '文档标准',
+ standardName: '标准名称',
+ initiateListConfirmation: '发起清单确认',
+ initiateTaskConfirmation:'发起任务确认',
+ alteration:'变更',
+ fixedPlate:'定版',
+ taskAffirmStatus:'任务发布状态',
}
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index 6fc8dfb8d..ba142e0dc 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -222,6 +222,35 @@
+
+
+
+
+ {{$t('See')}}
+
+
+ {{$t('download')}}
+
+
+ {{$t('StandardBreakdown')}}
+
+
+
+
@@ -241,15 +270,31 @@
getInfo: 'document/bussDocumentLibraryEO/getInfoById',
list: 'log/bussLogEO/page'
},
+ visibleFile: false,
columnsRelated: [
{
- title: '标准名称',
+ title: this.$t('standardName'),
dataIndex: 'title',
align: 'center',
ellipsis: true,
scopedSlots: { customRender: 'operation' }
}
],
+ columnsFile: [
+ {
+ title: this.$t('fileName'),
+ dataIndex: 'fileName',
+ align: 'center',
+ width: 260,
+ ellipsis: true
+ },
+ {
+ title: this.$t('operation'),
+ align: 'center',
+ width: 130,
+ scopedSlots: { customRender: 'fileOperation' }
+ }
+ ],
dataSourceRelated: [],
detailList: [],
visible: false,
@@ -261,6 +306,7 @@
pageSize: 10,
total: 0,
visibleRelated: false,
+ dataSourceFile: [],
columns: [
{
title: this.$t('ModificationContent'),
@@ -300,13 +346,15 @@
})
},
clickButtonToUpload(item) {
- this.$refs.uploadFile.perentHandleFunc()
- this.$refs.uploadFile.visible = true
+ this.loading = true
+ this.visibleFile = true
getAction('sys/common/getFileInfos', { id: item.join(',') }).then((res) => {
if (res.success) {
- this.$refs.uploadFile.perentHandleFunc(res.result)
+ this.dataSourceFile = res.result
+ this.loading = false
} else {
- this.$refs.uploadFile.perentHandleFunc()
+ this.dataSourceFile = []
+ this.loading = false
}
})
},
diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
index 50657c20c..c8413059e 100644
--- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
@@ -29,6 +29,10 @@
任务参数收集
+
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 011a4b79c..69be435f1 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -25,7 +25,7 @@
-
-
-
-
-
-
+
+
+
+ {{$t('initiateListConfirmation')}}
+
+
+
+ {{$t('initiateTaskConfirmation')}}
+
+
+
+ {{$t('alteration')}}
+
+
+
+ {{$t('fixedPlate')}}
+
-
+
-
-
+
+
@@ -104,6 +116,7 @@
import ImportFile from '@/components/ImportFile/index'
import listAddModel from './listAddModel'
import listEditModel from './listEditModel'
+ import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
export default {
name: 'listOfRegulations',
@@ -118,14 +131,17 @@
{
title: 'WVTA ID',
align: 'center',
- dataIndex: 'WVTAID',
+ dataIndex: 'wvtaId',
width: 100,
+ ellipsis: true,
fixed: 'left'
},
{
title: this.$t('standard'),
align: 'center',
- dataIndex: 'standard',
+ dataIndex: 'serialNumber',
+ width: 180,
+ ellipsis: true,
fixed: 'left'
},
{
@@ -133,6 +149,7 @@
align: 'center',
dataIndex: 'title',
width: 100,
+ ellipsis: true,
fixed: 'left'
},
{
@@ -140,84 +157,102 @@
align: 'center',
dataIndex: 'subtitle',
width: 100,
+ ellipsis: true,
fixed: 'left'
},
- {
- title: this.$t('taskReleaseStatus'),
- align: 'center',
- dataIndex: 'taskReleaseStatus'
- },
+ // {
+ // title: this.$t('taskReleaseStatus'),
+ // align: 'center',
+ // dataIndex: 'taskReleaseStatus'
+ // },
{
title: this.$t('correspondingStandard'),
align: 'center',
+ ellipsis: true,
dataIndex: 'correspondingStandard'
},
{
title: this.$t('implementationCategory'),
align: 'center',
- dataIndex: 'implementationCategory'
+ ellipsis: true,
+ dataIndex: 'implementType'
},
{
title: this.$t('ImplementationDate'),
align: 'center',
- dataIndex: 'ImplementationDate'
+ ellipsis: true,
+ dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1'
},
{
title: this.$t('vehicleInProductionDate'),
align: 'center',
- dataIndex: 'vehicleInProductionDate'
+ ellipsis: true,
+ dataIndex: 'implementTime'
},
{
title: this.$t('certificationType'),
align: 'center',
- dataIndex: 'certificationType'
+ ellipsis: true,
+ dataIndex: 'attestationType_dictText'
},
{
title: this.$t('certificationLevel'),
align: 'center',
- dataIndex: 'certificationLevel'
+ ellipsis: true,
+ dataIndex: 'attestationRank_dictText'
},
+ //
{
title: this.$t('areaOfResponsibility'),
align: 'center',
- dataIndex: 'areaOfResponsibility'
+ ellipsis: true,
+ dataIndex: 'dutyTerritory_dictText'
},
{
title: this.$t('regulatoryEngineer'),
align: 'center',
- dataIndex: 'regulatoryEngineer'
+ ellipsis: true,
+ dataIndex: 'regulationOwnerName'
+ },
+ {
+ title: this.$t('certifiedEngineer'),
+ align: 'center',
+ ellipsis: true,
+ dataIndex: 'homologationEngineerName'
},
{
title: this.$t('engineeringInterfacePerson'),
align: 'center',
- dataIndex: 'engineeringInterfacePerson'
+ ellipsis: true,
+ dataIndex: 'engineeringInterfacePersonName'
},
{
title: this.$t('remarks'),
align: 'center',
- dataIndex: 'remarks'
+ ellipsis: true,
+ dataIndex: 'remark'
},
{
title: this.$t('confirmationOfDesignConformity'),
children: [
{
- title: this.$t('task'),
- dataIndex: 'task',
+ title: this.$t('Deliverables'),
+ dataIndex: 'designDeliverableTemplate',
align: 'center'
},
{
title: this.$t('Sponsor'),
- dataIndex: 'Sponsor',
+ dataIndex: 'designInitiator',
align: 'center'
},
{
title: this.$t('personLiable'),
- dataIndex: 'personLiable',
+ dataIndex: 'designDuty',
align: 'center'
},
{
title: this.$t('TaskCutOffTime'),
- dataIndex: 'TaskCutOffTime',
+ dataIndex: 'designDueDate',
align: 'center'
}
]
@@ -226,23 +261,23 @@
title: this.$t('PrehomoConfirmation'),
children: [
{
- title: this.$t('task'),
- dataIndex: 'task',
+ title: this.$t('Deliverables'),
+ dataIndex: 'prehomoDeliverableTemplate',
align: 'center'
},
{
title: this.$t('Sponsor'),
- dataIndex: 'Sponsor',
+ dataIndex: 'prehomoInitiator',
align: 'center'
},
{
title: this.$t('personLiable'),
- dataIndex: 'personLiable',
+ dataIndex: 'prehomoDuty',
align: 'center'
},
{
title: this.$t('TaskCutOffTime'),
- dataIndex: 'TaskCutOffTime',
+ dataIndex: 'prehomoDueDate',
align: 'center'
}
]
@@ -251,27 +286,33 @@
title: this.$t('verificationAndConformityconfirmation'),
children: [
{
- title: this.$t('task'),
- dataIndex: 'task',
+ title: this.$t('Deliverables'),
+ dataIndex: 'verifyDeliverableTemplate',
align: 'center'
},
{
title: this.$t('Sponsor'),
- dataIndex: 'Sponsor',
+ dataIndex: 'verifyInitiator',
align: 'center'
},
{
title: this.$t('personLiable'),
- dataIndex: 'personLiable',
+ dataIndex: 'verifyDuty',
align: 'center'
},
{
title: this.$t('TaskCutOffTime'),
- dataIndex: 'TaskCutOffTime',
+ dataIndex: 'verifyDueDate',
align: 'center'
}
]
},
+ {
+ title: this.$t('taskAffirmStatus'),
+ align: 'center',
+ ellipsis: true,
+ dataIndex: 'taskAffirmStatusName'
+ },
{
title: this.$t('operation'),
align: 'center',
@@ -282,12 +323,19 @@
],
selectedRowKeys: [],
queryParam: {},
- url: {},
+ url: {
+ list: '/project/projectLawsInventoryEO/list',
+ add: 'project/projectLawsInventoryEO/add',
+ edit: '/project/projectLawsInventoryEO/edit',
+ deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
+ deleteOne: '/project/projectLawsInventoryEO/delete'
+ },
loading: false,
dataSource: []
}
},
mounted() {
+ this.getList()
},
methods: {
handleModule() {
@@ -306,22 +354,70 @@
this.$refs.addModelRef.addModel()
},
handleDel() {
- this.$refs.editModelRef.editModel()
+ if (this.selectedRowKeys.length > 0) {
+ let _this = this
+ this.$confirm({
+ content: _this.$t('ConfirmBatchDeletion'),
+ onOk() {
+ let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+ deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.selectedRowKeys = []
+ _this.getList()
+ } else {
+ _this.$message.warning(_this.$t('operationFailed'))
+ }
+ })
+ }
+ })
+ } else {
+ this.$message.warning(this.$t('selectLeastOne'))
+ }
},
- edit() {
-
+ edit(item) {
+ this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
},
- deleteLib() {
-
+ deleteLib(val) {
+ let _this = this
+ this.$confirm({
+ content: _this.$t('ConfirmDelete'),
+ onOk() {
+ deleteAction(_this.url.deleteOne, { id: val.id }).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.getList()
+ } else {
+ _this.$message.warning(_this.$t('operationFailed'))
+ }
+ })
+ }
+ })
},
- onSelectChange() {
-
+ onSelectChange(value) {
+ this.selectedRowKeys = value
},
searchQuery() {
-
+ this.getList()
},
searchReset() {
-
+ this.queryParam = {}
+ this.getList()
+ },
+ getList() {
+ let query = {
+ ...this.queryParam,
+ projectLibraryId: this.$route.query.id
+ }
+ this.loading = true
+ getAction(this.url.list, query).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result
+ this.loading = false
+ } else {
+ this.loading = false
+ }
+ })
}
}
}
@@ -398,15 +494,14 @@
}
.title-text {
- width: 20%;
- min-width: 110px;
+ width: 32px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
- text-align: right;
+ text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;