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

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
wangzhijiang
2022-06-23 14:57:05 +08:00
parent ba05f52c00 35f60cc15f
commit 8302c5cfa3
22 changed files with 1224 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java
+10 -10
View File
@@ -11,16 +11,16 @@ import java.util.Map;
* @Date: Created in 15:51 2022/4/22
*/
public enum ControlTypeEnum {
TEXT("文本", "text","1"),
PULL_SINGLE("下拉单选","pull single","2"),
PULL_MORE("下拉多选","pull more","3"),
FILE("附件","file","4"),
TEXT_PULL_SINGLE("文本+下拉单选","text+pull single","5"),
TEXT_PULL_MORE("文本+下拉多选","text+pull more","6"),
TEXT_FILE("文本+附件","text+file","7"),
PULL_SINGLE_FILE("下拉单选+附件","pull single+file","8"),
PULL_MORE_FILE("下拉多选+附件","pull more+file","9"),
TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","text+pull single file","10");
TEXT("文本", "Text","1"),
PULL_SINGLE("下拉单选","Pull single","2"),
PULL_MORE("下拉多选","Pull more","3"),
FILE("附件","File","4"),
TEXT_PULL_SINGLE("文本+下拉单选","Text+Pull single","5"),
TEXT_PULL_MORE("文本+下拉多选","Text+Pull more","6"),
TEXT_FILE("文本+附件","Text+File","7"),
PULL_SINGLE_FILE("下拉单选+附件","Pull single+File","8"),
PULL_MORE_FILE("下拉多选+附件","Pull more+File","9"),
TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","Text+Pull single+File","10");
String name;
String enName;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
+9 -9
View File
@@ -11,15 +11,15 @@ import java.util.Map;
* @Date: Created in 15:58 2022/4/22
*/
public enum ControlVerifyEnum {
NULL("无","null","1"),
CHINESE("中文","chinese","2"),
POSITIVE_INTEGER("正整数","positive integer","3"),
POSITIVE_FLOAT("正浮点数","positive float","4"),
INTEGER_DECIMAL("整数或小数","integer decimal","5"),
DECIMAL_ONE("一位小数","decimal one","6"),
DECIMAL_TWO("两位小数","decimal two","7"),
DECIMAL_THREE("三位小数","decimal three","8"),
DECIMAL_FOUR("四位小数","decimal four","9");
NULL("无","Null","1"),
CHINESE("中文","Chinese","2"),
POSITIVE_INTEGER("正整数","Positive integer","3"),
POSITIVE_FLOAT("正浮点数","Positive float","4"),
INTEGER_DECIMAL("整数或小数","Integer decimal","5"),
DECIMAL_ONE("一位小数","Decimal one","6"),
DECIMAL_TWO("两位小数","Decimal two","7"),
DECIMAL_THREE("三位小数","Decimal three","8"),
DECIMAL_FOUR("四位小数","Decimal four","9");
String name;
String enName;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java
+2 -2
View File
@@ -11,8 +11,8 @@ import java.util.Map;
* @Date: Created in 11:20 2022/4/14
*/
public enum ParamsIsMustEnum {
YES("是","yes","1"),
NO("否","no","0");
YES("是","Yes","1"),
NO("否","No","0");
String name;
String enName;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+38 -26
View File
@@ -1072,24 +1072,28 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
Map<String, Object> resultMap = new HashMap<>();
// nio编号
String nioNumber = dto.getNioNumber();
resultMap = validateMustAndLength(nioNumber, "nio编号", "nio number", IsMustEnum.YES.getValue(),"15", false, cut);
resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO Number", IsMustEnum.YES.getValue(),"15", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
if (StringUtils.isNotEmpty(dto.getNioNumber())) {
// 校验nio编号 格式：字母数字横杠（-）
String nioNumberRegex = "^[A-Za-z0-9-]+$";
if (!nioNumber.matches(nioNumberRegex)) {
errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)";
if(CutEnum.CN.getValue().equals(cut)) {
errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)；";
} else {
errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-);";
}
countError++;
}
}
// 是否必填
String isMust = dto.getIsMust();
resultMap = validateMustAndLength(isMust, "是否必填", "is must", IsMustEnum.YES.getValue(), "50", false, cut);
resultMap = validateMustAndLength(isMust, "是否必填", "Is Must", IsMustEnum.YES.getValue(), "50", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(isMust,"是否必填","is must","enum",paramsIsMustEnumMap,null,null,cut);
resultMap = getCodeByName(isMust,"是否必填","Is Must","enum",paramsIsMustEnumMap,null,null,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
isMust = (String)resultMap.get("value");
@@ -1097,16 +1101,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 参数名称
String paramsName = dto.getParamsName();
resultMap = validateMustAndLength(paramsName, "参数名称", "params name", IsMustEnum.YES.getValue(), "30", false, cut);
resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(), "30", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
// 技术领域
String technologyTerritory = dto.getTechnologyTerritory();
resultMap = validateMustAndLength(technologyTerritory, "技术领域", "technology territory", IsMustEnum.YES.getValue(), "1000", false, cut);
resultMap = validateMustAndLength(technologyTerritory, "技术领域", "Technical Field", IsMustEnum.YES.getValue(), "1000", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(technologyTerritory,"技术领域", "technology territory","treeDicCode",null,treeNameList,categoryList,cut);
resultMap = getCodeByName(technologyTerritory,"技术领域", "Technical Field","treeDicCode",null,treeNameList,categoryList,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
technologyTerritory = (String)resultMap.get("value");
@@ -1114,10 +1118,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 参数批次
String paramsBatch = dto.getParamsBatch();
resultMap = validateMustAndLength(paramsBatch, "参数批次", "params batch", IsMustEnum.YES.getValue(), "50", true, cut);
resultMap = validateMustAndLength(paramsBatch, "参数批次", "Params Batch", IsMustEnum.YES.getValue(), "50", true, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(paramsBatch,"参数批次", "params batch", "dicCode",null,itemNameList,dictItemList,cut);
resultMap = getCodeByName(paramsBatch,"参数批次", "Params Batch", "dicCode",null,itemNameList,dictItemList,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
paramsBatch = (String)resultMap.get("value");
@@ -1125,10 +1129,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 责任领域
String dutyTerritory = dto.getDutyTerritory();
resultMap = validateMustAndLength(dutyTerritory, "责任领域", "duty territory", IsMustEnum.YES.getValue(), "50",true, cut);
resultMap = validateMustAndLength(dutyTerritory, "责任领域", "Duty Territory", IsMustEnum.YES.getValue(), "50",true, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(dutyTerritory,"责任领域", "duty territory", "dicCode",null,itemNameList,dictItemList,cut);
resultMap = getCodeByName(dutyTerritory,"责任领域", "Duty Territory", "dicCode",null,itemNameList,dictItemList,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
dutyTerritory = (String)resultMap.get("value");
@@ -1136,13 +1140,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 参数说明
String description = dto.getDescription();
resultMap = validateMustAndLength(description,"参数说明", "description", IsMustEnum.NO.getValue(),"200",false,cut);
resultMap = validateMustAndLength(description,"参数说明", "Description", IsMustEnum.NO.getValue(),"200",false,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
// 认证类别
// 来源：认证类别sheet页
resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "cert category", IsMustEnum.YES.getValue(), "1000", false, cut);
resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.YES.getValue(), "1000", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
dto.setCertCategory(nioCertCategoryMap.get(nioNumber));
@@ -1159,10 +1163,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 控件类型
String controlType = dto.getControlType();
resultMap = validateMustAndLength(controlType, "控件类型", "control type", IsMustEnum.YES.getValue(), "50", false, cut);
resultMap = validateMustAndLength(controlType, "控件类型", "Control Type", IsMustEnum.YES.getValue(), "50", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(controlType,"控件类型", "control type", "enum",controlTypeEnumMap,null,null,cut);
resultMap = getCodeByName(controlType,"控件类型", "Control Type", "enum",controlTypeEnumMap,null,null,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
controlType = (String)resultMap.get("value");
@@ -1177,9 +1181,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
resultMap = validateMustAndLength(controlValues, "控件备选值", "control values", IsMustEnum.YES.getValue(), "500", false, cut);
resultMap = validateMustAndLength(controlValues, "控件备选值", "Control Values", IsMustEnum.YES.getValue(), "500", false, cut);
} else {
resultMap = validateMustAndLength(controlValues, "控件备选值", "control values", IsMustEnum.NO.getValue(), "500", false, cut);
resultMap = validateMustAndLength(controlValues, "控件备选值", "Control Values", IsMustEnum.NO.getValue(), "500", false, cut);
}
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
@@ -1191,13 +1195,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)
|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
resultMap = validateMustAndLength(controlVerify, "控件校验", "control verify", IsMustEnum.YES.getValue(), "50", false, cut);
resultMap = validateMustAndLength(controlVerify, "控件校验", "Control Verify", IsMustEnum.YES.getValue(), "50", false, cut);
} else {
resultMap = validateMustAndLength(controlVerify, "控件校验", "control verify", IsMustEnum.NO.getValue(), "50", false, cut);
resultMap = validateMustAndLength(controlVerify, "控件校验", "Control Verify", IsMustEnum.NO.getValue(), "50", false, cut);
}
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
resultMap = getCodeByName(controlVerify,"控件校验", "control verify", "enum",controlVerifyEnumMap,null,null,cut);
resultMap = getCodeByName(controlVerify,"控件校验", "Control Verify", "enum",controlVerifyEnumMap,null,null,cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
controlVerify = (String)resultMap.get("value");
@@ -1267,7 +1271,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg = certCategory + " 第" + j + "行：";
} else {
errorMsg = j + " line：";
errorMsg = certCategory + " " + j + " line：";
}
Map<String, Object> resultMap = new HashMap<>();
@@ -1280,23 +1284,27 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// 校验nio编号 格式：字母数字横杠（-）
String nioNumberRegex = "^[A-Za-z0-9-]+$";
if (!nioNumber.matches(nioNumberRegex)) {
errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)";
if(CutEnum.CN.getValue().equals(cut)) {
errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)；";
} else {
errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-);";
}
countError++;
}
}
// 编号
String paramsNumber = ccDto.getParamsNumber();
resultMap = validateMustAndLength(paramsNumber, "编号", "number", IsMustEnum.YES.getValue(),"15", false, cut);
resultMap = validateMustAndLength(paramsNumber, "编号", "Number", IsMustEnum.YES.getValue(),"15", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
// 参数名称
String paramsName = ccDto.getParamsName();
resultMap = validateMustAndLength(paramsName, "参数名称", "params name", IsMustEnum.YES.getValue(),"30", false, cut);
resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(),"30", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
// 参数说明
String description = ccDto.getDescription();
resultMap = validateMustAndLength(description, "参数说明", "description", IsMustEnum.NO.getValue(),"200", false, cut);
resultMap = validateMustAndLength(description, "参数说明", "Description", IsMustEnum.NO.getValue(),"200", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
@@ -1311,7 +1319,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
.collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new));
if (ccDtoAfterDistinct.size() < certCategoryParamsInfoEOList.size()) {
stringMessage.add("导入数据中存在重复认证编号；");
if(CutEnum.CN.getValue().equals(cut)) {
stringMessage.add("导入数据中存在重复认证编号；");
} else {
stringMessage.add("Repeat number exist in the Import Data;");
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
+2 -2
View File
@@ -89,12 +89,12 @@ public class ParamsInfoEnExport {
private String certCategory;
/**控件类型*/
@Excel(name = "*Control Type", width = 15, replace = {"text_1","pull single_2","pull more_3","file_4","text+pull single_5","text+pull more_6","text+file_7","pull single+file_8","pull more+file_9","text+pull single+file_10"})
@Excel(name = "*Control Type", width = 15, replace = {"Text_1","Pull single_2","Pull more_3","File_4","Text+Pull single_5","Text+Pull more_6","Text+File_7","Pull single+File_8","Pull more+File_9","Text+Pull single+File_10"})
@ApiModelProperty(value = "控件类型")
private String controlType;
/**控件校验*/
@Excel(name = "Control Verify", width = 15, replace = {"null_1","chinese_2","positive integer_3","positive float_4","integer decimaL_5","decimal one_6","decimal two_7","decimal three_8","decimal four_9"})
@Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Positive integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"})
@ApiModelProperty(value = "控件校验")
private String controlVerify;
jero-web/src/common/lang/en-us.js
+53 -2
View File
@@ -74,7 +74,7 @@ module.exports = {
user: 'User',
numericalValue: 'Numerical Value',
not: 'No.',
notOnlyRz: 'no',
notOnlyRz: 'No',
EnterValue: 'Please Enter a Value',
SavedQuery: 'Saved Search',
NoQueriesSaved: 'No Queries Were Saved',
@@ -985,6 +985,19 @@ module.exports = {
primaryCoverageEn:'Primary coverage (En)',
workProgressCn:'NIO Work progress (Cn)',
workProgressEn:'NIO Work progress (En)',
initiatingProcess:'Initiating Process',
collectResults:'Collect results',
dateOfInitiation:'Date of initiation',
closingDate:'Closing date',
viewProcess:'View process',
evaluationResults:'Evaluation results',
Assessor:'Assessor',
collectionOfRegulatoryOpinions:'Collection Of Regulatory Opinions',
feedbackInformation:'Feedback Information',
relevantSections:'Relevant sections',
questionsSuggestions:'Questions or Suggestions',
reason:'Reason',
feedbackPoint:'Feedback point',
link:'Link',
// 上报库
Enable: 'Enable',
@@ -992,5 +1005,43 @@ module.exports = {
Exporthistory: 'Exporthistory',
Exporttype: 'Export Type',
Exporttime: 'Export Time',
file: 'File'
file: 'File',
// 中英修改-全局
Copysuccessful: 'Copy Successful',
Copyfailed: 'Copy Failed',
Synchronizedatabase: 'Synchronize the data of the selected row to the database?',
Aftersynchronization: 'After synchronization, the parameter items cannot be modified. Only the collection can be redistributed. The parameters have been updated',
FNumber: 'Number',
NNiONumber: 'NIO Number',
NRequired: 'Is Must',
NParameterName: 'Params Name',
NtechnicalField: 'Technical Field',
NparameterBatch: 'Params Batch',
NareaOfResponsibility: 'Duty Territory',
NParameterDescription: 'Description',
NcertificationCategory: 'Cert Category',
NcontrolType: 'Control Type',
NcontrolVerification: 'Control Verify',
NcontrolAlternatives: 'Control Values',
NattachmentTemplate: 'File Template',
Ntext: 'Text',
NDropdownradio: 'Pull single',
NDropdownmultipleselection: 'Pull more',
Nenclosure: 'File',
Atext: 'Text+Pull single',
Btext: 'Text+Pull more',
Ctext: 'Text+File',
Dtext: 'Pull single+File',
Etext:'Pull more+File',
Ftext: 'Text+Pull single+File',
Nnothing: 'Null',
Nchinese: 'Chinese',
NpositiveInteger: 'Positive integer',
NPositivefloatingpointnumber: 'Positive float',
NintegerOrDecimal: 'Integer decimal',
NOneDecimalPlace: 'Decimal one',
NTwoDecimalplaces: 'Decimal two',
NThreedecimalplaces: 'Decimal three',
NFourDecimalplaces: 'Decimal four',
yes: 'Yes',
}
jero-web/src/common/lang/zh-cn.js
+51 -1
View File
@@ -990,12 +990,62 @@ module.exports = {
primaryCoverageEn: '主要内容(英文)',
workProgressCn: 'NIO工作进展(中文)',
workProgressEn: 'NIO工作进展(英文)',
initiatingProcess: '发起流程',
collectResults: '收集结果',
dateOfInitiation: '发起日期',
closingDate: '截止日期',
viewProcess: '查看流程',
evaluationResults: '评估结果',
Assessor:'评估人',
collectionOfRegulatoryOpinions:'法规意见收集',
feedbackInformation:'反馈信息',
relevantSections:'相关章节',
questionsSuggestions:'问题/建议',
link: '链接',
reason:'附件',
feedbackPoint:'反馈点',
// 上报库
Enable: '启用',
Latestupdatetime: '最新更新时间',
Exporthistory: '导出历史',
Exporttype: '导出类型',
Exporttime: '导出时间',
file: '文件'
file: '文件',
// 中英修改-全局
Copysuccessful: '复制成功',
Copyfailed: '复制失败',
Synchronizedatabase: '是否同步选中行数据至上报库?',
Aftersynchronization: '同步后的参数项将不可修改,仅能重新下发收集,已更新参数',
FNumber: '账号',
NNiONumber: 'NIO编号',
NRequired: '是否必填',
NParameterName: '参数名称',
NtechnicalField: '技术领域',
NparameterBatch: '参数批次',
NareaOfResponsibility: '责任领域',
NParameterDescription: '参数说明',
NcertificationCategory: '认证类别',
NcontrolType: '控件类型',
NcontrolVerification: '控件校验',
NcontrolAlternatives: '控件备选值',
NattachmentTemplate: '附件模板',
Ntext: '文本',
NDropdownradio: '下拉单选',
NDropdownmultipleselection: '下拉多选',
Nenclosure: '附件',
Atext: '文本+下拉单选',
Btext: '文本+下拉多选',
Ctext: '文本+附件',
Dtext: '下拉单选+附件',
Etext:'下拉多选+附件',
Ftext: '文本+下拉单选+附件',
Nnothing: '无',
Nchinese: '中文',
NpositiveInteger: '正整数',
NPositivefloatingpointnumber: '正浮点数',
NintegerOrDecimal: '整数或小数',
NOneDecimalPlace: '一位小数',
NTwoDecimalplaces: '两位小数',
NThreedecimalplaces: '三位小数',
NFourDecimalplaces: '四位小数'
}
jero-web/src/components/AssignedBy/index.vue
+4 -4
View File
@@ -11,13 +11,13 @@
>
<a-row :gutter='24' style='margin-left: -66px'>
<a-col :span='9'>
<a-form-model-item ref='paramsTemplateName' :label="$t('fullName')" prop='paramsTemplateName'>
<a-form-model-item ref='paramsTemplateName' :label="$t('name')" prop='paramsTemplateName'>
<a-input
v-model='form.realname' />
</a-form-model-item>
</a-col>
<a-col :span='9'>
<a-form-model-item ref='paramsTemplateName' :label="$t('accountNumber')" prop='paramsTemplateName'>
<a-form-model-item ref='paramsTemplateName' :label="$t('FNumber')" prop='paramsTemplateName'>
<a-input
v-model='form.username' />
</a-form-model-item>
@@ -78,14 +78,14 @@ export default {
editId: '',
columns: [
{
title: this.$t('fullName'),
title: this.$t('name'),
dataIndex: 'realname',
key: 'showArea',
align: 'center',
ellipsis: true
},
{
title: this.$t('accountNumber'),
title: this.$t('FNumber'),
align: 'center',
dataIndex: 'username',
ellipsis: true
jero-web/src/components/SynchronousSubmissionLibrary/index.vue
+2 -2
View File
@@ -11,8 +11,8 @@
>
<a-row :gutter='24'>
<a-col :span='20'>
<div>是否同步选中行数据至上报库?</div>
<div>同步后的参数项将不可修改,仅能重新下发收集,已更新参数</div>
<div>{{ $t('Synchronizedatabase') }}</div>
<div>{{ $t('Aftersynchronization') }}</div>
</a-col>
</a-row>
</a-form-model>
jero-web/src/components/layouts/TabLayout.vue
+2
View File
@@ -92,6 +92,8 @@
this.$route.path == '/virtualListDetails' ||
this.$route.path == '/taskListProcess' ||
this.$route.path == '/ProjectDetails' ||
this.$route.path == '/regulatoryInitiatingProcess' ||
this.$route.path == '/regulatoryProcessReview' ||
this.$route.path == '/handshakeProcess' ||
this.$route.path == '/projectStatusAndProgress' ||
this.$route.path == '/TaskPlanList' ||
jero-web/src/components/tableCollection/index.vue
+35 -31
View File
@@ -55,7 +55,7 @@
>
<a-row :gutter='24'>
<a-col :span='24'>
<a-form-model-item ref='region' :label="$t('engineeringInterfacePerson')" prop='region'>
<a-form-model-item ref='region' :label="$t('engineeringInterfacePerson')" prop='querySdt'>
<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 ">
@@ -212,9 +212,9 @@
areaVisible: false,
form: {},
rules: {
// templatetitle: [
// { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
// ]
querySdt: [
{ required: true, message: this.$t('PleaseSelect')+this.$t('engineeringInterfacePerson'), trigger: 'blur' }
]
},
wrapperCol: {
xs: { span: 24 },
@@ -285,35 +285,39 @@
handleSubmit(record) {
let _this = this
let param = { sdt: this.Dateline.querySdt, ids: this.getquerySdtId }
axios({
url: '/jero-boot/params/collectManifest/updateSdt',
method: 'post',
data: param,
transformRequest: [function(data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token': _this.token
this.$refs.ruleForm.validate(valid => {
if (valid) {
axios({
url: '/jero-boot/params/collectManifest/updateSdt',
method: 'post',
data: param,
transformRequest: [function(data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token': _this.token
}
})
.then((res) => {
console.log(res)
if (res.data.success) {
_this.$message.success(res.data.result)
_this.areaVisible = false
this.getLoginUserType()
} else {
_this.$message.warning(res.data.result)
}
})
.catch((error) => {
console.log(error)
})
}
})
.then((res) => {
console.log(res)
if (res.data.success) {
_this.$message.success(res.data.result)
_this.areaVisible = false
this.getLoginUserType()
} else {
_this.$message.warning(res.data.result)
}
})
.catch((error) => {
console.log(error)
})
},
// 工程接口人 取消
cancleImports() {
jero-web/src/config/router.config.js
+10
View File
@@ -337,6 +337,11 @@ export const constantRouterMap = [
name: 'ProjectDetails',
component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index')
},
{
path: '/regulatoryInitiatingProcess',
name: 'initiatingProcess',
component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess')
},
// {
// path: '/ParameterItemCollection',
// name: 'ParameterItemCollection',
@@ -357,6 +362,11 @@ export const constantRouterMap = [
name: 'handshakeProcess',
component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/handshakeProcess/index')
},
{
path: '/regulatoryProcessReview',
name: 'regulatoryProcessReview',
component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/regulatoryProcess/index')
},
{
path: '/historicalVersion',
name: 'historicalVersion',
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+335
View File
@@ -0,0 +1,335 @@
<template>
<div id="examineBox">
<headerProcess
:title="title"
/>
<div class="detail-box">
<div class="detail-content" style="padding: 20px">
<div class="table-page-search-wrapper">
<search ref="searchRef"
:flag="'1'"
:url="url"/>
</div>
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%'}"
rowKey="id"
:data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
</a-table>
<div class="page" v-if="dataSource && dataSource.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
@change="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="closingDate">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('closingDate')"
@change="dateChange('closingDate')"
:getCalendarContainer="(trigger) => trigger.parentNode"
format="YYYY-MM-DD"
v-model="formInline['closingDate']"
style="width: 100%"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dreUserIdName">
<PersonnelSelection class="box-input"
:personneQuery="formInline"
:query="{db_field_name:'dreUserId',db_field_txt:$t('Assessor')}"
:isInput="true"
:isSingleChoice="true"
@change="PersonnelSelectionChange"
v-model="formInline.dreUserIdName"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('taskDescription')">{{$t('taskDescription')}}</span>
</div>
<a-form-model-item class="itemModel" prop="standard">
<a-textarea :placeholder="$t('pleaseEnter')+$t('taskDescription')"
v-model="formInline.approvalOpinion"
:rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
<a-form-model-item class="itemModel" prop="approvalFile">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('approvalFile')">
{{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
<footerProcess
@submit="submit"
:isSubmit="true"
/>
</div>
</div>
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
</div>
</template>
<script>
import headerProcess from '../../../processCenter/components/headerProcess'
import search from '@/components/search/index'
import uploadFile from '@/components/uploadFile/file'
import PersonnelSelection from '@/components/PersonnelSelection/index'
import footerProcess from '../../../processCenter/components/footerProcess'
import { getAction, postAction } from '@/api/manage'
import moment from 'moment'
export default {
name: 'initiatingProcess',
components: {
headerProcess,
search,
uploadFile,
footerProcess,
PersonnelSelection
},
data() {
return {
title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),
//url传参严格按照当前命名
url: {
seachList: 'document/bussDocumentLibraryEO/queryCondition' //搜索字段
},
loading: false,
dataSource: [],
selectedRowKeys: [],
total: 0,
pageSize: 10,
pageNo: 1,
formInline: {},
rules: {},
columns: [
{
title: this.$t('standard'),
align: 'center',
dataIndex: 'serial_number',
width: 170,
scopedSlots: { customRender: 'serial_number' }
},
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
width: 170,
scopedSlots: { customRender: 'titleName' }
},
{
title: this.$t('status'),
align: 'center',
width: 140,
ellipsis: true,
dataIndex: 'state'
},
{
title: this.$t('zoneOfApplication'),
align: 'center',
width: 170,
ellipsis: true,
dataIndex: 'region'
},
{
title: this.$t('technicalField'),
align: 'center',
ellipsis: true,
width: 170,
dataIndex: 'technology_territory'
},
{
title: this.$t('vehicleInProductionDate'),
align: 'center',
ellipsis: true,
width: 210,
dataIndex: 'implement_time'
},
{
title: this.$t('ImplementationDate'),
align: 'center',
ellipsis: true,
width: 210,
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
}
]
}
},
mounted() {
document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
},
methods: {
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
},
onSelectChange(value) {
this.selectedRowKeys = value
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
/** 上传文件的回调 */
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
attIdList.push(item.id || data.name)
})
}
/** 赋值给当前对应的表单文件 */
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
PersonnelSelectionChange(value, id) {
this.formInline[value] = id
this.formInline = { ...this.formInline }
},
dateChange(item) {
this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
},
submit() {
}
}
}
</script>
<style scoped>
.detail-box {
padding: 67px 0 0 0;
background: #ffffff;
height: 100%;
overflow: auto;
}
#examineBox {
display: flex;
flex-direction: column;
background: #fff;
position: relative;
height: 100%;
overflow-y: auto;
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text {
width: 88px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
color: #000F16;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
margin-bottom: 12px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
.formAdd {
margin-top: 20px;
}
.button-text {
height: 38px;
width: calc(100% - 100px);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
color: #00B3BE;
}
.page {
text-align: right;
margin-top: 20px;
}
</style>
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+253
View File
@@ -0,0 +1,253 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serialNumber"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('technicalField')">
<span>{{$t('technicalField')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('technicalField')"
v-model="queryParam.technicalField"></j-input>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('collectResults')">
<span>{{$t('collectResults')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('collectResults')"
v-model="queryParam.collectResults"></j-input>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<div @click="initiatingProcessClick" class="operator-text">
<a-icon type="apartment"/>
{{$t('initiatingProcess')}}
</div>
</div>
<div>
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%'}"
rowKey="id"
:data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
<a class="text-operation" @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
@change="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
</a-card>
</template>
<script>
export default {
name: 'index',
data() {
return {
//url传参严格按照当前命名
url: {
deleteBatch: ''
},
loading: false,
toggleSearchStatus: false,
dataSource: [],
selectedRowKeys: [],
total: 0,
pageSize: 10,
pageNo: 1,
queryParam: {},
columns: [
{
title: this.$t('standard'),
align: 'center',
dataIndex: 'serialNumber',
width: 170
},
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
width: 170
},
{
title: this.$t('technicalField'),
align: 'center',
width: 170,
ellipsis: true,
dataIndex: 'technology_territory'
},
{
title: this.$t('collectResults'),
align: 'center',
width: 170,
ellipsis: true,
dataIndex: 'collectResults'
},
{
title: this.$t('dateOfInitiation'),
align: 'center',
ellipsis: true,
width: 170,
dataIndex: 'dateOfInitiation'
},
{
title: this.$t('closingDate'),
align: 'center',
ellipsis: true,
width: 170,
dataIndex: 'closingDate'
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 180,
scopedSlots: { customRender: 'operation' }
}
]
}
},
mounted() {
},
methods: {
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
searchQuery() {
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
},
onSelectChange(value) {
this.selectedRowKeys = value
},
initiatingProcessClick() {
// let newUrl = this.$router.resolve({
// path: '/regulatoryInitiatingProcess'
// })
let newUrl = this.$router.resolve({
path: '/regulatoryProcessReview'
})
window.open(newUrl.href, '_blank')
},
viewProcessClick() {
},
evaluationResultsClick() {
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
.page {
text-align: right;
margin-top: 20px;
}
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
}
.title-text {
width: 20%;
min-width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-input {
display: inline-block;
width: 70%;
height: 38px;
margin-top: 2px;
}
.box-button {
height: 38px;
/*margin-top: 2px;*/
}
</style>
jero-web/src/views/parameter/parameterlist/components/addModel.vue
+48 -48
View File
@@ -17,13 +17,13 @@
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('NiONumber')">{{$t('NiONumber')}}</span>
:title="$t('NNiONumber')">{{$t('NNiONumber')}}</span>
</div>
<a-form-model-item class="itemModel" prop="nioNumber">
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.nioNumber"
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
:placeholder="$t('PleaseEnter')+$t('NNiONumber')"/>
</a-form-model-item>
</div>
</a-col>
@@ -31,10 +31,10 @@
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('Required')">{{$t('Required')}}</span>
<span class="title-text-text" :title="$t('NRequired')">{{$t('NRequired')}}</span>
</div>
<a-form-model-item class="itemModel" prop="isMust">
<a-select allowClear :placeholder="$t('PleaseSelect')+$t('Required')" v-model='formInline.isMust'>
<a-select allowClear :placeholder="$t('PleaseSelect')+$t('NRequired')" v-model='formInline.isMust'>
<a-select-option :key="'1'" :value="'1'">{{$t('yes')}}
</a-select-option>
<a-select-option :key="'0'" :value="'0'">{{$t('notOnlyRz')}}
@@ -50,13 +50,13 @@
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('ParameterName')">{{$t('ParameterName')}}</span>
:title="$t('NParameterName')">{{$t('NParameterName')}}</span>
</div>
<a-form-model-item class="itemModel" prop="paramsName">
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.paramsName"
:placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
:placeholder="$t('PleaseEnter')+$t('NParameterName')"/>
</a-form-model-item>
</div>
</a-col>
@@ -64,7 +64,7 @@
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('technicalField')">{{$t('technicalField')}}</span>
<span class="title-text-text" :title="$t('NtechnicalField')">{{$t('NtechnicalField')}}</span>
</div>
<a-form-model-item class="itemModel" prop="technologyTerritory">
<a-tree-select
@@ -76,7 +76,7 @@
style="width: 100%"
:tree-data="CategoryTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('technicalField')"
:placeholder="$t('PleaseSelect')+$t('NtechnicalField')"
/>
</a-form-model-item>
</div>
@@ -88,12 +88,12 @@
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('parameterBatch')">{{$t('parameterBatch')}}</span>
:title="$t('NparameterBatch')">{{$t('NparameterBatch')}}</span>
</div>
<a-form-model-item class="itemModel" prop="paramsBatch">
<j-dict-select-tag class="box-input" v-model="formInline.paramsBatch"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('parameterBatch')"
:placeholder="$t('PleaseSelect')+$t('NparameterBatch')"
:type="'select'"
:triggerChange="false" :dictCode="'params_batch'"/>
</a-form-model-item>
@@ -103,12 +103,12 @@
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
<span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-model-item>
@@ -120,7 +120,7 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('ParameterDescription')">{{$t('ParameterDescription')}}</span>
:title="$t('NParameterDescription')">{{$t('NParameterDescription')}}</span>
</div>
<a-form-model-item class="itemModel" prop="description">
<a-input class="box-input add-input"
@@ -128,7 +128,7 @@
type="textarea"
:disabled="disabled"
v-model="formInline.description"
:placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
:placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
</a-form-model-item>
</div>
</a-col>
@@ -139,14 +139,14 @@
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('ParameterName')">{{$t('certificationCategory')}}</span>
:title="$t('NcertificationCategory')">{{$t('NcertificationCategory')}}</span>
</div>
<a-form-model-item class="itemModel-multi" prop="certCategory">
<j-multi-select-tag-only-rz class="box-input" v-model="formInline.certCategory"
@change='Onchange'
v-on:changelabel='Onchangelabel'
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('certificationCategory')"
:placeholder="$t('PleaseSelect')+$t('NcertificationCategory')"
:type="'checkbox'"
:triggerChange="false" :dictCode="'cert_category'"/>
</a-form-model-item>
@@ -159,10 +159,10 @@
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('controlType')">{{$t('controlType')}}</span>
:title="$t('NcontrolType')">{{$t('NcontrolType')}}</span>
</div>
<a-form-model-item class="itemModel" prop="controlType">
<a-select :placeholder="$t('PleaseSelect')+$t('controlType')" allowClear v-model="formInline.controlType">
<a-select :placeholder="$t('PleaseSelect')+$t('NcontrolType')" allowClear v-model="formInline.controlType">
<a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label }}
@@ -177,10 +177,10 @@
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('controlVerification')">{{$t('controlVerification')}}</span>
<span class="title-text-text" :title="$t('NcontrolVerification')">{{$t('NcontrolVerification')}}</span>
</div>
<a-form-model-item class="itemModel" prop="controlVerify">
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" allowClear v-model="formInline.controlVerify">
<a-select :placeholder="$t('PleaseSelect')+$t('NcontrolVerification')" allowClear v-model="formInline.controlVerify">
<a-select-option v-for="(item, key) in controlVerification" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label }}
@@ -198,14 +198,14 @@
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('controlAlternatives')">{{$t('controlAlternatives')}}</span>
:title="$t('NcontrolAlternatives')">{{$t('NcontrolAlternatives')}}</span>
</div>
<a-form-model-item class="itemModel" prop="controlValues">
<a-input class="box-input add-input"
:disabled="disabled"
type="textarea"
v-model="formInline.controlValues"
:placeholder="$t('PleaseEnter')+$t('controlAlternatives')"/>
:placeholder="$t('PleaseEnter')+$t('NcontrolAlternatives')"/>
</a-form-model-item>
</div>
</a-col>
@@ -214,7 +214,7 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('attachmentTemplate')">{{$t('attachmentTemplate')}}</span>
:title="$t('NattachmentTemplate')">{{$t('NattachmentTemplate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="paramsTemplateName">
<a-button type="primary" class="button-text"
@@ -236,13 +236,13 @@
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('standard')">{{$t('standard')}}</span>
:title="$t('NNiONumber')">{{$t('NNiONumber')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input class="box-input"
:disabled="disabled"
v-model="item.paramsNumber"
:placeholder="$t('PleaseEnter')+$t('standard')"/>
:placeholder="$t('PleaseEnter')+$t('NNiONumber')"/>
</a-form-model-item>
</div>
</a-col>
@@ -250,13 +250,13 @@
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('ParameterName')">{{$t('ParameterName')}}</span>
<span class="title-text-text" :title="$t('NParameterName')">{{$t('NParameterName')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input class="box-input"
:disabled="disabled"
v-model="item.paramsName"
:placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
:placeholder="$t('PleaseEnter')+$t('NParameterName')"/>
</a-form-model-item>
</div>
</a-col>
@@ -266,7 +266,7 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('ParameterDescription')">{{$t('ParameterDescription')}}</span>
:title="$t('NParameterDescription')">{{$t('NParameterDescription')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input class="box-input add-input"
@@ -274,7 +274,7 @@
:disabled="disabled"
type="textarea"
v-model="item.description"
:placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
:placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
</a-form-model-item>
</div>
</a-col>
@@ -320,27 +320,27 @@ export default {
data() {
return {
controlType: [ // 控件类型
{value:'1', label: this.$t('text') },
{value:'2', label: this.$t('Dropdownradio') },
{value:'3', label: this.$t('Dropdownmultipleselection') },
{value:'4', label: this.$t('enclosure') },
{value:'5', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownradio') },
{value:'6', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownmultipleselection') },
{value:'7', label: this.$t('text')+ this.$t('a')+this.$t('enclosure') },
{value:'8', label: this.$t('Dropdownradio')+ this.$t('a')+this.$t('enclosure') },
{value:'9', label: this.$t('Dropdownmultipleselection')+ this.$t('a')+this.$t('enclosure') },
{value:'10', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownradio')+ this.$t('a')+this.$t('enclosure') },
{value:'1', label: this.$t('Ntext') },
{value:'2', label: this.$t('NDropdownradio') },
{value:'3', label: this.$t('NDropdownmultipleselection') },
{value:'4', label: this.$t('Nenclosure') },
{value:'5', label: this.$t('Atext') },
{value:'6', label: this.$t('Btext') },
{value:'7', label: this.$t('Ctext') },
{value:'8', label: this.$t('Dtext') },
{value:'9', label: this.$t('Etext') },
{value:'10', label: this.$t('Ftext') },
],
controlVerification: [ // 控件校验
{value:'1', label: this.$t('nothing') },
{value:'2', label: this.$t('chinese') },
{value:'3', label: this.$t('positiveInteger') },
{value:'4', label: this.$t('Positivefloatingpointnumber') },
{value:'5', label: this.$t('integerOrDecimal')},
{value:'6', label: this.$t('OneDecimalPlace') },
{value:'7', label: this.$t('TwoDecimalplaces') },
{value:'8', label: this.$t('Threedecimalplaces') },
{value:'9', label: this.$t('FourDecimalplaces') },
{value:'1', label: this.$t('Nnothing') },
{value:'2', label: this.$t('Nchinese') },
{value:'3', label: this.$t('NpositiveInteger') },
{value:'4', label: this.$t('NPositivefloatingpointnumber') },
{value:'5', label: this.$t('NintegerOrDecimal')},
{value:'6', label: this.$t('NOneDecimalPlace') },
{value:'7', label: this.$t('NTwoDecimalplaces') },
{value:'8', label: this.$t('NThreedecimalplaces') },
{value:'9', label: this.$t('NFourDecimalplaces') },
],
CategoryTreeList: [], // 技术领域
certCategoryParamsInfoEOList: [], // 认证类别得tab栏
jero-web/src/views/processCenter/components/feedbackInformation.vue
+233
View File
@@ -0,0 +1,233 @@
<template>
<div class="box">
<div class="box-text">
<div class="header-text">
{{title}}
</div>
</div>
<div class="content-text">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<div v-for="(item,index) in dataList" :key="index">
<div class="feedbackPoint">
{{$t('feedbackPoint')+(index+1)}}
<a-icon class="icon-size"
@click="addData"
v-if="(dataList.length-1) == index"
type="plus-circle"/>
<a-icon class="icon-size"
@click="deleteData"
v-if="dataList.length > 1 && (dataList.length - 1) == index"
type="minus-circle"/>
</div>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<a-form-model-item class="itemModel" prop="relevantSections">
<a-input class="box-input"
:disabled="false"
v-model="formInline.relevantSections"
:placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
</div>
<a-form-model-item class="itemModel" prop="questionsSuggestions">
<a-input class="box-input"
:disabled="false"
v-model="formInline.questionsSuggestions"
:placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input class="box-input"
:disabled="false"
v-model="formInline.reason"
:placeholder="$t('PleaseEnter')+$t('reason')"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
<a-form-model-item class="itemModel" prop="approvalFile">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('approvalFile')">
{{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
</div>
</a-col>
</a-row>
</div>
</a-form-model>
</div>
</div>
</template>
<script>
import { getAction, postAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'feedbackInformation',
components: {
uploadFile
},
props: {
title: {
type: String,
default: ''
}
},
data() {
return {
formInline: {},
rules: {},
dataList: [{ id: 1 }]
}
},
methods: {
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
/** 上传文件的回调 */
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
attIdList.push(item.id || data.name)
})
}
/** 赋值给当前对应的表单文件 */
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
addData() {
this.dataList.push({
id: 2
})
this.dataList = [...this.dataList]
},
deleteData() {
this.dataList.pop()
this.dataList = [...this.dataList]
}
}
}
</script>
<style scoped lang="less">
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.box-text {
display: flex;
justify-content: space-between;
height: 60px;
line-height: 40px;
.header-text {
font-size: 16px;
font-weight: 400;
color: #000F16;
}
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text {
width: 88px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
color: #000F16;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
margin-bottom: 12px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
.button-text {
height: 38px;
width: calc(100% - 100px);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
color: #00B3BE;
}
.feedbackPoint {
font-size: 14px;
font-weight: 400;
color: #000F16;
margin-bottom: 10px;
}
.icon-size {
font-size: 18px;
margin-left: 8px;
cursor: pointer;
}
</style>
jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+118
View File
@@ -0,0 +1,118 @@
<template>
<div id="examineBox">
<headerProcess
:title="title"
/>
<div class="detail-box">
<div class="detail-content" style="padding: 10px 0 0 0">
<standardContent
v-if="isDisplay"
:title="$t('essentialInformation')"
:standardContentList="standardContentList"
:url="url"
:standardContentQuery="queryProject"
/>
<feedbackInformation
ref="feedbackInformationRef"
:title="$t('feedbackInformation')"
/>
<footerProcess
v-if="isDisplay"
isPreservation
:isSubmit="true"
@preservation="preservation"
@submit="submit"
/>
<circulationHistory v-if="isDisplay"/>
</div>
</div>
</div>
</template>
<script>
import headerProcess from '../../components/headerProcess'
import standardContent from '../../components/standardContent'
import circulationHistory from '../../components/taskCirculationHistory'
import footerProcess from '../../components/footerProcess'
import feedbackInformation from '../../components/feedbackInformation'
export default {
name: 'index',
components: {
headerProcess,
standardContent,
circulationHistory,
footerProcess,
feedbackInformation
},
data() {
return {
title: this.$t('collectionOfRegulatoryOpinions'),
url: {},
isDisplay: true,
queryProject: {},
standardContentList: [
{
title: this.$t('standard'),
value: 'serialNumber'
},
{
title: this.$t('title'),
value: 'title'
},
{
title: this.$t('regulatoryEngineer'),
value: 'regulatoryEngineer'
},
{
title: this.$t('closingDate'),
value: 'closingDate'
},
{
title: this.$t('enclosure'),
value: 'enclosure',
type: 2
},
{},
{
title: this.$t('taskDescription'),
value: 'taskDescription'
}
// {
// title: this.$t('remarks'),
// value: 'remark'
// }
]
}
},
mounted() {
},
methods: {
preservation() {
},
submit() {
}
}
}
</script>
<style scoped>
.detail-box {
padding: 67px 0 0 0;
background: #ffffff;
height: 100%;
overflow: auto;
}
#examineBox {
display: flex;
flex-direction: column;
background: #fff;
position: relative;
height: 100%;
overflow-y: auto;
}
</style>
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+2 -2
View File
@@ -1,7 +1,7 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper doc-detail">
<div class="Virtual-detail-header" style="position: fixed;top: 0">
<div class="Virtual-detail-header" style="top: 0">
<div class="Virtual-detail-title">
<span>
{{ $t('ParameteItemCollectionList') }}
@@ -9,7 +9,7 @@
</div>
</div>
<!-- 认证参数收集-参数项收集清单-10控件-->
<div class='Virtual-detail-content'>
<div class='Virtual-detail-content' style='margin-top: 15px'>
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24" style='margin-left: -90px;'>
<a-col :md="6" :sm="8">
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+3 -3
View File
@@ -158,7 +158,7 @@
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 200,
width: 310,
scopedSlots: { customRender: 'operation' }
}
],
@@ -211,7 +211,7 @@
window.open(newUrl.href, '_blank')
},
deleteLib(val) {
if(val.state === '已完成') {
if(val.state === '已完成' || val.state === 'Finished' ) {
let _this = this
this.$confirm({
content: _this.$t('ConfirmDelete'),
@@ -304,7 +304,7 @@
// 默认为0 可全部删除
let flag = 1
this.selectedRowKeysvalArray.forEach((item) => {
if(item.state !== '已完成'){
if(item.state !== '已完成' && val.state !== 'Finished' ){
flag = 0
}
})
jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+4 -4
View File
@@ -270,20 +270,20 @@ export default {
this.confirmLoading = true
let _tt = {
paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId,
projectId: this.selectedRowKeysDate[0].projectId,
title: this.selectedRowKeysDate[0].title,
projectId: this.projectId,
title: this.formData.title,
paramsTemplatePublishVersion: this.selectedRowKeysDate[0].paramsTemplatePublishVersion,
sourceManifestId: this.selectedRowKeysDate[0].id,
}
postAction('params/manifest/copy', _tt).then((res) => {
if (res.success) {
this.$emit('copysubmit')
this.$message.success(res.message)
this.$message.success(this.$t('Copysuccessful'))
this.flag = false
this.spinLoading = false
this.confirmLoading = false
} else {
this.$message.warning(res.message)
this.$message.warning(this.$t('Copyfailed'))
this.flag = false
this.spinLoading = false
this.confirmLoading = false
jero-web/src/views/projectManagement/dialog/configure.vue
+3
View File
@@ -238,6 +238,9 @@ export default {
_this.deleteConfigIdsArray.push(displaySeq)
_this.deleteConfigIds = _this.deleteConfigIdsArray.join(',')
let _tt = _this.paramsConfigEOList.splice(index,1)
if(_tt.length === 1) {
_this.$message.success(_this.$t('DeleteSucceeded'))
}
}
})
},
jero-web/src/views/regulatoryEarlyWarning/index.vue
+7 -4
View File
@@ -195,11 +195,14 @@
clearSelected() {
},
pageOnChange() {
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange() {
SizeChange(pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {