update: update

src/views/setting/editDeliver.vue

@@ -105,11 +105,11 @@
                   <el-radio :label="1">
                     动态日期
                   </el-radio>
-                  <el-radio :label="2" disabled>
+                  <el-radio :label="2" :disabled="erpGoodsFlag">
                     固定日期
                   </el-radio>
                 </el-radio-group>
-                <div class="tip-warm">
+                <div class="tip-warm" v-if="erpGoodsFlag">
                   <p style="line-height:32px;">
                     您已开启【商品兑换库存同步接口】，如果该自提点支持调货，请选择【动态日期】，否则客户无法选择该自提点
                   </p>
@@ -186,7 +186,7 @@
                       v-model="item.dataRange"
                       :picker-options="pickerOptionsEnd"
                       is-range
-                      disabled
+                      :disabled="erpGoodsFlag"
                       format="yy-MM-dd"
                       type="daterange"
                       range-separator="至"
@@ -274,6 +274,7 @@
 // import qs from 'qs';
 import request from '../../service/request.js';
 import getInputVal from '../../utils/common.js';
+import { mapState } from 'vuex';
 // import stockModal from '../../../components/getSkuList';
 
 export default {
@@ -438,6 +439,9 @@ export default {
       enableAccessControl: false,
     };
   },
+  computed: {
+    ...mapState(['erpGoodsFlag']),
+  },
   created () {
     this.integralMallPickUpPointId = this.$route.query.integralMallPickUpPointId;
     if (this.integralMallPickUpPointId !== '-1') {

src/views/setting/pickedAuto.vue

@@ -24,11 +24,11 @@
             <el-radio :label="1">
               动态日期
             </el-radio>
-            <el-radio :label="2">
+            <el-radio :label="2" :disabled="erpGoodsFlag">
               固定日期
             </el-radio>
           </el-radio-group>
-          <div class="tip-warm" style="margin-left:0;">
+          <div class="tip-warm" style="margin-left:0;" v-if="erpGoodsFlag">
             <p style="line-height:32px;">
               您已开启【商品兑换库存同步接口】，如果该自提点支持调货，请选择【动态日期】，否则客户无法选择该自提点
             </p>
@@ -106,6 +106,7 @@
                 v-model="item.dataRange"
                 :picker-options="pickerOptionsEnd"
                 is-range
+                :disabled="erpGoodsFlag"
                 format="yy-MM-dd"
                 type="daterange"
                 range-separator="至"
@@ -186,6 +187,7 @@ import request from '../../service/request.js';
 // import copy from '../../utils/clone.js';
 import getInputVal from '../../utils/common.js';
 import { confirmInfo } from '../../utils/user.js';
+import { mapState } from 'vuex';
 export default {
   props: {
     pickedForm: {
@@ -347,6 +349,9 @@ export default {
   //   let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
   //   this.pickedModal.timeRangeList[0].timeRange = [currentTime, currentTime1];
   // },
+  computed: {
+    ...mapState(['erpGoodsFlag']),
+  },
   watch: {
     pickedForm: {
       handler: function (n, o) {