lilei 1 month ago
parent
commit
15932f992b

+ 5 - 1
src/views/promotionRulesManagement/dealerPromotions/addModal.vue

@@ -77,7 +77,7 @@
             style="margin-left:10px;width:300px;"
             style="margin-left:10px;width:300px;"
             v-model="form.dealerMaxJoinQty"
             v-model="form.dealerMaxJoinQty"
             id="promotionList-dealerMaxJoinQty"
             id="promotionList-dealerMaxJoinQty"
-            :min="0"
+            :min="1"
             :step="1"
             :step="1"
             :max="99999999"
             :max="99999999"
             :precision="0"
             :precision="0"
@@ -321,6 +321,10 @@ export default {
             _this.$message.warning('请输入活动经费上限金额!')
             _this.$message.warning('请输入活动经费上限金额!')
             return
             return
           }
           }
+          if (form.dealerMaxJoinFlag == '1' && !form.dealerMaxJoinQty) {
+            _this.$message.warning('最大参与次数必需大于0!')
+            return
+          }
           if (form.minOrderFlag == '0') {
           if (form.minOrderFlag == '0') {
             form.minOrderAmount = undefined
             form.minOrderAmount = undefined
           }
           }

+ 16 - 0
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -299,6 +299,22 @@ export default {
               width: 50,
               width: 50,
               align: 'center',
               align: 'center',
               renderBodyCell: ({ row, column, rowIndex }, h) => formatTd(row, column, rowIndex, 'specialPriceUnit')
               renderBodyCell: ({ row, column, rowIndex }, h) => formatTd(row, column, rowIndex, 'specialPriceUnit')
+            },
+            {
+              field: 'regularBaseVal',
+              key: '91',
+              title: '基础差',
+              width: 60,
+              align: 'center',
+              renderBodyCell: ({ row, column, rowIndex }, h) => formatTd(row, column, rowIndex, 'regularUnit')
+            },
+            {
+              field: 'regularNextVal',
+              key: '92',
+              title: '下阶差',
+              width: 60,
+              align: 'center',
+              renderBodyCell: ({ row, column, rowIndex }, h) => formatTd(row, column, rowIndex, 'regularUnit')
             }
             }
           ]
           ]
         },
         },