chenrui 6 ماه پیش
والد
کامیت
51f76d6273

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

@@ -147,7 +147,7 @@ export default {
       const _this = this
       // 格式化数字金额单元格
       const formatTd = (row, column, rowIndex, uniKey, fun) => {
-        if (row[column.field]) {
+        if (row[column.field] || row[column.field] == 0) {
           return (<div onClick={() => fun ? fun(row, uniKey) : false}><span class={fun ? 'table-link-btn' : ''}>{row[column.field]}</span><span style="font-size:10px;zoom:0.7;margin-left:3px;">{row[uniKey]}</span></div>)
         } else {
           return ''

+ 9 - 8
src/views/salesManagement/salesQueryNew/comps/cumulativeProduct.vue

@@ -65,8 +65,8 @@
       class="sTable"
       ref="table"
       size="small"
-      :rowKey="(record) => record.productSn"
-      rowKeyName="productSn"
+      :rowKey="(record) => record.borrowDetailSn"
+      rowKeyName="borrowDetailSn"
       :columns="columns"
       :data="loadData"
       :row-selection="{ columnWidth: 40 }"
@@ -108,11 +108,11 @@ export default {
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '' //  产品三级分类
+        productTypeSn3: '', //  产品三级分类
+        promoProductClz: 'GATE' // 促销产品类型
       },
       tableHeight: 300, // 表格高度
       disabled: false, //  查询、重置按钮是否可操作
-      promoProductClz: 'GATE', // 促销产品类型
       promoRuleData: null, // 促销规则数据
       tabList: [], // 促销产品选项卡
       rowSelectionInfo: null, // 已选择
@@ -196,7 +196,7 @@ export default {
     },
     // 切换tab
     changeTab (e) {
-      this.promoProductClz = e
+      this.queryParam.promoProductClz = e
       this.resetSearchForm()
       // 清空表格选中项
       this.$refs.table.clearSelected()
@@ -226,6 +226,7 @@ export default {
       this.promoRuleData = promo.promotionRule
       this.queryParam.salesBillSn = data.salesBillSn
       this.queryParam.salesPromoSn = promo.salesPromoSn
+      this.queryParam.promoRuleSn = promo.salesPromoSn
       // 选项卡数据
       const tabList = []
       if (this.promoRuleData) {
@@ -237,7 +238,7 @@ export default {
         }
       }
       this.tabList = tabList
-      this.promoProductClz = tabList && tabList.length ? tabList[0].val:''
+      this.queryParam.promoProductClz = tabList && tabList.length ? tabList[0].val : ''
       this.tableHeight = window.innerHeight - 368
       this.resetSearchForm()
     },
@@ -257,10 +258,10 @@ export default {
       const chooseDataList = this.rowSelectionInfo.selectedRows = this.rowSelectionInfo.selectedRows.map(item => {
         item.borrowFlag = 1
         item.salesBillSn = this.queryParam.salesBillSn
-        item.promotionFlag = this.promoProductClz
+        item.promotionFlag = this.queryParam.promoProductClz
         return item
       })
-      this.$emit('add', chooseDataList, this.promoProductClz)
+      this.$emit('add', chooseDataList, this.queryParam.promoProductClz)
     },
     // 选择产品分类  change
     changeProductType (val, opt) {