浏览代码

修改bug

chenrui 2 月之前
父节点
当前提交
772480531a

+ 2 - 2
src/views/salesManagement/salesQueryNew/detailAll.vue

@@ -84,8 +84,8 @@
               <span v-if="isCityPrice">市级总售价:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? toThousands(detailData.totalCityAmount) : '--' }}</strong>;</span>
               <span v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalDiscountAmount" style="color: red;">优惠金额:<strong>{{ toThousands(detailData.totalDiscountAmount) }}</strong>;</span>
               <span>合计重量(kg):<strong>{{ detailData&&(detailData.totalWeight || detailData.totalWeight==0) ? detailData.totalWeight : '--' }}</strong>;</span>
-              <span>平均成本公斤单价:<strong>{{ detailData&&(detailData.averageCost || detailData.averageCost==0) ? toThousands(detailData.averageCost) : '--' }}</strong>;</span>
-              <span>平均售价公斤单价:<strong>{{ detailData&&(detailData.averageRealAmount || detailData.averageRealAmount==0) ? toThousands(detailData.averageRealAmount) : '--' }}</strong>;</span>
+              <span>平均成本公斤单价:<strong>{{ detailData&&(detailData.totalWeightAvgCost || detailData.totalWeightAvgCost==0) ? toThousands(detailData.totalWeightAvgCost) : '--' }}</strong>;</span>
+              <span>平均售价公斤单价:<strong>{{ detailData&&(detailData.totalWeightAvgPrice || detailData.totalWeightAvgPrice==0) ? toThousands(detailData.totalWeightAvgPrice) : '--' }}</strong>;</span>
             </div>
           </div>
         </a-alert>

+ 3 - 2
src/views/setting/tireSubsidySetting/rebateAddModal.vue

@@ -108,8 +108,8 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          if (_this.form.ruleValue1 <= 0) {
-            _this.$message.warning('请输入数')
+          if (_this.form.ruleValue1 < 0) {
+            _this.$message.warning('请输入大于等于0的返利基数')
             return
           }
           _this.form.ruleType = _this.pageType
@@ -206,6 +206,7 @@ export default {
         this.resetFormData()
       } else {
         if (!this.itemSn) {
+          this.form.ruleValue1 = undefined
           this.getHistoryData({ defaultFlag: 1, subsidyQueryStatus: 'NOT_FINISH', ruleType: this.pageType })
         }
       }