Преглед изворни кода

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

chenrui пре 1 година
родитељ
комит
074f3e426d

+ 8 - 0
src/views/salesManagement/salesQueryNew/detail.vue

@@ -306,6 +306,14 @@ export default {
     },
     // 打开审核/一键审核弹框
     handleAudit (isBatch) {
+      if(this.detailData&&this.detailData.promoFlag==1&&this.$refs.productList.outStockStr != ''){
+        this.$info({
+          title: '提示',
+          content: '参加促销活动的销售单,有缺货产品,不可一键审核!',
+          centered: true
+        })
+        return
+      }
       if (isBatch) { // 一键审核
         this.showDsModal = true
         this.$refs.dsModal.setDetail(this.detailData)

+ 1 - 1
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -188,7 +188,7 @@ export default {
   },
   computed: {
     hasPrompActive(){
-      return this.detailData&&this.detailData.promoFlag==1&&!this.detailData.totalPushedQty
+      return this.detailData&&this.detailData.promoFlag==1&&!this.detailData.totalCancelQty
     },
     checkboxOption () {
       return {