feat:merge

src/pages/Activity/Manage/index.vue

@@ -289,7 +289,15 @@ export default {
       };
     },
     // 查看详情
-    handleLook() {}
+    handleLook(row) {
+      this.$router.push({
+        path: "/op/groupmeal/orderManagement",
+        query: {
+          marketing_id: row.activiteId,
+          marketing_type: row.marketing_type
+        }
+      });
+    }
   },
   created() {
     this.getActivityList();

src/pages/Activity/releaseProduc/components/infoEditing.vue

@@ -91,6 +91,10 @@ export default {
 
     // 获取营销活动详情
     marketingInfoMet() {
+      let marketingId = this.$route.query.marketing_id;
+      if (marketingId == undefined) {
+        return;
+      }
       this.propData = JSON.parse(localStorage.getItem("propData"));
       this.infoEditForm.title = this.propData.marketing_name;
       this.infoEditForm.desc = this.propData.pindan_desc;

src/pages/Activity/releaseProduc/components/spellOrderSet.vue

@@ -261,9 +261,6 @@ export default {
           return time.getTime() < _now || time.getTime() > ninetyDays; //大于当前的禁止，小于90天前的禁止
         }
       },
-      defaultTime1: [new Date(2000, 1, 1, 12, 0, 0)],
-      startMinTime: "", // 开始时间的最小选择时间
-      startMaxTime: "", // 开始时间的最大选择时间
       mapDialogVisible: false,
       pageLoading: false,
       rules: {
@@ -297,6 +294,7 @@ export default {
       pageCount: 0, // 总条数
       takePlacelist: [], // 自提点列表
       checkedTakePlacelist: [], // 已选择自提点列表 活动详情中添加的自提点列表
+      hasCheckedList: false, // 表示是否有选中的自提点列表  是编辑还是添加的区别
       multipleSelection: [],
       dialogFormVisible: false,
       formLabelWidth: "120px",
@@ -347,7 +345,7 @@ export default {
         this.pageLoading = true;
         let data = await ActivityService.getPlaceList(params);
         this.pageLoading = false;
-        this.setTableListData(data.result.list);
+        this.takePlacelist = this.setTableListData(data.result.list);
         this.pageCount = data.result.total;
       } catch {
         this.pageLoading = false;
@@ -389,7 +387,7 @@ export default {
 
     // tableList数据格式转换
     setTableListData(data) {
-      this.takePlacelist = data.map(item => {
+      let result = data.map(item => {
         return {
           name: item.take_place_name,
           location: item.province + item.city + item.area, // p + c + a
@@ -398,6 +396,7 @@ export default {
           id: item.take_place_id
         };
       });
+      return result;
     },
 
     // 删除自提点操作
@@ -437,8 +436,29 @@ export default {
     },
     // 复选框
     handleSelectionChange(val) {
+      console.log("lihui", val);
       this.checkedNum = val.length;
       this.multipleSelection = val;
+      let takePlaceIds = "";
+      val.forEach(item => {
+        if (takePlaceIds === "") {
+          takePlaceIds = item.id;
+        } else {
+          takePlaceIds = takePlaceIds + "," + item.id;
+        }
+      });
+      this.$emit("getTakeTakePlaceListFromChild", takePlaceIds);
+    },
+    // 勾选某些列表的操作
+    toggleSelection(rows) {
+      console.log("liuna", rows);
+      if (rows) {
+        rows.forEach(row => {
+          this.$refs.multipleTable.toggleRowSelection(row);
+        });
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
     },
 
     //改变开始时间
@@ -459,13 +479,15 @@ export default {
       this.form.latitude = mapInfo.lng;
     }
   },
-  async created() {
+  created() {
     if (this.$route.query.marketing_id) {
+      // 此时需要两份数据对比
+      this.hasCheckedList = true;
       console.log(this.spellOrderSetArr);
-      this.setTableListData(this.spellOrderSetArr);
-    } else {
-      this.getPlaceList();
+      this.checkedTakePlacelist = this.setTableListData(this.spellOrderSetArr); // 选中的自提点列表
+      this.toggleSelection(this.checkedTakePlacelist);
     }
+    this.getPlaceList();
   }
 };
 </script>

src/pages/Activity/releaseProduc/index.vue

@@ -28,6 +28,7 @@
         ref="spellOrderSet"
         v-show="active === 3"
         :spellOrderSet="spellOrderSetArr"
+        @getTakeTakePlaceListFromChild="getTakeTakePlaceListFromChild"
       />
     </div>
     <div class="stepsBtn">
@@ -64,7 +65,7 @@ export default {
   },
   data() {
     return {
-      active: 1, // 步骤条状态
+      active: 3, // 步骤条状态
       infoEditArr: [], // 信息编辑数据
       addProducArr: [], // 添加商品
       goodsSkuIDArr: [], // 接收goods_sku_id
@@ -172,6 +173,9 @@ export default {
           ElMessage.error(res.reason);
         }
       }
+    },
+    getTakeTakePlaceListFromChild(val) {
+      console.log(val);
     }
   },
   created() {