Sfoglia il codice sorgente

Merge branch 'develop_yh49_1' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh49_1

lilei 7 mesi fa
parent
commit
c05bce8634

+ 8 - 5
src/views/easyPassManagement/promotionalActivities/detailModal.vue

@@ -61,7 +61,7 @@
             <div v-if="form.promoType==='BUY_PROD_GIVE_VALID'">
               <a-col :xs="12" :sm="12">
                 <a-form-model-item label="券名称" prop="validName" required :label-col="{span:8}" :wrapper-col="{span:14}">
-                  {{ form.validName }}
+                  {{ form.validName||'--' }}
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12">
@@ -76,9 +76,12 @@
               </a-col> -->
               <a-col :xs="24" :sm="24">
                 <a-form-model-item label="券有效期" prop="validType" required>
-                  <span>{{ form.validType==='FIXED'?'固定日期':'领取后,立即生效' }}</span>
-                  <span style="margin-left:10px;" v-if="form.validType==='FIXED'">{{ form.validStartDate }}~{{ form.validEndDate }}</span>
-                  <span style="margin-left:10px;" v-else>有效期{{ form.validDays }}天</span>
+                  <div v-if="form.validType">
+                    <span>{{ form.validType==='FIXED'?'固定日期':'领取后,立即生效' }}</span>
+                    <span style="margin-left:10px;" v-if="form.validType==='FIXED'">{{ form.validStartDate }}~{{ form.validEndDate }}</span>
+                    <span style="margin-left:10px;" v-else>有效期{{ form.validDays }}天</span>
+                  </div>
+                  <div v-else>--</div>
                 </a-form-model-item>
               </a-col>
               <a-col :xs="24" :sm="24">
@@ -253,7 +256,7 @@ export default {
     getDetail () {
       shopPromoDetail({ sn: this.itemSn }).then(res => {
         if (res.status == 200) {
-          this.form = res.data
+          this.form = { ...this.form, ...res.data }
           this.$nextTick(() => {
             this.$refs.table.refresh(true)
           })

+ 7 - 12
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' }]
       }
     }
@@ -436,12 +435,17 @@ export default {
       const _this = this
       const res = await shopPromoDetail(ajaxData)
       if (res.status == 200) {
-        _this.form = res.data
+        _this.form = { ..._this.form, ...res.data }
         _this.form.productNum = 0
         if (_this.$route.params.pageType === 'edit') {
           _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()
         })
@@ -666,14 +670,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>