diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java index 1c0f1bfb4..3beeb783d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java @@ -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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java index 0234d1fa8..b8b399e51 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java @@ -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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java index 27e4cc10a..5c8ea1caf 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ParamsIsMustEnum.java @@ -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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index f8623f09c..4f06abf50 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -1072,24 +1072,28 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 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 resultMap = new HashMap<>(); @@ -1280,23 +1284,27 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 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;"); + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java index b5dd68d1d..e4e9b0339 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java @@ -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; diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 726752690..e9aed8ea9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -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', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 324304fe9..dedee38fa 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -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: '四位小数' } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 2fcef6a5a..062ac424f 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -11,13 +11,13 @@ > - + - + @@ -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 diff --git a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue index 6760052e7..41fe4c090 100644 --- a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue +++ b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue @@ -11,8 +11,8 @@ > -
是否同步选中行数据至上报库?
-
同步后的参数项将不可修改,仅能重新下发收集,已更新参数
+
{{ $t('Synchronizedatabase') }}
+
{{ $t('Aftersynchronization') }}
 diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index e2b49847b..bd131a3ca 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -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' || diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 82260a907..1f7548d3c 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -55,7 +55,7 @@ > - + @@ -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() { diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 07c804f03..c00cf28f2 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -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', diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue new file mode 100644 index 000000000..7383fa0f2 --- /dev/null +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -0,0 +1,335 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue new file mode 100644 index 000000000..87e5a37e6 --- /dev/null +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -0,0 +1,253 @@ + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 75567f562..3fef55e8f 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -17,13 +17,13 @@
* {{$t('NiONumber')}} + :title="$t('NNiONumber')">{{$t('NNiONumber')}}
+ :placeholder="$t('PleaseEnter')+$t('NNiONumber')"/> @@ -31,10 +31,10 @@
* - {{$t('Required')}} + {{$t('NRequired')}}
- + {{$t('yes')}} {{$t('notOnlyRz')}} @@ -50,13 +50,13 @@
* {{$t('ParameterName')}} + :title="$t('NParameterName')">{{$t('NParameterName')}}
+ :placeholder="$t('PleaseEnter')+$t('NParameterName')"/>
@@ -64,7 +64,7 @@
* - {{$t('technicalField')}} + {{$t('NtechnicalField')}}
@@ -88,12 +88,12 @@
* {{$t('parameterBatch')}} + :title="$t('NparameterBatch')">{{$t('NparameterBatch')}}
@@ -103,12 +103,12 @@
* - {{$t('areaOfResponsibility')}} + {{$t('NareaOfResponsibility')}}
@@ -120,7 +120,7 @@
{{$t('ParameterDescription')}} + :title="$t('NParameterDescription')">{{$t('NParameterDescription')}}
+ :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
@@ -139,14 +139,14 @@
* {{$t('certificationCategory')}} + :title="$t('NcertificationCategory')">{{$t('NcertificationCategory')}}
@@ -159,10 +159,10 @@
* {{$t('controlType')}} + :title="$t('NcontrolType')">{{$t('NcontrolType')}}
- + {{ item.label }} @@ -177,10 +177,10 @@
* - {{$t('controlVerification')}} + {{$t('NcontrolVerification')}}
- + {{ item.label }} @@ -198,14 +198,14 @@
* {{$t('controlAlternatives')}} + :title="$t('NcontrolAlternatives')">{{$t('NcontrolAlternatives')}}
+ :placeholder="$t('PleaseEnter')+$t('NcontrolAlternatives')"/>
@@ -214,7 +214,7 @@
{{$t('attachmentTemplate')}} + :title="$t('NattachmentTemplate')">{{$t('NattachmentTemplate')}}
* {{$t('standard')}} + :title="$t('NNiONumber')">{{$t('NNiONumber')}}
+ :placeholder="$t('PleaseEnter')+$t('NNiONumber')"/>
@@ -250,13 +250,13 @@
* - {{$t('ParameterName')}} + {{$t('NParameterName')}}
+ :placeholder="$t('PleaseEnter')+$t('NParameterName')"/>
@@ -266,7 +266,7 @@
{{$t('ParameterDescription')}} + :title="$t('NParameterDescription')">{{$t('NParameterDescription')}}
+ :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
@@ -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栏 diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue new file mode 100644 index 000000000..959ff4f07 --- /dev/null +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -0,0 +1,233 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue new file mode 100644 index 000000000..7c8e09c40 --- /dev/null +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -0,0 +1,118 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 10b9b80a7..e1e7a2918 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1,7 +1,7 @@