上/下架

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

@@ -154,4 +154,7 @@ public class Package extends BaseEntity {
 
     private int sort;
 
+    @ApiModelProperty(value = "是否下架")
+    private boolean offShelf;
+
 }

src/main/java/com/izouma/jiashanxia/web/PackageController.java

@@ -75,6 +75,8 @@ public class PackageController extends BaseController {
     public Page<Package> all(@RequestBody PageQuery pageQuery) {
         BigDecimal personalRatio = sysConfigService.getBigDecimal("PERSONAL_RATIO_0");
         pageQuery.setSort("sort,desc");
+        Map<String, Object> query = pageQuery.getQuery();
+        query.put("offShelf",false);
         return packageService.all(pageQuery).map(aPackage -> {
             BigDecimal balance = aPackage.getAmount().subtract(aPackage.getSettlementPrice());
             BigDecimal shareAmount;

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

@@ -317,6 +317,12 @@
             <el-form-item prop="note" label="注意事项" style="width: 500px">
                 <simple-rich-text v-model="formData.note" class="select-width"></simple-rich-text>
             </el-form-item>
+            <el-form-item prop="offShelf" label="上下架">
+                <el-radio-group v-model="formData.offShelf">
+                    <el-radio :label="false">上架</el-radio>
+                    <el-radio :label="true">下架</el-radio>
+                </el-radio-group>
+            </el-form-item>
             <!-- <el-form-item prop="content" label="流程" style="width:800px">
                 <div>
                     <el-form

src/main/vue/src/views/PackageList.vue

@@ -55,7 +55,7 @@
             <!-- <el-table-column prop="detail" label="详情"> </el-table-column> -->
             <!-- <el-table-column prop="type" label="套餐类型" :formatter="typeFormatter"> </el-table-column> -->
             <el-table-column prop="categoryName" label="套餐类型"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <el-table-column label="操作" align="center" fixed="right" min-width="220">
                 <template slot-scope="{ row, $index }">
                     <el-button @click="move($index, -1)" :disabled="$index == 0" type="success" size="mini" plain
                         >上移</el-button
@@ -63,11 +63,13 @@
                     <el-button
                         @click="move($index, 1)"
                         :disabled="(page - 1) * pageSize + $index == totalElements - 1"
-                        type="warning"
+                        type="success"
                         size="mini"
                         plain
                         >下移</el-button
                     >
+                    <el-button type="warning" plain @click="takeoff(row, false)">上架</el-button>
+                    <el-button type="warning" plain @click="takeoff(row, true)">下架</el-button>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
@@ -285,6 +287,16 @@ export default {
                     this.loading = false;
                     this.$message.error(e.error);
                 });
+        },
+        takeoff(row, take) {
+            this.$http.post(
+                '/package/save',
+                {
+                    ...row,
+                    offShelf: take
+                },
+                { body: 'json' }
+            );
         }
     }
 };