diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b12b22593..db07b6035 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -573,5 +573,6 @@ module.exports = { documentSplitList:'document split list display', selectSplitListDisplay:'Please select whether to split the document list for display', selectDisplayList:'please select whether to display in list', + documentSplitDisplay:'document splitting module display', } \ 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 996afdb62..1b21307d2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -577,5 +577,6 @@ module.exports = { documentSplitList:'文档拆分列表展示', selectSplitListDisplay:'请选择是否文档拆分列表展示', selectDisplayList:'请选择是否列表展示', + documentSplitDisplay:'文档拆分模块展示', } \ No newline at end of file diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index 93cc88eed..c93f144c0 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -106,7 +106,8 @@ watch:{ menuId(oldValue,newValue){ // console.log('oldnew',oldValue,newValue) - this.getTableList() + + // this.getTableList() } }, mounted() { @@ -188,17 +189,19 @@ this.getTableList() }, getTableList() { + console.log('this.searchParmestable',this.searchParmes) let pageNo = JSON.parse(JSON.stringify(this.pageNo)) let pageSize = JSON.parse(JSON.stringify(this.pageSize)) let params = { ...this.searchParmes, // orderBy: this.orderBy, // orderByField: this.orderByField, - info_id:this.infoId, - menu_id:this.menuId, + // info_id:this.infoId, + // menu_id:this.searchParmes.menuId?this.searchParmes.menuId:this.menuId, pageNo: pageNo + '', pageSize: pageSize + '' } + // console.log('parmsss',params) this.loading = true postAction(this.url.tableList, params).then((res) => { diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue index 242e257b8..9ce33e721 100644 --- a/jero-web/src/components/SplitImport/index.vue +++ b/jero-web/src/components/SplitImport/index.vue @@ -96,7 +96,7 @@ // console.log('rrr',this.myfileList) }, handleChange(info) { - // console.log('info',info) + console.log('info',info) let { file } = info; const status = info.file.status; info.fileList.forEach((val,index)=>{ @@ -129,6 +129,8 @@ this.$message.destroy() this.$message.success(`${info.file.name} 删除成功。`); } else if (status === 'done') { + // console.log('file1111',this.fileList) + this.$emit('uploadSuccess', this.fileList,'success') this.fileList = [] this.myfileList = info.fileList; // console.log('file3333',info.fileList) @@ -143,8 +145,8 @@ this.fileList.push(res) } }) - // console.log('file1111',this.fileList) - this.$emit('uploadSuccess', this.fileList) + + this.$emit('uploadSuccess', this.fileList,'success') this.$message.destroy() this.$message.error('最多只能上传一个文件'); return @@ -160,7 +162,8 @@ }) if(this.myfileList.length > 0){ - this.$emit('uploadSuccess', this.fileList) + console.log('file1111',this.fileList) + this.$emit('uploadSuccess', this.fileList,'success') this.$message.destroy() this.$message.success(`${info.file.name} 文件上传成功。`); } diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue new file mode 100644 index 000000000..9995e6145 --- /dev/null +++ b/jero-web/src/components/SplitSearch/index.vue @@ -0,0 +1,275 @@ + + + + + + + + {{item.db_field_txt}} + + + + + + {{item.db_field_txt}} + + + + + + {{item.db_field_txt}} + + + + + + {{item.db_field_txt}} + + + + + + {{item.db_field_txt}} + + + + + + + + + + + + + + + {{item.db_field_txt}} + + + + + + + + + {{item.db_field_txt}} + + + + + + {{item.db_field_txt}} + + + + + + {{item.db_field_txt}} + + + + + + {{item.db_field_txt}} + + + + + + {{item.db_field_txt}} + + + + + + + + + + + + + + + {{item.db_field_txt}} + + + + + + + + + {{$t('query')}} + {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + + + + + + + + + \ 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 920666d18..33ab2256a 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -670,7 +670,13 @@ this.$message.success(this.$t('OperationSuccessful')) this.visible=false // this.$emit('closeVisible',false) - eventBUs.$emit('searchReset') + let queryParam={ + menu_id:this.menuId, + info_id: this.infoId, + + } + eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + // eventBUs.$emit('searchReset') this.$emit('sumber') }else{ this.$message.warning(this.$t('operationFailed')) diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 3bbf0d64c..1b408c582 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -7,6 +7,7 @@ - + @@ -161,7 +163,7 @@