From 268dc896a47206d2070f54aaadc53542382e0663 Mon Sep 17 00:00:00 2001
From: "925116093-qq.com" <925116093@qq.com>
Date: Thu, 29 May 2025 17:40:34 +0800
Subject: [PATCH] 202505291740

---
 .../system/controller/CouponsController.java  |   40 +-
 .../java/com/ruoyi/system/domain/Coupons.java |    2 +
 .../com/ruoyi/system/mapper/UsersMapper.java  |    7 +
 .../ruoyi/system/service/IUsersService.java   |    9 +
 .../system/service/impl/UsersServiceImpl.java |    6 +
 .../resources/mapper/system/UsersMapper.xml   |    9 +
 ruoyi-ui/src/api/system/Coupons.js            |   33 +
 ruoyi-ui/src/views/system/Coupons/index.vue   | 1072 ++++++++++++-----
 .../src/views/system/IntegralOrder/index.vue  |  115 +-
 .../src/views/system/WorkerApply/index.vue    |    4 +-
 ruoyi-ui/src/views/system/transfer/index.vue  |    4 +-
 11 files changed, 976 insertions(+), 325 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/CouponsController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/CouponsController.java
index 5c1b2c5..e85f80f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/CouponsController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/CouponsController.java
@@ -155,6 +155,44 @@ public class CouponsController extends BaseController
         return toAjax(couponsService.deleteCouponsByIds(ids));
     }
 
-
+    /**
+     * 根据优惠券ID查询userIds对应的用户列表，只返回name、phone、userId字段
+     */
+    @PreAuthorize("@ss.hasPermi('system:Coupons:query')")
+    @GetMapping("/userListByCoupon/{id}")
+    public AjaxResult getUserListByCoupon(@PathVariable("id") Long id) {
+        Coupons coupon = couponsService.selectCouponsById(id);
+        if (coupon == null || coupon.getUserIds() == null) {
+            return error("优惠券不存在");
+        }
+        List<Long> userIdList;
+        try {
+            // 假设userIds存储为JSON数组字符串
+            userIdList = com.alibaba.fastjson2.JSON.parseArray(coupon.getUserIds(), Long.class);
+        } catch (Exception e) {
+            // 如果不是JSON格式，尝试逗号分隔
+            userIdList = new java.util.ArrayList<>();
+            for (String s : coupon.getUserIds().split(",")) {
+                try {
+                    userIdList.add(Long.parseLong(s.trim()));
+                } catch (Exception ignore) {}
+            }
+        }
+        if (userIdList.isEmpty()) {
+            return error("优惠券不存在");
+        }
+        // 查询用户列表
+        List<Users> usersList = usersService.selectUsersByIds(userIdList);
+        // 只返回name、phone、userId字段
+        List<java.util.Map<String, Object>> simpleList = new java.util.ArrayList<>();
+        for (Users user : usersList) {
+            java.util.Map<String, Object> map = new java.util.HashMap<>();
+            map.put("userId", user.getId());
+            map.put("name", user.getName());
+            map.put("phone", user.getPhone());
+            simpleList.add(map);
+        }
+        return success(simpleList);
+    }
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Coupons.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Coupons.java
index 429ce27..578fc3a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Coupons.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Coupons.java
@@ -30,6 +30,8 @@ public class Coupons extends BaseEntity
     @Excel(name = "面值")
     private BigDecimal price;
 
+
+
     /** 最低消费 */
     @Excel(name = "最低消费")
     private BigDecimal minPrice;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsersMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsersMapper.java
index f2bb619..1a48414 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsersMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsersMapper.java
@@ -58,4 +58,11 @@ public interface UsersMapper
      * @return 结果
      */
     public int deleteUsersByIds(Long[] ids);
+
+    /**
+     * 批量根据ID查询用户
+     * @param ids 用户ID列表
+     * @return 用户对象列表
+     */
+    public List<Users> selectUsersByIds(List<Long> ids);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java
index c9082af..2b5c727 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java
@@ -58,4 +58,13 @@ public interface IUsersService
      * @return 结果
      */
     public int deleteUsersById(Long id);
+
+
+
+    /**
+     * 批量根据ID查询用户
+     * @param ids 用户ID列表
+     * @return 用户对象列表
+     */
+    public List<Users> selectUsersByIds(List<Long> ids);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsersServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsersServiceImpl.java
index 0a7e361..1fc383f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsersServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsersServiceImpl.java
@@ -90,4 +90,10 @@ public class UsersServiceImpl implements IUsersService
     {
         return usersMapper.deleteUsersById(id);
     }
+
+    @Override
+    public List<Users> selectUsersByIds(List<Long> ids) {
+        if (ids == null || ids.isEmpty()) return java.util.Collections.emptyList();
+        return usersMapper.selectUsersByIds(ids);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml
index 9dc9c05..24c7916 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml
@@ -216,4 +216,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectUsersByIds" parameterType="java.util.List" resultMap="UsersResult">
+        <include refid="selectUsersVo"/>
+        where id in
+        <foreach collection="list" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/Coupons.js b/ruoyi-ui/src/api/system/Coupons.js
index 304117a..2342b0a 100644
--- a/ruoyi-ui/src/api/system/Coupons.js
+++ b/ruoyi-ui/src/api/system/Coupons.js
@@ -17,6 +17,31 @@ export function getCoupons(id) {
   })
 }
 
