update: update

src/views/setting/deliverSet.vue

@@ -207,7 +207,7 @@
       </div>
     </div>
     <!-- 自提点设置 -->
-    <pickedAuto :pickedForm="pickedForm" @getList="getList" />
+    <pickedAuto :pickedForm="pickedForm" :visible.sync="pickedVisible" @getList="getList" />
     <!-- 导出自提点 -->
     <vue-gic-export-excel
       :dataArr="tableDate"
@@ -248,10 +248,10 @@ export default {
       tableDate: [],
       creatorOptions: [],
       pickedForm: {
-        dialogVisible: false,
         selectIdList: [], // 复选框选中的数据的id
         list: [{ timeRange: [] }], // 初始数据
       },
+      pickedVisible: false,
       creatorLoading: false,
       enableAccessControl: false,
       // 导出
@@ -360,7 +360,7 @@ export default {
         const currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
         // this.pickedModal.timeRangeList[0].timeRange = [currentTime, currentTime1];
         this.pickedForm.list[0].timeRange = [currentTime, currentTime1];
-        this.pickedForm.dialogVisible = true;
+        this.pickedVisible = true;
       }
     },
     // 获取自提点状态
@@ -510,7 +510,7 @@ export default {
 .section {
   background: #fff;
   margin: 24px;
-  /* padding: 24px; */
+  padding: 0;
 }
 .header-top {
   /* margin: 15px 0 22px 0; */

src/views/setting/pickedAuto.vue

@@ -24,11 +24,11 @@
             <el-radio :label="1">
               动态日期
             </el-radio>
-            <el-radio :label="2" :disabled="product.erpGoodsFlag">
+            <el-radio :label="2" :disabled="erpGoodsFlag">
               固定日期
             </el-radio>
           </el-radio-group>
-          <div class="tip-warm" style="margin-left:0;" v-if="product.erpGoodsFlag">
+          <div class="tip-warm" style="margin-left:0;" v-if="erpGoodsFlag">
             <p style="line-height:32px;">
               您已开启【商品兑换库存同步接口】，如果该自提点支持调货，请选择【动态日期】，否则客户无法选择该自提点
             </p>
@@ -106,7 +106,7 @@
                 v-model="item.dataRange"
                 :picker-options="pickerOptionsEnd"
                 is-range
-                :disabled="product.erpGoodsFlag"
+                :disabled="erpGoodsFlag"
                 format="yy-MM-dd"
                 type="daterange"
                 range-separator="至"
@@ -200,6 +200,10 @@ export default {
         };
       },
     },
+    visible: {
+      type: Boolean,
+      default: false,
+    },
   },
   data () {
     const timeHoursValidator = (rule, value, callback) => {
@@ -350,17 +354,14 @@ export default {
   //   this.pickedModal.timeRangeList[0].timeRange = [currentTime, currentTime1];
   // },
   computed: {
-    ...mapState(['product']),
+    ...mapState(['erpGoodsFlag']),
   },
   watch: {
-    pickedForm: {
+    visible: {
       handler: function (n, o) {
-        console.log(n.dialogVisible);
-        if (n.dialogVisible) {
-          this.dialogVisible = n.dialogVisible;
-        }
+        this.dialogVisible = n;
       },
-      deep: true,
+      immediate: true,
     },
   },
   created () {
@@ -605,7 +606,7 @@ export default {
     // 取消
     cancelSubmit (pickedModal) {
       this.$refs[pickedModal].resetFields();
-      this.$emit('update:pickedForm', Object.assign({}, this.pickedForm, { dialogVisible: false }));
+      this.$emit('update:visible', false);
       this.pickedModal.status = false;
       this.pickedModal.timeRangeList = this.pickedForm.list;
       // let currentTime = new Date(new Date().valueOf());