Merge branch 'dev' into purchaseDev

src/views/purchase/PurchaseDemandList/add.vue

@@ -967,9 +967,12 @@ export default {
                       this.back()
                     }
                   }).catch(err => {
-                    let errorList = JSON.parse(err.message).rowList
-                    console.log(errorList)
-                    this.gainRed(errorList)
+                    // 加入定时器防止报错关不掉遮罩
+                    setTimeout(() => {
+                      let errorList = JSON.parse(err.message).rowList
+                      console.log(errorList)
+                      this.gainRed(errorList)
+                    }, 500)
                     this.$modal.closeLoading();
                   })
                 } else if (this.sonPageStu == 'edit') {
@@ -987,9 +990,12 @@ export default {
                       this.back()
                     }
                   }).catch(err => {
-                    let errorList = JSON.parse(err.message).rowList
-                    console.log(errorList)
-                    this.gainRed(errorList)
+                    // 加入定时器防止报错关不掉遮罩
+                    setTimeout(() => {
+                      let errorList = JSON.parse(err.message).rowList
+                      // console.log(errorList)
+                      this.gainRed(errorList)
+                    },500)
                     this.$modal.closeLoading();
                   })
                 }
@@ -1077,9 +1083,12 @@ export default {
           this.back()
         }
       }).catch(err => {
-        let errorList = JSON.parse(err.message).rowList
-        console.log(errorList)
-        this.gainRed(errorList)
+        // 加入定时器防止报错关不掉遮罩
+        setTimeout(() => {
+          let errorList = JSON.parse(err.message).rowList
+          console.log(errorList)
+          this.gainRed(errorList)
+        }, 500)
         this.$modal.closeLoading();
       })
     },

src/views/purchase/workSpace/index.vue

@@ -31,7 +31,7 @@
       </div>
 
       <div class="btn_grooup">
-        <el-button type="primary" size="mini" @click="audits">批量审批</el-button>
+        <!-- <el-button type="primary" size="mini" @click="audits">批量审批</el-button> -->
       </div>
 
       <el-table