修改页面

src/main/java/com/izouma/jiashanxia/domain/Package.java

@@ -46,7 +46,4 @@ public class Package extends BaseEntity {
     @Convert(converter = StringArrayConverter.class)
     private List<String> img;
 
-//    @OneToMany(cascade = CascadeType.DETACH)
-//    @JoinColumn(name = "set_goods_id")
-//    private List<SetGoods> setGoods;
 }

src/main/java/com/izouma/jiashanxia/domain/PackageGoods.java

@@ -23,17 +23,11 @@ import java.math.BigDecimal;
 public class PackageGoods extends BaseEntity {
     private Long packageId;
 
-    @ApiModelProperty(value = "名称")
-    private String name;
-
     private Long goodsInfoId;
 
     @ApiModelProperty(value = "数量")
     private Integer num;
 
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
     @ApiModelProperty(value = "价格")
     private BigDecimal price;
 

src/main/java/com/izouma/jiashanxia/domain/UserPackage.java

@@ -21,17 +21,11 @@ public class UserPackage extends BaseEntity {
 
     private Long userId;
 
-//    @ApiModelProperty(value = "名称")
-//    private String name;
-
     private Long goodsInfoId;
 
     @ApiModelProperty(value = "数量")
     private Integer num;
 
-//    @ApiModelProperty(value = "单位")
-//    private String unit;
-
     private String remark;
 
 }

src/main/vue/src/components/PackageEdit.vue

@@ -133,7 +133,13 @@ export default {
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
-                    this.$router.go(-1);
+                    this.$emit('next', 'second');
+                    this.$router.replace({
+                        name: 'PackageEdit',
+                        query: {
+                            id: res.id
+                        }
+                    });
                 })
                 .catch(e => {
                     console.log(e);

src/main/vue/src/components/PackageGoodsTable.vue

@@ -2,9 +2,9 @@
     <div>
         <el-table :data="setList" ref="table">
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="name" label="名称" min-width="120px"> </el-table-column>
+            <el-table-column prop="goodsInfo.name" label="名称" min-width="120px"> </el-table-column>
             <el-table-column prop="num" label="数量"> </el-table-column>
-            <el-table-column prop="unit" label="单位"> </el-table-column>
+            <el-table-column prop="goodsInfo.unit" label="单位"> </el-table-column>
             <el-table-column prop="price" label="价格"> </el-table-column>
             <el-table-column prop="remark" label="备注" min-width="100px"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
@@ -102,7 +102,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/setGoodsEdit',
+                path: '/packageGoodsEdit',
                 query: {
                     ...this.$route.query
                 }
@@ -122,7 +122,7 @@ export default {
         download() {
             this.downloading = true;
             this.$axios
-                .get('/setGoods/excel', {
+                .get('/packageGoods/excel', {
                     responseType: 'blob',
                     params: { size: 10000 }
                 })
@@ -155,11 +155,11 @@ export default {
         deleteRow(row) {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/setGoods/del/${row.id}`);
+                    return this.$http.post(`/packageGoods/del/${row.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');
-                    this.getData();
+                    this.$router.go(0);
                 })
                 .catch(e => {
                     if (e !== 'cancel') {
@@ -186,10 +186,8 @@ export default {
             this.$refs.form.validate(valid => {
                 if (valid) {
                     let data = { ...this.formData };
-                    data.unit = this.goods.unit;
                     data.price = this.goods.price * data.num;
                     data.packageId = this.id;
-                    data.name = this.goods.name;
                     this.saving = true;
                     this.$http
                         .post('/packageGoods/save', data, { body: 'json' })
@@ -197,7 +195,7 @@ export default {
                             this.saving = false;
                             this.$message.success('成功');
                             this.showDialog = false;
-                            this.getData();
+                            this.$router.go(0);
                         })
                         .catch(e => {
                             console.log(e);

src/main/vue/src/views/PackageEdit.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="edit-view">
-        <el-tabs type="border-card" class="my-tabs" v-model="active">
+        <el-tabs type="border-card" class="my-tabs" v-model="active" @tab-click="handleClick">
             <el-tab-pane label="套餐信息" name="first">
                 <PackageEdit @next="goNext" />
             </el-tab-pane>
@@ -27,9 +27,38 @@ export default {
             id: 0
         };
     },
+    mounted() {
+        this.updateType();
+    },
     methods: {
         goNext(page) {
             this.active = page;
+        },
+        updateType() {
+            let type = this.$route.query.type;
+            //通过拿到的值不同，更改activeName的值
+            if (type === '1') {
+                this.active = 'first';
+            } else if (type === '2') {
+                this.active = 'second';
+            }
+        },
+        // 切换tab时再根据标签名的不同将url中的参数值改掉
+        handleClick(tab) {
+            let queryType;
+            if (tab.name === 'first') {
+                queryType = 1;
+            } else if (tab.name === 'second') {
+                queryType = 2;
+            }
+            //将新的值和url放在一起拼成一个完整的路径
+            this.$router.push({
+                path: '/packageEdit',
+                query: {
+                    id: this.id,
+                    type: queryType || 1
+                }
+            });
         }
     },
     components: {