From 826354dbdd1b55fe77688824d00601738580c9e7 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 24 Oct 2022 17:40:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E9=93=BE=E6=8E=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 16 +++++++-------- .../components/modules/industryTemplate.vue | 20 +++++++++---------- .../components/modules/releaseStandard.vue | 6 +++--- .../components/modules/solicitOpinions.vue | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index ac203237e..a16ec2490 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -331,29 +331,29 @@ ], productionCarImplementTime: [ { - max: 100, - message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], newCarImplementTime: [ { - max: 100, - message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], issueTime: [ { - max: 100, - message: this.$t('releaseDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('releaseDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], implementCar: [ { - max: 100, - message: this.$t('implementationModel') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('implementationModel') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue index d265772bf..41b44678b 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -194,36 +194,36 @@ ], relatedAreasEn: [ { - max: 100, - message: this.$t('relatedFieldsEn') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('relatedFieldsEn') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], relatedAreasCn: [ { - max: 100, - message: this.$t('relatedFields') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('relatedFields') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], sourceCn: [ { - max: 100, - message: this.$t('source') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('source') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], sourceEn: [ { - max: 100, - message: this.$t('sourceEn') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('sourceEn') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], time: [ { - max: 100, - message: this.$t('date') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + max: 500, + message: this.$t('date') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue index 8fe91d578..35bf4c0d1 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue @@ -20,7 +20,7 @@ Date: Mon, 24 Oct 2022 18:06:46 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationReport/components/modules/defaultTemplate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index a16ec2490..a03fa0a4a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -115,7 +115,7 @@ :disabled="disabled" :placeholder="$t('PleaseSelect')+$t('status')" :type="'radio'" - :triggerChange="false" :dictCode="'state'"/> + :triggerChange="false" :dictCode="'fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4'"/> From 8ee8a95b04b373371b3592ebd5b90d029c999d59 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 25 Oct 2022 13:47:18 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 94 +++++++++++++------ .../src/components/tableCollection/index1.vue | 80 +++++++++++----- .../components/comparisonResults.vue | 15 ++- 3 files changed, 129 insertions(+), 60 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index cc605e642..a567b381f 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -19,12 +19,16 @@ {{ text }} + + {{text}} +
- + {{ item.db_field_txt }} {{$t('See')}}
- + {{$t('See')}} @@ -55,7 +59,7 @@ {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} + @click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} @@ -135,14 +139,14 @@ - - - - - - - - + + + + + + + +
- {{$t('preservation')}} + + {{$t('preservation')}} {{$t('cancel')}}
@@ -235,7 +240,7 @@ default: {}, require: true }, - description:'', + description: '', formInline: { type: Object, default: true @@ -300,7 +305,7 @@ indeterminate: false, columns: [], content: [], - confirmLoading:false, + confirmLoading: false, selectedRowKeys: [], selectedRowrowValue: [], dataSource: [], @@ -316,7 +321,7 @@ sdt: 0, // 工程接口人 dre: 0, // 填写人 areaVisible: false, - areaVisiblezr:false, + areaVisiblezr: false, form: {}, rules: { querySdt: [ @@ -342,13 +347,13 @@ xs: { span: 24 }, sm: { span: 7 } }, - queryParamQuery:{}, - queryParam:{}, + queryParamQuery: {}, + queryParam: {}, querySdtList: [], // 工程接口人 Dateline: {}, getquerySdtId: '', // 当前工程接口人的id areaVisibleView: false, // 查看配置得弹框 - seeVisibleView:false, + seeVisibleView: false, configDetail: {} // 查看配置得详细信息 } }, @@ -394,7 +399,7 @@ this.$emit('handlePreservation') this.getTableList() }, - onClickTitle(val){ + onClickTitle(val) { console.log(val) this.description = val.description this.seeVisibleView = true @@ -455,7 +460,11 @@ // 责任领域 保存 handleSubmitzr(record) { let _this = this - let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, } + let param = { + dutyTerritory: this.Dateline.queryzr, + ids: this.getquerySdtId, + paramsManifestId: this.$route.query.id + } this.$refs.ruleFormOne.validate(valid => { if (valid) { this.confirmLoading = true @@ -538,7 +547,7 @@ this.areaVisible = false this.$refs['ruleForm'].resetFields() }, - cancel(){ + cancel() { this.areaVisiblezr = false this.$refs['ruleFormOne'].resetFields() }, @@ -597,7 +606,7 @@ } getAction('/params/userTypeLog/queryCurrentType', query).then((res) => { if (res.success) { - this.queryParamQuery = {...this.queryParamQuery} + this.queryParamQuery = { ...this.queryParamQuery } if (res.result && res.result.userType) { if (!(result.some(val => val.value == res.result.userType))) { @@ -631,7 +640,7 @@ let params = { paramsManifestId: paramsManifestid, flag: '7', - userType:userType, + userType: userType } getAction(url, params).then((res) => { if (res.success) { @@ -662,25 +671,27 @@ dataIndex: res.db_field_name, align: 'center', // ellipsis: true, - fixed: res.click5?'left':'', + fixed: res.click5 ? 'left' : '', sorter: res.sort, width: 160 }) - console.log(res) this.columns[index].scopedSlots = { customRender: 'titleName' } - if(res.click1){ + if (res.db_field_name == 'nioNumber') { + this.columns[index].width = 100 + } + if (res.click1) { this.columns[index].scopedSlots = { customRender: 'operationzr' } } - if(res.click2){ + if (res.click2) { this.columns[index].scopedSlots = { customRender: 'ParameterDescription' } } - if(res.click3){ + if (res.click3) { this.columns[index].scopedSlots = { customRender: 'paramsNameDescription' } @@ -691,6 +702,12 @@ customRender: 'operationbtn' } } + if (res.db_field_name == 'paramsName') { + this.columns[index].width = 200 + this.columns[index].scopedSlots = { + customRender: 'paramsName' + } + } } }) this.columns = [...this.columns] @@ -707,7 +724,7 @@ let params = { paramsManifestId: this.$route.query.id, pageNo: this.pageNo, - pageSize: this.pageSize, + pageSize: this.pageSize // userTypes: this.currentPersonRole } let url @@ -812,7 +829,7 @@ // }) let tt = [] if (this.currentPersonRole !== 'dre') { - console.log(res.result.records,'res.result.records') + console.log(res.result.records, 'res.result.records') res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { @@ -912,6 +929,7 @@ border: none !important; padding: 0 !important; } + //::v-deep .ant-table-row:first-child { // background: #fff!important; // /*opacity: 0.9;*/ @@ -952,6 +970,7 @@ font-weight: 400; } } + .textfield { width: 100%; margin-bottom: 8px; @@ -981,6 +1000,19 @@ } } } + + .textName { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } \ No newline at end of file From 7978d74b757f01d1ef3317b16d66a4a89f3d0b8a Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Tue, 25 Oct 2022 14:07:54 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileCompareItemCommentServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index c3c39bd8a..2a5b0ced8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -393,7 +393,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl right_length ? i + left_length : i + right_length; } if (includeComments || StringUtils.isEmpty(selectIds)) { Row row = sheet.createRow(i); From dc38f9546f3d59fc97875d49a33f007cc5915864 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 25 Oct 2022 15:27:00 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 8 +++++-- .../components/modules/defaultTemplate.vue | 24 ++++++++++++------- .../components/modules/industryTemplate.vue | 24 ++++++++++++------- .../splitting/modules/SplitDetail.vue | 2 +- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 487daf815..f5588cdff 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -604,7 +604,7 @@ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } }, - tempSaveClick(){ + tempSaveClick() { }, submit(releaseStatus) { @@ -845,10 +845,14 @@ .box-input-index { width: calc(100% - 130px); display: inline-block; - height: 38px; + height: 48px; margin-right: 10px; } + /*::v-deep .box-input-index .ant-select-selection--multiple {*/ + /* height: 44px!important;*/ + /*}*/ + .itemOption { display: inline-block; width: 100%; diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index a03fa0a4a..1bca8ea51 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -9,10 +9,14 @@ :title="$t('title')">{{$t('title')}} - + + + + + @@ -24,10 +28,14 @@ :title="$t('englishTitle')">{{$t('englishTitle')}} - + + + + + diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue index 41b44678b..8fb6a1f6e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -9,10 +9,14 @@ :title="$t('title')">{{$t('title')}} - + + + + + @@ -24,10 +28,14 @@ :title="$t('englishTitle')">{{$t('englishTitle')}} - + + + + + diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 0c5a95218..043fd45b1 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -266,7 +266,7 @@ form: {}, rules: { name: [ - { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' }, + // { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' }, { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' } ], itemName: [ From 9013aceb9e249ea5b4ee488fb6ab08707b63944a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 25 Oct 2022 15:49:28 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5--?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8,=20?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E9=9D=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/report/entity/LawsMonthlyReportWriteEO.java | 2 +- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index 11892a582..3d91a9ccb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -122,7 +122,7 @@ public class LawsMonthlyReportWriteEO implements Serializable { /**状态*/ @Excel(name = "状态", width = 15) @ApiModelProperty(value = "状态") - @Dict(dicCode = "state") + @Dict(dicCode = "fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4") private java.lang.String state; /**用法*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index cb571424d..d2abd92d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -1050,10 +1050,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Tue, 25 Oct 2022 16:04:21 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E3=80=81=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=AF=BC=E5=87=BA=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...awsOpinionAssessmentResultEOServiceImpl.java | 13 +++++++++++-- ...EvaluationComplianceResultEOServiceImpl.java | 17 +++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index df0bd1d1a..8722fb974 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -191,14 +191,23 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl params) { String ids = (String)params.get("ids"); String cut = (String)params.get("cut"); + String lawsTechnologyEvaluationId = (String)params.get("lawsTechnologyEvaluationId"); + if(StringUtils.isEmpty(lawsTechnologyEvaluationId)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("法规技术评估id为空，请检查！"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("The lawsTechnologyEvaluationId is empty, please check!"); + } + } + LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = this.lawsTechnologyEvaluationEOService.queryById(lawsTechnologyEvaluationId); if(!StringUtils.isEmpty(ids)){ lawsTechnologyEvaluationComplianceResultEO.setIds(ids); @@ -187,12 +200,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){ title = "相关章节,问题说明,附件"; bottomTitle = "符合性结果："; - fileName = "评估结果" + ".xls"; + fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " 评估结果" + ".xls"; sheetName = "反馈结果"; }else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){ title = "Related section,Problem description,Accessory"; bottomTitle = "Compliance results:"; - fileName = "Evaluation results" + ".xls"; + fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " Evaluation results" + ".xls"; sheetName = "Feedback result"; } From 8c4f948a864956917a90d91682beeac73f638582 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 25 Oct 2022 16:24:27 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9D=A1=E6=AC=BE=E5=8F=B7=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 3 +++ .../split/service/impl/FileSplitItemsEOServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index aa02d7fe1..706a8ec55 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1203,3 +1203,6 @@ MODIFY COLUMN `content_en` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ALTER TABLE `laws_weilai`.`laws_monthly_report_write` MODIFY COLUMN `work_progress_cn` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'NIO工作进展中文' AFTER `content_en`, MODIFY COLUMN `work_progress_en` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'NIO工作进展英文' AFTER `work_progress_cn`; + +--文档拆分条款 条款号取消必填 2022-10-25 未同步生产环境 +UPDATE `laws_weilai`.`onl_cgform_field` SET `field_must_input` = '0' WHERE `id` = '0a455895498552bc709dff250b3364b1' \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index b7a5cb5fa..761fb4294 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -2653,7 +2653,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Tue, 25 Oct 2022 17:39:51 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 +- jero-web/src/components/tableCollection/index1.vue | 2 +- .../components/problemKnowledgeBaseAdd.vue | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index a567b381f..0f1cd2343 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -703,7 +703,7 @@ } } if (res.db_field_name == 'paramsName') { - this.columns[index].width = 200 + this.columns[index].width = 300 this.columns[index].scopedSlots = { customRender: 'paramsName' } diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index d966a7fad..24c653458 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -526,7 +526,7 @@ } } if (res.db_field_name == 'paramsName') { - this.columns[index].width = 200 + this.columns[index].width = 300 this.columns[index].ellipsis = false this.columns[index].scopedSlots = { customRender: 'paramsName' diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index f5588cdff..16acba02c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -849,9 +849,10 @@ margin-right: 10px; } - /*::v-deep .box-input-index .ant-select-selection--multiple {*/ - /* height: 44px!important;*/ - /*}*/ + ::v-deep .box-input-index .ant-select-selection--multiple::-webkit-scrollbar { + /*height: 52px!important;*/ + display: block; + } .itemOption { display: inline-block;