chenrui 11 hónapja
szülő
commit
0c8dc55de2

+ 0 - 1
src/views/promotionRulesManagement/promotionManagement/detailModal.vue

@@ -326,7 +326,6 @@ export default {
       overflow-y: scroll;
     }
     .timeBox{
-      margin-left: 10px;
       color:#ed1c24;
       opacity: .7;
     }

+ 2 - 1
src/views/promotionRulesManagement/promotionManagement/edit.vue

@@ -161,6 +161,7 @@
             </a-col>
           </a-row>
         </a-form-model>
+
         <a-form-model
           id="setPromotion-form"
           ref="sellRuleForm"
@@ -236,7 +237,7 @@
                   :disabled-date="disabledDate"
                   :placeholder="['开始时间', '结束时间']" />
                 <span style="width:40%;margin-left:10px;" v-show="sellForm.validType==='LIMIT'">
-                  领取后,立即生效,有效期<a-input-number
+                  有效期<a-input-number
                     style="margin:0 5px;"
                     v-model="sellForm.validDays"
                     :step="1"

+ 1 - 2
src/views/promotionRulesManagement/promotionManagement/list.vue

@@ -14,7 +14,7 @@
               <a-form-item label="促销名称">
                 <a-input id="promotion-promotionName" v-model.trim="queryParam.name" allowClear placeholder="请输入促销名称"/>
               </a-form-item>
-            </a-col>s
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="促销状态">
                 <v-select
@@ -34,7 +34,6 @@
             </a-col>
           </a-row>
         </a-form>
-
       </div>
     </a-card>
     <!-- 列表 -->

+ 7 - 0
src/views/promotionRulesManagement/promotionManagement/productTable.vue

@@ -22,6 +22,7 @@
             :max="99999999"
             @blur="editAllPrice(record,'price')"
             placeholder="请输入"
+            :disabled="disabledVal"
             v-model="record.price"
             :id="'productTable-price'+record.id "
             size="small"/>
@@ -32,6 +33,7 @@
             :step="1"
             :precision="2"
             :max="99999999"
+            :disabled="disabledVal"
             @blur="editAllPrice(record,'ruleValue')"
             placeholder="请输入"
             v-model="record.ruleValue"
@@ -45,6 +47,7 @@
             type="link"
             class="button-error"
             :id="'productTable-del-btn'+record.id "
+            :disabled="disabledVal"
             @click="handleDel(record)"
           >删除</a-button>
         </template>
@@ -64,6 +67,10 @@ export default {
     promoActiveSn: {
       type: String,
       default: ''
+    },
+    disabledVal: {
+      type: Boolean,
+      default: false
     }
   },
   data () {