WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_third_stage' 到 'master'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!204
This commit is contained in:
高嵩
2022-10-25 22:12:01 +08:00
parent 5511ef9f48 853bceb72b
commit 625aa37f3d
16 changed files with 232 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+3
View File
@@ -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'
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+3 -1
View File
@@ -393,7 +393,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
cell.setCellStyle(cellStyle);
}
}
i = i + leftSplit.length;
int left_length = ObjectUtils.isEmpty(leftSplit) ? 0 : leftSplit.length;
int right_length = ObjectUtils.isEmpty(rightSplit) ? 0 : rightSplit.length;
i = left_length > right_length ? i + left_length : i + right_length;
}
if (includeComments || StringUtils.isEmpty(selectIds)) {
Row row = sheet.createRow(i);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+11 -2
View File
@@ -191,14 +191,23 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
this.disposeData(exportData,lawsOpinionAssessmentResultEO,cut);
String lawsOpinionGatherId = (String)params.get("lawsOpinionGatherId");
if(StringUtils.isEmpty(lawsOpinionGatherId)){
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
throw new JeroBootException("法规意见收集id为空，请检查！");
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
throw new JeroBootException("The lawsOpinionGatherId is empty, please check!");
}
}
LawsOpinionGatherEO lawsOpinionGatherEO = this.lawsOpinionGatherEOService.queryById(lawsOpinionGatherId);
String title = "";
String fileName = "";
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
title = "相关章节,问题/建议,理由,条款内容,附件,评估人,提出时间";
fileName = "评估结果" + ".xls";
fileName = lawsOpinionGatherEO.getSerialNumber() + " 评估结果" + ".xls";
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
title = "Related section,IssueOrSuggest,Reason,Item Content,Accessory,Evaluator,Submit Date";
fileName = "Evaluation results" + ".xls";
fileName = lawsOpinionGatherEO.getSerialNumber() + " Evaluation results" + ".xls";
}
OutputStream os = null;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
+15 -2
View File
@@ -11,11 +11,13 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.FileUtils;
import com.jero.common.util.oss.CosBootUtil;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
import com.jero.modules.lawsTechnologyEvaluation.enums.ComplianceResultEnum;
import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
import com.jero.modules.oss.entity.OSSFile;
@@ -64,6 +66,8 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService;
/**
* 保存
@@ -173,6 +177,15 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
Map<String, Object> 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";
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+1 -1
View File
@@ -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;
/**用法*/
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+4 -4
View File
@@ -1050,10 +1050,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
String year = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[0];
String mothNew = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[1];
int mothLast = Integer.valueOf(mothNew) + 1;
int mothLast = Integer.valueOf(mothNew) - 1;
//添加说明 2022/7/15 至 2022/8/14 期间发布的主要内容
String text = year + "/" + mothNew +"/15 至 "+year+"/"+mothLast+"/14期间发布的主要内容";
String text = year + "/" + mothLast +"/15 至 "+year+"/"+mothNew+"/14期间发布的主要内容";
WordUtil.exportWord(document, text, null, ParagraphAlignment.CENTER, 0, 11,
false, false, "Blue Sky Noto Regular",null,null,flag);
@@ -1113,7 +1113,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
String year = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[0];
String mothNew = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[1];
int mothLast = Integer.valueOf(mothNew) + 1;
int mothLast = Integer.valueOf(mothNew) - 1;
String moth = mothNew+"/"+year;
String mothNewEn = getMothEn(mothNew);
String mothLastEn = getMothEn(String.valueOf(mothLast));
@@ -1137,7 +1137,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
//添加说明 Update between July 15, 2022 and August 14, 2022
String text = "Update between "+mothNewEn+" 15,"+year+" and "+mothLastEn+" 14,"+year;
String text = "Update between "+mothLastEn+" 15,"+year+" and "+mothNewEn+" 14,"+year;
WordUtil.exportWord(document, text, null, ParagraphAlignment.CENTER, 0, 11,
false, false, "Blue Sky Noto Regular",null,null,flag);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+1 -1
View File
@@ -2653,7 +2653,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
for (int j = 0; j < headerArr.length; j++) {
// 条款号和输入框数字类型 列 设置单元格格式为文本
if ("*条款号".equals(headerArr[j]) || "*Item No.".equals(headerArr[j]) || FieldTypeEnum.TEXT_NUMBER.getValue().equals(headerTypeArr[j])) {
if ("条款号".equals(headerArr[j]) || "Item No.".equals(headerArr[j]) || FieldTypeEnum.TEXT_NUMBER.getValue().equals(headerTypeArr[j])) {
sheet.setDefaultColumnStyle(j, cellStyle);
}
row.createCell(j).setCellValue(headerArr[j]);
jero-web/src/components/tableCollection/index.vue
+63 -31
View File
@@ -19,12 +19,16 @@
<span slot="titleName" slot-scope="text,record" :title="text">
{{ text }}
</span>
<span slot="paramsName" slot-scope="text,record">
<span class="textName" :title="text">{{text}}</span>
</span>
<div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
<span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone" two-tone-color="#00B3BE" /></span>
<span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone"
two-tone-color="#00B3BE"/></span>
<span style='padding-right: 10px'>{{ item.db_field_txt }} </span>
<a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
</div>
<!-- {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
<!-- {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
<span slot="ParameterDescription" slot-scope="text,record" :title="text">
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
@@ -55,7 +59,7 @@
<span
v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'>
<span :title='record.dataValue'
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
</span>
<span v-else>
<span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
@@ -135,14 +139,14 @@
<a-row :gutter='24'>
<a-col :span='24'>
<a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
<!-- v-model="Dateline.querySdt">-->
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
<!-- v-model="Dateline.querySdt">-->
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
@input="handleInput('queryzr')"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
@@ -155,7 +159,8 @@
<div class="imports-footer">
<div class="imports-footer-wrap">
<a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
<a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">
{{$t('preservation')}}
</a-button>
<a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
</div>
@@ -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
}
</style>
<style>
.resize-table-th {
@@ -1001,7 +1033,7 @@
}
.rowClassRed {
background: #f3d9de ;
background: #f3d9de;
}
.rowClassRedYellow {
jero-web/src/components/tableCollection/index1.vue
+55 -25
View File
@@ -28,22 +28,25 @@
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
</span>
<!-- <span slot="operationbtn" slot-scope="record">-->
<!-- <span v-if='currentPersonRole === "homo"'>-->
<!--&lt;!&ndash; 认证工程师 &ndash;&gt;-->
<!-- <span-->
<!-- v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
<!--&lt;!&ndash; <span&ndash;&gt;-->
<!--&lt;!&ndash; @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<span slot="paramsName" slot-scope="text,record">
<span class="textName" :title="text">{{text}}</span>
</span>
<!-- <span slot="operationbtn" slot-scope="record">-->
<!-- <span v-if='currentPersonRole === "homo"'>-->
<!--&lt;!&ndash; 认证工程师 &ndash;&gt;-->
<!-- <span-->
<!-- v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
<!--&lt;!&ndash; <span&ndash;&gt;-->
<!--&lt;!&ndash; @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='text'/>
</span>
@@ -99,7 +102,8 @@
</div>
</a-modal>
<!-- 配置信息--->
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal">
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null"
@cancel="hideModal">
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -246,7 +250,7 @@
sdt: 0, // 工程接口人
dre: 0, // 填写人
areaVisible: false,
seeVisibleView:false,
seeVisibleView: false,
form: {},
rules: {
querySdt: [
@@ -293,7 +297,7 @@
return 'rowClassRed'
}
},
onClickTitle(val){
onClickTitle(val) {
console.log(val)
this.description = val.description
this.seeVisibleView = true
@@ -310,7 +314,7 @@
// this.$emit('handlePreservation')
this.getTableList()
},
hideModal(){
hideModal() {
this.areaVisibleView = false
},
// 查看配置详细信息
@@ -507,17 +511,27 @@
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
if(res.click2){
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].ellipsis = false
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
})
this.columns = [...this.columns]
@@ -532,8 +546,8 @@
let params = {
paramsManifestId: this.$route.query.id,
userTypes: this.currentPersonRole,
pageNo:this.pageNo,
pageSize:this.pageSize
pageNo: this.pageNo,
pageSize: this.pageSize
}
this.loading = true
this.$emit('listReset', '')
@@ -723,14 +737,16 @@
border: none !important;
padding: 0 !important;
}
::v-deep .ant-table-row:first-child {
background: #fff!important;
background: #fff !important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent!important;
background: transparent !important;
}
.textfield {
width: 100%;
margin-bottom: 8px;
@@ -759,6 +775,7 @@
font-weight: 400;
}
}
.content-text {
width: 100%;
display: flex;
@@ -791,6 +808,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
}
</style>
<style>
.resize-table-th {
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+7 -2
View File
@@ -604,7 +604,7 @@
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
tempSaveClick(){
tempSaveClick() {
},
submit(releaseStatus) {
@@ -845,10 +845,15 @@
.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::-webkit-scrollbar {
/*height: 52px!important;*/
display: block;
}
.itemOption {
display: inline-block;
width: 100%;
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+25 -17
View File
@@ -9,10 +9,14 @@
:title="$t('title')">{{$t('title')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleCn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleCn"
:placeholder="$t('PleaseEnter')+$t('title')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('title')"
v-model.trim="formInline.titleCn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleCn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('title')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -24,10 +28,14 @@
:title="$t('englishTitle')">{{$t('englishTitle')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleEn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleEn"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"
v-model.trim="formInline.titleEn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleEn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -115,7 +123,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'"/>
</a-form-model-item>
</div>
</a-col>
@@ -331,29 +339,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'
}
],
jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue
+26 -18
View File
@@ -9,10 +9,14 @@
:title="$t('title')">{{$t('title')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleCn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleCn"
:placeholder="$t('PleaseEnter')+$t('title')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('title')"
v-model.trim="formInline.titleCn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleCn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('title')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -24,10 +28,14 @@
:title="$t('englishTitle')">{{$t('englishTitle')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleEn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleEn"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"
v-model.trim="formInline.titleEn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleEn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -194,36 +202,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'
}
],
jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
+3 -3
View File
@@ -20,7 +20,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNumber'"
:rules="[{max: 100,message: $t('standardNo') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNo') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -37,7 +37,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNameCn'"
:rules="[{max: 100,message: $t('standardNameCn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNameCn') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -55,7 +55,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNameEn'"
:rules="[{max: 100,message: $t('standardNameEn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNameEn') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue
+3 -3
View File
@@ -20,7 +20,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.planNumberCn'"
:rules="[{max: 100,message: $t('planNoChinese') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('planNoChinese') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -37,7 +37,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNameCn'"
:rules="[{max: 100,message: $t('standardNameCn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNameCn') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -55,7 +55,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNameEn'"
:rules="[{max: 100,message: $t('standardNameEn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNameEn') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+1 -1
View File
@@ -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: [
jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
+11 -4
View File
@@ -60,7 +60,9 @@
<span style="cursor: pointer"
@click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
</div>
<div class="detail-content-header-content-rightOne" :title="$t('comparisonDifferenceComment')">
<div class="detail-content-header-content-rightOne"
:class="{'detail-content-header-content-rightOne-active':isDisplay}"
:title="$t('comparisonDifferenceComment')">
{{$t('comparisonDifferenceComment')}}
</div>
<div class="detail-content-header-content-right" v-if="!isDisplay">
@@ -567,6 +569,10 @@
white-space: nowrap;
}
.detail-content-header-content-rightOne-active {
border-right: none;
}
.detail-content-header-content-right {
width: 128px;
display: inline-block;
@@ -751,7 +757,7 @@
}
.detail-content-header-content-left-active {
width: 50% !important;
width: calc(50% - 130px) !important;
}
.detail-content-bottom-left-text {
@@ -761,7 +767,8 @@
.detail-content-bottom-right-text {
width: calc(50% - 256px);
}
.operator-text-text-text{
color: #00B3BE!important;
.operator-text-text-text {
color: #00B3BE !important;
}
</style>