update: update

src/views/setting/editDeliver.vue

@@ -105,11 +105,11 @@
                   <el-radio :label="1">
                     动态日期
                   </el-radio>
-                  <el-radio :label="2" :disabled="erpGoodsFlag">
+                  <el-radio :label="2" :disabled="product.erpGoodsFlag">
                     固定日期
                   </el-radio>
                 </el-radio-group>
-                <div class="tip-warm" v-if="erpGoodsFlag">
+                <div class="tip-warm" v-if="product.erpGoodsFlag">
                   <p style="line-height:32px;">
                     您已开启【商品兑换库存同步接口】，如果该自提点支持调货，请选择【动态日期】，否则客户无法选择该自提点
                   </p>
@@ -186,7 +186,7 @@
                       v-model="item.dataRange"
                       :picker-options="pickerOptionsEnd"
                       is-range
-                      :disabled="erpGoodsFlag"
+                      :disabled="product.erpGoodsFlag"
                       format="yy-MM-dd"
                       type="daterange"
                       range-separator="至"
@@ -440,7 +440,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(['erpGoodsFlag']),
+    ...mapState(['product']),
   },
   created () {
     this.integralMallPickUpPointId = this.$route.query.integralMallPickUpPointId;
@@ -695,7 +695,7 @@ export default {
           return false;
         }
       }
-      if (this.form.dateType === 2) {
+      if (this.form.dateType === 2 && this.product.erpGoodsFlag) {
         return this.$alert('您已开启【商品兑换库存同步接口】，如果该自提点支持调货，请选择【动态日期】，否则客户无法选择该自提点', '', {
           confirmButtonText: '确定',
         });
@@ -844,7 +844,7 @@ export default {
 .section {
   background: #fff;
   margin: 24px;
-  padding-bottom: 24px;
+  padding: 0 0 24px  0;
 }
 .section-content h3 {
   height: 55px;

src/views/setting/pickedAuto.vue

@@ -24,11 +24,11 @@
             <el-radio :label="1">
               动态日期
             </el-radio>
-            <el-radio :label="2" :disabled="erpGoodsFlag">
+            <el-radio :label="2" :disabled="product.erpGoodsFlag">
               固定日期
             </el-radio>
           </el-radio-group>
-          <div class="tip-warm" style="margin-left:0;" v-if="erpGoodsFlag">
+          <div class="tip-warm" style="margin-left:0;" v-if="product.erpGoodsFlag">
             <p style="line-height:32px;">
               您已开启【商品兑换库存同步接口】，如果该自提点支持调货，请选择【动态日期】，否则客户无法选择该自提点
             </p>
@@ -106,7 +106,7 @@
                 v-model="item.dataRange"
                 :picker-options="pickerOptionsEnd"
                 is-range
-                :disabled="erpGoodsFlag"
+                :disabled="product.erpGoodsFlag"
                 format="yy-MM-dd"
                 type="daterange"
                 range-separator="至"
@@ -350,7 +350,7 @@ export default {
   //   this.pickedModal.timeRangeList[0].timeRange = [currentTime, currentTime1];
   // },
   computed: {
-    ...mapState(['erpGoodsFlag']),
+    ...mapState(['product']),
   },
   watch: {
     pickedForm: {