From 4d950e242e6aaba67cb1f4dd95775b1f063df69c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 27 Mar 2023 15:11:54 +0800 Subject: [PATCH 1/2] bug67205 --- jero-web/src/components/uploadFileOta/file.vue | 12 +++++++++++- .../components/beupgradedonline.vue | 8 ++++---- .../components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradedonline.vue | 4 ++-- .../otamanagement/vehicleregistration/index.vue | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue index 510dc1a4c..d61721059 100644 --- a/jero-web/src/components/uploadFileOta/file.vue +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -88,6 +88,16 @@ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); console.log(file) this.fileTypeSatus = true + //根据格式拦截 + if(this.acceptcode){ + let fileNames = file.name.split('.') + let fileType = fileNames[fileNames.length - 1].toLocaleLowerCase() + let extList = this.acceptcode.split(',') + if (!extList.find((item) => item == fileType)) { + this.$message.error(this.$t('uploadOnly') + this.acceptcode + this.$t('type')) + return false + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded')) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 8cf9c9cf3..6d1537b41 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -50,13 +50,13 @@ - + - + - + @@ -103,7 +103,7 @@ {{$t('last')}} {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 66653b1ed..2690dc4a0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -47,7 +47,7 @@ {{$t('last')}} {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 9d3871bec..5f4f216e0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -32,7 +32,7 @@ - + @@ -99,7 +99,7 @@ {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index dd41cd958..84613bcec 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -104,7 +104,7 @@ {{ $t('datamaintenance') }}
- +
From fb45ce36c6a8d74a881d2001267b348884bb6570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 15:32:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=B8=8D=E7=AC=A6=E5=90=88=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA;=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88-=E4=B8=8D=E5=A1=AB=E5=86=99=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 3 ++- .../projectManagement/components/listOfRegulations.vue | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b64ce7989..4731695af 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1719,4 +1719,5 @@ module.exports = { note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification', format:'It supports doc/docx/pdf format and is less than 50M in size', cantTransferToYourself:"Can't transfer to yourself", + theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', } \ 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 1aa0154f3..3b05b3e70 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -77,7 +77,7 @@ module.exports = { yes: '是', not: '否', have:'有', - + notOnlyRz: '否', EnterValue: '请输入值', SavedQuery: '保存的查询', @@ -1821,4 +1821,5 @@ module.exports = { note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', format:'支持doc/docx/pdf格式,大小50M以内', cantTransferToYourself:"不能转办给自己", + theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 8053df156..ac361119e 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1528,7 +1528,7 @@ _this.selectedRowKeys = [] _this.getList() if (detailedWarningList && detailedWarningList.length > 0) { - this.promptInformation(detailedWarningList) + _this.promptInformation(detailedWarningList) } } else { _this.$message.warning(_this.$t('operationFailed')) @@ -2389,9 +2389,11 @@ _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } + } if (this.requestsNum == 0) { - _this.promptInformation(_this.detailedWarningList) + this.$message.warning(_this.$t('theDataYouInitiate')) + // _this.promptInformation(_this.detailedWarningList) this.JTextLoading = false } },