Forráskód Böngészése

Merge branch 'develop_yh12' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh12

chenrui 2 éve
szülő
commit
b347e7c12d

+ 15 - 7
src/views/purchasingManagement/bulkWarehousingOrder/batchAuditNoModal.vue

@@ -47,7 +47,7 @@
           :loading="spinning"
           :class="loadData.length==0?'button-grey':'button-primary'"
           @click="handleSubmit"
-          style="padding: 0 40px;">确认审</a-button>
+          style="padding: 0 40px;">确认审</a-button>
         <a-button
           id="batchAuditModal-cancel"
           size="large"
@@ -123,16 +123,24 @@ export default {
     },
     // 确认导入
     handleSubmit () {
+      const _this = this
       if (this.loadData.length == 0) {
         this.$message.warning('没有可审核的数据!')
       } else {
-        this.spinning = true
-        sparePartsBatchAudit(this.snList).then(res => {
-          if(res.status == 200){
-            this.$emit('ok',res.message)
-            this.isShow = false
+        this.$confirm({
+          title: '提示',
+          content: '确认要审核通过吗?',
+          centered: true,
+          onOk () {
+            _this.spinning = true
+            sparePartsBatchAudit(_this.snList).then(res => {
+              if(res.status == 200){
+                _this.$emit('ok',res.message)
+                _this.isShow = false
+              }
+              _this.spinning = false
+            })
           }
-          this.spinning = false
         })
       }
     },

+ 7 - 14
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -329,22 +329,15 @@ export default {
         return
       }
       const snList = this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys || []
-      this.$confirm({
-        title: '提示',
-        content: '确认要批量审核通过吗?',
-        centered: true,
-        onOk () {
-          _this.spinning = true
-          sparePartsAuditVerify(snList).then(res => {
-            if(res.status == 200&&res.data){
-              _this.$nextTick(()=>{
-                _this.openBatchAuditNoModal = true
-                _this.$refs.batchAuditNoModal.getData(res.data)
-              })
-            }
-            _this.spinning = false
+      _this.spinning = true
+      sparePartsAuditVerify(snList).then(res => {
+        if(res.status == 200&&res.data){
+          _this.$nextTick(()=>{
+            _this.openBatchAuditNoModal = true
+            _this.$refs.batchAuditNoModal.getData(res.data)
           })
         }
+        _this.spinning = false
       })
     },
     // 审核成功