联调优惠券类别

src/api/coupon/couponType.js

 import request from "@/utils/request";
 
 // 查询列表
-export function listClass(query) {
+export function getCouCategoryList(data) {
   return request({
-    url: "/system/category/list",
-    method: "get",
-    params: query,
-  });
-}
-// 查询列表
-export function getList(query) {
-  return request({
-    url: "/system/category/getList",
-    method: "get",
-    params: query,
+    url: "/coupon-category",
+    method: "post",
+    data: data,
   });
 }
 
-// 查询详细
-export function getClass(id) {
+// 新增
+export function addCouCategory(data) {
   return request({
-    url: "/system/category/" + id,
-    method: "get",
+    url: "/coupon-category",
+    method: "put",
+    data: data,
   });
 }
 
 // 新增
-export function addClass(data) {
+export function updateCouCategory(data) {
   return request({
-    url: "/system/category",
+    url: "/coupon-category/update",
     method: "post",
     data: data,
   });
 }
 
-// 修改
-export function updateClass(data) {
+// 删除
+export function delCouCategory(id) {
   return request({
-    url: "/system/category",
-    method: "put",
-    data: data,
+    url: "/coupon-category/" + id,
+    method: "delete",
   });
 }
 
-// 删除
-export function delClass(id) {
+// 下架
+export function offlineCouCategory(id) {
   return request({
-    url: "/system/category/" + id,
-    method: "delete",
+    url: "/coupon-category/offline/" + id,
+    method: "get",
   });
 }
 
-// 查询排序列表
-export function turnList(query) {
+// 上架
+export function onlineCouCategory(id) {
   return request({
-    url: "/system/category/turnOrder",
+    url: "/coupon-category/online/" + id,
     method: "get",
-    params: query,
   });
 }
+
+

src/views/coupon/couponType/index.vue → src/views/coupon/couponCategory/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-      <el-form-item label="分类名称 " prop="name">
-        <el-input v-model="queryParams.name" placeholder="分类名称 " clearable @keyup.enter.native="handleQuery" />
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <el-form-item label="优惠券类别" >
+        <el-select v-model="queryParams.name" filterable placeholder="请选择优惠券类别" clearable @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="item in nameList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="状态">
-        <el-select v-model="queryParams.state" placeholder="请选择" clearable @keyup.enter.native="handleQuery">
+        <el-select v-model="queryParams.state" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -15,14 +22,14 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" v-hasPermi="['system:category:query']">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" v-hasPermi="['coupon:category:query']">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['system:category:add']">新增</el-button>
+          v-hasPermi="['coupon:category:add']">新增</el-button>
       </el-col>
    </el-row>
 
@@ -32,23 +39,25 @@
           <a @click="handleUpdate(scope.row)" style="color: blue">{{ scope.row.name }}</a>
         </template>     
       </el-table-column>
-      <el-table-column label="折扣形式" align="center" prop="code" />
-      <el-table-column label="优惠券数量" align="center" prop="remarks" />
-      <el-table-column label="通用简述" align="center" prop="goodsCount" />
+      <el-table-column label="折扣形式" align="center" prop="typeDesc" />
+      <el-table-column label="优惠券数量" align="center" prop="couponCnt" />
+      <el-table-column label="通用简述" align="center" prop="desc" />
       <el-table-column label="状态" align="center" prop="state">
         <template slot-scope="scope">
-          <span v-if="scope.row.state == 1">启用</span>
-          <span v-if="scope.row.state == 2">停用</span>
+          <span v-if="scope.row.state == 1">生效中</span>
+          <span v-if="scope.row.state == 2">未生效</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-show="scope.row.state == 2" size="mini" type="text" icon="el-icon-edit" @click="handleStatus(scope.row,'1')"
-            v-hasPermi="['system:category:restart']">下线</el-button>
-          <el-button v-show="scope.row.state == 1" size="mini" type="text" icon="el-icon-edit" @click="handleStatus(scope.row,'2')"
-            v-hasPermi="['system:category:stop']">上线</el-button> 
+          <el-button v-show="scope.row.state == 1" size="mini" type="text" icon="el-icon-edit" @click="handleStatus(scope.row,'1')"
+            v-hasPermi="['coupon:category:off']">下线</el-button>
+          <el-button v-show="scope.row.state == 2" size="mini" type="text" icon="el-icon-edit" @click="handleStatus(scope.row,'2')"
+            v-hasPermi="['coupon:category:online']">上线</el-button> 
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['coupon:category:edit']">编辑</el-button>   
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:category:remove']">删除</el-button>     
+            v-hasPermi="['coupon:category:remove']">删除</el-button>     
         </template>
       </el-table-column>
     </el-table>
@@ -58,21 +67,21 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="类别名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入类别名" minlength="1" maxlength="100"/>
+          <el-input v-model="form.name" placeholder="请输入类别名" minlength="1" maxlength="7"/>
         </el-form-item>
-        <el-form-item label="类别" prop="name">
-          <el-radio-group v-model="form.name">
-            <el-radio :label="3">抵扣</el-radio>
-            <el-radio :label="6">折扣</el-radio>
-            <el-radio :label="9">面单</el-radio>
+        <el-form-item label="类别" prop="type">
+          <el-radio-group v-model="form.type">
+            <el-radio :label="1">抵扣</el-radio>
+            <el-radio :label="2">折扣</el-radio>
+            <el-radio :label="3">免单</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="通用简述" prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" maxlength="17"/>
+        <el-form-item label="通用简述" prop="desc">
+          <el-input v-model="form.desc" type="textarea" placeholder="请输入内容" maxlength="17"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-hasPermi="['system:category:edit']">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-hasPermi="['coupon:category:edit']">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -81,12 +90,8 @@
 
 <script>
 import {
-  listClass,
-  getClass,
-  delClass,
-  addClass,
-  updateClass,
-  turnList
+  addCouCategory,updateCouCategory,getCouCategoryList,offlineCouCategory,onlineCouCategory,delCouCategory
+  
 } from "@/api/coupon/couponType";
 
 export default {
@@ -111,34 +116,49 @@ export default {
         state: null
       },
       // 表单参数
-      form: {},
+      form: {
+        id: null,
+        name: null,
+        type: null,
+        desc : null,
+        state:null
+      },
       // 表单校验
       rules: {
         name: [{ required: true, message: "不能为空", trigger: "blur" }],
-        status: [{ required: true, message: "不能为空", trigger: "blur" }],
-        code: [{ required: true, message: "不能为空", trigger: "blur" }],
-        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        type: [{ required: true, message: "不能为空", trigger: "blur" }],
+        desc: [{ required: true, message: "不能为空", trigger: "blur" }]
       },
       options: [{
         value: null,
         label: '全部'
-      }, {
+      },{
         value: '1',
-        label: '启用'
-      }, {
+        label: '生效中'
+      },{
         value: '2',
-        label: '停用'
+        label: '未生效'
       }],
+      nameList:[]
     };
   },
   created() {
     this.getList();
+    this.getNameList();
   },
   methods: {
     /** 查询列表 */
+    getNameList() {
+      
+      getCouCategoryList(this.queryParams).then((response) => {
+        this.nameList = response.rows;
+
+      });
+    },
+    /** 查询列表 */
     getList() {
       this.loading = true;
-      listClass(this.queryParams).then((response) => {
+      getCouCategoryList(this.queryParams).then((response) => {
         this.couponTypeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -154,10 +174,8 @@ export default {
       this.form = {
         id: null,
         name: null,
-        status: "0",
-        remarks: null,
-        code: null,
-        createTime: null,
+        type: null,
+        desc : null,       
       };     
     },
     /** 搜索按钮操作 */
@@ -174,27 +192,26 @@ export default {
 
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
       this.open = true;
       this.title = "新增类别";
     },
-    /** 启用、禁用按钮操作 */
+    /** 上线、下线按钮操作 */
     handleStatus(row,tag) {
-      let mess="";
-      let sta="";
+      let mess="";    
       if(tag=='1'){
-        mess="启用";
-        sta="1";
+        mess="下线";      
       }else if(tag=='2'){
-        mess="停用";
-        sta="2";
+        mess="上线";        
       }
       this.$modal
         .confirm('是否确认' + mess + '该数据项？')
         .then(function () {
-          return updateClass({id:row.id,state:sta});
-        })
-        .then((response) => {
+          if(tag=="1"){
+            return offlineCouCategory(row.id);
+          }else if(tag=="2"){
+            return onlineCouCategory(row.id);
+          }
+        }).then((response) => {
           if(response.code="200"){
             this.getList();
             this.$modal.msgSuccess('' + mess + '成功');
@@ -206,12 +223,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids;
-      getClass(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改商品分类";
-      });
+      let obj=Object.assign({},row);
+      this.form.id=obj.id;
+      this.form.name=obj.name;
+      this.form.type=obj.type;
+      this.form.desc=obj.desc;
+      this.open = true;
+      this.title = "修改类别";
     },
     /** 提交按钮 */
     submitForm() {
@@ -219,19 +237,23 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             if(this.form.state == "1"){
-              this.$message.error("停用之后才可以修改");
+              this.$message.error("修改类别需先下架类别!");
               return;
             }
-            updateClass(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
+            updateCouCategory(this.form).then((response) => {
+              if(response.code=="200"){
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
             });
           } else {
-            addClass(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+            addCouCategory(this.form).then((response) => {
+              if(response.code=="200"){
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
             });
           }
         }
@@ -240,19 +262,20 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       if(row.state=="1"){
-        this.$message.error("停用状态才能删除!");
+        this.$message.error("未生效状态才能删除!");
         return;
       }
-      const ids = row.id || this.ids;
+      const ids = row.id;
       this.$modal
-        .confirm('是否确认删除分类编码为' + row.code + '的数据项？')
+        .confirm('是否确定删除?')
         .then(function () {
-          return delClass(ids);
+          return delCouCategory(ids);
         })
-        .then((response) => {          
-          console.log("response",response);
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
+        .then((response) => {
+          if(response.code=="200"){
+            this.getList();
+            this.$modal.msgSuccess("删除成功");
+          }
         })
         .catch(() => { });
     },

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://140.143.224.240:8091`,
+        target: `http://140.143.224.240:8090`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",