diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index 3b8f4ebfe..211c5d3ff 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -265,9 +265,9 @@ if(!this.form.file) { this.$refs.ruleForm.validate(valid => { if (valid) { - this.flag = true - if (this.flag) { + if (!this.flag) { + this.flag = true axios({ url: '/jero-boot/split/sarFileSplitItems/importSplitResult', method: 'post', @@ -291,9 +291,10 @@ } }) }else { - this.flag = true + this.$refs.ruleForm.clearValidate() - if (this.flag) { + if (!this.flag) { + this.flag = true axios({ url: '/jero-boot/split/sarFileSplitItems/importSplitResult', method: 'post', diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 3be8f188d..055029b45 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -48,7 +48,7 @@ + v-model="formInline[item.db_field_name]" :max="99999999"/> @@ -666,9 +666,10 @@ // console.log('vallll',this.contentList) this.$refs.splitEditForm.validate(valid=>{ if(valid){ - this.submitFlag=true - this.confirmLoading = true - if(this.submitFlag){ + + this.loading = true + if(!this.submitFlag){ + this.submitFlag=true let url = '' if (this.formInline.id) { url = this.url.updateInfo @@ -709,7 +710,7 @@ }) .then( (res) =>{ if (res.data.success) { - this.confirmLoading = false + this.loading = false this.$message.success(this.$t('OperationSuccessful')) this.visible=false // this.$emit('closeVisible',false) @@ -728,7 +729,7 @@ .catch( (error) =>{ console.log(error); }).finally(()=>{ - this.confirmLoading=false + this.loading=false this.submitFlag=false }) } @@ -748,8 +749,8 @@ // console.log('contentList111111',this.contentList) this.$refs.numberForm.validate(valid=>{ if(valid){ - this.numberFlag=true - if(this.numberFlag){ + if(!this.numberFlag){ + this.numberFlag=true for(let i=this.contentList.length;i>this.addIndex;i--){ this.contentList[i+this.numberForm.textNumber-1]=this.contentList[i-1] } diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 01556b404..6ddaec914 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -727,7 +727,7 @@ let name = this.$route.query.infoNumber +' '+ dateName+'.zip' let query = { infoId:this.infoId, - exportName:name, + exportName:this.$route.query.infoNumber +' '+ dateName, idList:this.selectedRowKeys.join(',') }