Merge remote-tracking branch 'origin/seven' into d_ls

src/views/Marketing/goods/spec/compoent/configTable.vue

@@ -86,13 +86,7 @@ export default {
           placeholder: "商品编号",
         },
       ],
-      formData: {
-        status: "0,1",
-        pageSize: 10,
-        pageNum: 1,
-        businessId: this.businessId,
-        educationTypeId: this.educationTypeId,
-      },
+      formData: {},
       loading: false,
       total: 0,
       tableRadio: "",
@@ -123,7 +117,9 @@ export default {
           type: "success",
         });
         let obj = this.courseData.find((e) => e.goodsId == this.tableRadio);
-        this.activeData = Object.assign(this.activeData, obj);
+        this.activeData = Object.assign(this.activeData, obj, {
+          specTemplateId,
+        });
         this.dialogTableVisible = false;
       });
     },
@@ -150,6 +146,7 @@ export default {
         businessId: this.businessId,
         educationTypeId: this.educationTypeId,
         status: "0,1",
+        goodsTypes: [1, 2, 6],
       };
       this.search();
     },
@@ -168,7 +165,7 @@ export default {
       this.tableRadio = "";
       this.activeData = row;
       this.dialogTableVisible = true;
-      this.search();
+      this.init();
     },
     handleSizeChange(v) {
       this.formData.pageSize = v;