lilei 1 week ago
parent
commit
9f4f2aa4ed

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

@@ -68,7 +68,7 @@ export default {
       default: ''
     },
     // 是否促销产品
-    promoFlag: {
+    promoProductClz: {
       type: String,
       default: ''
     },
@@ -373,7 +373,7 @@ export default {
         showStock: this.showStock,
         warehouseSn: this.warehouseSn,
         borrowFlag: this.borrowFlag,
-        promotionFlag: this.promoFlag == '' ? undefined : this.promoFlag
+        promotionFlag: this.promoProductClz == '' ? undefined : this.promoProductClz
       }
       // 查询正常产品
       if (this.type == 'normal') {
@@ -382,7 +382,7 @@ export default {
           this.transferTableData(this.chooseList)
         } else {
           // 查询正常产品明细列表
-          if (this.promoFlag == 0 || this.promoFlag == undefined) {
+          if (this.promoProductClz == 0 || this.promoProductClz == undefined) {
             this.dataSource = await salesDetailAllList(params).then(res => res.data || [])
             if (this.activeList.length > 0) {
               this.countData = await salesDetaiCount(params).then(res => res.data)
@@ -391,7 +391,7 @@ export default {
         }
       } else {
         // 查询活动产品明细列表
-        if (this.promoFlag !== '0') {
+        if (this.promoProductClz !== '0') {
           this.dataSource = await salesDetailExtPromoList({ salesPromoSnSet: this.salesPromoSnSet, ...params }).then(res => res.data || [])
         }
       }

+ 3 - 3
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -60,7 +60,7 @@
             <a-col flex="1">
               <a-form-item label="产品类型">
                 <a-select
-                  v-model="queryParam.promotionFlag"
+                  v-model="queryParam.promoProductClz"
                   id="salesEdit-promoFlag"
                   allowClear
                   :dropdownMatchSelectWidth="false"
@@ -267,7 +267,7 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        promotionFlag: undefined, // 是否累计产品
+        promoProductClz: undefined, // 产品类型
         promoFlag: undefined,
         unitFlag: undefined // 是否满足起订量
       },
@@ -644,7 +644,7 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.borrowFlag = undefined
-      this.queryParam.promotionFlag = undefined
+      this.queryParam.promoProductClz = undefined
       this.queryParam.unitFlag = undefined
       this.productType = []
       this.rowSelectionInfo = null

+ 9 - 9
src/views/salesManagement/salesQueryNew/detail.vue

@@ -134,9 +134,9 @@
                   <a-col flex="300px" v-if="hasPrompActive">
                     <a-form-item label="产品类型">
                       <a-select
-                        v-model="promoFlag"
+                        v-model="promoProductClz"
                         @change="e=> {borrowFlag = undefined}"
-                        id="salesDetail-promoFlag"
+                        id="salesDetail-promoProductClz"
                         allowClear
                         :dropdownMatchSelectWidth="false"
                         placeholder="请选择产品类型">
@@ -161,7 +161,7 @@
                       </a-select>
                     </a-form-item>
                   </a-col>
-                  <a-col flex="200px" v-if="hasPrompActive&&promoFlag!=='0'">
+                  <a-col flex="200px" v-if="hasPrompActive&&promoProductClz!=='0'">
                     <a-form-item label="累计产品">
                       <v-select code="FLAG" v-model="borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
                     </a-form-item>
@@ -214,7 +214,7 @@
             :maxHeight="pageHeight"
             :detailData="detailData"
             :warehouseSn="warehouseSn"
-            :promoFlag="promoFlag"
+            :promoProductClz="promoProductClz"
             :pageType="$route.params.pageType"
             :salesBillSn="$route.params.sn || bizSn"
             :authCode="authCode"
@@ -273,7 +273,7 @@
           :detailData="detailData"
           :activeList="activeList"
           :warehouseSn="warehouseSn"
-          :promoFlag="promoFlag"
+          :promoProductClz="promoProductClz"
           :borrowFlag="borrowFlag"
           :pageType="$route.params.pageType"
           :salesBillSn="$route.params.sn || bizSn"
@@ -459,7 +459,7 @@ export default {
       auditText: null, // 审核备注信息
       fromRouter: null, // 从那个页面打开当前页面
       warehouseSn: undefined, // 所在仓库
-      promoFlag: undefined, // 产品类型
+      promoProductClz: undefined, // 产品类型
       openTipModal: false, // 改单弹窗
       sourceData: undefined, // 价格变动数据
       tempData: undefined, // 校验临时数据
@@ -568,9 +568,9 @@ export default {
     hideTable (type, len) {
       this.spinning = false
       if (type == 'normal') {
-        this.hideNormalTable = !(this.promoFlag == 0 || this.promoFlag == undefined) || this.borrowFlag != undefined || (len == 0 && this.activeList.length)
+        this.hideNormalTable = !(this.promoProductClz == 0 || this.promoProductClz == undefined) || this.borrowFlag != undefined || (len == 0 && this.activeList.length)
       } else {
-        if (this.promoFlag == 0) {
+        if (this.promoProductClz == 0) {
           this.hideActiveTable = true
         }
       }
@@ -635,7 +635,7 @@ export default {
     //  重置
     resetSearchForm () {
       this.warehouseSn = undefined
-      this.promoFlag = undefined
+      this.promoProductClz = undefined
       this.transferQty = undefined
       this.borrowFlag = undefined
       this.searchTable()