优惠活动bug修复

src/views/ecw/product/index.vue

@@ -206,19 +206,6 @@
           <el-radio v-model.number="form.needBook" :label="1">{{$t('是')}}</el-radio>
           <el-radio v-model.number="form.needBook" :label="0">{{$t('否')}}</el-radio>
         </el-form-item>
-        <el-form-item v-if="this.form.id == null " :label="$t('可参与优惠')">
-<!--          <el-select multiple v-model="form.couponlds" size="5"  style="min-width: 300px; border:1px solid #DCDFE6; border-radius:4px">-->
-<!--            <el-option v-for="item in preferentialList"  :value="item.couponId" :label="item.titleZh" :key="item.couponId" :disabled="item.mandatory">{{item.titleZh}}</el-option>-->
-<!--          </el-select>-->
-           <div style="width: 300px;height: 400px;border: 1px solid;overflow-y: auto">
-             <div @click="selectMoveAbout(item)" style="display: flex;justify-content: space-between; align-items: center;" :style="{'cursor':item.mandatory ? 'no-drop' : 'pointer'  }"  v-for="item in preferentialList">
-               <div>
-                 {{$l(item, 'title')}}
-               </div>
-                <i v-if="form.couponIds.includes(item.couponId)" style="margin-right: 20px;" class="el-icon-check"></i>
-             </div>
-           </div>
-        </el-form-item>
         <!--        <el-form-item :label="$t('可参与优惠活动')" prop="you">
                   <el-select v-model="form.you" :placeholder="$t('可参与优惠活动')" clearable>
                     <el-option v-for="packageItem in packagingList" :key="packageItem.value" :label="packageItem.label" :value="packageItem.value" />
@@ -229,7 +216,19 @@
             <template slot="append">{{$t('立方米')}}</template>
           </el-input>
         </el-form-item>
-
+        <el-form-item  :label="$t('可参与优惠')">
+          <!--          <el-select multiple v-model="form.couponlds" size="5"  style="min-width: 300px; border:1px solid #DCDFE6; border-radius:4px">-->
+          <!--            <el-option v-for="item in preferentialList"  :value="item.couponId" :label="item.titleZh" :key="item.couponId" :disabled="item.mandatory">{{item.titleZh}}</el-option>-->
+          <!--          </el-select>-->
+          <div style="width: 300px;height: 400px;border: 1px solid;overflow-y: auto">
+            <div @click="selectMoveAbout(item)" style="display: flex;justify-content: space-between; align-items: center;" :style="{'cursor':item.mandatory ? 'no-drop' : 'pointer'  }"  v-for="item in preferentialList">
+              <div>
+                {{$l(item, 'title')}}
+              </div>
+              <i v-if="form.couponIds.includes(item.couponId)" style="margin-right: 20px;" class="el-icon-check"></i>
+            </div>
+          </div>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{$t('确定')}}</el-button>
@@ -382,10 +381,6 @@ export default {
     this.getAttrList();
     this.getTypeList();
     this.getList();
-    product_coupon_newProd().then(r => {
-      this.preferentialList = r.data
-      this.reset()
-    })
   },
   methods: {
     /** 获取产品属性列表 */
@@ -606,14 +601,41 @@ export default {
       });
     },
     selectMoveAbout(val){
+      console.log(val,'val')
       if(!val.mandatory){
        let index =   this.form.couponIds.findIndex(i => val.couponId == i)
         if(index >= 0){
+          this.$confirm(this.$t(`您确定要将商品从优惠活动${this.$l(val,'title')}中移出吗？`), this.$t('提示'), {
+            confirmButtonText: this.$t('确定'),
+            cancelButtonText:this.$t('取消') ,
+            type: 'warning'
+          }).then(() => {
             this.form.couponIds.splice(index,1)
+          }).catch(() => {
+
+            });
         }else {
+          this.$confirm(this.$t(`您确定要将商品加入到优惠活动${this.$l(val,'title')}中吗？`), this.$t('提示'), {
+            confirmButtonText: this.$t('确定'),
+            cancelButtonText:this.$t('取消') ,
+            type: 'warning'
+          }).then(() => {
             this.form.couponIds.push(val.couponId)
+          }).catch(() => {
+
+          });
+        }
       }
     }
+  },
+  watch:{
+     open(val){
+       if(val){
+         product_coupon_newProd().then(r => {
+           this.preferentialList = r.data
+           this.reset()
+         })
+       }
      }
   }
 };