From 3c462393ac63e9efc429ef058dac01e467b976d6 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 3 Apr 2023 16:04:48 +0800 Subject: [PATCH 1/4] bug 67654 --- .../vehicleinformation/components/basicInformation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index d68f43ccd..d45d03b2c 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -305,7 +305,7 @@ import { message } from 'ant-design-vue' if(item.cpxh==null){ item.cpxh='' } - obj.value=item.ggpc+'-'+item.cpmc+'-'+item.cpxh + obj.value=item.cpdjbh+'-'+item.ggpc+'-'+item.cpxh this.selectList.push(obj) }) } From 01485dad2b743ea71893929d8793bfe231521f38 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 3 Apr 2023 16:07:14 +0800 Subject: [PATCH 2/4] bug 67654 --- .../upgradeactivityrecord/components/upgradetargetmodel.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index a40abd2ea..152728cd1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -343,7 +343,6 @@ export default { }, changeId(value, option) { - debugger this.$nextTick(() => { this.form = { ...this.form } this.$refs.ruleForm.validateField('bapc') From 0e848b2595ffed60e298d09421c9f1fcc420e7a1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 3 Apr 2023 16:37:52 +0800 Subject: [PATCH 3/4] bug 67654 --- .../components/upgradetargetmodel.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 152728cd1..86eac3fb6 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -187,6 +187,7 @@ export default { projectNameList2: [], selectListPc: [], selectListMb: [], + flag:'', rules: { babh: [ { required: true, message: this.$t('upgraderecordnumber') + this.$t('cannotEmpty'), trigger: 'blur' } @@ -277,9 +278,11 @@ export default { this.form.otaId = otaId postAction('/ota/otaBaSjSjmbcx/add', { otaId: otaId, ...this.form }).then(res => { if (res.code == 200) { + this.flag = 1 localStorage.setItem('otaId', res.result.otaId) this.$message.success(this.$t('SavedSuccessfully')) this.getData() + } }) } else { @@ -295,11 +298,17 @@ export default { // this.$refs.ruleForm.clearValidate('bapc') // }) // } - this.$refs.ruleForm.validate(valid => { - if (valid) { + // this.$refs.ruleForm.validate(valid => { + // if (valid) { + setTimeout(()=>{ + console.log(this.flag) + if(this.flag == 1){ this.$emit('basicInformationForm') } - }) + },1000) + + // } + // }) }, @@ -344,7 +353,7 @@ export default { }, changeId(value, option) { this.$nextTick(() => { - this.form = { ...this.form } + // this.form = { ...this.form } this.$refs.ruleForm.validateField('bapc') }) this.selectListPc.map(item => { From db54040f1a7789d82cda0aabe1cbd4eed04e25ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 3 Apr 2023 17:03:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentManage/library/docDetail/index.vue | 2 +- .../projectManagement/components/certificationList/index.vue | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 0a7af1fd7..dac92f625 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -1026,7 +1026,7 @@ } .TextInformation-box-box-text { - width: calc(25% - 20px); + width: calc(50% - 20px); margin-right: 20px; height: 36px; float: left; diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index e4b0bf2b9..407749f5e 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -258,6 +258,7 @@ ref="table" class="customizetable" :loading="loading" + :components="drag(columns,'columnsAll')" :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 300px)'}" rowKey="id" @@ -489,12 +490,14 @@ import SelectedBy from '@/components/SelectedBy/index' import referenceDeliverablesList from './components/referenceDeliverablesList' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import moment from 'moment' import { mapGetters } from 'vuex' export default { name: 'index', props: ['isDisplayNum'], + mixins: [ResizeColumnProvide, ResizeHeader], components: { globalAdvancedQuery, ImportFile,