lilei 1 year ago
parent
commit
30c0d74826

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

@@ -51,6 +51,10 @@
           type: String,
           default: ''
         },
+        promoFlag: {
+          type: String,
+          default: ''
+        },
         salesBillSn: {
           type: String,
           default: ''
@@ -278,7 +282,8 @@
             const params = {
                 salesBillSn: this.salesBillSn,
                 showStock: this.showStock,
-                warehouseSn: this.warehouseSn
+                warehouseSn: this.warehouseSn,
+                promoFlag: this.promoFlag
             }
             const active = this.activeList.filter(item => item.enabledFlag == 1)
 

+ 26 - 2
src/views/salesManagement/salesQueryNew/detail.vue

@@ -95,11 +95,32 @@
             <div style="flex-grow: 1;width: 60%;">
               <a-form layout="inline" @keyup.enter.native="searchTable">
                 <a-row :gutter="15" type="flex">
-                  <a-col flex="350px">
+                  <a-col flex="300px">
                     <a-form-item label="出库仓库">
                       <chooseWarehouse ref="warehouse" v-model="warehouseSn"></chooseWarehouse>
                     </a-form-item>
                   </a-col>
+                  <a-col flex="300px">
+                    <a-form-item label="产品类型">
+                      <a-select v-model.trim="promoFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
+                        <a-select-option value="0">
+                          正常产品
+                        </a-select-option>
+                        <a-select-option value="REGULAR">
+                          正价产品(活动)
+                        </a-select-option>
+                        <a-select-option value="DISCOUNT">
+                          特价产品
+                        </a-select-option>
+                        <a-select-option value="GIFT">
+                          促销产品
+                        </a-select-option>
+                        <a-select-option value="GATE">
+                          门槛产品
+                        </a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
                   <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                     <a-button type="primary" @click="searchTable" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
                     <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
@@ -119,6 +140,7 @@
             ref="productList"
             :detailData="detailData"
             :warehouseSn="warehouseSn"
+            :promoFlag="promoFlag"
             :salesBillSn="$route.params.sn || bizSn"
             :authCode="authCode"
             :maxHeight="pageHeight"
@@ -245,7 +267,8 @@ export default {
       spinningAudit: false,
       auditText: null,
       fromRouter: null,
-      warehouseSn: undefined
+      warehouseSn: undefined,
+      promoFlag: undefined
     }
   },
   computed: {
@@ -282,6 +305,7 @@ export default {
     //  重置
     resetSearchForm () {
       this.warehouseSn = undefined
+      this.promoFlag = undefined
       setTimeout(() => {
         this.searchTable()
       }, 100)