diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8fb825c0e..db7e44757 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1216,6 +1216,7 @@ module.exports = { documentNumber:'Document Number', documentTitle:'Document Title', bringInDocumentInformation:'Bring in document information', + thereWhichCannotDeleted:'There are sub headings under this title, which cannot be deleted', sdt:'sdt', dre:'dre', } \ 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 33dc196e6..13a03d29c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1319,6 +1319,7 @@ module.exports = { documentNumber:'文档编号', documentTitle:'文档标题', bringInDocumentInformation:'带入文档信息', + thereWhichCannotDeleted:'该标题下存在子标题无法进行删除', sdt:'工程接口人', dre:'填写人', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index d1059e89b..1cb6d2823 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -1,13 +1,270 @@ - \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 61e2611e2..f8b17a2ce 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -379,6 +379,8 @@ this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery)) if (this.formInline.technologyTerritory) { this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',') + } else { + this.formInline.technologyTerritory = [] } this.formInline = { ...this.formInline } } else { @@ -396,6 +398,11 @@ this.formInline.titleCn = value.serial_number + ' ' + value.title this.formInline.titleEn = value.serial_number + ' ' + value.title_en this.formInline.technologyTerritory = value.technology_territory_dict + if (this.formInline.technologyTerritory) { + this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',') + } else { + this.formInline.technologyTerritory = [] + } this.formInline.applyCar = value.shi4_yong4_che1_xing2_dict this.formInline.applyScope = value.shi4_yong4_fan4_wei2_dict this.formInline.state = value.state_dict @@ -406,7 +413,7 @@ var pos = curPath.indexOf(pathname) var localhostPath = curPath.substring(0, pos) this.formInline.link = localhostPath + '/docManage/library/detail?id=' + value.id - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index 7d2abf4fb..a93e3f426 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -192,6 +192,10 @@ }) }, deleteLib(val) { + if (val.children && val.children.length > 0) { + this.$message.warning(this.$t('thereWhichCannotDeleted')) + return + } let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index d33391169..15940fc5e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -14,12 +14,13 @@
- {{$t('chineseTitle')}} + * + {{$t('chineseTitle')}}
- +
@@ -27,11 +28,12 @@
+ * {{$t('englishTitle')}}
- +
@@ -77,7 +79,32 @@ visible: false, confirmLoading: false, formInline: {}, - rules: {}, + rules: { + titleCn: [ + { + required: true, + message: this.$t('chineseTitle') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('chineseTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], + titleEn: [ + { + required: true, + message: this.$t('englishTitle') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('englishTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ] + }, ParentList: [], title: '', url: { @@ -240,4 +267,9 @@ .formAdd { margin-bottom: 40px; } + + .Required { + color: red; + margin-right: 4px; + } \ No newline at end of file