Merge branch 'feature/1月-1年后上线' of http://git.gicdev.com/integralMall/integral-mall into dev

src/components/store/store-group.vue

@@ -280,6 +280,7 @@ export default {
         delete v.value;
         delete v.key;
         delete v.disabled;
+        return v;
       });
       this.$emit('getSelectList', this.selectLeftList);
       this.popoverShow = false;

src/components/store/store-part.vue

@@ -268,6 +268,7 @@ export default {
         delete v.pickUpPointPhone;
         delete v.canChooseTime;
         delete v.pickUpPointType;
+        return v;
       });
       this.$emit('getSelectList', this.selectLeftList);
       this.popoverShow = false;

src/views/setting/editDeliver.vue

@@ -105,7 +105,7 @@
                   <el-radio :label="1">
                     动态日期
                   </el-radio>
-                  <el-radio :label="2">
+                  <el-radio :label="2" disabled>
                     固定日期
                   </el-radio>
                 </el-radio-group>
@@ -181,12 +181,12 @@
                     :key="index"
                     style="margin:0px 0 22px 0"
                     :prop="'dataRangeList.' + index + '.dataRange'"
-                    :rules="[{ validator: validateData, trigger: 'change' }]"
                   >
                     <el-date-picker
                       v-model="item.dataRange"
                       :picker-options="pickerOptionsEnd"
                       is-range
+                      disabled
                       format="yy-MM-dd"
                       type="daterange"
                       range-separator="至"
@@ -691,6 +691,11 @@ export default {
           return false;
         }
       }
+      if (this.form.dateType === 2) {
+        return this.$alert('您已开启【商品兑换库存同步接口】，如果该自提点支持调货，请选择【动态日期】，否则客户无法选择该自提点', '', {
+          confirmButtonText: '确定',
+        });
+      }
       let params = {};
       let url = '';
       if (this.integralMallPickUpPointId === '-1') {