+export function getGoodsDataList() {
+  return request({
+    url: '/system/QuoteType/goodsDataList',
+    method: 'get'
+  })
+}
+// 查询用户列表列表
+export function getUserDataList(query) {
+  return request({
+    url: '/system/users/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+// // 获取接单记录列表
+// export function getUserDataList(type) {
+//   return request({
+//     url: '/system/transfer/getUsersDataList/'+type,
+//     method: 'get'
+//   })
+// }
+
 // 查询优惠券详细
 export function getTypeList() {
   return request({
@@ -25,6 +50,14 @@ export function getTypeList() {
   })
 }
 
+export function getUserListByCoupon(id) {
+  return request({
+    url: '/system/Coupons/userListByCoupon/'+id,
+    method: 'get'
+  })
+}
+
+
 
 // 任务状态修改
 export function changetypeStatus(id, status) {
diff --git a/ruoyi-ui/src/views/system/Coupons/index.vue b/ruoyi-ui/src/views/system/Coupons/index.vue
index d8e615a..560a5af 100644
--- a/ruoyi-ui/src/views/system/Coupons/index.vue
+++ b/ruoyi-ui/src/views/system/Coupons/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <!-- 页面标题栏 -->
+   
+      
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="名称" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -11,61 +14,62 @@
       </el-form-item>
 
       <el-form-item label="面值" prop="priceRange">
-        <el-input
+        <el-input-number
           v-model="queryParams.priceMin"
           placeholder="最低面值"
-          style="width: 100px; margin-right: 10px;"
-          type="number"
-          min="0"
-          clearable
+          style="width: 130px; margin-right: 10px;"
+          :min="0"
+          :step="1"
+          controls-position="right"
         />
-        <span style="margin: 0 5px;">-</span>
-        <el-input
+        <span style="margin: 0 8px; color: #909399; font-weight: 500;">至</span>
+        <el-input-number
           v-model="queryParams.priceMax"
           placeholder="最高面值"
-          style="width: 100px;"
-          type="number"
-          min="0"
-          clearable
+          style="width: 130px;"
+          :min="0"
+          :step="1"
+          controls-position="right"
         />
       </el-form-item>
 
       <el-form-item label="最低消费" prop="minPriceRange">
-        <el-input
+        <el-input-number
           v-model="queryParams.minPriceMin"
           placeholder="最低消费"
-          style="width: 100px; margin-right: 10px;"
-          type="number"
-          min="0"
-          clearable
+          style="width: 130px; margin-right: 10px;"
+          :min="0"
+          :step="1"
+          controls-position="right"
         />
-        <span style="margin: 0 5px;">-</span>
-        <el-input
+        <span style="margin: 0 8px; color: #909399; font-weight: 500;">至</span>
+        <el-input-number
           v-model="queryParams.minPriceMax"
           placeholder="最高消费"
-          style="width: 100px;"
-          type="number"
-          min="0"
-          clearable
+          style="width: 130px;"
+          :min="0"
+          :step="1"
+          controls-position="right"
         />
       </el-form-item>
       <el-form-item label="数量" prop="countRange">
-        <el-input
+        <el-input-number
           v-model="queryParams.countMin"
-          placeholder="最少"
-          style="width: 100px; margin-right: 10px;"
-          type="number"
-          min="0"
+          placeholder="最少数量"
+          style="width: 130px; margin-right: 10px;"
+          :min="0"
+          :step="1"
           clearable
+          controls-position="right"
         />
-        <span style="margin: 0 5px;">-</span>
-        <el-input
+        <span style="margin: 0 8px; color: #909399; font-weight: 500;">至</span>
+        <el-input-number
           v-model="queryParams.countMax"
-          placeholder="最多"
-          style="width: 100px;"
-          type="number"
-          min="0"
-          clearable
+          placeholder="最多数量"
+          style="width: 130px;"
+          :min="0"
+          :step="1"
+          controls-position="right"
         />
       </el-form-item>
       <el-form-item label="发送方式" prop="type">
@@ -100,9 +104,9 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="指定分类" prop="type">
+      <el-form-item label="指定分类" prop="cateId">
         <el-select
-          v-model="queryParams.type"
+          v-model="queryParams.cateId"
           placeholder="请选择指定分类"
           clearable
           filterable
@@ -123,8 +127,19 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button 
+          type="primary" 
+          icon="el-icon-search" 
+          size="mini" 
+          @click="handleQuery"
+          style="background: linear-gradient(135deg, #409eff 0%, #36a3f7 100%); border: none;"
+        >搜索</el-button>
+        <el-button 
+          icon="el-icon-refresh" 
+          size="mini" 
+          @click="resetQuery"
+          style="margin-left: 10px;"
+        >重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -132,12 +147,12 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:Coupons:add']"
-        >新增</el-button>
+          style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); border: none;"
+        >新增优惠券</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -179,24 +194,45 @@
       <el-table-column label="ID" align="center" width="55"  prop="id" />
       <el-table-column label="名称" align="center" prop="title" />
 
-      <el-table-column label="面值" width="120px" align="left"  prop="price" >
+      <el-table-column label="面值" width="120px" align="center"  prop="price" >
         <template slot-scope="scope">
-          <span >￥{{scope.row.price.toFixed(2)}}</span>
+          <div class="money-display">
+            <span class="money-symbol">￥</span>
+            <span class="money-amount-primary">{{scope.row.price.toFixed(2)}}</span>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="最低消费" width="120px" align="left"  prop="price" >
+      <el-table-column label="最低消费" width="120px" align="center"  prop="price" >
         <template slot-scope="scope">
-          <span >￥{{scope.row.minPrice.toFixed(2)}}</span>
+          <div class="money-display">
+            <span class="money-symbol">￥</span>
+            <span class="money-amount-warning">{{scope.row.minPrice.toFixed(2)}}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="数量" align="center" prop="count">
+        <template slot-scope="scope">
+          <span class="count-display">{{scope.row.count}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效期" align="center" prop="couponTime">
+        <template slot-scope="scope">
+          <div class="validity-display">
+            <i class="el-icon-time"></i>
+            <span>{{scope.row.couponTime}}天</span>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="数量" align="center" prop="count" />
-      <el-table-column label="有效期" align="center" prop="couponTime" />
       <el-table-column label="发送方式" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.coupons_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="排序" align="center" prop="sort" />
+      <el-table-column label="排序" align="center" prop="sort">
+        <template slot-scope="scope">
+          <span class="sort-display">{{scope.row.sort}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="状态"  width="85"  align="center">
         <template slot-scope="scope">
           <el-switch
@@ -204,6 +240,7 @@
             :active-value="1"
             :inactive-value="0"
             @change="handleStatusChange(scope.row)"
+            class="status-switch"
           ></el-switch>
         </template>
       </el-table-column>
@@ -212,19 +249,23 @@
           <el-button
             type="text"
             @click="showRecordDialog(scope.row)"
-          >{{ scope.row.couponUserList ? scope.row.couponUserList.length : 0 }}条记录</el-button>
+            class="record-button"
+          >
+            <i class="el-icon-document"></i>
+            {{ scope.row.couponUserList ? scope.row.couponUserList.length : 0 }}条记录
+          </el-button>
         </template>
       </el-table-column>
       
 
       <el-table-column label="创建时间" align="center" prop="createdAt" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
+          <span>{{ formatDate(scope.row.createdAt) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="更新时间" align="center" prop="updatedAt" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
+          <span>{{ formatDate(scope.row.updatedAt) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -235,111 +276,251 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:Coupons:edit']"
-          >修改</el-button>
+            class="edit-button"
+            title="修改"
+          ></el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:Coupons:remove']"
-          >删除</el-button>
+            class="delete-button"
+            title="删除"
+          ></el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      style="margin-top: 20px;"
     />
 
-
-
-    <!-- 添加或修改优惠券对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="jiluform" :model="jiluform" :rules="rules" label-width="80px">
-        <el-table :data="couponUserList" :row-class-name="rowCouponUserIndex" @selection-change="handleCouponUserSelectionChange" ref="couponUser">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="用户" prop="uid" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.uid" placeholder="请输入用户" />
-            </template>
-          </el-table-column>
-          <el-table-column label="名称" prop="couponTitle" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.couponTitle" placeholder="请输入名称" />
-            </template>
-          </el-table-column>
-          <el-table-column label="面值" prop="couponPrice" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.couponPrice" placeholder="请输入面值" />
-            </template>
-          </el-table-column>
-          <el-table-column label="最低消费" prop="minPrice" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.minPrice" placeholder="请输入最低消费" />
-            </template>
-          </el-table-column>
-          <el-table-column label="领取时间" prop="addTime" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.addTime" placeholder="请输入领取时间" />
-            </template>
-          </el-table-column>
-          <el-table-column label="失效时间" prop="loseTime" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.loseTime" placeholder="请输入失效时间" />
-            </template>
-          </el-table-column>
-          <el-table-column label="使用时间" prop="useTime" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.useTime" placeholder="请输入使用时间" />
-            </template>
-          </el-table-column>
-          <el-table-column label="指定分类" prop="cateId" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.cateId" placeholder="请输入指定分类" />
-            </template>
-          </el-table-column>
-          <el-table-column label="指定商品" prop="productId" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.productId" placeholder="请输入指定商品" />
-            </template>
-          </el-table-column>
-          <el-table-column label="1:通用券 2：品类券 3：指定商品" prop="receiveType" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.receiveType" placeholder="请选择1:通用券 2：品类券 3：指定商品">
-                <el-option label="请选择字典生成" value="" />
+    <!-- 添加或修改优惠券抽屉 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="open"
+      size="50%"
+      :before-close="handleClose"
+      direction="rtl"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <!-- 类型选择 -->
+        <el-form-item label="类型" prop="receiveType">
+          <el-radio-group v-model="form.receiveType">
+            <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="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="title">
+          <el-input v-model="form.title" placeholder="朋友券" />
+        </el-form-item>
+        
+        <!-- 面值 -->
+        <el-form-item label="面值" prop="price">
+          <div style="display: flex; align-items: center;">
+            <el-input-number 
+              v-model="form.price" 
+              :min="0" 
+              :precision="2"
+              :step="1"
+              controls-position="right"
+              style="width: 200px;"
+              placeholder="请输入面值"
+            />
+            <span style="margin-left: 8px; color: #606266; font-size: 14px;">元</span>
+          </div>
+        </el-form-item>
+        
+        <!-- 最低消费 -->
+        <el-form-item label="最低消费" prop="minPrice">
+          <div style="display: flex; align-items: center;">
+            <el-input-number 
+              v-model="form.minPrice" 
+              :min="0" 
+              :precision="2"
+              :step="1"
+              controls-position="right"
+              style="width: 200px;"
+              placeholder="请输入最低消费"
+            />
+            <span style="margin-left: 8px; color: #606266; font-size: 14px;">元</span>
+          </div>
+        </el-form-item>
+        
+        <!-- 领取时间 -->
+        <el-form-item label="领取时间">
+          <el-col :span="11">
+            <el-date-picker
+              v-model="form.startTime"
+              type="datetime"
+              placeholder="选择开始时间"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              style="width: 100%;"
+            />
+          </el-col>
+          <el-col class="line" :span="2" style="text-align: center;">-</el-col>
+          <el-col :span="11">
+            <el-date-picker
+              v-model="form.endTime"
+              type="datetime"
+              placeholder="选择结束时间"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              style="width: 100%;"
+            />
+          </el-col>
+        </el-form-item>
+        
+        <!-- 是否无限领取 -->
+        <el-form-item label="是否无限领取" prop="isPermanent">
+          <el-radio-group v-model="form.isPermanent">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        
+        <!-- 数量 -->
+        <el-form-item label="数量" prop="count">
+          <div style="display: flex; align-items: center;">
+            <el-input-number 
+              v-model="form.count" 
+              :min="0" 
+              :step="1"
+              controls-position="right"
+              style="width: 200px;"
+              placeholder="请输入数量"
+            />
+            <span style="margin-left: 8px; color: #909399; font-size: 12px;">领取后至少30天有效</span>
+          </div>
+        </el-form-item>
+        
+        <!-- 有效期 -->
+        <el-form-item label="有效期" prop="couponTime">
+          <div style="display: flex; align-items: center;">
+            <el-input-number 
+              v-model="form.couponTime" 
+              :min="0" 
+              :step="1"
+              controls-position="right"
+              style="width: 200px;"
+              placeholder="请输入有效期"
+            />
+            <span style="margin-left: 8px; color: #606266; font-size: 14px;">天</span>
+          </div>
+        </el-form-item>
+        
+        <!-- 排序 -->
+        <el-form-item label="排序" prop="sort">
+          <div style="display: flex; align-items: center;">
+            <el-input-number 
+              v-model="form.sort" 
+              :min="0" 
+              :step="1"
+              controls-position="right"
+              style="width: 200px;"
+              placeholder="请输入排序"
+            />
+            <span style="margin-left: 8px; color: #909399; font-size: 12px;">数字越小排序越靠前</span>
+          </div>
+        </el-form-item>
+        
+        <!-- 状态 -->
+        <el-form-item label="状态" prop="status">
+          <el-switch
+            v-model="form.status"
+            :active-value="1"
+            :inactive-value="0"
+          ></el-switch>
+        </el-form-item>
+        
+        <!-- 指定商品 (仅当类型为商品券时显示) -->
+        <el-form-item label="指定商品" prop="productId" v-if="form.receiveType === 3">
+          <el-select
+            v-model="form.productId"
+            placeholder="请选择指定商品"
+            clearable
+            filterable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="item in serviceGoodsList"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
               </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="1：未使用 2：已使用 3:已失效" prop="status" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.status" placeholder="请选择1：未使用 2：已使用 3:已失效">
-                <el-option label="请选择字典生成" value="" />
+        </el-form-item>
+        
+        <!-- 指定分类 (仅当类型为品类券时显示) -->
+        <el-form-item label="指定分类" prop="cateId" v-if="form.receiveType === 2">
+          <el-select
+            v-model="form.cateId"
+            placeholder="请选择指定分类"
+            clearable
+            filterable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="item in typeDataList"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
               </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="$comment" prop="createdAt" width="240">
-            <template slot-scope="scope">
-              <el-date-picker clearable v-model="scope.row.createdAt" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" />
-            </template>
-          </el-table-column>
-          <el-table-column label="$comment" prop="updatedAt" width="240">
-            <template slot-scope="scope">
-              <el-date-picker clearable v-model="scope.row.updatedAt" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" />
-            </template>
-          </el-table-column>
-        </el-table>
+        </el-form-item>
+        
+        <!-- 选择用户 (仅当发送方式为手动赠送时显示) -->
+        <el-form-item label="选择用户" prop="selectedUsers" v-if="form.type === 3">
+          <el-button 
+            type="primary" 
+            icon="el-icon-user" 
+            @click="showUserDialog"
+            style="width: 100%; margin-bottom: 10px;"
+          >
+            {{ selectedUsers.length > 0 ? `已选择 ${selectedUsers.length} 个用户` : '选择赠送用户' }}
+          </el-button>
+          <div v-if="selectedUsers.length > 0" class="selected-users-container">
+            <el-tag 
+              v-for="user in selectedUsers" 
+              :key="user.userId"
+              closable
+              type="info"
+              class="user-tag"
+              @close="removeUser(user)"
+            >
+              <span class="user-tag-content">
+                <span class="user-name">{{ user.name || '未命名用户' }}</span>
+                <span class="user-phone">{{ user.phone || '无手机号' }}</span>
+              </span>
+            </el-tag>
+          </div>
+        </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+      <div  class="dialog-footer">
+        <el-button @click="resetForm('form')">重 置</el-button>
+        <el-button type="primary" @click="submitForm">{{ form.id ? '保 存' : '确认创建' }}</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
-
+    </el-drawer>
 
     <!-- 领取记录弹窗 -->
     <el-dialog title="优惠券领取记录" :visible.sync="recordDialogVisible" width="70%" append-to-body>
@@ -347,42 +528,104 @@
         <el-table-column label="用户" prop="uname" align="center" />
         <el-table-column label="面值" prop="couponPrice" align="center" />
         <el-table-column label="最低消费" prop="minPrice" align="center" />
-       
-        <el-table-column label="领取时间" align="center" prop="addTime" width="180">
+        <el-table-column label="领取时间" align="center" prop="addTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.addTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ formatDate(scope.row.addTime) }}</span>
         </template>
       </el-table-column>
-
-        <el-table-column label="失效时间" prop="loseTime" align="center" />           
-        <el-table-column label="使用时间" align="center" prop="useTime" width="180">
+        <el-table-column label="失效时间" align="center" prop="loseTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.useTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ formatDate(scope.row.loseTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="使用时间" align="center" prop="useTime">
+          <template slot-scope="scope">
+            <span>{{ formatDate(scope.row.useTime) }}</span>
         </template>
       </el-table-column>
         <el-table-column label="指定分类" prop="catename" align="center" />
         <el-table-column label="指定商品" prop="productname" align="center" />
-
         <el-table-column label="类型" align="center" prop="receiveType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.coupons_user_type" :value="scope.row.receiveType"/>
         </template>
       </el-table-column>
-
         <el-table-column label="状态" prop="status" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status === '1'">未使用</el-tag>
+            <el-tag v-if="scope.row.status === '1'" type="warning">未使用</el-tag>
             <el-tag type="success" v-else-if="scope.row.status === '2'">已使用</el-tag>
             <el-tag type="info" v-else>已失效</el-tag>
           </template>
         </el-table-column>
       </el-table>
     </el-dialog>
+
+    <!-- 用户选择对话框 -->
+    <el-dialog 
+      title="用户列表" 
+      :visible.sync="userDialogVisible" 
+      width="800px" 
+      append-to-body
+      :close-on-click-modal="false"
+      destroy-on-close
+    >
+      <div class="user-dialog-container">
+        <!-- 搜索框 -->
+        <div class="search-box">
+          <el-input
+            v-model="userSearchKeyword"
+            placeholder="请输入用户名称搜索"
+            clearable
+            prefix-icon="el-icon-search"
+            style="width: 300px;"
+            @keyup.enter.native="handleUserSearch"
+            @clear="handleUserSearch"
+          >
+            <el-button slot="append" icon="el-icon-search" @click="handleUserSearch">搜索</el-button>
+          </el-input>
+        </div>
+
+        <!-- 用户表格 -->
+        <el-table
+          ref="userTable"
+          :data="filteredUserList"
+          @select="handleUserSelectionChange"
+           @select-all="handleUserSelectionChange"
+     
+          height="400"
+          border
+          v-loading="userTableLoading"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="用户ID" prop="id" width="80" align="center" />
+          <el-table-column label="用户名称" prop="name" align="center" />
+          <el-table-column label="手机号" prop="phone" align="center" />
+        </el-table>
+
+        <!-- 分页 -->
+        <div class="pagination-container">
+          <el-pagination
+            @size-change="handleUserSizeChange"
+            @current-change="handleUserCurrentChange"
+            :current-page.sync="userTableParams.pageNum"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size.sync="userTableParams.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="totalUsers"
+          />
+        </div>
+      </div>
+      
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="userDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmUserSelection">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listCoupons, getCoupons, delCoupons, addCoupons, updateCoupons,changetypeStatus,getTypeList } from "@/api/system/Coupons"
+import { listCoupons, getCoupons, delCoupons, addCoupons, updateCoupons, changetypeStatus, getTypeList,getUserDataList,getGoodsDataList,getUserListByCoupon} from "@/api/system/Coupons"
 import { getUserProfile } from "@/api/system/user"
 
 export default {
@@ -394,8 +637,6 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 子表选中数据
-      checkedCouponUser: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -404,12 +645,10 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-
+      userDataList:[],
       typeDataList: [],
       // 优惠券表格数据
       CouponsList: [],
-      // 优惠券领取记录表格数据
-      couponUserList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -418,25 +657,22 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        title: null,
-        priceMin: null,
-        priceMax: null,
-        minPriceMin: null,
-        minPriceMax: null,
-        countMin: null,
-        countMax: null,
-        isPermanent: null,
-        status: null,
-        productId: null,
-        type: null,
-        cateId: null,
-        sort: null,
+        title: undefined,
+        priceMin: undefined,
+        priceMax: undefined,
+        minPriceMin: undefined,
+        minPriceMax: undefined,
+        countMin: undefined,
+        countMax: undefined,
+        isPermanent: undefined,
+        status: undefined,
+        productId: undefined,
+        type: undefined,
+        cateId: undefined,
+        sort: undefined
       },
       // 表单参数
       form: {},
-
-      // 表单参数
-      jiluform: {},
       // 表单校验
       rules: {
         title: [
@@ -449,79 +685,109 @@ export default {
           { required: true, message: "最低消费不能为空", trigger: "blur" }
         ],
         isPermanent: [
-          { required: true, message: "是否无限领取不能为空", trigger: "blur" }
+          { required: true, message: "是否无限领取不能为空", trigger: "change" }
         ],
         status: [
-          { required: true, message: "1 正常 0 关闭不能为空", trigger: "change" }
+          { required: true, message: "状态不能为空", trigger: "change" }
         ],
         couponTime: [
           { required: true, message: "有效期不能为空", trigger: "blur" }
         ],
         type: [
-          { required: true, message: "1：新人券 2：手动领取 3：系统赠送不能为空", trigger: "change" }
+          { required: true, message: "发送方式不能为空", trigger: "change" }
+        ],
+        receiveType: [
+          { required: true, message: "类型不能为空", trigger: "change" }
         ],
         sort: [
           { required: true, message: "排序不能为空", trigger: "blur" }
         ],
+        count: [
+          { required: true, message: "数量不能为空", trigger: "blur" }
+        ],
       },
+
       // 领取记录弹窗显示状态
       recordDialogVisible: false,
       // 领取记录列表
       recordList: [],
       serviceGoodsList: [],
+
+
+      // 用户选择对话框相关
+      userDialogVisible: false,
+      userSearchKeyword: '',
+      filteredUserList: [],
+      selectedUsers: [],
+      tempSelectedUsers: [],
+      userTableParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined
+      },
+      totalUsers: 0,
+      userTableLoading: false,
     }
   },
   created() {
     this.getList()
-    this.getServiceGoodsList()
+    this.getGoodsDataList()
     this.getTypeList()
   },
+
+
+  
+
+
   methods: {
-    getServiceGoodsList() {
-      // 获取服务商品下拉数据
-      this.$api ? this.$api.system.ServiceGoods.listServiceGoods({}).then(res => {
-        this.serviceGoodsList = res.rows || []
-      }) :
-      import('@/api/system/ServiceGoods').then(module => {
-        module.listServiceGoods({}).then(res => {
-          this.serviceGoodsList = res.rows || []
-        })
-      })
-    },
+   
     /** 查询优惠券列表 */
     getList() {
-      this.loading = true
-      const params = { ...this.queryParams }
-      if (params.priceMin !== null && params.priceMin !== '') params.priceMin = Number(params.priceMin)
-      if (params.priceMax !== null && params.priceMax !== '') params.priceMax = Number(params.priceMax)
-      if (params.minPriceMin !== null && params.minPriceMin !== '') params.minPriceMin = Number(params.minPriceMin)
-      if (params.minPriceMax !== null && params.minPriceMax !== '') params.minPriceMax = Number(params.minPriceMax)
-      if (params.countMin !== null && params.countMin !== '') params.countMin = Number(params.countMin)
-      if (params.countMax !== null && params.countMax !== '') params.countMax = Number(params.countMax)
-      listCoupons(params).then(response => {
-        this.CouponsList = response.rows.map(item => {
-          // 如果后端没有直接返回couponUserList，需要单独获取
-          if (!item.couponUserList) {
-            getCoupons(item.id).then(res => {
-              item.couponUserList = res.data.couponUserList || [];
-              this.$set(item, 'couponUserList', res.data.couponUserList || []);
-            })
+      this.loading = true;
+      // 创建新的对象，避免引用传递
+      const params = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize
+      };
+      
+      // 只传递有值的参数
+      Object.keys(this.queryParams).forEach(key => {
+        if (this.queryParams[key] !== undefined && 
+            this.queryParams[key] !== null && 
+            this.queryParams[key] !== '' &&
+            !['pageNum', 'pageSize'].includes(key)) {
+          if (['priceMin', 'priceMax', 'minPriceMin', 'minPriceMax', 'countMin', 'countMax'].includes(key)) {
+            params[key] = Number(this.queryParams[key]);
+          } else {
+            params[key] = this.queryParams[key];
           }
-          return item;
-        });
-        this.total = response.total
-        this.loading = false
-      })
+        }
+      });
+
+      listCoupons(params).then(response => {
+        if (response.code === 200) {
+          this.CouponsList = response.rows || [];
+          this.total = parseInt(response.total) || 0;
+        } else {
+          this.CouponsList = [];
+          this.total = 0;
+          this.$message.error(response.msg || '获取数据失败');
+        }
+        this.loading = false;
+      }).catch(error => {
+        console.error('获取优惠券列表失败:', error);
+        this.CouponsList = [];
+        this.total = 0;
+        this.loading = false;
+        this.$message.error('获取数据失败');
+      });
     },
     // 取消按钮
     cancel() {
       this.open = false
       this.reset()
     },
-    reset1() {
-      this.couponUserList = []
-      this.resetForm("form")
-    },
     // 表单重置
     reset() {
       this.form = {
@@ -532,33 +798,42 @@ export default {
         startTime: null,
         endTime: null,
         count: null,
-        isPermanent: null,
-        status: null,
+        isPermanent: 1,
+        status: 1,
         couponTime: null,
         productId: null,
-        type: null,
-        receiveType: null,
-        sort: null,
+        type: 1,
+        receiveType: 1,
+        sort: 1,
         cateId: null,
-        userIds: null,
+        userIds: '[]', // 初始化为空数组的JSON字符串
         createdAt: null,
         updatedAt: null,
         deletedAt: null
       }
-      this.couponUserList = []
+      this.selectedUsers = []
       this.resetForm("form")
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
+      this.resetForm("queryForm");
+      // 重置后需要将分页参数也重置
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.getList();
     },
+    getDataUserListByCoupon(id){
+      getUserListByCoupon(id).then(response => {
+        this.selectedUsers = response.data;
+        this.tempSelectedUsers=JSON.parse(JSON.stringify(response.data)) ;
+      })
 
+    },
     // 任务状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用"
@@ -581,29 +856,58 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加优惠券"
+      this.title = "创建优惠券"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      const id = row.id || this.ids
+      this.reset();
+      const id = row.id || this.ids;
+      this.getDataUserListByCoupon(id);
       getCoupons(id).then(response => {
-        this.form = response.data
-        this.couponUserList = response.data.couponUserList
-        this.open = true
-        this.title = "修改优惠券"
-      })
-    },
-
-    /** 修改按钮操作 */
-    handjiluleUpdate(row) {
-      this.reset1()
-      const id = row.id || this.ids
-      getCoupons(id).then(response => {
-        this.couponUserList = response.data.couponUserList
-        this.open = true
-        this.title = "优惠券领取记录"
-      })
+        this.form = response.data;
+        // 处理日期字段
+        if (this.form.startTime) {
+          this.form.startTime = this.parseTime(this.form.startTime, '{y}-{m}-{d} {h}:{i}:{s}');
+        }
+        if (this.form.endTime) {
+          this.form.endTime = this.parseTime(this.form.endTime, '{y}-{m}-{d} {h}:{i}:{s}');
+        }
+        
+        // 处理userIds
+        // if (this.form.userIds) {
+        //   let userIdArray = [];
+        //   try {
+        //     // 尝试解析JSON字符串
+        //     if (typeof this.form.userIds === 'string') {
+        //       userIdArray = JSON.parse(this.form.userIds);
+        //     } else if (Array.isArray(this.form.userIds)) {
+        //       userIdArray = this.form.userIds;
+        //     }
+        //   } catch (e) {
+        //     // 如果解析失败，尝试按逗号分隔
+        //     userIdArray = this.form.userIds.split(',');
+        //   }
+          
+        //   // 确保所有ID都是数字
+        //   userIdArray = userIdArray.map(id => parseInt(id)).filter(id => !isNaN(id));
+          
+          // 获取用户列表并初始化选中用户
+          // getUserDataList().then(res => {
+          //   const userList = res.data || [];
+          //   this.selectedUsers = userList.filter(user => userIdArray.includes(user.id))
+          //     .map(user => ({
+          //       id: user.id,
+          //       name: user.name || '未命名用户',
+          //       phone: user.phone || '无手机号'
+          //     }));
+          //   // 更新form中的userIds为标准格式
+          //   this.form.userIds = JSON.stringify(this.selectedUsers.map(user => user.id));
+          // });
+        // }
+        
+        this.open = true;
+        this.title = "修改优惠券";
+      });
     },
 
     getTypeList() {
@@ -611,26 +915,49 @@ export default {
         this.typeDataList = response.data
       })
     },
+    getGoodsDataList() {
+      getGoodsDataList().then(response => {
+        this.serviceGoodsList = response.data
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.couponUserList = this.couponUserList
-          if (this.form.id != null) {
-            updateCoupons(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
-            })
+          const submitData = { ...this.form };
+          
+          // 处理日期格式，转换为10位时间戳（秒）
+          if (submitData.startTime) {
+            submitData.startTime = typeof submitData.startTime === 'number' && submitData.startTime.toString().length === 10
+              ? submitData.startTime
+              : Math.floor(new Date(submitData.startTime).getTime() / 1000);
+          }
+          if (submitData.endTime) {
+            submitData.endTime = typeof submitData.endTime === 'number' && submitData.endTime.toString().length === 10
+              ? submitData.endTime
+              : Math.floor(new Date(submitData.endTime).getTime() / 1000);
+          }
+
+          // 确保userIds是JSON字符串格式
+          if (submitData.userIds && Array.isArray(this.selectedUsers)) {
+            submitData.userIds = JSON.stringify(this.selectedUsers.map(user => String(user.userId)));
+          }
+
+          if (submitData.id != null) {
+            updateCoupons(submitData).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
           } else {
-            addCoupons(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
-            })
+            addCoupons(submitData).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -642,44 +969,6 @@ export default {
         this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
-    /** 优惠券领取记录序号 */
-    rowCouponUserIndex({ row, rowIndex }) {
-      row.index = rowIndex + 1
-    },
-    /** 优惠券领取记录添加按钮操作 */
-    handleAddCouponUser() {
-      let obj = {}
-      obj.uid = ""
-      obj.couponTitle = ""
-      obj.couponPrice = ""
-      obj.minPrice = ""
-      obj.addTime = ""
-      obj.loseTime = ""
-      obj.useTime = ""
-      obj.cateId = ""
-      obj.productId = ""
-      obj.receiveType = ""
-      obj.status = ""
-      obj.createdAt = ""
-      obj.updatedAt = ""
-      this.couponUserList.push(obj)
-    },
-    /** 优惠券领取记录删除按钮操作 */
-    handleDeleteCouponUser() {
-      if (this.checkedCouponUser.length == 0) {
-        this.$modal.msgError("请先选择要删除的优惠券领取记录数据")
-      } else {
-        const couponUserList = this.couponUserList
-        const checkedCouponUser = this.checkedCouponUser
-        this.couponUserList = couponUserList.filter(function(item) {
-          return checkedCouponUser.indexOf(item.index) == -1
-        })
-      }
-    },
-    /** 复选框选中数据 */
-    handleCouponUserSelectionChange(selection) {
-      this.checkedCouponUser = selection.map(item => item.index)
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/Coupons/export', {
@@ -693,6 +982,215 @@ export default {
         this.recordList = response.data.couponUserList || [];
       });
     },
+
+    // 用户选择相关
+    showUserDialog() {
+      this.tempSelectedUsers=JSON.parse(JSON.stringify(this.selectedUsers)) ;
+      this.userDialogVisible = true;
+      // this.tempSelectedUsers = [...this.selectedUsers];
+      this.userSearchKeyword = '';
+      this.userTableParams.pageNum = 1;
+     
+      this.getUserList();
+    },
+    
+    handleUserSelectionChange(selection) {
+      let newSelected=this.tempSelectedUsers.map(r=>r.userId);
+      selection.map(r=>{
+        if(!newSelected.includes(r.id)){
+          this.tempSelectedUsers.push({
+          userId: r.id,
+          name: r.name ,
+          phone: r.phone 
+         })
+        }
+      })
+      let _ids=[];
+      this.filteredUserList.map(r=>{
+        if(!selection.map(r=>r.id).includes(r.id)){
+          _ids.push(r.id);
+        }
+      })
+      _ids.map(r=>{
+        this.tempSelectedUsers.map((s,index)=>{
+          if(s.userId==r){
+            this.tempSelectedUsers.splice(index,1)
+          }
+        })  
+      })
+    },
+    
+    getUserList() {
+
+
+      this.userTableLoading = true;
+      const params = {
+        pageNum: this.userTableParams.pageNum,
+        pageSize: this.userTableParams.pageSize,
+        userName: this.userSearchKeyword
+      };
+      import('@/api/system/users').then(module => {
+        module.listUsers(params).then(response => {
+          if (response.code === 200) {
+            this.filteredUserList = response.rows || [];
+            this.totalUsers = parseInt(response.total) || 0;
+            // 设置已选用户的选中状态
+            this.$nextTick(() => {
+              if (this.$refs.userTable) {
+                console.log(this.tempSelectedUsers,66666)
+                this.$refs.userTable.clearSelection();
+                const selectedIds = (this.tempSelectedUsers || []).map(u => Number(u.userId));
+                this.filteredUserList.forEach(row => {
+                  if (selectedIds.includes(row.id)) {
+                    this.$refs.userTable.toggleRowSelection(row, true);
+                  }
+                });
+              }
+            });
+          } else {
+            this.$message.error(response.msg || '获取用户列表失败');
+          }
+          this.userTableLoading = false;
+        }).catch(error => {
+          this.$message.error('获取用户列表失败');
+          this.userTableLoading = false;
+        });
+      });
+    },
+    
+    handleUserSearch() {
+      this.userTableParams.pageNum = 1;
+      this.getUserList();
+    },
+    
+    handleUserSizeChange(val) {
+      this.userTableParams.pageSize = val;
+      this.getUserList();
+    },
+    
+    handleUserCurrentChange(val) {
+      this.userTableParams.pageNum = val;
+      this.getUserList();
+    },
+    
+    confirmUserSelection() {
+      this.selectedUsers = [...this.tempSelectedUsers];
+      this.form.userIds = JSON.stringify(this.selectedUsers.map(user => user.userId));
+      this.userDialogVisible = false;
+      console.log(this.form.userIds+"#############",this.selectedUsers)
+    },
+    
+    removeUser(user) {
+     
+      this.selectedUsers = this.selectedUsers.filter(u => u.userId !== user.userId);
+   
+      this.form.userIds = JSON.stringify(this.selectedUsers.map(user => user.userId));
+      if (this.$refs.userTable) {
+        const row = this.filteredUserList.find(item => item.userId === user.userId);
+        if (row) {
+          this.$refs.userTable.toggleRowSelection(row, false);
+        }
+      }
+    },
+
+    /** 关闭抽屉前的回调 */
+    handleClose(done) {
+    
+          this.reset();
+          done();
+        
+    },
+
+    /** 表格日期格式化 */
+    formatDate(dateStr) {
+      if (!dateStr) return '';
+      return this.parseTime(dateStr, '{y}-{m}-{d} {h}:{i}:{s}');
+    },
   }
 }
 </script>
+
+<style>
+/* 用户选择对话框样式 */
+.user-dialog-container .search-box {
+  margin-bottom: 15px;
+}
+
+.user-dialog-container .pagination-container {
+  margin-top: 15px;
+  text-align: right;
+}
+
+/* 已有的样式保持不变 */
+.selected-users-container {
+  margin-top: 8px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  max-height: 120px;
+  overflow-y: auto;
+  padding: 8px;
+  border: 1px solid #EBEEF5;
+  border-radius: 4px;
+  background: #FAFAFA;
+}
+
+.user-tag {
+  display: inline-flex;
+  align-items: center;
+  margin: 2px;
+  max-width: 100%;
+  background-color: #f4f4f5;
+  border-color: #e9e9eb;
+  color: #909399;
+  transition: all 0.3s;
+}
+
+.user-tag:hover {
+  background-color: #ecf5ff;
+  border-color: #d9ecff;
+  color: #409eff;
+}
+
+.user-tag-content {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  max-width: 200px;
+  overflow: hidden;
+  padding: 0 4px;
+}
+
+.user-name {
+  font-weight: 500;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 100px;
+}
+
+.user-phone {
+  color: #909399;
+  font-size: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 90px;
+}
+
+/* 滚动条样式优化 */
+.selected-users-container::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.selected-users-container::-webkit-scrollbar-thumb {
+  background: #c0c4cc;
+  border-radius: 3px;
+}
+
+.selected-users-container::-webkit-scrollbar-track {
+  background: #f5f7fa;
+  border-radius: 3px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/system/IntegralOrder/index.vue b/ruoyi-ui/src/views/system/IntegralOrder/index.vue
index 5b388e9..9807dbb 100644
--- a/ruoyi-ui/src/views/system/IntegralOrder/index.vue
+++ b/ruoyi-ui/src/views/system/IntegralOrder/index.vue
@@ -77,7 +77,7 @@
           v-hasPermi="['system:IntegralOrder:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -97,7 +97,7 @@
           @click="handleExport"
           v-hasPermi="['system:IntegralOrder:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -154,13 +154,13 @@
     />
 
     <!-- 添加或修改积分订单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="订单号" prop="orderId">
           <el-input v-model="form.orderId" placeholder="请输入订单号" />
         </el-form-item>
         <el-form-item label="用户" prop="uid">
-          <el-select v-model="form.uid" placeholder="请选择用户" clearable filterable>
+          <el-select v-model="form.uid" placeholder="请选择用户" clearable filterable style="width: 100%">
             <el-option v-for="item in users" :key="item.userId" :label="item.userName" :value="item.userId" />
           </el-select>
         </el-form-item>
@@ -174,40 +174,69 @@
           <el-input v-model="form.userAddress" placeholder="请输入地址" />
         </el-form-item>
         <el-form-item label="商品" prop="productId">
-          <el-select v-model="form.productId" placeholder="请选择商品" clearable filterable>
+          <el-select v-model="form.productId" placeholder="请选择商品" clearable filterable style="width: 100%">
             <el-option v-for="item in serviceGoods" :key="item.id" :label="item.title" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="规格" prop="sku">
-          <el-input v-model="form.sku" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
         <el-form-item label="数量" prop="num">
-          <el-input v-model="form.num" placeholder="请输入数量" />
+          <el-input-number 
+            v-model="form.num" 
+            :min="1" 
+            :max="9999" 
+            controls-position="right" 
+            style="width: 100%" 
+            placeholder="请输入数量"
+          />
         </el-form-item>
         <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价" />
+          <el-input-number 
+            v-model="form.price" 
+            :min="0" 
+            :precision="2" 
+            :step="0.01" 
+            controls-position="right" 
+            style="width: 100%" 
+            placeholder="请输入单价"
+          />
         </el-form-item>
-        <el-form-item label="总积分" prop="totalPrice">
-          <el-input v-model="form.totalPrice" placeholder="请输入总积分" />
-        </el-form-item>
-        <el-form-item label="快递" prop="deliveryId">
-          <el-input v-model="form.deliveryId" placeholder="请输入快递" />
-        </el-form-item>
-        <el-form-item label="单号" prop="deliveryNum">
-          <el-input v-model="form.deliveryNum" placeholder="请输入单号" />
-        </el-form-item>
-        <el-form-item label="备注" prop="mark">
-          <el-input v-model="form.mark" placeholder="请输入备注" />
+        <el-form-item label="支付积分" prop="totalPrice">
+          <el-input-number 
+            v-model="form.totalPrice" 
+            :min="0" 
+            :max="999999" 
+            controls-position="right" 
+            style="width: 100%" 
+            placeholder="请输入支付积分"
+          />
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请选择状态" clearable>
-            <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
+          <el-radio-group v-model="form.status">
+            <el-radio :label="1">待发货</el-radio>
+            <el-radio :label="2">发货</el-radio>
+            <el-radio :label="3">完成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 当选择发货状态时显示的字段 -->
+        <template v-if="form.status === 2">
+          <el-form-item label="快递" prop="deliveryId">
+            <el-input v-model="form.deliveryId" placeholder="请输入快递公司" />
+          </el-form-item>
+          <el-form-item label="单号" prop="deliveryNum">
+            <el-input v-model="form.deliveryNum" placeholder="请输入快递单号" />
+          </el-form-item>
+        </template>
+        <el-form-item label="备注">
+          <el-input 
+            v-model="form.mark" 
+            type="textarea" 
+            :rows="3" 
+            placeholder="请输入备注"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -260,7 +289,7 @@ export default {
           { required: true, message: "订单号不能为空", trigger: "blur" }
         ],
         uid: [
-          { required: true, message: "用户不能为空", trigger: "blur" }
+          { required: true, message: "用户不能为空", trigger: "change" }
         ],
         userName: [
           { required: true, message: "姓名不能为空", trigger: "blur" }
@@ -272,10 +301,7 @@ export default {
           { required: true, message: "地址不能为空", trigger: "blur" }
         ],
         productId: [
-          { required: true, message: "商品不能为空", trigger: "blur" }
-        ],
-        sku: [
-          { required: true, message: "规格不能为空", trigger: "blur" }
+          { required: true, message: "商品不能为空", trigger: "change" }
         ],
         num: [
           { required: true, message: "数量不能为空", trigger: "blur" }
@@ -284,10 +310,34 @@ export default {
           { required: true, message: "单价不能为空", trigger: "blur" }
         ],
         totalPrice: [
-          { required: true, message: "总积分不能为空", trigger: "blur" }
+          { required: true, message: "支付积分不能为空", trigger: "blur" }
         ],
         status: [
-          { required: true, message: "1：待发货 2：待收货 3：已完成不能为空", trigger: "change" }
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ],
+        deliveryId: [
+          { 
+            validator: (rule, value, callback) => {
+              if (this.form.status === 2 && (!value || value.trim() === '')) {
+                callback(new Error('快递公司不能为空'));
+              } else {
+                callback();
+              }
+            }, 
+            trigger: "blur" 
+          }
+        ],
+        deliveryNum: [
+          { 
+            validator: (rule, value, callback) => {
+              if (this.form.status === 2 && (!value || value.trim() === '')) {
+                callback(new Error('快递单号不能为空'));
+              } else {
+                callback();
+              }
+            }, 
+            trigger: "blur" 
+          }
         ],
       },
       users: [],
@@ -329,7 +379,6 @@ export default {
         userPhone: null,
         userAddress: null,
         productId: null,
-        sku: null,
         num: null,
         price: null,
         totalPrice: null,
diff --git a/ruoyi-ui/src/views/system/WorkerApply/index.vue b/ruoyi-ui/src/views/system/WorkerApply/index.vue
index 313fb2e..1f06dfb 100644
--- a/ruoyi-ui/src/views/system/WorkerApply/index.vue
+++ b/ruoyi-ui/src/views/system/WorkerApply/index.vue
@@ -49,7 +49,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -93,7 +93,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="WorkerApplyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
diff --git a/ruoyi-ui/src/views/system/transfer/index.vue b/ruoyi-ui/src/views/system/transfer/index.vue
index 4226d90..9e591ee 100644
--- a/ruoyi-ui/src/views/system/transfer/index.vue
+++ b/ruoyi-ui/src/views/system/transfer/index.vue
@@ -50,7 +50,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -94,7 +94,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="transferList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />