lilei 1 rok pred
rodič
commit
6e650a5b81

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

@@ -283,7 +283,7 @@
                 salesBillSn: this.salesBillSn,
                 showStock: this.showStock,
                 warehouseSn: this.warehouseSn,
-                promoFlag: this.promoFlag
+                promotionFlag: this.promoFlag
             }
             const active = this.activeList.filter(item => item.enabledFlag == 1)
 

+ 2 - 9
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -16,7 +16,7 @@
           </a-col>
           <a-col :md="4" :sm="24" v-if="hasPrompActive">
             <a-form-item label="产品类型">
-              <a-select allowClear v-model.trim="queryParam.promoFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
+              <a-select allowClear v-model.trim="queryParam.promotionFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
                 <a-select-option value="0">
                   正常产品
                 </a-select-option>
@@ -159,7 +159,7 @@ export default {
         pushProductType: '', // 类型
         productCode: '', //  产品编码
         productName: '', //  产品名称
-        promoFlag: undefined, //  是否促销品
+        promotionFlag: undefined, //  是否促销品
         brandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
@@ -412,11 +412,6 @@ export default {
         this.queryParam.salesBillSn = this.salesBillSn
         this.queryParam.showStock = true
         const params = this.queryParam
-        if(params.promoFlag){
-          params.isGifg = params.promoFlag == 1 ? 'Y' : 'N'
-        }else{
-          params.isGifg = undefined
-        }
  
         const active = this.activeList
 
@@ -512,8 +507,6 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.warehouseSn = undefined
-      this.queryParam.promoFlag = undefined
-      this.queryParam.isGifg = undefined
       this.productType = []
       this.dataSource = []
       this.clearSelectTable()