Pārlūkot izejas kodu

Merge branch 'develop_yh49_1' of jianguan-web/jg-ocs-html into pre-release

刘俊俊 7 mēneši atpakaļ
vecāks
revīzija
fc1741a039

+ 7 - 11
src/views/easyPassManagement/promotionalActivities/edit.vue

@@ -108,7 +108,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-                <a-form-model-item class="productName" label="券适用范围">
+                <a-form-model-item label="券适用范围" required>
                   全部产品
                 </a-form-model-item>
               </a-col>
@@ -320,7 +320,6 @@ export default {
         validName: [{ required: true, message: '请输入券名称', trigger: ['change', 'blur'] }],
         validBaseType: [{ required: true, message: '请选择生成方式', trigger: 'change' }],
         validType: [{ required: true, message: '请选择券有效期类型', trigger: 'change' }],
-        // validScope: [{ required: true, message: '请选择券适用范围', trigger: 'blur' }],
         productNum: [{ required: true, message: '选择产品不能为空', trigger: 'blur' }]
       }
     }
@@ -442,6 +441,11 @@ export default {
           _this.pageType = res.data.promoType
           _this.promotionName = res.data.promoName
         }
+        // 买产品送代金券
+        if (_this.form.promoType == 'BUY_PROD_GIVE_VALID' && _this.form.validType == 'FIXED') {
+          // 固定日期
+          _this.timeLimit = [res.data.validStartDate, res.data.validEndDate]
+        }
         _this.$nextTick(() => {
           _this.$refs.chooseProductList.pageInit()
         })
@@ -494,6 +498,7 @@ export default {
       delete formData.productNum
       _this.spinning = true
       formData.saveType = 'all'
+      formData.validScope = '1'
       saveShopPromo(formData).then(res => {
         if (res.status == 200) {
           _this.spinning = false
@@ -666,14 +671,5 @@ export default {
         max-height:30vh !important;
       }
     }
-    /deep/.productName .ant-form-item-label::before{
-          display: inline-block;
-          margin-right: 4px;
-          color: #f5222d;
-          font-size: 12px;
-          font-family: SimSun, sans-serif;
-          line-height: 1;
-          content: '*';
-    }
   }
 </style>