diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index b45ceda41..6adca19af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -17,10 +17,7 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -871,25 +868,38 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId); int startRow = 63; for (OtaBaCxSjmk sjmk : sjmkList) { row = s.createRow(startRow); cell = row.createCell(0); + cell.setCellStyle(style); cell.setCellValue(sjmk.getBjmc()); cell = row.createCell(1); + cell.setCellStyle(style); cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(sjmk.getPzqk())); cell = row.createCell(2); + cell.setCellStyle(style); cell.setCellValue(sjmk.getKzqmc()); cell = row.createCell(3); + cell.setCellStyle(style); cell.setCellValue(sjmk.getYjggxh()); cell = row.createCell(4); + cell.setCellStyle(style); cell.setCellValue(sjmk.getYjscqy()); cell = row.createCell(5); + cell.setCellStyle(style); cell.setCellValue(sjmk.getRjbb()); cell = row.createCell(6); + cell.setCellStyle(style); cell.setCellValue(sjmk.getRjkfqy()); cell = row.createCell(7); + cell.setCellStyle(style); cell.setCellValue(sjmk.getBzwz()); startRow++; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 4deb3da19..946350682 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -20,10 +20,7 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -340,44 +337,65 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl mccsList = this.getByOtaId(otaId); Workbook wb = ImportFileUtil.readExcel(file); Sheet s = wb.getSheetAt(0); + CellStyle style = wb.createCellStyle(); + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); int startRow = 3; for (int i = 0; i < mccsList.size(); i++) { OtaBaCxKsjjsmccs mccs = mccsList.get(i); Row row = s.getRow(startRow); Cell cell = row.createCell(0); + cell.setCellStyle(style); cell.setCellValue(mccs.getGnmc()); cell = row.createCell(1); + cell.setCellStyle(style); cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(mccs.getPzqk())); cell = row.createCell(2); + cell.setCellStyle(style); cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj())); cell = row.createCell(3); + cell.setCellStyle(style); cell.setCellValue(ComparisonUtil.queryDictTextByKey("driving_automation_level", mccs.getJszdhjb(), sysDictService)); cell = row.createCell(4); + cell.setCellStyle(style); cell.setCellValue(mccs.getSjggcs()); cell = row.createCell(5); + cell.setCellStyle(style); cell.setCellValue(mccs.getGnms()); cell = row.createCell(6); + cell.setCellStyle(style); cell.setCellValue(mccs.getSytj()); cell = row.createCell(7); + cell.setCellStyle(style); cell.setCellValue(mccs.getKzqmc()); cell = row.createCell(8); + cell.setCellStyle(style); cell.setCellValue(mccs.getKzqscqy()); cell = row.createCell(9); + cell.setCellStyle(style); cell.setCellValue(mccs.getKzqxh()); cell = row.createCell(10); + cell.setCellStyle(style); cell.setCellValue(mccs.getYjbbxx()); cell = row.createCell(11); + cell.setCellStyle(style); cell.setCellValue(mccs.getRjkfqy()); cell = row.createCell(12); + cell.setCellStyle(style); cell.setCellValue(mccs.getCzxtbbh()); cell = row.createCell(13); + cell.setCellStyle(style); cell.setCellValue(mccs.getCsyzsj()); startRow++; } Row row = s.createRow(startRow); Cell cell = row.createCell(0); + cell.setCellStyle(style); cell.setCellValue("证明材料"); cell = row.createCell(1); + cell.setCellStyle(style); OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); if (ObjectUtils.isNotEmpty(otaBaCxList)) { StringBuilder sb = new StringBuilder(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index 4c389e199..c780fa0ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -20,10 +20,7 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -414,19 +411,28 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl mccsList = this.getByOtaId(otaId); Workbook wb = ImportFileUtil.readExcel(file); Sheet s = wb.getSheetAt(0); + CellStyle style = wb.createCellStyle(); + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); int startRow = 3; for (OtaBaCxKsjxtmccs mccs : mccsList) { Row row = s.getRow(startRow); Cell cell = row.createCell(0); + cell.setCellStyle(style); cell.setCellValue(mccs.getXtlb()); cell = row.createCell(1); + cell.setCellStyle(style); cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj())); cell = row.createCell(2); + cell.setCellStyle(style); cell.setCellValue(mccs.getSjbgcs()); cell = row.createCell(3); + cell.setCellStyle(style); StringBuilder sb = new StringBuilder(); String tptStr = mccs.getTpt(); if (StringUtils.isNotEmpty(tptStr)) { @@ -446,26 +452,37 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级的驾驶辅助功能与参数变化.xlsx")) { + if (f.getName().equals("本次升级的驾驶辅助功能名称与参数变化.xlsx")) { upFile = f; } } @@ -297,24 +294,36 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级涉及的目标车辆.xlsx")) { + if (f.getName().equals("本次升级的目标车辆.xlsx")) { upFile = f; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index f60660bda..54a126f67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -18,10 +18,8 @@ import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -199,7 +197,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级的系统名称与变更参数.xlsx")) { + if (f.getName().equals("本次升级的系统名称与参数变化.xlsx")) { upFile = f; } } @@ -290,34 +288,51 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl
-
- {{$t('VirtualListName')}} +
+ {{$t('marketRegulationList')}}
-
@@ -54,7 +54,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:'calc(100vh - 300px)'}" :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" @change="tableOnChange" @@ -119,12 +119,12 @@
* - {{$t('VirtualListName')}} + {{$t('marketRegulationList')}}
+ :placeholder="$t('PleaseEnter')+$t('marketRegulationList')"/>
@@ -180,12 +180,12 @@ name: [ { required: true, - message: this.$t('VirtualListName') + this.$t('cannotEmpty'), + message: this.$t('marketRegulationList') + this.$t('cannotEmpty'), trigger: 'blur' }, { max: 100, - message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('marketRegulationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'), trigger: 'blur' } ], @@ -218,7 +218,7 @@ title: this.$t('newlyAdded'), columns: [ { - title: this.$t('VirtualListName'), + title: this.$t('marketRegulationList'), align: 'left', dataIndex: 'name', width: '40', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index 6a2a843c1..b85422476 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -68,139 +68,140 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue index bc56236c8..7fecfbea3 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addCodeNumber.vue @@ -66,7 +66,7 @@ :scroll="{x: '100%',y:'calc(100vh - 300px)'}" :data-source="dataList" :pagination="false" - :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' ' , type:'radio'}" + :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}" :loading="loading">
@@ -204,7 +204,13 @@ }, onSelectChange(value, row) { this.selectedRowKeys = value + if (this.selectedRowKeys.length > 1) { + this.selectedRowKeys.shift() + } this.selectedRowList = row + if (this.selectedRowList.length > 1) { + this.selectedRowList.shift() + } }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index f9fa721ef..2a67fb149 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -33,10 +33,10 @@ @@ -87,6 +87,13 @@ dataIndex: 'studioEngineerName', align: 'left', ellipsis: true, + width: 140 + }, + { + title: this.$t('explain'), + dataIndex: 'explanation', + align: 'left', + ellipsis: true, width: 223 } ], diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue index e9c82a9db..2e7c52030 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue @@ -45,7 +45,7 @@ - {{ $t('modifyHistory') }} + {{ $t('history') }} * {{$t('cutoffTime')}} + :title="$t('deliveryDate')">{{$t('deliveryDate')}} + message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]"> * {{$t('cutoffTime')}} + :title="$t('deliveryDate')">{{$t('deliveryDate')}} + message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]">
-
- - 重置流程(数据迁移) -
+ + + +
@@ -291,11 +291,13 @@ {{text}} @@ -355,7 +358,8 @@ {{text}} @@ -776,7 +780,7 @@ ellipsis: true }, { - title: this.$t('TaskCutOffTime'), + title: this.$t('deliveryDate'), dataIndex: 'designDueDate', align: 'left', ellipsis: true, @@ -822,7 +826,7 @@ sorter: true }, { - title: this.$t('TaskCutOffTime'), + title: this.$t('deliveryDate'), dataIndex: 'verifyDueDate', align: 'left', ellipsis: true, @@ -1048,9 +1052,9 @@ }, { sort: '', - name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'), + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliveryDate'), headFieldCn: '截止时间', - headFieldEn: 'Due Date', + headFieldEn: 'Delivery Date', field: 'designDueDate', affirmFlag: '1', key: 23, @@ -1098,9 +1102,9 @@ }, { sort: '', - name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'), - headFieldCn: '截止时间', - headFieldEn: 'Due Date', + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliveryDate'), + headFieldCn: '交付日期', + headFieldEn: 'Delivery Date', field: 'verifyDueDate', affirmFlag: '3', key: 33, @@ -1118,7 +1122,7 @@ }, { sort: '', - name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'), + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('typeOfDeliverables'), headFieldCn: '交付物类型', headFieldEn: 'Deliverable Type', field: 'verifyDeliverableTypeName', @@ -1240,6 +1244,11 @@ key: 'List to be released', label: this.$t('listToBeReleased') }, + { + value: 'Regulatory engineer returns', + key: 'Regulatory engineer returns', + label: this.$t('regulatoryEngineerReturns') + }, { value: 'Duty Person Rejected', key: 'Duty Person Rejected', @@ -1296,6 +1305,11 @@ key: 'List to be released', label: this.$t('listToBeReleased') }, + { + value: 'Regulatory engineer returns', + key: 'Regulatory engineer returns', + label: this.$t('regulatoryEngineerReturns') + }, { value: 'Duty Person Rejected', key: 'Duty Person Rejected', @@ -1543,7 +1557,7 @@ designFlowStatusClick(row, name) { let query = {} let TaskKey = '' - if (name == this.$t('designComplianceReview')) { + if (name == this.$t('designComplianceProcess')) { if (row.designFlowStatus == 'Task to be confirmed' || row.designFlowStatus == 'Duty Person Rejected') { TaskKey = 'zrrqr' } else if (row.designFlowStatus == 'Results to be submitted') { @@ -1749,9 +1763,9 @@ } } } - if (!isTrue){ - this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code,content[0]) - }else{ + if (!isTrue) { + this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code, content[0]) + } else { this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code) } } else { @@ -2369,7 +2383,7 @@ if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { for (let k = 0; k < this.columnsAll[j].children.length; k++) { for (let l = 0; l < this.column[i].children.length; l++) { - if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) { this.columnsAll[j].children[k] = this.column[i].children[l] } } @@ -2381,7 +2395,7 @@ if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { for (let k = 0; k < this.columnsAll[j].children.length; k++) { for (let l = 0; l < this.column[i].children.length; l++) { - if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) { this.columnsAll[j].children[k] = this.column[i].children[l] } } @@ -2475,7 +2489,10 @@ } } for (let i = 0; i < dataSource.length; i++) { - if (dataSource[i].verifyFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'List to be released') { + if (dataSource[i].verifyFlowStatus == 'List to be released' || + dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' || + dataSource[i].designFlowStatus == 'List to be released' || + dataSource[i].designFlowStatus == 'Regulatory engineer returns') { if (dataSource[i].regulationOwnerId) { this.detailedSuccessList.push(dataSource[i]) } else { @@ -2965,28 +2982,28 @@ download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) }, - profileClick() { - let _this = this - this.$confirm({ - width: 760, - content: _this.$t('NoteConfirmTheChange'), - onOk() { - let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - postAction('/project/projectLawsInventoryEO/resetFlowTemp', { - ids: idList.join(','), - projectLibraryId: _this.$route.query.id - }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) - } + // profileClick() { + // let _this = this + // this.$confirm({ + // width: 760, + // content: _this.$t('NoteConfirmTheChange'), + // onOk() { + // let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + // postAction('/project/projectLawsInventoryEO/resetFlowTemp', { + // ids: idList.join(','), + // projectLibraryId: _this.$route.query.id + // }).then((res) => { + // if (res.success) { + // _this.$message.success(_this.$t('OperationSuccessful')) + // _this.selectedRowKeys = [] + // _this.getList() + // } else { + // _this.$message.warning(_this.$t('operationFailed')) + // } + // }) + // } + // }) + // } } } diff --git a/jero-web/src/views/projectManagement/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/transferListvirtal.vue index 95e0ef863..eaf0451bb 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtal.vue @@ -2,7 +2,7 @@ {{textLoading}} - {{$t('referenceDeliverables')}} -
+ {{$t('referenceDeliverables')}} + @@ -87,6 +87,13 @@ dataIndex: 'studioEngineerName', align: 'left', ellipsis: true, + width: 140 + }, + { + title: this.$t('explain'), + dataIndex: 'explanation', + align: 'left', + ellipsis: true, width: 223 } ], @@ -151,6 +158,9 @@ }, onSelectChange(value) { this.selectedRowKeys = value + if (this.selectedRowKeys.length > 1) { + this.selectedRowKeys.shift() + } }, handleCancel() { this.visible = false diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index c2563a666..81e29ade2 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -2,8 +2,7 @@
- {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || $route.query.TaskKey - == 'dezrrtjjfw' + {{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'dezrrtjjfw' ? $t('personLiableConfirm'):$t('sponsorReview')}}
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index b08a13f0c..beb513a27 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -23,10 +23,10 @@
-
- {{$t('taskType')}} +
+ {{$t('ProcessType')}}
-
-
- {{$t('taskStatus')}} +
+ {{$t('ProcessStatus')}}
-
-
- {{$t('CertificationListName')}} +
+ {{$t('marketCertificationList')}}
-
@@ -114,12 +114,12 @@
* {{$t('CertificationListName')}} + :title="$t('marketCertificationList')">{{$t('marketCertificationList')}}
+ :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"/>
@@ -167,12 +167,12 @@ name: [ { required: true, - message: this.$t('CertificationListName') + this.$t('cannotEmpty'), + message: this.$t('marketCertificationList') + this.$t('cannotEmpty'), trigger: 'blur' }, { max: 100, - message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + message: this.$t('marketCertificationList') + this.$t('cannotExceed') + 100 + this.$t('Characters'), trigger: 'blur' } ], @@ -212,10 +212,10 @@ dataSource: [], columns: [ { - title: this.$t('CertificationListName'), + title: this.$t('marketCertificationList'), align: 'left', dataIndex: 'name', - width: '40%', + width: '40', ellipsis: true, scopedSlots: { customRender: 'CertificationListName' } },