diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index 6a991d9f1..508e746af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -38,7 +38,7 @@ public class ComparisonUtil { String newStr = parseDictText(ote, field, newClazz, sysDictService); String oldStr = parseDictText(ote, field, oldClazz, sysDictService); if (!newStr.equals(oldStr)) { - String content = "由" + title + "的" + oldStr + "改为" + newStr; + String content = "将" + title + "的'" + oldStr + "'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } @@ -56,7 +56,7 @@ public class ComparisonUtil { if (ObjectUtils.isEmpty(id)) { Field tableField = newObj.getClass().getDeclaredField(tableTitle); tableField.setAccessible(true); - String content = "新增了一条" + tableField.get(newObj).toString(); + String content = "新增了一条'" + tableField.get(newObj).toString() + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); Field[] fields = newObj.getClass().getDeclaredFields(); for (Field field : fields) { @@ -68,12 +68,12 @@ public class ComparisonUtil { title = ote.getValue(); field.setAccessible(true); Object newVal = field.get(newObj); - String newStr = "空"; + String newStr = ""; if (ObjectUtils.isNotEmpty(newVal)) { newStr = newVal.toString(); + content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'"; + resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } - content = "增加" + tableField.get(newObj).toString() + "中" + title + "为" + newStr; - resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } else { for (T oldObj : oldList) { @@ -105,7 +105,7 @@ public class ComparisonUtil { if (ObjectUtils.isNotEmpty(tableTitleObj)) { tableTitleObjStr = tableTitleObj.toString(); } - String content = "删除了" + tableTitleObjStr; + String content = "删除了'" + tableTitleObjStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } @@ -143,7 +143,7 @@ public class ComparisonUtil { newTitleStr = newTitleVal.toString(); } } - String content = newTitleStr + "的" + title + "由" + oldStr + "改为" + newStr; + String content = newTitleStr + "-" + title + "由'" + oldStr + "'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } catch (IllegalAccessException | NoSuchFieldException e) { diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ceb06b6ac..ed3137454 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -594,7 +594,7 @@ module.exports = { labelAreaDeleted: 'If it is deleted, All label items under the display area will be deleted', searchInResults: 'Search In Results', searchContent: 'Search Content', - viewFile: 'View File', + viewFile: 'View', fileFormatIncorrect: 'The file format is incorrect', pleaseUploadFile: 'Please upload the file', documentSplitList: 'Document Split List Display', @@ -1523,7 +1523,7 @@ module.exports = { VINcodeupload:'VIN code upload', Tasknode:'Task Node', Taskresponsibilityrecognition:'Task responsibility recognition', - uploadattachment:'Upload attachment', + uploadattachment:'Upload', Processhistory:'Process history', resultofhandling:'Result of handling', cause:'cause', @@ -1715,4 +1715,5 @@ module.exports = { reasonForReturn:'Reason For Return', pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process', complianceReporting:'Compliance Reporting', + youCanOnlySelectStatusClearSubmit:'You can only select data with a process status of Clear to Submit', } \ 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 9126f3501..4aac259d7 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1815,4 +1815,5 @@ module.exports = { reasonForReturn:'退回原因', pleaseFillInTheInformationTaskProcess:'请填写工程接口人和责任人信息后再发起任务流程', complianceReporting:'合规报告', + youCanOnlySelectStatusClearSubmit:'只能选择流程状态为清单待提交的数据', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index 5743d2c61..c3bed400a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -85,7 +85,7 @@ {{$t('cause') + (index+1)}} - @@ -137,10 +137,8 @@ {{$t('implementationrecords')}} - + @@ -362,7 +360,7 @@ export default { width: calc(100% - 130px); display: inline-block; margin-top: 2px; - height: 40px; + min-height: 40px; margin-bottom: 24px; } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 94d70de89..07f92fd14 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -210,7 +210,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjfzbh/exportData', - importZipUrl: '/ota/otaBaSjSjfzbh/importData',//导入 + importZipUrl: '/ota/otaBaSjSjfzbh/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index bdbaf46d0..161896a0e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -113,7 +113,7 @@ export default { formInline:{}, url: { exportData: '/ota/otaBaSjSjmbcl/exportData', - importZipUrl: '/ota/otaBaSjSjmbcl/importData',//导入 + importZipUrl: '/ota/otaBaSjSjmbcl/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 69ba8eaba..8a9ba250d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -246,7 +246,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjxtbh/exportData', - importZipUrl: '/ota/otaBaSjSjxtbh/importData',//导入 + importZipUrl: '/ota/otaBaSjSjxtbh/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index cba9b95c1..14424544b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -167,7 +167,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjyxpg/exportData', - importZipUrl: '/ota/otaBaSjSjyxpg/importData',//导入 + importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, loading: false, disable:false, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 586cc9396..28cdc7401 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -167,7 +167,7 @@ import ImportFile from '@/components/ImportFileData/index' }, url: { exportData: '/ota/otaBaSjSjmbcx/exportData', - importZipUrl: '/ota/otaBaSjSjmbcx/importData',//导入 + importZipUrl: '/ota/otaBaSjSjmbcx/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'], projectNameList2:[], diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 3e4680d34..7b7d6f0b2 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -192,7 +192,7 @@ export default { formInline:{}, url: { exportData: '/ota/otaBaSjGgnrfs/exportData', - importZipUrl: '/ota/otaBaSjGgnrfs/importData',//导入 + importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue index 24c13f9b2..76fc112de 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue @@ -53,7 +53,7 @@ class="table" :columns="columnshistory" :pagination="false" - :scroll="{x: '100%', y: 400}" + :scroll="{x: '100%', y: 'calc(100vh - 330px)'}" :data-source="dataSourcehistory" :loading="loading" > diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 8f5a15039..754c0b314 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -240,7 +240,7 @@ import { message } from 'ant-design-vue' formRules:[], url: { exportData: '/ota/otaBaCxJbxx/exportData', - importZipUrl: '/ota/otaBaCxJbxx/importData',//导入 + importZipUrl: '/ota/otaBaCxJbxx/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, form:{ cxmb:undefined, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 8e9e85708..5c9c59deb 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -125,7 +125,7 @@ import ImportFile from '@/components/ImportFileData/index' fileList:'', url: { exportData: '/ota/otaBaCxKsjjsmccs/exportData', - importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入 + importZipUrl: '/ota/otaBaCxKsjjsmccs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 277fe7021..0c2bb82ca 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -15,81 +15,81 @@
{{$t('componentname')}} - {{$t('networksecurityrequirements')}} +   {{$t('networksecurityrequirements')}} - {{$t('millimeterwaveradar')}} +   {{$t('millimeterwaveradar')}} - {{$t('ultrasonicradar')}} +   {{$t('ultrasonicradar')}} - {{$t('camera')}} +   {{$t('camera')}} - {{$t('asternimage')}} +   {{$t('asternimage')}} - {{$t('Monocularbinocularmultiocular')}} +   {{$t('Monocularbinocularmultiocular')}} - {{$t('driverattentionmonitoringsystem')}} +   {{$t('driverattentionmonitoringsystem')}} - {{$t('driversurveillancecamera')}} +   {{$t('driversurveillancecamera')}} - {{$t('drivermonitoringinfraredsensor')}} +   {{$t('drivermonitoringinfraredsensor')}} - {{$t('positioningandnavigationsystem')}} +   {{$t('positioningandnavigationsystem')}} - {{$t('vehiclesatellitepositioningequipment')}} +   {{$t('vehiclesatellitepositioningequipment')}} - {{$t('inertialnavigationsystem')}} +   {{$t('inertialnavigationsystem')}} - {{$t('wheelspeedmeter')}} +   {{$t('wheelspeedmeter')}} - {{$t('highprecisionmap')}} +   {{$t('highprecisionmap')}} - {{$t('electronicfence')}} +   {{$t('electronicfence')}} - {{$t('vehiclecommunicationsystem')}} +   {{$t('vehiclecommunicationsystem')}} - {{$t('signalingdevices')}} +   {{$t('signalingdevices')}} - {{$t('driverassistancefunctioncontrols')}} +   {{$t('driverassistancefunctioncontrols')}} - {{$t('drivingassistancefunctionindicatorsignaldevice')}} +   {{$t('drivingassistancefunctionindicatorsignaldevice')}} - {{$t('steerinwheelreleaseindicatorsignaldevice')}} +   {{$t('steerinwheelreleaseindicatorsignaldevice')}} - {{$t('driverattentionindicatorsignaldevice')}} +   {{$t('driverattentionindicatorsignaldevice')}} - {{$t('automaticDrivingDataRecordingSystem')}} +   {{$t('automaticDrivingDataRecordingSystem')}} - {{$t('eventdatarecordingsystem')}} +   {{$t('eventdatarecordingsystem')}}
@@ -212,7 +212,7 @@
{{$t('ParameterName')}} - {{item.ParameterName}} +   {{item.ParameterName}}
@@ -295,7 +295,7 @@ export default { radioList:9, url: { exportData: '/ota/otaBaCxJsfzbacs/exportData', - importZipUrl: '/ota/otaBaCxJsfzbacs/importData',//导入 + importZipUrl: '/ota/otaBaCxJsfzbacs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index a4de6370e..46b817dbf 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -63,7 +63,7 @@ import ImportFile from '@/components/ImportFileData/index' return { url: { exportData: '/ota/otaBaCxAqcs/exportData', - importZipUrl: '/ota/otaBaCxAqcs/importData',//导入 + importZipUrl: '/ota/otaBaCxAqcs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { @@ -202,8 +202,10 @@ import ImportFile from '@/components/ImportFileData/index' // this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs) this.dataSource[2].info= res.result.sjsbcs this.dataSource[3].info= res.result.xxaqjz + if(res.result.zmclList){ + console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile')) + } this.fileList.uploadName = res.result.zmclList - this.fileList.certifyingmaterials = this.$t('viewFile') this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) this.$forceUpdate() this.loading = false diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 5e3e7c5a2..d2ad38e2f 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -46,7 +46,7 @@ export default { return { url: { exportData: '/ota/otaBaCxZxsjyq/exportData', - importZipUrl: '/ota/otaBaCxZxsjyq/importData',//导入 + importZipUrl: '/ota/otaBaCxZxsjyq/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { @@ -221,12 +221,10 @@ export default { this.dataSource[7].relevantverification=Number(res.result.sjsbaq) this.dataSource[8].relevantverification=Number(res.result.sjgg) this.dataSource[9].relevantverification=Number(res.result.sjzt) + if(res.result.zmclList){ + console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile')) + } this.fileList.uploadName = res.result.zmclList - this.$nextTick(() => { - this.fileList.certifyingmaterials = this.$t('viewFile') - }) - this.fileList.certifyingmaterials = this.$t('viewFile') - console.log(this.fileList) this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) this.$forceUpdate() }) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 5121c9a8e..09b03809d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -120,7 +120,7 @@ import uploadFileOta from '@/components/uploadFileOta/file' return { url: { exportData: '/ota/otaBaCxKsjxtmccs/exportData', - importZipUrl: '/ota/otaBaCxKsjxtmccs/importData',//导入 + importZipUrl: '/ota/otaBaCxKsjxtmccs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, fileList:'', dataSource: [ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue index c91ca4f3b..503940a48 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue @@ -53,7 +53,7 @@ class="table" :columns="columnshistory" :pagination="false" - :scroll="{x: '100%', y: 400}" + :scroll="{x: '100%', y: 'calc(100vh - 330px)'}" :data-source="dataSourcehistory" :loading="loading" > diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index 285a5462e..c852df760 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -11,7 +11,7 @@ ref="table" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :columns="columns" > @@ -47,18 +47,21 @@ title: this.$t('OperationNode'), dataIndex: 'name', align: 'left', + ellipsis: true, width:200, }, { title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', + ellipsis: true, width:200, }, { title: this.$t('result'), dataIndex: 'approvalResult', align: 'left', + ellipsis: true, width:200, scopedSlots: { customRender: 'approvalResult' } }, @@ -66,6 +69,7 @@ title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'left', + ellipsis: true, width:200, }, { @@ -73,6 +77,7 @@ dataIndex: 'createTime', align: 'left', width:200, + ellipsis: true, customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index c0018a077..9496a5adc 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -11,11 +11,11 @@ :components="drag(columns,'columns')" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :columns="columns" > - + {{text}} @@ -49,18 +49,21 @@ title: this.$t('OperationNode'), dataIndex: 'name', align: 'left', + ellipsis: true, width: 470 }, { title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', + ellipsis: true, width: 270 }, { title: this.$t('result'), dataIndex: 'reviewResult', align: 'left', + ellipsis: true, scopedSlots: { customRender: 'reviewResult' }, width: 270 }, @@ -68,14 +71,15 @@ title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'left', + ellipsis: true, width: 270 }, { title: this.$t('operationTime'), dataIndex: 'createTime', align: 'left', + ellipsis: true, width: 200, - fixed: 'right' } ], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download' 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 642b23e65..4098e6e3b 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -88,7 +88,7 @@ align: 'left', ellipsis: true, width: 223 - }, + } ], dataList: [], content: [], @@ -96,7 +96,7 @@ pageNo: 1, pageSize: 10, total: 0, - ids:'', + ids: '' } }, mounted() { @@ -165,19 +165,27 @@ }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + if (res.result) { + this.$message.warning(res.result) + } else { + this.$message.success(this.$t('OperationSuccessful')) + } this.visible = false this.selectedRowKeys = [] this.$emit('referenceDeliverablesListForm') } else { - this.$message.warning(this.$t('operationFailed')) + if (res.result) { + this.$message.warning(res.result) + } else { + this.$message.warning(this.$t('operationFailed')) + } this.confirmLoading = false } }) } else { this.$message.warning(this.$t('selectLeastOne')) } - }, + } } } diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 463a8fa54..67c00adfe 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1379,7 +1379,19 @@ //引用交付物 referenceDeliverablesClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys))) + let isTrue + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { + isTrue = true + }else{ + isTrue = false + this.$message.warning(this.$t('youCanOnlySelectStatusClearSubmit')) + return + } + } + if (isTrue){ + this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } } else { this.$message.warning(this.$t('selectLeastOne')) } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ce68da751..da433c8e8 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1279,7 +1279,7 @@ isDisplay: false, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -1309,7 +1309,7 @@ flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', @@ -1685,13 +1685,23 @@ let _this = this let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let isTrue + let content = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - isTrue = true + content.push(this.dataSource[i]) } } } + for (let i = 0; i < content.length; i++) { + if (content[i].designFlowStatus == 'List to be released' && + content[i].verifyFlowStatus == 'List to be released') { + isTrue = false + + } else { + isTrue = true + } + } if (isTrue) { this.changeInterface(selectedRowKeys) } @@ -2559,7 +2569,7 @@ }, download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) - }, + } } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 9c6ba1c7d..c547327ad 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -242,7 +242,7 @@ isDisplay: false, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -310,7 +310,7 @@ flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 6440c1f4d..a4fdce5b5 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -30,9 +30,10 @@
@@ -104,7 +105,7 @@ title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', - width: 200, + width: 120, ellipsis: true }, { @@ -128,7 +129,7 @@ title: this.$t('resultofhandling'), dataIndex: 'operatorResultName', align: 'left', - width: 200, + width: 160, ellipsis: true, }, { @@ -246,6 +247,7 @@