From 93edc979d9d93dff3d0cc70afb70f18e43b29385 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Thu, 7 Apr 2022 11:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=AF=BC=E5=87=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../splitting/modules/ImportResult.vue          |  9 +++++----
 .../splitting/modules/SplitAddForm.vue          | 17 +++++++++--------
 .../splitting/modules/SplitDetail.vue           |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

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 @@
                                 <a-input-number class="box-input"
                                                 :placeholder="$t('PleaseEnter')+item.db_field_txt"
                                                 :disabled="disabled"
-                                                v-model="formInline[item.db_field_name]" :min="1" :max="99999999"/>
+                                                v-model="formInline[item.db_field_name]"  :max="99999999"/>
                               </a-form-model-item>
                             </div>
                           </a-col>
@@ -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(',')
         }