chenrui 4 meses atrás
pai
commit
64b0536bf1

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

@@ -155,7 +155,7 @@ export default {
       const _this = this
       // 格式化数字金额单元格
       const formatTd = (row, column, rowIndex, uniKey, fun) => {
-        if (column.field != 'regularBaseVal' && column.field != 'regularNextVal' ? row[column.field] : row[column.field] == 0) {
+        if (column.field != 'regularBaseVal' && column.field != 'regularNextVal' ? row[column.field] : (row[column.field] || row[column.field] == 0)) {
           return (<div onClick={() => fun ? fun(row, uniKey) : false}><span class={fun ? 'table-link-btn' : (column.field == 'geteBalance' || column.field == 'regularBaseVal') ? 'table-word-color' : ''}>{row[column.field]}</span><span style="font-size:10px;zoom:0.7;margin-left:3px;">{row[uniKey]}</span></div>)
         } else {
           return ''
@@ -531,8 +531,8 @@ export default {
         const regularQuota = item.promotionRule.promotionRuleType != 'PROMO_PROD' ? item.gateQuotaAmount : 0// 配额  // 额度item.regularRuleValue
         const regularSelected = isYuan1 ? item.regularTotalAmount : item.regularTotalQty // 已选
         const regularTotal = isYuan1 ? item.regularBorrowAmount : item.regularBorrowQty // 累计
-        const regularBaseVal = (isYuan1 ? item.baseAmount : item.baseQty) * 1 <= 0 ? 0 : undefined // 基础差
-        const regularNextVal = (isYuan1 ? item.nextAmount : item.nextQty) * 1 <= 0 ? 0 : undefined // 下级差
+        const regularBaseVal = (isYuan1 ? item.baseAmount : item.baseQty) * 1 <= 0 ? 0 : (isYuan1 ? item.baseAmount : item.baseQty) // 基础差
+        const regularNextVal = (isYuan1 ? item.nextAmount : item.nextQty) * 1 <= 0 ? 0 : (isYuan1 ? item.nextAmount : item.nextQty) // 下级差
         // 促销品
         const promoUnit = '个'
         const promoSelected = item.giftQty || 0 // 已选

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

@@ -802,6 +802,7 @@ export default {
           }).then(res => {
             if (res.status == 200) {
               _this.searchProduct()
+              _this.clearTableSelect()
               _this.$emit('refash', 'promo', 'batchDel')
               _this.$message.success(res.message)
             }
@@ -858,13 +859,13 @@ export default {
       const _this = this
       _this.spinning = true
       updateWarehouse(data).then(res => {
-        console.log(res)
         if (res.status == 200) {
           _this.$message.success(res.message)
           _this.$emit('refash', 'promo', 'update')
         }
         _this.openWarehouseModal = false
         _this.searchProduct()
+        _this.clearTableSelect()
         _this.spinning = false
       })
     },
@@ -881,7 +882,6 @@ export default {
       } else if (e.key == 1) { // 删除已选项
         this.handleBatchDel()
       } else if (e.key == 3) { // 全部仓库设置
-        _this.clearTableSelect()
         if (_this.dataSource.length == 0) {
           _this.$message.warning('暂无可设置的产品!')
           return