diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9533d09d6..b12b22593 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -570,5 +570,8 @@ module.exports = { viewFile:'view file', fileFormatIncorrect:'the file format is incorrect', pleaseUploadFile:'please upload the file', + documentSplitList:'document split list display', + selectSplitListDisplay:'Please select whether to split the document list for display', + selectDisplayList:'please select whether to display in list', } \ 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 211b3d30b..996afdb62 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -574,6 +574,8 @@ module.exports = { viewFile:'查看文件', fileFormatIncorrect:'文件格式不正确', pleaseUploadFile:'请上传文件', - + documentSplitList:'文档拆分列表展示', + selectSplitListDisplay:'请选择是否文档拆分列表展示', + selectDisplayList:'请选择是否列表展示', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index b05ab58e4..f70d6b4be 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -106,12 +106,11 @@
- * + * {{item.db_field_txt}}
@@ -628,7 +627,7 @@ //保存 splitSave(){ // console.log('vallll',this.contentList) - // console.log('formInline',this.formInline) + console.log('formInline',this.formInline) this.$refs.splitEditForm.validate(valid=>{ if(valid){ this.submitFlag=true @@ -952,8 +951,15 @@ edit(item) { this.visible=true this.type = 'edit' + // this.getForm(() => { + // this.formInline=item + // }) this.getForm(() => { - this.formInline=item + getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => { + if (res.success) { + this.formInline = res.result[0] + } + }) }) }, add() { @@ -1164,4 +1170,13 @@ text-align: center; } } + .split-content{ + .box-input .ant-input-number-input-wrap{ + height: 30px; + line-height: 30px; + } + .ant-input-number{ + width: 100%; + } + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue index 10c63f01a..ec8600f5d 100644 --- a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue @@ -76,12 +76,17 @@

{{$t('DocumentLibraryModuleDisplay')}}

- + + :placeholder="$t('selectDisplayList')" /> + + + + - + @@ -97,14 +102,14 @@ -

{{$t('DisplayOtherModules')}}

- - +

{{$t('DisplayOtherModules')}}

+ + - + @@ -218,7 +223,7 @@ { required: true, message: this.$t('selectWhetherRequired'),trigger: 'change'}, ], isShowList: [ - { required: true, message: this.$t('SelectWhetherDisplayList'),trigger: 'change'}, + { required: true, message: this.$t('selectDisplayList'),trigger: 'change'}, ], showArea: [ { required: true, message: this.$t('SelectDisplayArea'),trigger: 'change'}, @@ -250,7 +255,8 @@ isSearch:true, isLength:true, flag:false, //表单提交标识 - disabledEdit:false + disabledEdit:false, + moduleShow:true } }, watch:{ @@ -282,6 +288,15 @@ }, disableEdit(){ + }, + 'form.isModel'(val){ + console.log('val',val) + if(val=='1'){ + this.moduleShow=true + }else if(val=='0'){ + this.moduleShow=false + + } } }, computed: { @@ -420,15 +435,23 @@ } }) // console.log('form',this.form) + console.log('model',this.form.isModel) + let onlineId='' + let url='' + if(this.form.isModel=='1'){ + onlineId='48308196e7b04761b533dc31bc899707' + }else if(this.form.isModel=='0'){ + onlineId='c998a34ea4b84089932197ed0705c757' + } httpAction(httpurl,this.form,method).then((res)=>{ if(res.success){ this.$message.success(this.$t('OperationSuccessful')); - postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal + postAction(`online/cgform/api/doDbSynch/${onlineId}/normal `,{}).then(res=>{ }) this.$emit('ok',false); }else{ - this.$message.warning(this.$t('operationFailed')); + this.$message.warning(res.message); } }).finally(() => { this.confirmLoading = false; diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 619919bc8..f33e4ca45 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -342,9 +342,9 @@ this.queryParams.pageNo=this.queryParams.pageNo-1 } this.loadData() - postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal - `,{}).then(res=>{ - }) + // postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal + // `,{}).then(res=>{ + // }) }else{ this.$message.warning(this.$t('operationFailed')) } diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index 257160e40..d30faa250 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -337,23 +337,24 @@ if (res.success) { if (this.key == 1) { this.$message.success(this.$t('OperationSuccessful')) - if(this.tableData&&this.tableData.length==1&&this.queryParam.pageNo!=1){ - this.queryParam.pageNo=this.queryParam.pageNo-1 + if (this.tableData && this.tableData.length == 1 && this.queryParam.pageNo != 1) { + this.queryParam.pageNo = this.queryParam.pageNo - 1 } this.loadData(1) } else if (this.key == 2) { this.$message.success(this.$t('OperationSuccessful')) - if(this.tableData&&this.tableData.length==1&&this.queryParam.pageNo!=1){ - this.queryParam.pageNo=this.queryParam.pageNo-1 + if (this.tableData && this.tableData.length == 1 && this.queryParam.pageNo != 1) { + this.queryParam.pageNo = this.queryParam.pageNo - 1 } this.loadData(0) } - postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal -`,{}).then(res=>{ - }) - }else{ +// postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal +// `,{}).then(res=>{ +// }) + } else { this.$message.warning(this.$t('operationFailed')) } + }) } }) @@ -388,9 +389,9 @@ } this.loadData(0) } - postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal - `,{}).then(res=>{ - }) + // postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal + // `,{}).then(res=>{ + // }) }else{ this.$message.warning(this.$t('operationFailed')) }