浏览代码

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

chenrui 1 年之前
父节点
当前提交
99a3021347

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

@@ -280,7 +280,7 @@
                 showStock: this.showStock,
                 warehouseSn: this.warehouseSn
             }
-            const active = this.activeList
+            const active = this.activeList.filter(item => item.enabledFlag == 1)
 
             // 正常产品
             const proList = await salesDetailAllList(params).then(res => res.data)

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

@@ -381,7 +381,7 @@ export default {
     getActiveList(){
       salesPromoQueryList({ salesBillSn: this.salesBillSn }).then(res => {
         if(res.status == 200){
-          this.activeList = res.data || []
+          this.activeList = res.data.filter(item => item.enabledFlag == 1) || []
         }
         this.$nextTick(()=>{
           this.searchTable()