lilei 5 months ago
parent
commit
0088727fb3

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -106,7 +106,7 @@
       class="sTable"
       ref="table"
       size="small"
-      :scroll="showTotal ? null :{ y: tableHeight }"
+      :scroll="showTotal ? {y:300} :{ y: tableHeight }"
       :columns="columns"
       :data="loadData"
       :row-selection="{ columnWidth: 30 }"

+ 18 - 16
src/views/salesManagement/salesQueryNew/detail.vue

@@ -709,24 +709,26 @@ export default {
               </ol>
             </div>,
             onOk () {
-              // 售价是否低于参考成本价
-              if (d.length) {
-                if (isBatch) { // 一键审核,弹框文字提示
-                  _this.tempData = { vaildPriceList: d[0].data.map(item => item.productCode) }
-                  _this.verificationSuccess(isBatch)
-                } else {
-                  // 审核或上级审核,弹框表格提示
-                  d[0].type = 'audit_price_less_cost'
-                  _this.openVaildPrice(d[0])
-                }
-              } else {
-                _this.verificationSuccess(isBatch)
-              }
+              _this.verificationSuccess(isBatch)
             },
             onCancel () {
               _this.spinning = false
             }
           })
+          return
+        }
+        // 售价是否低于参考成本价
+        if (d.length) {
+          if (isBatch) { // 一键审核,弹框文字提示
+            _this.tempData = { vaildPriceList: d[0].data.map(item => item.productCode) }
+            _this.verificationSuccess(isBatch)
+          } else {
+            // 审核或上级审核,弹框表格提示
+            d[0].type = 'audit_price_less_cost'
+            _this.openVaildPrice(d[0])
+          }
+        } else {
+          _this.verificationSuccess(isBatch)
         }
       } else {
         _this.verificationSuccess(isBatch)
@@ -757,15 +759,15 @@ export default {
     // 验证通过
     verificationSuccess (isBatch) {
       if (isBatch) { // 一键审核
-        if (this.$refs.productList.hasOutStockOfActive) {
+        if (this.$refs.productActiveList.hasOutStockOfActive) {
           this.messageInfo('参加促销活动的产品存在缺货,不可一键审核!')
           return
         }
-        if (this.$refs.productList.showConvertPromoGifts) {
+        if (this.$refs.productActiveList.showConvertPromoGifts) {
           this.messageInfo('该活动规则中,促销产品可转费用报销单,不可一键审核!')
           return
         }
-        if (this.$refs.productList.hasJGtire) {
+        if (this.$refs.productList && this.$refs.productList.hasJGtire) {
           this.messageInfo('销售单内有品牌是【箭冠】,且三级分类是【轮胎】的产品,不可一键审核!')
           return
         }

+ 8 - 6
src/views/salesManagement/salesQueryNew/edit.vue

@@ -385,17 +385,19 @@ export default {
             </ol>
           </div>,
           onOk () {
-            // 价格校验弹框
-            if (c.length > 0) {
-              _this.openVaildPrice(c[0])
-            } else {
-              _this.submitOrder()
-            }
+            _this.submitOrder()
           },
           onCancel () {
             _this.spinning = false
           }
         })
+        return
+      }
+      // 价格校验弹框
+      if (c.length > 0) {
+        _this.openVaildPrice(c[0])
+      } else {
+        _this.submitOrder()
       }
     },
     // 校验销售价低于成本价提示