11.20

fuintAdmin/src/api/integral/category.js

@@ -25,4 +25,12 @@ export function getGiftCategoryApi(data) {
     })
   }
 
+  // 删除有关信息
+  export function deleteGiftCategoryApi(id) {
+    return request({
+      url: 'business/integral/integralGiftCategory',
+      method: 'delete',
+      params: id
+    })
+  }
 

fuintAdmin/src/views/EventMarketing/center/index.vue

@@ -222,28 +222,33 @@
             :data="tableData"
             border
             style="width: 100%">
-            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column type="selection" align="center" width="55"></el-table-column>
-            <el-table-column type="index" label="序号" width="55"></el-table-column>
+            <el-table-column type="index" label="序号" align="center" width="55"></el-table-column>
-            <el-table-column prop="typeText" label="活动类型"></el-table-column>
+            <el-table-column prop="typeText" label="活动类型" align="center"></el-table-column>
-            <el-table-column prop="name" label="活动名称"></el-table-column>
+            <el-table-column prop="name" label="活动名称" align="center"></el-table-column>
-            <el-table-column prop="discountActiveDescribe" label="活动内容"></el-table-column>
+            <el-table-column prop="discountActiveDescribe" label="活动内容" align="center"></el-table-column>
-            <el-table-column prop="time" label="活动时间">
+            <el-table-column prop="time" label="活动时间" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.time==0">不限时间</span>
                 <span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="userGradeName" label="适用会员等级">
+            <el-table-column prop="userGradeName" label="适用会员等级" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.userGradeName || "--" }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="sendNum" label="已领数量">
+            <el-table-column prop="discountActiveDescribe" label="活动详情" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.discountActiveDescribe || "--" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="sendNum" label="已领数量" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.sendNum || 0 }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="activeStatus" label="状态">
+            <el-table-column prop="activeStatus" label="状态" align="center">
               <template slot-scope="scope">
                 <el-switch
                   v-model="scope.row.activeStatus"
@@ -255,8 +260,8 @@
                 </el-switch>
               </template>
             </el-table-column>
-            <el-table-column prop="createName" label="创建人"></el-table-column>
+            <el-table-column prop="createName" label="创建人" align="center"></el-table-column>
-            <el-table-column prop="createTime" label="创建时间"></el-table-column>
+            <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
             <el-table-column prop="date" label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
@@ -321,23 +326,28 @@
               type="selection"
               width="55">
             </el-table-column>
-            <el-table-column type="index" label="序号" width="55"></el-table-column>
+            <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
-            <el-table-column prop="typeText" label="活动类型"></el-table-column>
+            <el-table-column prop="typeText" label="活动类型" align="center"></el-table-column>
-            <el-table-column prop="name" label="活动名称"></el-table-column>
+            <el-table-column prop="name" label="活动名称" align="center"></el-table-column>
-            <el-table-column prop="discountActiveDescribe" label="活动内容"></el-table-column>
+            <el-table-column prop="discountActiveDescribe" label="活动内容" align="center"></el-table-column>
-            <el-table-column prop="time" label="活动时间">
+            <el-table-column prop="time" label="活动时间" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.time==0">不限时间</span>
                 <span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="userGradeName" label="适用会员等级">
+            <el-table-column prop="userGradeName" label="适用会员等级" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.userGradeName || "--" }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="sendNum" label="已领数量"></el-table-column>
+            <el-table-column prop="discountActiveDescribe" label="活动详情" align="center">
-            <el-table-column prop="activeStatus" label="状态">
+              <template slot-scope="scope">
+                <span>{{ scope.row.discountActiveDescribe || "--" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="sendNum" label="已领数量" align="center"></el-table-column>
+            <el-table-column prop="activeStatus" label="状态" align="center">
               <template slot-scope="scope">
                 <el-switch
                   v-model="scope.row.activeStatus"
@@ -350,8 +360,8 @@
               </template>
 
             </el-table-column>
-            <el-table-column prop="createName" label="创建人"></el-table-column>
+            <el-table-column prop="createName" label="创建人" align="center"></el-table-column>
-            <el-table-column prop="createTime" label="创建时间"></el-table-column>
+            <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
             <el-table-column prop="date" label="操作" align="center">
               <template slot-scope="scope">
                 <el-button

fuintAdmin/src/views/integral/giftCategory/index.vue

@@ -53,7 +53,7 @@
           width="50">
         </el-table-column>
         <el-table-column label="分类名称" align="center" prop="categoryName"/>
-        <el-table-column label="创建人" align="createBy" prop="sort" />
+        <el-table-column label="创建人" align="center" prop="createByName" />
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
             <div slot="reference" class="name-wrapper">
@@ -68,11 +68,17 @@
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['integral:giftCategory:index:update']"
 
             >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['integral:giftCategory:index:update']"
+
+            >删除</el-button>
           </template>
 <!--          v-hasPermi="['']"-->
         </el-table-column>
@@ -102,8 +108,8 @@
                   :value="dict.value"/>
                 </el-radio-group>
             </el-form-item>
-        <el-form-item label="备注" prop="categoryName">
+        <el-form-item label="备注" >
-          <el-input type="textarea" :rows="6" v-model="dataForm.remark" placeholder="分类名称" maxlength="30"/>
+          <el-input type="textarea" :rows="6" v-model="dataForm.remark" placeholder="请输入备注" maxlength="30"/>
         </el-form-item>
 
 
@@ -120,7 +126,12 @@
 
 <script>
 
-import {getGiftCategoryApi,insertGiftCategoryApi,updateGiftCategoryApi  } from "@/api/integral/category";
+import {
+  deleteGiftCategoryApi,
+  getGiftCategoryApi,
+  insertGiftCategoryApi,
+  updateGiftCategoryApi
+} from "@/api/integral/category";
 
 export default {
   name: "giftCategory",
@@ -228,6 +239,30 @@ export default {
       this.open = true
       this.getList();
     },
+      // 删除信息
+      handleDelete(data){
+        this.$confirm('是否删除本条数据，删除后无法恢复!', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteGiftCategoryApi({id:data.id}).then(res=>{
+            if (res.code == 200) {
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              });
+              this.getList()
+            }
+          })
+
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });
+        });
+      },
     resetQuery(){
       this.queryParams = {}
       this.getList();

fuintAdmin/src/views/order/order_Added.vue

@@ -105,6 +105,7 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
+                v-if="scope.row.status != 0"
                 size="mini"
                 type="text"
                 @click="returnRecord(scope.row.id)"

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralGiftCategory.java

@@ -35,6 +35,10 @@ public class IntegralGiftCategory extends BaseEntity {
      * 店铺ID
      */
     private Integer storeId;
+    /**
+     * 创建人
+     */
+    private String createByName;
 
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftCategoryMapper.xml

@@ -23,9 +23,9 @@
     </select>
 
     <!--查询指定行数据-->
-    <select id="queryAllByLimit" resultMap="IntegralGiftCategoryMap">
+    <select id="queryAllByLimit" resultType="com.fuint.business.integral.entity.IntegralGiftCategory">
         select
-        igc.id, igc.category_name, igc.sort, igc.status, igc.store_id, igc.create_time, igc.update_time, igc.create_by, igc.update_by,ta.real_name as createBy
+        igc.id, igc.category_name, igc.sort, igc.status, igc.store_id, igc.create_time, igc.update_time, igc.create_by, igc.update_by,ta.real_name as createByName
         from integral_gift_category igc
         left join mt_staff ta on igc.create_by=ta.id
         <where>