chenrui 3 سال پیش
والد
کامیت
e1a0b5c7e9

+ 1 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -108,7 +108,7 @@
     <!-- 新增 -->
     <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_OUT_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('WAIT_OUT_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </template>
 

+ 16 - 10
src/views/common/auditModal.vue

@@ -7,17 +7,19 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="416">
-    <div class="audit-main">
-      <a-icon type="question-circle" style="color: #faad14;font-size: 22px;margin-right: 16px;" />
-      <div class="audit-cont">
-        <p class="audit-tit">提示</p>
-        <p class="audit-txt">请点击下方按钮确认操作?</p>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <div class="audit-main">
+        <a-icon type="question-circle" style="color: #faad14;font-size: 22px;margin-right: 16px;" />
+        <div class="audit-cont">
+          <p class="audit-tit">提示</p>
+          <p class="audit-txt">请点击下方按钮确认操作?</p>
+        </div>
       </div>
-    </div>
-    <div class="btn-box">
-      <a-button type="primary" class="button-error" @click="handleAuditFail">审核不通过</a-button>
-      <a-button type="primary" class="button-info" @click="handleAuditOk">审核通过</a-button>
-    </div>
+      <div class="btn-box">
+        <a-button type="primary" class="button-error" @click="handleAuditFail">审核不通过</a-button>
+        <a-button type="primary" class="button-info" @click="handleAuditOk">审核通过</a-button>
+      </div>
+    </a-spin>
   </a-modal>
 </template>
 
@@ -28,6 +30,10 @@ export default {
     openModal: { //  弹框显示状态
       type: Boolean,
       default: false
+    },
+    spinning: {
+      type: Boolean,
+      default: false
     }
   },
   data () {

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -95,7 +95,7 @@
       </div>
     </a-spin>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" @close="visibleAudit=false" @ok="auditOrder('PASS')" @fail="auditOrder('REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('PASS')" @fail="auditOrder('REJECT')" />
   </a-modal>
 </template>
 

+ 1 - 1
src/views/salesManagement/examineVerify/list.vue

@@ -103,7 +103,7 @@
       </s-table>
     </a-spin>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('STOCK_UP_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('STOCK_UP_REJECT')" />
   </a-card>
 </template>
 

+ 1 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -181,7 +181,7 @@
     <!-- 选择客户弹框 -->
     <choose-custom-modal :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </template>
 

+ 1 - 1
src/views/salesManagement/salesReturn/detail.vue

@@ -72,7 +72,7 @@
       </a-card>
     </a-spin>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
   </div>
 </template>
 

+ 1 - 1
src/views/salesManagement/salesReturn/list.vue

@@ -149,7 +149,7 @@
     <!-- 选择客户弹框 -->
     <choose-custom-modal :show="openModal" @ok="handleEdit" @cancel="openModal=false"></choose-custom-modal>
     <!-- 审核 -->
-    <auditModal :openModal="visibleAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
+    <auditModal :openModal="visibleAudit" :spinning="spinning" @close="visibleAudit=false" @ok="auditOrder('WAIT_CHECK')" @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
 </template>