diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 6ca1cbee4..938451ce0 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -244,11 +244,17 @@ }) }, - sVisible(val) { + sVisible(val,num) { this.splitVisible = false + if (num == 1){ + eventBUs.$emit('searchGetData') + } }, - iVisible(val) { + iVisible(val,num) { this.importsVisible = val + if (num == 1){ + eventBUs.$emit('searchGetData') + } }, //查询 searchQuery() { diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index c6dda8495..101bdb159 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -43,6 +43,7 @@ @click="cancleImports">{{$t('cancel')}} {{$t('submit')}} @@ -57,7 +58,7 @@
- {{$t('Submitting')}} + @@ -290,10 +291,9 @@ }).then(res => { if (res.data.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchGetData') this.visible = false this.loading = false - this.$emit('visible', false) + this.$emit('visible', false,1) } else { this.loading = false // this.$message.warning(res.data.message) diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index b5108ebad..92249066a 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -68,12 +68,12 @@ {{$t('cancel')}} - {{$t('submit')}} - {{$t('Submitting')}} + @@ -244,10 +244,9 @@ postAction(`split/sarFileSplitInfo/add`, params).then(res => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchGetData') this.visible = false this.loading = false - this.$emit('visible', false) + this.$emit('visible', false,1) } else { this.loading = false this.$message.warning(res.message) @@ -281,10 +280,10 @@ postAction(`split/sarFileSplitInfo/add`, params).then(res => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchGetData') + // eventBUs.$emit('searchGetData') this.visible = false this.loading = false - this.$emit('visible', false) + this.$emit('visible', false,1) } else { this.loading = false this.$message.warning(res.message) diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index db3de9707..ec731f550 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -183,19 +183,34 @@ } }) }, + rejectCauseAdd(rejectCause,ids) { + let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + let query = { + rejectUserId:this.userInfo().id, + rejectTime:rejectTime, + rejectCause:rejectCause, + projectLawsInventoryId:ids.join(','), + rejectType:'0', + } + postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { + + }) + }, completeTask(value, handlingTime) { let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) - let data = JSON.stringify(json).replace(/\"/g, '\'') - Object.keys(data).forEach(res => { - if (data[res] && typeof data[res] == 'string') { - data[res] = data[res].replace(/\"/g, '“') - data[res] = data[res].replace(/\'/g, '‘') + // if (json.flag == '1'){ + // this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id) + // } + Object.keys(json).forEach(res => { + if (json[res] && typeof json[res] == 'string') { + json[res] = json[res].replace(/\"/g, '“') + json[res] = json[res].replace(/\'/g, '‘') } }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskId || this.$route.query.taskIds, - json: data + json: JSON.stringify(json).replace(/\"/g, '\'') } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) {