chenrui 1 год назад
Родитель
Сommit
60dd78040e

+ 20 - 7
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -73,7 +73,7 @@
               限制
             </a-select-option>
           </a-select>
-          <a-input-number
+          <a-input
             disabled="true"
             v-if="form.minOrderAmount"
             size="small"
@@ -82,7 +82,7 @@
           {{ form.minOrderAmount?'元':'' }}
         </a-form-model-item>
         <a-form-model-item prop="upperLimitFlag" label="活动经费上限">
-          <a-select v-model="form.minOrderFlag" style="width: 160px" size="small" disabled="true">
+          <a-select v-model="form.upperLimitFlag" style="width: 160px" size="small" disabled="true">
             <a-select-option value="0">
               不限
             </a-select-option>
@@ -90,7 +90,7 @@
               限制
             </a-select-option>
           </a-select>
-          <a-input-number
+          <a-input
             disabled="true"
             v-if="form.upperLimitAmount"
             size="small"
@@ -384,10 +384,23 @@ export default {
    .tabBox::-webkit-scrollbar {
        width: 0px;
     }
-    // .ant-form-item-control .ant-input[disabled]{
-    //   color:#333333;
-    //   background:#ffffff;
-    // }
+    .ant-form-item-control .ant-input[disabled]{
+      color:#333333;
+      background:#ffffff;
+    }
+   .ant-radio-button-wrapper-disabled{
+     color:#333333;
+     padding:0 16px;
+   }
+   .ant-radio-button-wrapper-disabled.ant-radio-button-wrapper-checked{
+   background-color: #ed1c24 !important;
+   color:#ffffff;
+    padding:0 16px;
+   }
+   /deep/.ant-select-disabled .ant-select-selection, .ant-cascader-picker-disabled{
+      color:#333 !important;
+      background:#fff;
+   }
   }
 
 </style>

+ 4 - 4
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -11,8 +11,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
-              <a-form-item label="促销名称">
-                <a-input id="promotionList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入促销名称"/>
+              <a-form-item label="促销名称/简称">
+                <a-input id="promotionList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入促销名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -209,7 +209,7 @@ export default {
       queryParam: {
         beginDate: undefined,
         endDate: undefined,
-        title: '',
+        queryWord: '',
         enabledFlag: undefined, // 发布状态
         state: undefined
       },
@@ -389,7 +389,7 @@ export default {
       this.queryParam = {
         beginDate: undefined,
         endDate: undefined,
-        title: '',
+        queryWord: '',
         enabledFlag: undefined, // 发布状态
         state: undefined
       }

+ 6 - 0
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -333,10 +333,16 @@ export default {
             _this.$message.warning('请输入订单起订限制金额数!')
             return
           }
+          if (_this.form.minOrderFlag == 0) {
+            _this.form.minOrderAmount = undefined
+          }
           if (_this.form.upperLimitFlag == 1 && !_this.form.upperLimitAmount) {
             _this.$message.warning('请输入活动经费上限金额!')
             return
           }
+          if (_this.form.upperLimitFlag == 0) {
+            _this.form.upperLimitAmount = undefined
+          }
           const form = JSON.parse(JSON.stringify(_this.form))
           let rowFlag1, rowFlag2, rowFlag3
           if (form.gateFlag == '1') {

+ 10 - 0
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -358,10 +358,17 @@ export default {
             _this.$message.warning('请输入订单起订限制金额数!')
             return
           }
+          if (_this.form.minOrderFlag == 0) {
+            _this.form.minOrderAmount = undefined
+          }
+
           if (_this.form.upperLimitFlag == 1 && !_this.form.upperLimitAmount) {
             _this.$message.warning('请输入活动经费上限金额!')
             return
           }
+          if (_this.form.upperLimitFlag == 0) {
+            _this.form.upperLimitAmount = undefined
+          }
 
           const form = JSON.parse(JSON.stringify(_this.form))
           let rowFlag1 = null
@@ -622,6 +629,9 @@ export default {
       align-items:center;
       justify-content:space-between;
     }
+    .ant-radio-button-wrapper-disabled.ant-radio-button-wrapper-checked{
+      background-color: #ed1c24 !important;
+    }
   }
 
 </style>

+ 6 - 1
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -255,11 +255,16 @@ export default {
             _this.$message.warning('请输入订单起订限制金额数!')
             return
           }
+          if (_this.form.minOrderFlag == 0) {
+            _this.form.minOrderAmount = undefined
+          }
           if (_this.form.upperLimitFlag == 1 && !_this.form.upperLimitAmount) {
             _this.$message.warning('请输入活动经费上限金额!')
             return
           }
-
+          if (_this.form.upperLimitFlag == 0) {
+            _this.form.upperLimitAmount = undefined
+          }
           const form = JSON.parse(JSON.stringify(_this.form))
           if (form.gateFlag == '1') {
             form.gateProductList = _this.$refs.cillProduct.getResultVal()