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/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); 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"; } 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 {{ 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 @@ - - - - - - - - + + + + + + + + @@ -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 = 300 + 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