Преглед на файлове

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

lilei преди 7 месеца
родител
ревизия
17b17f78aa
променени са 2 файла, в които са добавени 10 реда и са изтрити 13 реда
  1. 8 10
      src/views/easyPassManagement/promotionalActivities/detailModal.vue
  2. 2 3
      src/views/easyPassManagement/promotionalActivities/edit.vue

+ 8 - 10
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">
@@ -69,16 +69,14 @@
                   {{ form.validTitle ||'--' }}
                 </a-form-model-item>
               </a-col>
-              <!-- <a-col :xs="24" :sm="24">
-                <a-form-model-item label="生成方式" prop="validBaseType">
-                  {{ form.validBaseTypeDictValue||'--' }}
-                </a-form-model-item>
-              </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 +251,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)
           })

+ 2 - 3
src/views/easyPassManagement/promotionalActivities/edit.vue

@@ -109,7 +109,7 @@
               </a-col>
               <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                 <a-form-model-item label="券适用范围" required>
-                  {{ form.validScope=='1'?'全部产品':'--' }}
+                  全部产品
                 </a-form-model-item>
               </a-col>
               <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
@@ -435,7 +435,7 @@ 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
@@ -498,7 +498,6 @@ 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