From 5b06f9755e1ca564cc5780a5951be40413eb894b Mon Sep 17 00:00:00 2001
From: "925116093-qq.com" <925116093@qq.com>
Date: Fri, 6 Jun 2025 16:28:19 +0800
Subject: [PATCH] 202506061628

---
 .../controller/GoodsOrderController.java      |  30 +-
 .../controller/QuoteTypeController.java       |   8 +-
 .../controller/UserAddressController.java     |  11 +-
 ruoyi-ui/src/api/system/Coupons.js            |   4 +-
 ruoyi-ui/src/api/system/GoodsOrder.js         |  25 +-
 ruoyi-ui/src/api/system/Order.js              |  21 +-
 ruoyi-ui/src/api/system/QuoteType.js          |   4 +-
 ruoyi-ui/src/assets/styles/custom-beauty.scss |   2 +-
 .../src/assets/styles/element-variables.scss  |   2 +
 ruoyi-ui/src/components/UserSelect/index.vue  | 408 +++++++++++++++++
 ruoyi-ui/src/main.js                          |   3 +
 ruoyi-ui/src/views/system/Cooperate/index.vue |  21 +-
 .../src/views/system/CouponUser/index.vue     |  16 +-
 ruoyi-ui/src/views/system/Coupons/index.vue   | 156 +++----
 ruoyi-ui/src/views/system/GoodsCart/index.vue |  16 +-
 .../src/views/system/GoodsOrder/index.vue     | 375 +++++++++++----
 .../src/views/system/IntegralLog/index.vue    |  21 +-
 .../src/views/system/IntegralOrder/index.vue  |  35 +-
 ruoyi-ui/src/views/system/Order/index.vue     | 430 ++++++++++--------
 .../src/views/system/OrderComment/index.vue   |  16 +-
 .../src/views/system/OrderRework/index.vue    |  33 +-
 .../src/views/system/PayMoneyLog/index.vue    |  33 +-
 ruoyi-ui/src/views/system/QuoteType/index.vue |   4 +-
 .../src/views/system/UserAddress/index.vue    |  30 +-
 .../system/WorkerApply/WorkerApplyEdit.vue    |  24 +-
 .../src/views/system/WorkerApply/index.vue    |  15 +-
 .../src/views/system/WorkerSign/index.vue     |  23 +-
 ruoyi-ui/src/views/system/transfer/index.vue  |  26 +-
 替换完成总结.md                         | 160 +++++++
 29 files changed, 1456 insertions(+), 496 deletions(-)
 create mode 100644 ruoyi-ui/src/components/UserSelect/index.vue
 create mode 100644 替换完成总结.md

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/GoodsOrderController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/GoodsOrderController.java
index b021177..38004df 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/GoodsOrderController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/GoodsOrderController.java
@@ -3,10 +3,9 @@ package com.ruoyi.system.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.domain.Order;
-import com.ruoyi.system.domain.ServiceGoods;
-import com.ruoyi.system.domain.Users;
+import com.ruoyi.system.domain.*;
 import com.ruoyi.system.service.IServiceGoodsService;
+import com.ruoyi.system.service.IUserAddressService;
 import com.ruoyi.system.service.IUsersService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +21,6 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.GoodsOrder;
 import com.ruoyi.system.service.IGoodsOrderService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -42,7 +40,9 @@ public class GoodsOrderController extends BaseController
     @Autowired
     private IServiceGoodsService serviceGoodsService;
     @Autowired
-    IUsersService  usersService;
+    private  IUsersService  usersService;
+    @Autowired
+    private IUserAddressService userAddressService;
     /**
      * 查询商品订单列表
      */
@@ -93,15 +93,31 @@ public class GoodsOrderController extends BaseController
     }
 
     /**
-     * 新增商品订单
+     * 新增商品订单IServiceGoodsService serviceGoodsService;
      */
     @PreAuthorize("@ss.hasPermi('system:GoodsOrder:add')")
     @Log(title = "商品订单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody GoodsOrder goodsOrder)
     {
+        if (goodsOrder.getAddressId()!=null){
+            UserAddress userAddress=userAddressService.selectUserAddressById(goodsOrder.getAddressId());
+            if (userAddress!=null){
+                goodsOrder.setName(userAddress.getName());
+                goodsOrder.setPhone(userAddress.getPhone());
+                goodsOrder.setAddress(userAddress.getAddressName());
+            }
+        }
+      if (goodsOrder.getProductId()!=null){
+          ServiceGoods serviceGoods=serviceGoodsService.selectServiceGoodsById(goodsOrder.getProductId());
+          if (serviceGoods!=null){
+
+              goodsOrder.setGoodPrice(serviceGoods.getPrice());
+          }
+      }
+
         return toAjax(goodsOrderService.insertGoodsOrder(goodsOrder));
-    }
+      }
 
     /**
      * 修改商品订单
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/QuoteTypeController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/QuoteTypeController.java
index 17ddbc8..92ad90f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/QuoteTypeController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/QuoteTypeController.java
@@ -120,10 +120,12 @@ public class QuoteTypeController extends BaseController
      * 获取项目报价--工艺分类详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:QuoteType:query')")
-    @GetMapping(value = "/goodsDataList")
-    public AjaxResult goodsDataList()
+    @GetMapping(value = "/goodsDataList/{type}")
+    public AjaxResult goodsDataList(@PathVariable("type") int type)
     {
-        return success(serviceGoodsService.selectServiceGoodsList(new ServiceGoods()));
+        ServiceGoods serviceGoods=new ServiceGoods();
+        serviceGoods.setType(type);
+        return success(serviceGoodsService.selectServiceGoodsList(serviceGoods));
     }
 
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java
index 83df816..6daa59e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java
@@ -76,10 +76,15 @@ public class UserAddressController extends BaseController
      * 获取用户收货地址详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:UserAddress:query')")
-    @GetMapping(value = "/getuserAddressList")
-    public AjaxResult getuserAddressList()
+    @GetMapping(value = "/getuserAddressList/{id}")
+    public AjaxResult getuserAddressList(@PathVariable("id") Long id)
     {
-        return success(userAddressService.selectUserAddressList(new UserAddress()));
+        UserAddress userAddress=new UserAddress();
+        if (id!=null){
+            userAddress.setUid(id);
+        }
+
+        return success(userAddressService.selectUserAddressList(userAddress));
     }
 
 
diff --git a/ruoyi-ui/src/api/system/Coupons.js b/ruoyi-ui/src/api/system/Coupons.js
index 2342b0a..1744aae 100644
--- a/ruoyi-ui/src/api/system/Coupons.js
+++ b/ruoyi-ui/src/api/system/Coupons.js
@@ -17,9 +17,9 @@ export function getCoupons(id) {
   })
 }
 
-export function getGoodsDataList() {
+export function getGoodsDataList(type) {
   return request({
-    url: '/system/QuoteType/goodsDataList',
+    url: '/system/QuoteType/goodsDataList/'+type,
     method: 'get'
   })
 }
diff --git a/ruoyi-ui/src/api/system/GoodsOrder.js b/ruoyi-ui/src/api/system/GoodsOrder.js
index 3f24d50..5fd6eb6 100644
--- a/ruoyi-ui/src/api/system/GoodsOrder.js
+++ b/ruoyi-ui/src/api/system/GoodsOrder.js
@@ -16,12 +16,33 @@ export function getGoodsOrder(id) {
     method: 'get'
   })
 }
-export function getGoodsDataList() {
+
+
+
+export function getGoodsDataList(type) {
   return request({
-    url: '/system/QuoteType/goodsDataList',
+    url: '/system/QuoteType/goodsDataList/'+type,
     method: 'get'
   })
 }
+export function generateCode() {
+  return request({
+    url: '/system/Order/generateCode/',
+    method: 'get'
+  })
+}
+
+
+// 获取用户地址列表 - 备选方案
+export function getUserAddressList(userId) {
+  return request({
+    url: `/system/UserAddress/getuserAddressList/${userId}`,
+    method: 'get'
+  })
+}
+
+
+
 
 export function getSiteDeliveryList() {
   return request({
diff --git a/ruoyi-ui/src/api/system/Order.js b/ruoyi-ui/src/api/system/Order.js
index dd90f46..3984868 100644
--- a/ruoyi-ui/src/api/system/Order.js
+++ b/ruoyi-ui/src/api/system/Order.js
@@ -50,12 +50,29 @@ export function getReceiveRecords(orderId) {
     method: 'get'
   })
 }
-export function getGoodsDataList() {
+export function getGoodsDataList(type) {
   return request({
-    url: '/system/QuoteType/goodsDataList',
+    url: '/system/QuoteType/goodsDataList/'+type,
     method: 'get'
   })
 }
+
+// 获取用户地址列表
+export function getuserAddressList(id) {
+  return request({
+    url: '/system/UserAddress/getuserAddressList/' + id,
+    method: 'get'
+  })
+}
+
+// 获取用户地址列表 - 备选方案
+export function getUserAddressList(userId) {
+  return request({
+    url: `/system/UserAddress/getuserAddressList/${userId}`,
+    method: 'get'
+  })
+}
+
 // 获取接单记录列表
 export function getUserDataList(type) {
   return request({
diff --git a/ruoyi-ui/src/api/system/QuoteType.js b/ruoyi-ui/src/api/system/QuoteType.js
index 901441e..f1391f5 100644
--- a/ruoyi-ui/src/api/system/QuoteType.js
+++ b/ruoyi-ui/src/api/system/QuoteType.js
@@ -9,9 +9,9 @@ export function listQuoteType(query) {
   })
 }
 
-export function getGoodsDataList() {
+export function getGoodsDataList(type) {
   return request({
-    url: '/system/QuoteType/goodsDataList',
+    url: '/system/QuoteType/goodsDataList/'+type,
     method: 'get'
   })
 }
diff --git a/ruoyi-ui/src/assets/styles/custom-beauty.scss b/ruoyi-ui/src/assets/styles/custom-beauty.scss
index 9630080..6267a5e 100644
--- a/ruoyi-ui/src/assets/styles/custom-beauty.scss
+++ b/ruoyi-ui/src/assets/styles/custom-beauty.scss
@@ -231,7 +231,7 @@
 
     .el-input__inner, .el-textarea__inner {
       border-radius: 6px;
-      border-color: #e2e8f0;
+      // border-color: #e2e8f0;
       transition: all 0.3s;
 
       &:hover {
diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/ruoyi-ui/src/assets/styles/element-variables.scss
index 1615ff2..168124b 100644
--- a/ruoyi-ui/src/assets/styles/element-variables.scss
+++ b/ruoyi-ui/src/assets/styles/element-variables.scss
@@ -19,6 +19,8 @@ $--border-color-lighter: #e6ebf5;
 
 $--table-border: 1px solid #dfe6ec;
 
+$--border-color-base:#c1c1c1;
+
 /* icon font path, required */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';
 
diff --git a/ruoyi-ui/src/components/UserSelect/index.vue b/ruoyi-ui/src/components/UserSelect/index.vue
new file mode 100644
index 0000000..ff57c20
--- /dev/null
+++ b/ruoyi-ui/src/components/UserSelect/index.vue
@@ -0,0 +1,408 @@
+<template>
+  <div>
+    <!-- 用户选择输入框 -->
+    <div @click="openDialog" :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }">
+      <el-input
+        v-model="displayName"
+        :placeholder="placeholder"
+        readonly
+        :disabled="disabled"
+        :clearable="clearable && !disabled"
+        @clear="handleClear"
+        :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }"
+        @click.native="()=>{}"
+      >
+        <template slot="suffix">
+          <i class="el-icon-search" :style="{ marginRight: '8px', cursor: disabled ? 'not-allowed' : 'pointer' }"></i>
+        </template>
+      </el-input>
+    </div>
+
+    <!-- 用户选择弹窗 -->
+    <el-dialog
+      :title="dialogTitle"
+      :visible.sync="dialogVisible"
+      :width="$store.state.app.device === 'mobile' ? '95%' : '900px'"
+      :close-on-click-modal="false"
+      append-to-body
+      center
+      class="user-select-dialog"
+    >
+      <!-- 搜索表单 -->
+      <el-form :model="queryParams" :inline="true" label-width="60px" class="search-form">
+        <el-form-item label="昵称">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入昵称"
+            clearable
+            @keyup.enter.native="handleQuery"
+            style="width: 160px;"
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="电话">
+          <el-input
+            v-model="queryParams.phone"
+            placeholder="请输入电话"
+            clearable
+            @keyup.enter.native="handleQuery"
+            style="width: 160px;"
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 100px;" size="small">
+            <el-option label="启用" :value="1" />
+            <el-option label="禁用" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 用户列表表格 -->
+      <el-table
+        v-loading="loading"
+        :data="usersList"
+        @row-click="handleRowClick"
+        highlight-current-row
+        :row-class-name="getRowClassName"
+        max-height="400px"
+        style="width: 100%; margin-top: 15px;"
+      >
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column label="ID" prop="id" width="60" align="center" />
+        <el-table-column label="昵称" prop="name" min-width="100" show-overflow-tooltip />
+        <el-table-column label="电话" prop="phone" width="120" />
+        <el-table-column label="头像" width="70" align="center">
+          <template slot-scope="scope">
+            <el-avatar
+              v-if="scope.row.avatar"
+              :src="scope.row.avatar"
+              :size="35"
+              fit="cover"
+            />
+            <el-avatar v-else :size="35" icon="el-icon-user-solid" />
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" width="70" align="center">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'" size="small">
+              {{ scope.row.status === 1 ? '启用' : '禁用' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createdAt" width="90" align="center">
+          <template slot-scope="scope">
+            <span style="font-size: 12px;">{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.stop="selectUser(scope.row)"
+            >
+              选择
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页组件 -->
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+        style="margin-top: 15px; margin-bottom: 10px;"
+        class="text-center"
+      />
+
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUsers } from "@/api/system/users"
+
+export default {
+  name: "UserSelect",
+  props: {
+    // 当前选中的用户ID
+    value: {
+      type: [String, Number],
+      default: null
+    },
+    // 输入框占位符
+    placeholder: {
+      type: String,
+      default: "请选择用户"
+    },
+    // 是否禁用
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    // 是否可清空
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    // 弹窗标题
+    dialogTitle: {
+      type: String,
+      default: "选择用户"
+    },
+    // 用户类型过滤 (1: 普通用户, 2: 工人用户)
+    userType: {
+      type: String,
+      default: '1'
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      loading: false,
+      usersList: [],
+      total: 0,
+      selectedUser: null,
+      displayName: '',
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: this.userType,
+        name: null,
+        phone: null,
+        status: null
+      }
+    }
+  },
+  watch: {
+    value: {
+      handler(newVal) {
+        if (newVal) {
+          this.loadUserInfo(newVal)
+        } else {
+          this.displayName = ''
+          this.selectedUser = null
+        }
+      },
+      immediate: true
+    },
+    userType: {
+      handler(newVal) {
+        this.queryParams.type = newVal
+        if (this.dialogVisible) {
+          this.getList()
+        }
+      }
+    }
+  },
+  methods: {
+        // 打开选择弹窗
+    openDialog() {
+      if (this.disabled) return
+      
+      this.dialogVisible = true
+      this.resetQuery()
+      this.getList()
+    },
+
+    // 获取用户列表
+    getList() {
+      this.loading = true
+      listUsers(this.queryParams).then(response => {
+        this.usersList = response.rows || []
+        this.total = response.total || 0
+        this.loading = false
+      }).catch(error => {
+        console.error('获取用户列表失败:', error)
+        this.loading = false
+        this.$message.error('获取用户列表失败，请重试')
+      })
+    },
+
+    // 搜索
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+
+    // 重置搜索
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        type: this.userType,
+        name: null,
+        phone: null,
+        status: null
+      }
+      this.getList()
+    },
+
+    // 行点击事件
+    handleRowClick(row) {
+      this.selectedUser = row
+    },
+
+    // 选择用户
+    selectUser(user) {
+      this.selectedUser = user
+      this.displayName = user.name
+      this.$emit('input', user.id)
+      this.$emit('change', user)
+      this.dialogVisible = false
+    },
+
+    // 清空选择
+    handleClear() {
+      this.displayName = ''
+      this.selectedUser = null
+      this.$emit('input', null)
+      this.$emit('change', null)
+    },
+
+    // 加载用户信息
+    loadUserInfo(userId) {
+      if (!userId) return
+
+      // 如果当前列表中有该用户，直接使用
+      const user = this.usersList.find(u => u.id == userId)
+      if (user) {
+        this.displayName = user.name
+        return
+      }
+
+      // 否则发起请求获取用户信息
+      listUsers({
+        pageNum: 1,
+        pageSize: 1,
+        type: this.userType,
+        id: userId
+      }).then(response => {
+        if (response.rows && response.rows.length > 0) {
+          this.displayName = response.rows[0].name
+        }
+      }).catch(() => {
+        // 如果获取失败，显示用户ID
+        this.displayName = `用户ID: ${userId}`
+      })
+    },
+
+    // 获取行样式类名
+    getRowClassName({ row }) {
+      if (this.selectedUser && this.selectedUser.id === row.id) {
+        return 'selected-row'
+      }
+      return ''
+    },
+
+    // 时间格式化方法
+    parseTime(time, pattern) {
+      if (!time) return ''
+
+      const date = new Date(time)
+      if (isNaN(date.getTime())) return ''
+
+      const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+      const formatObj = {
+        y: date.getFullYear(),
+        m: date.getMonth() + 1,
+        d: date.getDate(),
+        h: date.getHours(),
+        i: date.getMinutes(),
+        s: date.getSeconds(),
+        a: date.getDay()
+      }
+
+      return format.replace(/{([ymdhisa])+}/g, (result, key) => {
+        const value = formatObj[key]
+        return value.toString().padStart(2, '0')
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.search-form {
+  background: #f5f7fa;
+  padding: 12px;
+  border-radius: 6px;
+  margin-bottom: 0;
+  border: 1px solid #e4e7ed;
+}
+
+
+
+// 选中行样式
+::v-deep .selected-row {
+  background-color: #ecf5ff !important;
+}
+
+::v-deep .el-table__row:hover {
+  background-color: #f5f7fa;
+}
+
+// 让输入框看起来像可点击的
+::v-deep .el-input__inner {
+  cursor: pointer;
+}
+
+::v-deep .el-input.is-disabled .el-input__inner {
+  cursor: not-allowed;
+}
+
+// 弹窗样式优化
+.user-select-dialog {
+  ::v-deep .el-dialog__header {
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    color: white;
+    padding: 15px 20px;
+    border-radius: 6px 6px 0 0;
+  }
+
+  ::v-deep .el-dialog__title {
+    color: white;
+    font-weight: 600;
+  }
+
+  ::v-deep .el-dialog__headerbtn .el-dialog__close {
+    color: white;
+    font-size: 18px;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 20px;
+  }
+
+  ::v-deep .el-table {
+    border-radius: 6px;
+    overflow: hidden;
+  }
+
+  ::v-deep .el-table th {
+    background-color: #f8f9fa;
+    color: #495057;
+    font-weight: 600;
+  }
+}
+
+// 表格行悬停效果
+::v-deep .el-table__row:hover {
+  background-color: #f8f9fa !important;
+  transition: background-color 0.2s ease;
+}
+
+// 分页居中
+.text-center {
+  text-align: center;
+}
+</style>
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index a264800..249f7f3 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -39,6 +39,8 @@ import VueMeta from 'vue-meta'
 import DictData from '@/components/DictData'
 // 美化包装组件
 import BeautyWrapper from '@/components/BeautyWrapper'
+// 用户选择组件
+import UserSelect from '@/components/UserSelect'
 
 import sku from '@/components/Sku/sku'
 
@@ -62,6 +64,7 @@ Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('BeautyWrapper', BeautyWrapper)
+Vue.component('UserSelect', UserSelect)
 Vue.component('Sku', sku)
 
 Vue.use(directive)
diff --git a/ruoyi-ui/src/views/system/Cooperate/index.vue b/ruoyi-ui/src/views/system/Cooperate/index.vue
index 7b403a1..017e396 100644
--- a/ruoyi-ui/src/views/system/Cooperate/index.vue
+++ b/ruoyi-ui/src/views/system/Cooperate/index.vue
@@ -2,9 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="公司名称" prop="company">
         <el-input
@@ -158,9 +162,12 @@
           <el-input v-model="form.id" disabled />
         </el-form-item>
         <el-form-item label="用户" prop="uid">
-          <el-select v-model="form.uid" placeholder="请选择用户" clearable filterable style="width: 100%">
-            <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="公司名称" prop="company">
           <el-input v-model="form.company" placeholder="请输入公司名称" />
@@ -193,7 +200,7 @@
 </template>
 
 <script>
-import { listCooperate, getCooperate, delCooperate, addCooperate, updateCooperate,changetypeStatus,getUserDataList } from "@/api/system/Cooperate"
+import { listCooperate, getCooperate, delCooperate, addCooperate, updateCooperate,changetypeStatus } from "@/api/system/Cooperate"
 
 export default {
   name: "Cooperate",
diff --git a/ruoyi-ui/src/views/system/CouponUser/index.vue b/ruoyi-ui/src/views/system/CouponUser/index.vue
index 22c75e2..88cadf0 100644
--- a/ruoyi-ui/src/views/system/CouponUser/index.vue
+++ b/ruoyi-ui/src/views/system/CouponUser/index.vue
@@ -2,11 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用户" prop="uid">
-        <el-input
+        <user-select
           v-model="queryParams.uid"
-          placeholder="请输入用户"
-          clearable
-          @keyup.enter.native="handleQuery"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
         />
       </el-form-item>
       <el-form-item label="优惠券id" prop="couponId">
@@ -206,7 +207,12 @@
     <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="uid">
-          <el-input v-model="form.uid" placeholder="请输入用户" />
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="优惠券id" prop="couponId">
           <el-input v-model="form.couponId" placeholder="请输入优惠券id" />
diff --git a/ruoyi-ui/src/views/system/Coupons/index.vue b/ruoyi-ui/src/views/system/Coupons/index.vue
index b8507a8..a3f3073 100644
--- a/ruoyi-ui/src/views/system/Coupons/index.vue
+++ b/ruoyi-ui/src/views/system/Coupons/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <!-- 页面标题栏 -->
-   
-      
+
+
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="名称" prop="title">
         <el-input
@@ -119,7 +119,7 @@
           />
         </el-select>
       </el-form-item>
-      
+
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
           <el-option label="正常" :value="1" />
@@ -127,16 +127,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button 
-          type="primary" 
-          icon="el-icon-search" 
-          size="mini" 
+        <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" 
+        <el-button
+          icon="el-icon-refresh"
+          size="mini"
           @click="resetQuery"
           style="margin-left: 10px;"
         >重置</el-button>
@@ -176,8 +176,8 @@
           v-hasPermi="['system:Coupons:remove']"
         >删除</el-button>
       </el-col>
-     
-     
+
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -248,7 +248,7 @@
           </el-button>
         </template>
       </el-table-column>
-      
+
 
       <el-table-column label="创建时间" align="center" prop="createdAt" width="180">
         <template slot-scope="scope">
@@ -312,7 +312,7 @@
             <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">
@@ -321,18 +321,18 @@
             <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" 
+            <el-input-number
+              v-model="form.price"
+              :min="0"
               :precision="2"
               :step="1"
               controls-position="right"
@@ -342,13 +342,13 @@
             <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" 
+            <el-input-number
+              v-model="form.minPrice"
+              :min="0"
               :precision="2"
               :step="1"
               controls-position="right"
@@ -358,7 +358,7 @@
             <span style="margin-left: 8px; color: #606266; font-size: 14px;">元</span>
           </div>
         </el-form-item>
-        
+
         <!-- 领取时间 -->
         <el-form-item label="领取时间">
           <el-col :span="11">
@@ -381,7 +381,7 @@
             />
           </el-col>
         </el-form-item>
-        
+
         <!-- 是否无限领取 -->
         <el-form-item label="是否无限领取" prop="isPermanent">
           <el-radio-group v-model="form.isPermanent">
@@ -389,13 +389,13 @@
             <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" 
+            <el-input-number
+              v-model="form.count"
+              :min="0"
               :step="1"
               controls-position="right"
               style="width: 200px;"
@@ -404,13 +404,13 @@
             <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" 
+            <el-input-number
+              v-model="form.couponTime"
+              :min="0"
               :step="1"
               controls-position="right"
               style="width: 200px;"
@@ -419,13 +419,13 @@
             <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" 
+            <el-input-number
+              v-model="form.sort"
+              :min="0"
               :step="1"
               controls-position="right"
               style="width: 200px;"
@@ -434,7 +434,7 @@
             <span style="margin-left: 8px; color: #909399; font-size: 12px;">数字越小排序越靠前</span>
           </div>
         </el-form-item>
-        
+
         <!-- 状态 -->
         <el-form-item label="状态" prop="status">
           <el-switch
@@ -443,7 +443,7 @@
             :inactive-value="0"
           ></el-switch>
         </el-form-item>
-        
+
         <!-- 指定商品 (仅当类型为商品券时显示) -->
         <el-form-item label="指定商品" prop="productId" v-if="form.receiveType === 3">
           <el-select
@@ -461,7 +461,7 @@
             />
               </el-select>
         </el-form-item>
-        
+
         <!-- 指定分类 (仅当类型为品类券时显示) -->
         <el-form-item label="指定分类" prop="cateId" v-if="form.receiveType === 2">
           <el-select
@@ -479,20 +479,20 @@
             />
               </el-select>
         </el-form-item>
-        
+
         <!-- 选择用户 (仅当发送方式为手动赠送时显示) -->
         <el-form-item label="选择用户" prop="selectedUsers" v-if="form.type === 3">
-          <el-button 
-            type="primary" 
-            icon="el-icon-user" 
+          <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" 
+            <el-tag
+              v-for="user in selectedUsers"
               :key="user.userId"
               closable
               type="info"
@@ -546,17 +546,17 @@
           <template slot-scope="scope">
             <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>
-           
+
           </template>
         </el-table-column>
       </el-table>
     </el-dialog>
 
     <!-- 用户选择对话框 -->
-    <el-dialog 
-      title="用户列表" 
-      :visible.sync="userDialogVisible" 
-      width="800px" 
+    <el-dialog
+      title="用户列表"
+      :visible.sync="userDialogVisible"
+      width="800px"
       append-to-body
       :close-on-click-modal="false"
       destroy-on-close
@@ -583,7 +583,7 @@
           :data="filteredUserList"
           @select="handleUserSelectionChange"
            @select-all="handleUserSelectionChange"
-     
+
           height="400"
           border
           v-loading="userTableLoading"
@@ -607,7 +607,7 @@
           />
         </div>
       </div>
-      
+
       <div slot="footer" class="dialog-footer">
         <el-button @click="userDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="confirmUserSelection">确 定</el-button>
@@ -729,11 +729,11 @@ export default {
   },
 
 
-  
+
 
 
   methods: {
-   
+
     /** 查询优惠券列表 */
     getList() {
       this.loading = true;
@@ -742,11 +742,11 @@ export default {
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize
       };
-      
+
       // 只传递有值的参数
       Object.keys(this.queryParams).forEach(key => {
-        if (this.queryParams[key] !== undefined && 
-            this.queryParams[key] !== null && 
+        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)) {
@@ -864,7 +864,7 @@ export default {
         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 = [];
@@ -879,10 +879,10 @@ export default {
         //     // 如果解析失败，尝试按逗号分隔
         //     userIdArray = this.form.userIds.split(',');
         //   }
-          
+
         //   // 确保所有ID都是数字
         //   userIdArray = userIdArray.map(id => parseInt(id)).filter(id => !isNaN(id));
-          
+
           // 获取用户列表并初始化选中用户
           // getUserDataList().then(res => {
           //   const userList = res.data || [];
@@ -896,7 +896,7 @@ export default {
           //   this.form.userIds = JSON.stringify(this.selectedUsers.map(user => user.id));
           // });
         // }
-        
+
         this.open = true;
         this.title = "修改优惠券";
       });
@@ -908,7 +908,7 @@ export default {
       })
     },
     getGoodsDataList() {
-      getGoodsDataList().then(response => {
+      getGoodsDataList(2).then(response => {
         this.serviceGoodsList = response.data
       })
     },
@@ -917,7 +917,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           const submitData = { ...this.form };
-          
+
           // 处理日期格式，转换为10位时间戳（秒）
           if (submitData.startTime) {
             submitData.startTime = typeof submitData.startTime === 'number' && submitData.startTime.toString().length === 10
@@ -982,10 +982,10 @@ export default {
       // 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=>{
@@ -993,7 +993,7 @@ export default {
           this.tempSelectedUsers.push({
           userId: r.id,
           name: r.name ,
-          phone: r.phone 
+          phone: r.phone
          })
         }
       })
@@ -1008,10 +1008,10 @@ export default {
           if(s.userId==r){
             this.tempSelectedUsers.splice(index,1)
           }
-        })  
+        })
       })
     },
-    
+
     getUserList() {
 
 
@@ -1049,33 +1049,33 @@ export default {
         });
       });
     },
-    
+
     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);
@@ -1087,10 +1087,10 @@ export default {
 
     /** 关闭抽屉前的回调 */
     handleClose(done) {
-    
+
           this.reset();
           done();
-        
+
     },
 
     /** 表格日期格式化 */
diff --git a/ruoyi-ui/src/views/system/GoodsCart/index.vue b/ruoyi-ui/src/views/system/GoodsCart/index.vue
index e7f32e0..192ae68 100644
--- a/ruoyi-ui/src/views/system/GoodsCart/index.vue
+++ b/ruoyi-ui/src/views/system/GoodsCart/index.vue
@@ -2,11 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用户" prop="uid">
-        <el-input
+        <user-select
           v-model="queryParams.uid"
-          placeholder="请输入用户"
-          clearable
-          @keyup.enter.native="handleQuery"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
         />
       </el-form-item>
       <el-form-item label="商品id" prop="goodId">
@@ -142,7 +143,12 @@
     <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="uid">
-          <el-input v-model="form.uid" placeholder="请输入用户" />
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="商品id" prop="goodId">
           <el-input v-model="form.goodId" placeholder="请输入商品id" />
diff --git a/ruoyi-ui/src/views/system/GoodsOrder/index.vue b/ruoyi-ui/src/views/system/GoodsOrder/index.vue
index a64a718..c6d2f74 100644
--- a/ruoyi-ui/src/views/system/GoodsOrder/index.vue
+++ b/ruoyi-ui/src/views/system/GoodsOrder/index.vue
@@ -26,9 +26,13 @@
         />
       </el-form-item>
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="商品" prop="productId">
         <el-select v-model="queryParams.productId" placeholder="请选择商品" clearable filterable>
@@ -117,7 +121,7 @@
           v-hasPermi="['system:GoodsOrder:remove']"
         >删除</el-button>
       </el-col>
-    
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -215,12 +219,31 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="用户" prop="uid">
-              <el-input v-model="form.uid" placeholder="请输入用户" />
+              <user-select
+                v-model="form.uid"
+                placeholder="请选择用户"
+                user-type="1"
+                dialog-title="选择用户"
+                @change="handleUserSelectChange"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="商品" prop="productId">
-              <el-input v-model="form.productId" placeholder="请输入商品" />
+              <el-select
+                v-model="form.productId"
+                placeholder="请选择商品"
+                clearable
+                filterable
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in goodsDataList"
+                  :key="item.id"
+                  :label="item.title"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -230,17 +253,38 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="总价" prop="totalPrice">
-              <el-input v-model="form.totalPrice" placeholder="请输入总价" prefix-icon="el-icon-money" />
+              <el-input-number
+                v-model="form.totalPrice"
+                placeholder="请输入总价"
+                :min="0"
+                :precision="2"
+                :step="0.01"
+                style="width: 100%"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="支付金额" prop="payPrice">
-              <el-input v-model="form.payPrice" placeholder="请输入支付金额" prefix-icon="el-icon-money" />
+              <el-input-number
+                v-model="form.payPrice"
+                placeholder="请输入支付金额"
+                :min="0"
+                :precision="2"
+                :step="0.01"
+                style="width: 100%"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="抵扣金额" prop="deduction">
-              <el-input v-model="form.deduction" placeholder="请输入抵扣金额" />
+              <el-input-number
+                v-model="form.deduction"
+                placeholder="请输入抵扣金额"
+                :min="0"
+                :precision="2"
+                :step="0.01"
+                style="width: 100%"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -258,17 +302,17 @@
                 <el-radio :label="5">已完成</el-radio>
               </el-radio-group>
               <div v-if="form.status === 3" style="margin-top: 8px;">
-                <el-alert 
-                  title="📦 选择发货状态后，请填写快递信息" 
-                  type="info" 
-                  :closable="false" 
+                <el-alert
+                  title="📦 选择发货状态后，请填写快递信息"
+                  type="info"
+                  :closable="false"
                   show-icon
                   style="font-size: 14px;"
                 />
               </div>
             </el-form-item>
           </el-col>
-          
+
           <!-- 当选择发货状态时显示的快递信息 -->
           <template v-if="form.status === 3">
             <el-col :span="24">
@@ -277,18 +321,18 @@
                 <el-row :gutter="20">
                   <el-col :span="24">
                     <el-form-item label="快递" prop="deliveryId">
-                      <el-select 
-                        v-model="form.deliveryId" 
-                        placeholder="请选择快递公司" 
-                        clearable 
-                        filterable 
+                      <el-select
+                        v-model="form.deliveryId"
+                        placeholder="请选择快递公司"
+                        clearable
+                        filterable
                         style="width: 100%"
                       >
-                        <el-option 
-                          v-for="item in deliveryList" 
-                          :key="item.id" 
-                          :label="item.name || item.title" 
-                          :value="item.id" 
+                        <el-option
+                          v-for="item in deliveryList"
+                          :key="item.id"
+                          :label="item.name || item.title"
+                          :value="item.id"
                         />
                       </el-select>
                     </el-form-item>
@@ -300,13 +344,13 @@
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="发货时间" prop="sendTime">
-                      <el-date-picker 
-                        clearable 
-                        v-model="form.sendTime" 
-                        type="datetime" 
-                        value-format="yyyy-MM-dd HH:mm:ss" 
-                        placeholder="请选择发货时间" 
-                        style="width:100%" 
+                      <el-date-picker
+                        clearable
+                        v-model="form.sendTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择发货时间"
+                        style="width:100%"
                       />
                     </el-form-item>
                   </el-col>
@@ -315,38 +359,57 @@
             </el-col>
           </template>
           <el-col :span="24">
-            <el-form-item label="关联地址" prop="addressId">
-              <el-input v-model="form.addressId" placeholder="请输入关联地址" />
-            </el-form-item>
+            <div class="address-section">
+              <h4 style="margin: 0 0 15px 0; color: #409EFF; font-size: 16px;">📍 关联地址</h4>
+              <el-form-item label="地址" prop="addressId" style="margin-bottom: 0;">
+                <el-select
+                  v-model="form.addressId"
+                  placeholder="请选择地址"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                  :disabled="!form.uid || addressLoading"
+                  :loading="addressLoading"
+                >
+                  <el-option
+                    v-for="item in userAddressList"
+                    :key="item.id"
+                    :label="item.addressName"
+                    :value="item.id"
+                  />
+                </el-select>
+                <div v-if="!form.uid" class="tip-text info">
+                  请先选择用户
+                </div>
+                <div v-else-if="userAddressList.length === 0 && !addressLoading" class="tip-text warning">
+                  该用户暂无地址信息
+                </div>
+                <div v-else-if="addressLoading" class="tip-text info">
+                  正在加载地址数据...
+                </div>
+              </el-form-item>
+            </div>
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="mark">
               <el-input v-model="form.mark" type="textarea" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="创建时间" prop="createdAt">
-              <el-date-picker clearable v-model="form.createdAt" type="date" value-format="yyyy-MM-dd" placeholder="请选择创建时间" style="width:100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="更新时间" prop="updatedAt">
-              <el-date-picker clearable v-model="form.updatedAt" type="date" value-format="yyyy-MM-dd" placeholder="请选择更新时间" style="width:100%" />
-            </el-form-item>
-          </el-col>
+
+
         </el-row>
         <div class="dialog-footer" style="text-align:left;margin-top:20px;">
           <el-button @click="reset">重置</el-button>
           <el-button type="primary" @click="submitForm">提交</el-button>
         </div>
       </el-form>
-     
+
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listGoodsOrder, getGoodsOrder, delGoodsOrder, addGoodsOrder, updateGoodsOrder, getUserDataList, getGoodsDataList ,getSiteDeliveryList} from "@/api/system/GoodsOrder"
+import { listGoodsOrder, getGoodsOrder, delGoodsOrder, addGoodsOrder, updateGoodsOrder, getGoodsDataList ,getSiteDeliveryList,getUserAddressList,generateCode} from "@/api/system/GoodsOrder"
 
 export default {
   name: "GoodsOrder",
@@ -368,7 +431,12 @@ export default {
       // 商品订单表格数据
       GoodsOrderList: [],
 
-      userDataList: [],
+
+      userAddressList: [],
+      // 地址加载状态
+      addressLoading: false,
+
+
       // 服务订单表格数据
 
       goodsDataList : [],
@@ -418,8 +486,13 @@ export default {
         payenddate: null
         //------------------
       },
-      // 表单参数
-      form: {},
+              // 表单参数
+        form: {
+          type: 2,
+          totalPrice: 0,
+          payPrice: 0,
+          deduction: 0,
+        },
       // 表单校验
       rules: {
         type: [
@@ -459,39 +532,39 @@ export default {
           { required: true, message: "关联地址不能为空", trigger: "blur" }
         ],
         deliveryId: [
-          { 
+          {
             validator: (rule, value, callback) => {
               if (this.form.status === 3 && (!value || value === '')) {
                 callback(new Error('请选择快递公司'));
               } else {
                 callback();
               }
-            }, 
-            trigger: "change" 
+            },
+            trigger: "change"
           }
         ],
         deliveryNum: [
-          { 
+          {
             validator: (rule, value, callback) => {
               if (this.form.status === 3 && (!value || value.trim() === '')) {
                 callback(new Error('快递单号不能为空'));
               } else {
                 callback();
               }
-            }, 
-            trigger: "blur" 
+            },
+            trigger: "blur"
           }
         ],
         sendTime: [
-          { 
+          {
             validator: (rule, value, callback) => {
               if (this.form.status === 3 && (!value || value === '')) {
                 callback(new Error('请选择发货时间'));
               } else {
                 callback();
               }
-            }, 
-            trigger: "change" 
+            },
+            trigger: "change"
           }
         ],
       },
@@ -501,7 +574,6 @@ export default {
   },
   created() {
     this.getList();
-    this.fetchUserDataList();
     this.fetchGoodsDataList();
     this.getdeliveryList();
 
@@ -525,7 +597,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        type: null,
+        type: 2,
         mainOrderId: null,
         orderId: null,
         transactionId: null,
@@ -534,13 +606,13 @@ export default {
         name: null,
         phone: null,
         address: null,
-        num: null,
-        totalPrice: null,
-        goodPrice: null,
-        servicePrice: null,
-        payPrice: null,
-        deduction: null,
-        postage: null,
+        num: 1,
+        totalPrice: 0,
+        goodPrice: 0,
+        servicePrice: 0,
+        payPrice: 0,
+        deduction: 0,
+        postage: 0,
         payTime: null,
         status: null,
         deliveryId: null,
@@ -553,6 +625,9 @@ export default {
         updatedAt: null,
         deletedAt: null
       }
+      // 重置地址列表
+      this.userAddressList = []
+      this.addressLoading = false
       this.resetForm("form")
     },
     /** 搜索按钮操作 */
@@ -592,8 +667,15 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    //获取报价材料列表
+    generateCode(){
+      generateCode().then(response => {
+        this.form.orderId=response.msg;
+      })
+    },
     /** 新增按钮操作 */
     handleAdd() {
+      this.generateCode()
       this.reset()
       this.open = true
       this.title = "添加商品订单"
@@ -604,6 +686,12 @@ export default {
       const id = row.id || this.ids
       getGoodsOrder(id).then(response => {
         this.form = response.data
+
+        // 如果有用户ID，获取对应的地址列表
+        if (this.form.uid) {
+          this.getUserAddressList(this.form.uid)
+        }
+
         this.open = true
         this.title = "修改商品订单"
       })
@@ -646,14 +734,22 @@ export default {
       }, `GoodsOrder_${new Date().getTime()}.xlsx`)
     },
 
-    fetchUserDataList() {
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data;
-      });
+    // handleUserSelectChange替代handleUserChange
+    handleUserSelectChange(userId) {
+      // 清空当前选中的地址
+      this.form.addressId = null
+
+      if (userId) {
+        // 获取新用户的地址列表
+        this.getUserAddressList(userId)
+      } else {
+        // 如果清空用户选择，也清空地址列表
+        this.userAddressList = []
+      }
     },
 
     fetchGoodsDataList() {
-      getGoodsDataList().then(response => {
+      getGoodsDataList(2).then(response => {
         this.goodsDataList = response.data;
       });
     },
@@ -663,6 +759,34 @@ export default {
       getSiteDeliveryList().then(response => {
         this.deliveryList = response.data;
       });
+    },
+
+
+
+    // 获取用户地址列表
+    getUserAddressList(userId) {
+      if (!userId) {
+        this.userAddressList = []
+        return
+      }
+
+      this.addressLoading = true
+
+      // 使用API函数获取用户地址
+      getUserAddressList(userId).then(response => {
+        this.userAddressList = response.rows || response.data || []
+        this.addressLoading = false
+
+        // 如果当前选中的地址不在新的地址列表中，清空选择
+        if (this.form.addressId && !this.userAddressList.find(item => item.id === this.form.addressId)) {
+          this.form.addressId = null
+        }
+      }).catch(error => {
+        console.error('获取用户地址列表失败:', error)
+        this.userAddressList = []
+        this.addressLoading = false
+        this.$modal.msgError('获取用户地址列表失败')
+      })
     }
   },
   watch: {
@@ -688,11 +812,72 @@ export default {
 /* 表单输入框字体变大，颜色分明 */
 .el-input__inner,
 .el-select .el-input__inner,
-.el-date-editor .el-input__inner {
+.el-date-editor .el-input__inner,
+.el-input-number .el-input__inner {
   font-size: 18px !important;
   color: #222 !important;
   background: #f8f8f8 !important;
   border: 1.5px solid #409EFF !important;
+  border-radius: 6px;
+  transition: all 0.3s;
+}
+
+.el-input__inner:hover,
+.el-select .el-input__inner:hover,
+.el-date-editor .el-input__inner:hover,
+.el-input-number .el-input__inner:hover {
+  border-color: #66b1ff !important;
+}
+
+.el-input__inner:focus,
+.el-select .el-input__inner:focus,
+.el-date-editor .el-input__inner:focus,
+.el-input-number .el-input__inner:focus {
+  border-color: #409EFF !important;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2) !important;
+}
+
+/* 数字输入框样式 */
+.el-input-number {
+  width: 100%;
+}
+
+.el-input-number .el-input-number__increase,
+.el-input-number .el-input-number__decrease {
+  background-color: #f8f8f8;
+  border-color: #409EFF;
+  color: #409EFF;
+}
+
+.el-input-number .el-input-number__increase:hover,
+.el-input-number .el-input-number__decrease:hover {
+  background-color: #409EFF;
+  color: #fff;
+}
+
+/* 下拉选择框禁用状态样式 */
+.el-select.is-disabled .el-input__inner {
+  background-color: #f5f7fa !important;
+  border-color: #e4e7ed !important;
+  color: #c0c4cc !important;
+  cursor: not-allowed;
+}
+
+/* 下拉选择项样式 */
+.el-select-dropdown__item {
+  font-size: 16px !important;
+  color: #222 !important;
+  padding: 8px 20px;
+  transition: background-color 0.3s;
+}
+
+.el-select-dropdown__item:hover {
+  background-color: #f5f7fa;
+}
+
+.el-select-dropdown__item.selected {
+  color: #409EFF !important;
+  font-weight: bold;
 }
 
 .el-form-item__label {
@@ -701,10 +886,7 @@ export default {
   font-weight: bold;
 }
 
-.el-select-dropdown__item {
-  font-size: 16px !important;
-  color: #222 !important;
-}
+/* 移除重复的样式定义，已在上面定义过 */
 
 .el-table th, .el-table td {
   font-size: 16px !important;
@@ -738,4 +920,43 @@ export default {
   border-color: #389e0d !important;
   box-shadow: 0 0 0 2px rgba(82, 196, 26, 0.2) !important;
 }
+
+/* 地址选择区域样式 */
+.address-section {
+  border: 1.5px solid #e6f7ff;
+  border-radius: 8px;
+  padding: 15px;
+  margin: 10px 0;
+  background-color: #f0f9ff;
+}
+
+.address-section .el-form-item__label {
+  color: #409EFF !important;
+  font-weight: bold;
+}
+
+.address-section .el-select .el-input__inner {
+  border: 1.5px solid #409EFF !important;
+  background-color: #fff !important;
+}
+
+.address-section .el-select .el-input__inner:focus {
+  border-color: #1890ff !important;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2) !important;
+}
+
+/* 提示信息样式 */
+.tip-text {
+  font-size: 12px;
+  margin-top: 4px;
+  padding: 2px 0;
+}
+
+.tip-text.warning {
+  color: #F56C6C;
+}
+
+.tip-text.info {
+  color: #909399;
+}
 </style>
diff --git a/ruoyi-ui/src/views/system/IntegralLog/index.vue b/ruoyi-ui/src/views/system/IntegralLog/index.vue
index e3fe3b2..109f02a 100644
--- a/ruoyi-ui/src/views/system/IntegralLog/index.vue
+++ b/ruoyi-ui/src/views/system/IntegralLog/index.vue
@@ -19,9 +19,13 @@
         />
       </el-form-item>
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
@@ -135,7 +139,12 @@
           <el-input v-model="form.mark" placeholder="请输入描述" />
         </el-form-item>
         <el-form-item label="用户" prop="uid">
-          <el-input v-model="form.uid" placeholder="请输入用户" />
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="积分值" prop="num">
           <el-input v-model="form.num" placeholder="请输入积分值" />
@@ -166,7 +175,7 @@
 </template>
 
 <script>
-import { listIntegralLog, getIntegralLog, delIntegralLog, addIntegralLog, updateIntegralLog ,getUserDataList} from "@/api/system/IntegralLog"
+import { listIntegralLog, getIntegralLog, delIntegralLog, addIntegralLog, updateIntegralLog } from "@/api/system/IntegralLog"
 import request from "@/utils/request"
 
 export default {
@@ -186,7 +195,7 @@ export default {
       // 总条数
       total: 0,
 
-      userDataList: [],
+
       // 积分日志表格数据
       IntegralLogList: [],
       // 弹出层标题
diff --git a/ruoyi-ui/src/views/system/IntegralOrder/index.vue b/ruoyi-ui/src/views/system/IntegralOrder/index.vue
index 469fce6..57736c6 100644
--- a/ruoyi-ui/src/views/system/IntegralOrder/index.vue
+++ b/ruoyi-ui/src/views/system/IntegralOrder/index.vue
@@ -10,9 +10,13 @@
         />
       </el-form-item>
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in users" :key="item.userId" :label="item.userName" :value="item.userId" />
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="姓名" prop="userName">
         <el-input
@@ -160,9 +164,12 @@
           <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 style="width: 100%">
-            <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="姓名" prop="userName">
           <el-input v-model="form.userName" placeholder="请输入姓名" />
@@ -256,7 +263,7 @@
 </template>
 
 <script>
-import { listIntegralOrder, getIntegralOrder, delIntegralOrder, addIntegralOrder, updateIntegralOrder,getUserDataList,getIntegralProductList,getSiteDeliveryList } from "@/api/system/IntegralOrder"
+import { listIntegralOrder, getIntegralOrder, delIntegralOrder, addIntegralOrder, updateIntegralOrder,getIntegralProductList,getSiteDeliveryList } from "@/api/system/IntegralOrder"
 import request from "@/utils/request"
 
 export default {
@@ -280,7 +287,7 @@ export default {
 
       integralProductList: [],
 
-      userDataList: [],
+
       // 积分订单表格数据
       IntegralOrderList: [],
       // 弹出层标题
@@ -367,9 +374,9 @@ export default {
   created() {
     this.getList()
     this.getOptions()
-    this.getuserDataList()
     this.getIntegralProductList()
     this.getSiteDeliveryList()
+    this.getUserAddressList()
   },
   methods: {
     getOptions() {
@@ -443,13 +450,15 @@ export default {
       })
     },
 
-
-    getuserDataList(){
-      getUserDataList(1).then(res => {
-        this.userDataList = res.data
+    getUserAddressList(){
+      getUserAddressList(this.form.uid).then(res => {
+        this.UserAddressList = res.data
       })
     },
 
+
+
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
diff --git a/ruoyi-ui/src/views/system/Order/index.vue b/ruoyi-ui/src/views/system/Order/index.vue
index ba20faf..90de953 100644
--- a/ruoyi-ui/src/views/system/Order/index.vue
+++ b/ruoyi-ui/src/views/system/Order/index.vue
@@ -109,9 +109,13 @@
       </el-form-item>
 
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="商品" prop="productId">
         <el-select v-model="queryParams.productId" placeholder="请选择商品" clearable filterable>
@@ -119,9 +123,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="师傅" prop="workerId">
-        <el-select v-model="queryParams.workerId" placeholder="请选择师傅" clearable filterable>
-          <el-option v-for="item in userGongRenList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <user-select
+          v-model="queryParams.workerId"
+          placeholder="请选择师傅"
+          user-type="2"
+          dialog-title="选择师傅"
+          style="width: 200px;"
+        />
       </el-form-item>
 
       <el-form-item>
@@ -345,26 +353,39 @@
           <template v-if="form.createType === 1">
             <el-col :span="24">
               <el-form-item label="用户" prop="uid">
-                <el-select v-model="form.uid" placeholder="请选择用户" clearable filterable style="width: 100%">
-                  <el-option
-                    v-for="item in userDataList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
+                <user-select
+                  v-model="form.uid"
+                  placeholder="请选择用户"
+                  user-type="1"
+                  dialog-title="选择用户"
+                  @change="handleUserSelectChange"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="关联地址" prop="addressId">
-                <el-select v-model="form.addressId" placeholder="请选择地址" clearable filterable style="width: 100%">
+                <el-select
+                  v-model="form.addressId"
+                  placeholder="请选择地址"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                  :disabled="!form.uid || addressLoading"
+                  :loading="addressLoading"
+                >
                   <el-option
                     v-for="item in addressList"
                     :key="item.id"
-                    :label="item.address"
+                    :label="item.addressName"
                     :value="item.id"
                   />
                 </el-select>
+                <div v-if="!form.uid" style="color: #909399; font-size: 12px; margin-top: 4px;">
+                  请先选择用户
+                </div>
+                <div v-else-if="addressList.length === 0 && !addressLoading" style="color: #F56C6C; font-size: 12px; margin-top: 4px;">
+                  该用户暂无地址信息
+                </div>
               </el-form-item>
             </el-col>
           </template>
@@ -485,28 +506,26 @@
                 </el-input>
               </el-form-item>
             </el-col>
-           
-          
+
+
           </template>
 
           <!-- 派单内容 -->
           <template v-if="form.jsonStatus === 1">
           <el-col :span="24">
               <el-form-item label="师傅" prop="orderLog.workerId">
-                <el-select v-model="form.orderLog.workerId" placeholder="请选择师傅" clearable filterable style="width: 100%">
-                  <el-option
-                    v-for="item in userGongRenList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
+                <user-select
+                  v-model="form.orderLog.workerId"
+                  placeholder="请选择师傅"
+                  user-type="2"
+                  dialog-title="选择师傅"
+                />
               </el-form-item>
             </el-col>
-            
+
           </template>
 
-          <!-- 接单内容 
+          <!-- 接单内容
           <template v-if="form.jsonStatus === 2">
             <el-col :span="24">
               <el-form-item label="备注" prop="orderLog.remark">
@@ -520,29 +539,29 @@
           </template>-->
 
           <!-- 设置上门内容 -->
-       
-          
+
+
           <!-- 出发上门内容 -->
-        
+
             <!-- 出发上门内容 -->
-          
+
 
           <!-- 项目报价内容 -->
           <template v-if="form.jsonStatus === 6">
             <el-col :span="24">
               <el-form-item label="项目费用" prop="price">
-                <el-input 
-                  v-model="form.price" 
-                  type="number" 
-                  placeholder="请输入项目费用" 
+                <el-input
+                  v-model="form.price"
+                  type="number"
+                  placeholder="请输入项目费用"
                   @change="handlePriceChange"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="基础项目" prop="baseProject">
-                <el-select 
-                  v-model="form.baseProject" 
+                <el-select
+                  v-model="form.baseProject"
                   multiple
                   collapse-tags
                   placeholder="请选择基础项目"
@@ -562,9 +581,9 @@
               <el-form-item label="服务项目" prop="serviceItems">
                 <div class="service-items">
                   <div v-for="(item, index) in form.serviceItems" :key="index" class="service-item">
-                    <el-select 
-                      v-model="item.id" 
-                      placeholder="选择项目" 
+                    <el-select
+                      v-model="item.id"
+                      placeholder="选择项目"
                       style="width: 40%; margin-right: 10px;"
                       @change="(val) => handleServiceItemChange(val, index)"
                     >
@@ -575,10 +594,10 @@
                         :value="option.id"
                       />
                     </el-select>
-                    <el-input-number 
-                      v-model="item.quantity" 
-                      :min="1" 
-                      placeholder="数量" 
+                    <el-input-number
+                      v-model="item.quantity"
+                      :min="1"
+                      placeholder="数量"
                       style="width: 25%; margin-right: 10px;"
                       @change="handleQuantityChange"
                     />
@@ -590,9 +609,9 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="服务项目合计" prop="servicePrice">
-                <el-input 
-                  v-model="form.servicePrice" 
-                  type="number" 
+                <el-input
+                  v-model="form.servicePrice"
+                  type="number"
                   placeholder="服务项目合计金额"
                   :disabled="true"
                   prefix-icon="el-icon-money"
@@ -605,9 +624,9 @@
               <el-form-item label="物料" prop="materials">
                 <div class="materials">
                   <div v-for="(item, index) in form.materials" :key="index" class="material-item">
-                    <el-select 
-                      v-model="item.id" 
-                      placeholder="选择物料" 
+                    <el-select
+                      v-model="item.id"
+                      placeholder="选择物料"
                       style="width: 40%; margin-right: 10px;"
                       @change="(val) => handleMaterialChange(val, index)"
                     >
@@ -618,10 +637,10 @@
                         :value="option.id"
                       />
                     </el-select>
-                    <el-input-number 
-                      v-model="item.quantity" 
-                      :min="1" 
-                      placeholder="数量" 
+                    <el-input-number
+                      v-model="item.quantity"
+                      :min="1"
+                      placeholder="数量"
                       style="width: 25%; margin-right: 10px;"
                       @change="handleQuantityChange"
                     />
@@ -633,9 +652,9 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="物料合计" prop="goodPrice">
-                <el-input 
-                  v-model="form.goodPrice" 
-                  type="number" 
+                <el-input
+                  v-model="form.goodPrice"
+                  type="number"
                   placeholder="物料合计金额"
                   :disabled="true"
                   prefix-icon="el-icon-money"
@@ -655,9 +674,9 @@
             <!-- 只在选择定金+尾款时显示定金输入框 -->
             <el-col :span="24" v-if="form.paymentMethod === 1">
               <el-form-item label="定金" prop="orderLog.deposit">
-                <el-input 
-                  v-model="form.orderLog.deposit" 
-                  type="number" 
+                <el-input
+                  v-model="form.orderLog.deposit"
+                  type="number"
                   placeholder="请输入定金金额"
                   @change="handleDepositChange"
                 >
@@ -685,7 +704,7 @@
                 </el-upload>
               </el-form-item>
             </el-col>
-          
+
           </template>
 
           <!-- 暂停内容 -->
@@ -728,7 +747,7 @@
                 />
               </el-form-item>
             </el-col>
-           
+
           </template>
 
           <!-- 完成服务内容 -->
@@ -749,7 +768,7 @@
                 </el-upload>
               </el-form-item>
             </el-col>
-           
+
           </template>
 
           <!-- 取消订单内容 - 用户取消 -->
@@ -799,14 +818,13 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="师傅" prop="orderLog.workerId">
-                <el-select v-model="form.orderLog.workerId" placeholder="请选择师傅" clearable filterable style="width: 100%" @change="handleCancelData">
-                  <el-option
-                    v-for="item in userGongRenList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
+                <user-select
+                  v-model="form.orderLog.workerId"
+                  placeholder="请选择师傅"
+                  user-type="2"
+                  dialog-title="选择师傅"
+                  @change="handleCancelDataWithWorker"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -948,7 +966,7 @@
           </el-col>
 
 
-          
+
         </el-row>
         <div class="dialog-footer" style="text-align:left;margin-top:20px;">
           <el-button @click="reset">重置</el-button>
@@ -1006,8 +1024,20 @@
 
 <script>
 
-import { listOrder, getOrder, delOrder, addOrder, updateOrder,getUserDataList,getGoodsDataList,selectQuoteCraftList,generateCode,selectQuoteMaterialList,selectBaseProjectList} from "@/api/system/Order"
-import { getuserAddressList } from "@/api/system/UserAddress"
+import {
+  listOrder,
+  getOrder,
+  delOrder,
+  addOrder,
+  updateOrder,
+  getGoodsDataList,
+  selectQuoteCraftList,
+  generateCode,
+  selectQuoteMaterialList,
+  selectBaseProjectList,
+  getuserAddressList,
+  getUserAddressList
+} from "@/api/system/Order"
 import CallRecord from './components/CallRecord'
 import AudioRecord from './components/AudioRecord'
 import ReceiveRecord from './components/ReceiveRecord'
@@ -1042,20 +1072,19 @@ export default {
       total: 0,
       // 报价工艺列表
       quoteCraftList: [],
-      // 报价材料列表 
+      // 报价材料列表
       quoteMaterialList: [],
 
       baseProjectList: [],
 
-      userDataList: [],
-
-      userGongRenList: [],
       // 服务订单表格数据
       OrderList: [],
 
       goodsDataList : [],
       // 用户地址列表
       addressList: [],
+      // 地址加载状态
+      addressLoading: false,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -1185,7 +1214,7 @@ export default {
         ],
         // 服务暂停状态下的必填字段验证
         servicePhotos: [
-          { 
+          {
             validator: (rule, value, callback) => {
               if (this.form.jsonStatus === 8) {
                 if (!value || value.length === 0) {
@@ -1196,12 +1225,12 @@ export default {
               } else {
                 callback()
               }
-            }, 
-            trigger: 'change' 
+            },
+            trigger: 'change'
           }
         ],
         pauseReason: [
-          { 
+          {
             validator: (rule, value, callback) => {
               if (this.form.jsonStatus === 8) {
                 if (!value || value.trim() === '') {
@@ -1212,12 +1241,12 @@ export default {
               } else {
                 callback()
               }
-            }, 
-            trigger: 'blur' 
+            },
+            trigger: 'blur'
           }
         ],
         nextServiceTime: [
-          { 
+          {
             validator: (rule, value, callback) => {
               if (this.form.jsonStatus === 8) {
                 if (!value) {
@@ -1235,12 +1264,12 @@ export default {
               } else {
                 callback()
               }
-            }, 
-            trigger: 'change' 
+            },
+            trigger: 'change'
           }
         ],
         cancelTime: [
-          { 
+          {
             validator: (rule, value, callback) => {
               if (this.form.jsonStatus >= 10 && this.form.jsonStatus <= 14) {
                 if (!value) {
@@ -1251,12 +1280,12 @@ export default {
               } else {
                 callback()
               }
-            }, 
-            trigger: 'change' 
+            },
+            trigger: 'change'
           }
         ],
         cancelReason: [
-          { 
+          {
             validator: (rule, value, callback) => {
               if (this.form.jsonStatus >= 10 && this.form.jsonStatus <= 14) {
                 if (!value || value.trim() === '') {
@@ -1267,8 +1296,8 @@ export default {
               } else {
                 callback()
               }
-            }, 
-            trigger: 'blur' 
+            },
+            trigger: 'blur'
           }
         ]
       },
@@ -1296,12 +1325,12 @@ export default {
   },
   created() {
     this.getList()
-    this.getUserDataList()
-    this.getuserGongRenList()
     this.getGoodsDataListList();
-    this.getAddressList();
+    // 移除这里的getAddressList调用，因为需要先选择用户
     this.getQuoteCraftList()
     this.getQuoteMaterialList()
+
+    // 初始化完成
   },
   methods: {
     /** 查询服务订单列表 */
@@ -1371,6 +1400,9 @@ export default {
         cancelReason: null, // 重置取消原因
         timeoutDuration: null, // 重置超时时长
       }
+      // 重置地址列表
+      this.addressList = []
+      this.addressLoading = false
       this.resetForm("form")
     },
     /** 搜索按钮操作 */
@@ -1454,7 +1486,7 @@ export default {
       selectBaseProjectList(id).then(response => {
         // 将接收到的数据转换为数组
         let basicData = response.data.basic
-        
+
         // 如果basicData是字符串，尝试解析为JSON
         if (typeof basicData === 'string') {
           try {
@@ -1464,7 +1496,7 @@ export default {
             basicData = []
           }
         }
-        
+
         // 确保最终结果是数组
         if (Array.isArray(basicData)) {
           this.baseProjectList = basicData
@@ -1475,7 +1507,7 @@ export default {
           // 如果都不是，设置为空数组
           this.baseProjectList = []
         }
-        
+
         console.log("转换后的baseProjectList:", this.baseProjectList)
       }).catch(error => {
         console.error('获取基础项目列表失败:', error)
@@ -1492,7 +1524,7 @@ export default {
     },
 
 
-     
+
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
@@ -1500,12 +1532,17 @@ export default {
       this.getBaseProjectList(row.id)
       getOrder(id).then(response => {
         this.form = response.data
-        
+
+        // 如果有用户ID，获取对应的地址列表
+        if (this.form.uid) {
+          this.getAddressList(this.form.uid)
+        }
+
         // 时间戳转换为日期格式显示
         if (this.form.makeTime && typeof this.form.makeTime === 'number') {
           this.form.makeTime = this.timestampToDate(this.form.makeTime)
         }
-        
+
         // 确保必要的数组和对象被初始化
         if (!this.form.serviceItems) {
           this.$set(this.form, 'serviceItems', [])
@@ -1526,7 +1563,7 @@ export default {
         if (this.form.orderLog && this.form.orderLog.content) {
           try {
             const content = JSON.parse(this.form.orderLog.content)
-            
+
             // 解析项目报价相关数据（jsonStatus === 6）
             if (content.craft) {
               this.form.serviceItems = content.craft.map(item => ({
@@ -1550,7 +1587,7 @@ export default {
             if (content.project) {
               this.form.price = content.project.price
             }
-            
+
             // 解析开始服务状态的图片数据（jsonStatus === 7）
             if (content.name === "师傅开始服务" && content.image && Array.isArray(content.image)) {
               // 将图片地址转换为文件列表格式
@@ -1560,7 +1597,7 @@ export default {
                 uid: Date.now() + index // 生成唯一的uid
               }))
             }
-            
+
             // 解析暂停状态的图片数据（jsonStatus === 8）
             if (content.name === "服务暂停" && content.image && Array.isArray(content.image)) {
               this.form.servicePhotos = content.image.map((url, index) => ({
@@ -1576,7 +1613,7 @@ export default {
                 this.form.nextServiceTime = content.nextServiceTime;
               }
             }
-            
+
             // 解析完成服务状态的图片数据（jsonStatus === 9）
             if (content.name === "服务完成" && content.image && Array.isArray(content.image)) {
               this.form.servicePhotos = content.image.map((url, index) => ({
@@ -1585,13 +1622,13 @@ export default {
                 uid: Date.now() + index
               }))
             }
-            
+
             // 解析取消订单数据（jsonStatus >= 10）
             if (content.cancelType && this.form.jsonStatus >= 10 && this.form.jsonStatus <= 14) {
               this.form.cancelTime = content.cancelTime || null;
               this.form.cancelReason = content.cancelReason || null;
               this.form.timeoutDuration = content.timeoutDuration || null;
-              
+
               // 如果是师傅取消，设置师傅信息
               if (content.workerId) {
                 this.form.orderLog.workerId = content.workerId;
@@ -1617,7 +1654,7 @@ export default {
               return
             }
           }
-          
+
           // 已取消状态的额外验证和数据处理
           if (this.form.jsonStatus >= 10 && this.form.jsonStatus <= 14) {
             const cancelValidation = this.validateCancelData()
@@ -1628,15 +1665,15 @@ export default {
             // 确保取消数据已正确封装
             this.handleCancelData()
           }
-          
+
           // 创建提交数据的副本
           const submitData = { ...this.form }
-          
+
           // 将预约时间转换为时间戳
           if (submitData.makeTime) {
             submitData.makeTime = this.dateToTimestamp(submitData.makeTime)
           }
-          
+
           if (submitData.id != null) {
             updateOrder(submitData).then(response => {
               this.$modal.msgSuccess("修改成功")
@@ -1711,30 +1748,65 @@ export default {
       }
     },
 
-    getUserDataList () {
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data
-      })
-    },
 
-    getuserGongRenList () {
-      getUserDataList("2").then(response => {
-        this.userGongRenList = response.data
-      })
-    },
     getGoodsDataListList () {
-      getGoodsDataList().then(response => {
+      getGoodsDataList(1).then(response => {
         this.goodsDataList = response.data
       })
     },
 
     // 获取用户地址列表
-    getAddressList() {
-      getuserAddressList().then(response => {
-        this.addressList = response.rows || []
+    getAddressList(userId) {
+      if (!userId) {
+        this.addressList = []
+        return
+      }
+
+      this.addressLoading = true
+
+      // 使用新的API函数
+      getUserAddressList(userId).then(response => {
+        this.addressList = response.rows || response.data || []
+        this.addressLoading = false
+
+        // 如果当前选中的地址不在新的地址列表中，清空选择
+        if (this.form.addressId && !this.addressList.find(item => item.id === this.form.addressId)) {
+          this.form.addressId = null
+        }
+      }).catch(error => {
+        console.error('获取用户地址列表失败:', error)
+        this.addressList = []
+        this.addressLoading = false
+        this.$modal.msgError('获取用户地址列表失败')
       })
     },
 
+    // 处理用户选择变化 (UserSelect组件的change事件)
+    handleUserSelectChange(user) {
+      // 清空当前选中的地址
+      this.form.addressId = null
+
+      if (user && user.id) {
+        // 获取新用户的地址列表
+        this.getAddressList(user.id)
+      } else {
+        // 如果清空用户选择，也清空地址列表
+        this.addressList = []
+      }
+    },
+
+    // 处理取消数据变化时的师傅选择
+    handleCancelDataWithWorker(user) {
+      if (user && user.id) {
+        this.form.orderLog.workerId = user.id
+      } else {
+        this.form.orderLog.workerId = null
+      }
+      this.handleCancelData()
+    },
+
+
+
     /** 显示记录详情 */
     showRecordDetails(row, type) {
       this.currentOrder = row
@@ -1848,14 +1920,14 @@ export default {
     },
     handlejsonStatusChange(value) {
       // 智能重置相关字段，只重置与当前状态无关的字段
-      
+
       // 重置通用字段
       this.form.workerId = null;
       this.form.departureTime = null;
       this.form.arrivalTime = null;
       this.form.projectCost = null;
       this.form.doorFee = null;
-      
+
       // 如果是取消相关状态，设置默认取消时间为当前时间
       if (value >= 10 && value <= 14) {
         if (!this.form.cancelTime) {
@@ -1873,7 +1945,7 @@ export default {
           this.handleCancelData();
         });
       }
-      
+
       // 根据新状态决定是否重置特定字段
       if (value !== 6) {
         // 如果不是项目报价状态，重置报价相关字段
@@ -1883,31 +1955,31 @@ export default {
         this.form.paymentMethod = 2;
         this.form.deposit = 0;
       }
-      
+
       if (value !== 7) {
         // 如果不是开始服务状态，重置开始服务相关字段
         this.form.startTime = null;
       }
-      
+
       if (value !== 8) {
         // 如果不是暂停服务状态，重置暂停相关字段
         this.form.pauseTime = null;
         this.form.pauseReason = null;
         this.form.nextServiceTime = null;
       }
-      
+
       if (value !== 9) {
         // 如果不是完成服务状态，重置完成相关字段
         this.form.completeTime = null;
       }
-      
+
       // 如果不是取消相关状态，重置取消相关字段
       if (value < 10 || value > 14) {
         this.form.cancelTime = null;
         this.form.cancelReason = null;
         this.form.timeoutDuration = null;
       }
-      
+
       // 只有在状态不是7、8、9时才重置服务照片
       if (value !== 7 && value !== 8 && value !== 9) {
         this.form.servicePhotos = [];
@@ -1984,13 +2056,13 @@ export default {
 
       // 将计算出的总价赋值给订单金额字段
       this.form.totalPrice = totalPrice;
-      
+
       // 将服务项目合计金额赋值给servicePrice
       this.form.servicePrice = craftTotal;
-      
+
       // 将物料合计金额赋值给goodPrice
       this.form.goodPrice = materialTotal;
-      
+
       // 根据支付方式设置支付金额
       if (this.form.paymentMethod === 1) {
         // 定金+尾款模式，支付金额为定金
@@ -2038,14 +2110,14 @@ export default {
     // 处理照片变更
     handlePhotoChange(file, fileList) {
       this.form.servicePhotos = fileList;
-      
+
       // 如果是暂停服务状态，触发表单验证
       if (this.form.jsonStatus === 8) {
         this.$nextTick(() => {
           this.$refs.form.validateField('servicePhotos')
         })
       }
-      
+
       // 根据不同的服务进度状态封装不同的JSON格式
       if (this.form.jsonStatus === 7) {
         // 开始服务状态
@@ -2058,18 +2130,18 @@ export default {
           }
           return '';
         }).filter(url => url);
-        
+
         const serviceImageJson = {
           name: "师傅开始服务",
           image: imageUrls
         };
         this.form.orderLog.content = JSON.stringify(serviceImageJson);
         console.log('开始服务图片JSON:', this.form.orderLog.content);
-        
+
       } else if (this.form.jsonStatus === 8) {
         // 暂停状态 - 调用专门的处理方法
         this.handlePauseServiceData();
-        
+
       } else if (this.form.jsonStatus === 9) {
         // 完成服务状态
         const imageUrls = fileList.map(file => {
@@ -2081,7 +2153,7 @@ export default {
           }
           return '';
         }).filter(url => url);
-        
+
         const completeImageJson = {
           name: "服务完成",
           image: imageUrls
@@ -2122,7 +2194,7 @@ export default {
           }
           return '';
         }).filter(url => url); // 过滤掉空字符串
-        
+
         // 暂停服务JSON结构
         const pauseServiceJson = {
           name: "服务暂停",
@@ -2130,12 +2202,12 @@ export default {
           pauseReason: this.form.pauseReason || "",
           nextServiceTime: this.form.nextServiceTime || ""
         };
-        
+
         this.form.orderLog.content = JSON.stringify(pauseServiceJson);
         console.log('暂停服务数据JSON:', this.form.orderLog.content);
       }
     },
-    
+
     /**
      * 将日期转换为Unix时间戳（秒）
      * @param {string|Date} date - 日期字符串或Date对象
@@ -2143,7 +2215,7 @@ export default {
      */
     dateToTimestamp(date) {
       if (!date) return null;
-      
+
       let dateObj;
       if (typeof date === 'string') {
         dateObj = new Date(date);
@@ -2152,17 +2224,17 @@ export default {
       } else {
         return null;
       }
-      
+
       // 检查日期是否有效
       if (isNaN(dateObj.getTime())) {
         console.error('无效的日期格式:', date);
         return null;
       }
-      
+
       // 返回Unix时间戳（秒）
       return Math.floor(dateObj.getTime() / 1000);
     },
-    
+
     /**
      * 将Unix时间戳转换为日期字符串
      * @param {number} timestamp - Unix时间戳（秒）
@@ -2170,22 +2242,22 @@ export default {
      */
     timestampToDate(timestamp) {
       if (!timestamp || typeof timestamp !== 'number') return null;
-      
+
       try {
         // 将秒级时间戳转换为毫秒级
         const date = new Date(timestamp * 1000);
-        
+
         // 检查日期是否有效
         if (isNaN(date.getTime())) {
           console.error('无效的时间戳:', timestamp);
           return null;
         }
-        
+
         // 格式化为 YYYY-MM-DD
         const year = date.getFullYear();
         const month = String(date.getMonth() + 1).padStart(2, '0');
         const day = String(date.getDate()).padStart(2, '0');
-        
+
         return `${year}-${month}-${day}`;
       } catch (error) {
         console.error('时间戳转换失败:', error);
@@ -2207,7 +2279,7 @@ export default {
           }
           return '';
         }).filter(url => url); // 过滤掉空字符串
-        
+
         // 暂停服务JSON结构
         const pauseServiceJson = {
           name: "服务暂停",
@@ -2215,40 +2287,40 @@ export default {
           pauseReason: this.form.pauseReason || "",
           nextServiceTime: this.form.nextServiceTime || ""
         };
-        
+
         this.form.orderLog.content = JSON.stringify(pauseServiceJson);
         console.log('暂停服务数据JSON:', this.form.orderLog.content);
       }
     },
-    
+
     /**
      * 验证服务暂停数据的完整性
      * @returns {Object} 验证结果对象
      */
     validatePauseServiceData() {
       const result = { valid: true, message: '' }
-      
+
       // 验证服务照片
       if (!this.form.servicePhotos || this.form.servicePhotos.length === 0) {
         result.valid = false
         result.message = '服务暂停时必须上传服务照片'
         return result
       }
-      
+
       // 验证暂停原因
       if (!this.form.pauseReason || this.form.pauseReason.trim() === '') {
         result.valid = false
         result.message = '服务暂停时必须填写暂停原因'
         return result
       }
-      
+
       // 验证下次服务时间
       if (!this.form.nextServiceTime) {
         result.valid = false
         result.message = '服务暂停时必须选择下次服务时间'
         return result
       }
-      
+
       // 验证下次服务时间必须是未来时间
       const selectedTime = new Date(this.form.nextServiceTime)
       const currentTime = new Date()
@@ -2257,10 +2329,10 @@ export default {
         result.message = '下次服务时间必须是未来时间'
         return result
       }
-      
+
       return result
     },
-    
+
     /**
      * 处理取消订单数据封装
      */
@@ -2268,7 +2340,7 @@ export default {
       console.log('handleCancelData 被调用, jsonStatus:', this.form.jsonStatus);
       console.log('当前取消时间:', this.form.cancelTime);
       console.log('当前取消原因:', this.form.cancelReason);
-      
+
       if (this.form.jsonStatus >= 10 && this.form.jsonStatus <= 14) {
         // 根据不同的取消类型构建JSON数据
         let cancelData = {
@@ -2276,7 +2348,7 @@ export default {
           cancelTime: this.form.cancelTime || "",
           cancelReason: this.form.cancelReason || ""
         };
-        
+
         // 师傅取消时添加师傅信息
         if (this.form.jsonStatus === 11 && this.form.orderLog.workerId) {
           const selectedWorker = this.userGongRenList.find(worker => worker.id === this.form.orderLog.workerId);
@@ -2285,12 +2357,12 @@ export default {
             cancelData.workerName = selectedWorker.name;
           }
         }
-        
+
         // 超时取消时添加超时时长
         if (this.form.jsonStatus === 13 && this.form.timeoutDuration) {
           cancelData.timeoutDuration = this.form.timeoutDuration;
         }
-        
+
         // 封装到orderLog.content中
         this.form.orderLog.content = JSON.stringify(cancelData);
         console.log('最终生成的取消订单数据JSON:', this.form.orderLog.content);
@@ -2299,49 +2371,49 @@ export default {
         console.log('jsonStatus不在取消状态范围内，跳过处理');
       }
     },
-    
+
     /**
      * 获取取消类型名称
      */
     getCancelTypeName(jsonStatus) {
       const typeMap = {
         10: "用户取消",
-        11: "师傅取消", 
+        11: "师傅取消",
         12: "系统取消",
         13: "超时取消",
         14: "其他原因"
       };
              return typeMap[jsonStatus] || "未知取消";
      },
-     
+
      /**
       * 验证取消数据的完整性
       * @returns {Object} 验证结果对象
       */
      validateCancelData() {
        const result = { valid: true, message: '' }
-       
+
        // 验证取消时间
        if (!this.form.cancelTime) {
          result.valid = false
          result.message = '取消时间不能为空'
          return result
        }
-       
+
        // 验证取消原因
        if (!this.form.cancelReason || this.form.cancelReason.trim() === '') {
          result.valid = false
          result.message = '取消原因不能为空'
          return result
        }
-       
+
        // 师傅取消时验证师傅选择
        if (this.form.jsonStatus === 11 && !this.form.orderLog.workerId) {
          result.valid = false
          result.message = '师傅取消时必须选择师傅'
          return result
        }
-       
+
        return result
      },
    }
@@ -2619,7 +2691,7 @@ export default {
     align-items: center;
     margin-bottom: 10px;
   }
-  
+
   .el-button {
     margin-top: 10px;
   }
@@ -2640,12 +2712,12 @@ export default {
     cursor: pointer;
     position: relative;
     overflow: hidden;
-    
+
     &:hover {
       border-color: #409EFF;
     }
   }
-  
+
   .el-upload__tip {
     font-size: 12px;
     color: #606266;
@@ -2655,7 +2727,7 @@ export default {
 
 .el-select {
   width: 100%;
-  
+
   &.el-select--multiple {
     .el-select__tags {
       max-width: calc(100% - 30px);
diff --git a/ruoyi-ui/src/views/system/OrderComment/index.vue b/ruoyi-ui/src/views/system/OrderComment/index.vue
index ce24506..06838d2 100644
--- a/ruoyi-ui/src/views/system/OrderComment/index.vue
+++ b/ruoyi-ui/src/views/system/OrderComment/index.vue
@@ -26,11 +26,12 @@
         />
       </el-form-item>
       <el-form-item label="用户" prop="uid">
-        <el-input
+        <user-select
           v-model="queryParams.uid"
-          placeholder="请输入用户"
-          clearable
-          @keyup.enter.native="handleQuery"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
         />
       </el-form-item>
       <el-form-item label="评分" prop="num">
@@ -181,7 +182,12 @@
           <el-input v-model="form.productId" placeholder="请输入商品ID" />
         </el-form-item>
         <el-form-item label="用户" prop="uid">
-          <el-input v-model="form.uid" placeholder="请输入用户" />
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="图片" prop="images">
           <el-input v-model="form.images" type="textarea" placeholder="请输入内容" />
diff --git a/ruoyi-ui/src/views/system/OrderRework/index.vue b/ruoyi-ui/src/views/system/OrderRework/index.vue
index 39d6f0b..b132c6c 100644
--- a/ruoyi-ui/src/views/system/OrderRework/index.vue
+++ b/ruoyi-ui/src/views/system/OrderRework/index.vue
@@ -2,14 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid"  filterable   placeholder="请选择用户" clearable>
-          <el-option
-            v-for="user in userDataList"
-            :key="user.id"
-            :label="user.name"
-            :value="user.id"
-          ></el-option>
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="电话" prop="phone">
         <el-input
@@ -76,7 +75,12 @@
     <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="uid">
-          <el-input v-model="form.uid" placeholder="请输入用户" />
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="订单ID" prop="oid">
           <el-input v-model="form.oid" placeholder="请输入订单ID" />
@@ -116,7 +120,7 @@
 </template>
 
 <script>
-import { listOrderRework, getOrderRework, delOrderRework, addOrderRework, updateOrderRework ,getUserDataList} from "@/api/system/OrderRework"
+import { listOrderRework, getOrderRework, delOrderRework, addOrderRework, updateOrderRework } from "@/api/system/OrderRework"
 
 export default {
   name: "OrderRework",
@@ -135,7 +139,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      userDataList: [],
+
       // OrderRework表格数据
       OrderReworkList: [],
       // 弹出层标题
@@ -179,7 +183,6 @@ export default {
   },
   created() {
     this.getList()
-    this.getUserDataList();
   },
   methods: {
     /** 查询OrderRework列表 */
@@ -227,11 +230,7 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    getUserDataList () {
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data
-      })
-    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
diff --git a/ruoyi-ui/src/views/system/PayMoneyLog/index.vue b/ruoyi-ui/src/views/system/PayMoneyLog/index.vue
index 08dc0f2..bce5b28 100644
--- a/ruoyi-ui/src/views/system/PayMoneyLog/index.vue
+++ b/ruoyi-ui/src/views/system/PayMoneyLog/index.vue
@@ -11,14 +11,13 @@
       </el-form-item>
 
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid"  filterable   placeholder="请选择用户" clearable>
-          <el-option
-            v-for="user in userDataList"
-            :key="user.id"
-            :label="user.name"
-            :value="user.id"
-          ></el-option>
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -83,7 +82,12 @@
           <el-input v-model="form.orderId" placeholder="请输入订单号" />
         </el-form-item>
         <el-form-item label="用户" prop="uid">
-          <el-input v-model="form.uid" placeholder="请输入用户" />
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="金额" prop="price">
           <el-input v-model="form.price" placeholder="请输入金额" />
@@ -125,7 +129,7 @@
 </template>
 
 <script>
-import { listPayMoneyLog, getPayMoneyLog, delPayMoneyLog, addPayMoneyLog, updatePayMoneyLog,getUserDataList } from "@/api/system/PayMoneyLog"
+import { listPayMoneyLog, getPayMoneyLog, delPayMoneyLog, addPayMoneyLog, updatePayMoneyLog } from "@/api/system/PayMoneyLog"
 
 export default {
   name: "PayMoneyLog",
@@ -144,7 +148,7 @@ export default {
       // 总条数
       total: 0,
 
-      userDataList: [],
+
       // 支付记录表格数据
       PayMoneyLogList: [],
       // 弹出层标题
@@ -189,7 +193,6 @@ export default {
   },
   created() {
     this.getList()
-    this.getUserDataList()
   },
   methods: {
     /** 查询支付记录列表 */
@@ -238,11 +241,7 @@ export default {
       this.multiple = !selection.length
     },
 
-    getUserDataList () {
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data
-      })
-    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
diff --git a/ruoyi-ui/src/views/system/QuoteType/index.vue b/ruoyi-ui/src/views/system/QuoteType/index.vue
index c18c6ec..c0352e0 100644
--- a/ruoyi-ui/src/views/system/QuoteType/index.vue
+++ b/ruoyi-ui/src/views/system/QuoteType/index.vue
@@ -9,7 +9,7 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
+
       <!-- <el-form-item label="服务项目" prop="goodsids">
         <el-select v-model="queryParams.goodsids"  filterable  multiple   placeholder="请选择服务项目" clearable>
           <el-option
@@ -302,7 +302,7 @@ export default {
       })
     },
     getTypeList() {
-      getGoodsDataList().then(response => {
+      getGoodsDataList(1).then(response => {
         this.typeDataList = response.data;
       })
     },
diff --git a/ruoyi-ui/src/views/system/UserAddress/index.vue b/ruoyi-ui/src/views/system/UserAddress/index.vue
index ac17328..83027a5 100644
--- a/ruoyi-ui/src/views/system/UserAddress/index.vue
+++ b/ruoyi-ui/src/views/system/UserAddress/index.vue
@@ -2,9 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="收货人" prop="name">
         <el-input
@@ -141,9 +145,12 @@
           <el-input v-model="form.id" placeholder="自动生成" :disabled="true" />
         </el-form-item>
         <el-form-item label="用户" prop="uid">
-          <el-select v-model="form.uid" placeholder="请选择用户" clearable filterable>
-            <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
+          <user-select
+            v-model="form.uid"
+            placeholder="请选择用户"
+            user-type="1"
+            dialog-title="选择用户"
+          />
         </el-form-item>
         <el-form-item label="收货人" prop="name">
           <el-input v-model="form.name" placeholder="请输入收货人" />
@@ -191,7 +198,7 @@
 </template>
 
 <script>
-import { listUserAddress, getUserAddress, delUserAddress, addUserAddress, updateUserAddress,getUserDataList } from "@/api/system/UserAddress"
+import { listUserAddress, getUserAddress, delUserAddress, addUserAddress, updateUserAddress } from "@/api/system/UserAddress"
 
 export default {
   name: "UserAddress",
@@ -209,7 +216,7 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      userDataList: [],
+
       total: 0,
       // 用户收货地址表格数据
       UserAddressList: [],
@@ -258,7 +265,6 @@ export default {
   },
   created() {
     this.getList()
-    this.getuserDataList()
   },
   methods: {
     /** 查询用户收货地址列表 */
@@ -318,11 +324,7 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    getuserDataList(){
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data
-      })
-    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
diff --git a/ruoyi-ui/src/views/system/WorkerApply/WorkerApplyEdit.vue b/ruoyi-ui/src/views/system/WorkerApply/WorkerApplyEdit.vue
index 50ec212..6b2def6 100644
--- a/ruoyi-ui/src/views/system/WorkerApply/WorkerApplyEdit.vue
+++ b/ruoyi-ui/src/views/system/WorkerApply/WorkerApplyEdit.vue
@@ -2,9 +2,12 @@
   <el-dialog :title="title" :visible.sync="visible" width="50%" append-to-body>
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="form.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <user-select
+          v-model="form.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+        />
       </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input v-model="form.name" placeholder="请输入姓名" />
@@ -77,7 +80,7 @@
 </template>
 
 <script>
-import { getUserDataList } from "@/api/system/WorkerApply"
+
 
 export default {
   name: "WorkerApplyEdit",
@@ -140,7 +143,7 @@ export default {
           { required: true, message: "接单地区不能为空", trigger: "change" }
         ]
       },
-      userDataList: [],
+
       areaOptions: [
         { id: 1, name: '未央区' },
         { id: 2, name: '莲湖区' },
@@ -168,19 +171,10 @@ export default {
         }
       },
       immediate: true
-    },
-    visible(val) {
-      if (val) {
-        this.getUserList()
-      }
     }
   },
   methods: {
-    getUserList() {
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data
-      })
-    },
+
     // 处理地区选择变化
     handleAreaChange(value) {
       if (value && value.length > 0) {
diff --git a/ruoyi-ui/src/views/system/WorkerApply/index.vue b/ruoyi-ui/src/views/system/WorkerApply/index.vue
index 380748f..b4821aa 100644
--- a/ruoyi-ui/src/views/system/WorkerApply/index.vue
+++ b/ruoyi-ui/src/views/system/WorkerApply/index.vue
@@ -3,9 +3,13 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
     
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input
@@ -154,7 +158,7 @@
 </template>
 
 <script>
-import { listWorkerApply, getWorkerApply, delWorkerApply, addWorkerApply, updateWorkerApply, getUserDataList } from "@/api/system/WorkerApply"
+import { listWorkerApply, getWorkerApply, delWorkerApply, addWorkerApply, updateWorkerApply } from "@/api/system/WorkerApply"
 import WorkerApplyEdit from './WorkerApplyEdit.vue'
 
 export default {
@@ -175,8 +179,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 用户数据列表
-      userDataList: [],
+
       // 师傅申请记录表格数据
       WorkerApplyList: [],
       // 弹出层标题
diff --git a/ruoyi-ui/src/views/system/WorkerSign/index.vue b/ruoyi-ui/src/views/system/WorkerSign/index.vue
index 93c3515..aafda73 100644
--- a/ruoyi-ui/src/views/system/WorkerSign/index.vue
+++ b/ruoyi-ui/src/views/system/WorkerSign/index.vue
@@ -1,10 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
-          <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+      <el-form-item label="师傅" prop="uid">
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择师傅"
+          user-type="2"
+          dialog-title="选择师傅"
+          style="width: 200px;"
+        />
       </el-form-item>
       <el-form-item label="签到日期" prop="time">
         <el-date-picker clearable
@@ -90,7 +94,7 @@
 </template>
 
 <script>
-import { listWorkerSign, getWorkerSign, delWorkerSign, addWorkerSign, updateWorkerSign,getUserDataList } from "@/api/system/WorkerSign"
+import { listWorkerSign, getWorkerSign, delWorkerSign, addWorkerSign, updateWorkerSign } from "@/api/system/WorkerSign"
 
 export default {
   name: "WorkerSign",
@@ -109,7 +113,7 @@ export default {
       // 总条数
       total: 0,
 
-      userDataList: [],
+
       // 师傅签到记录表格数据
       WorkerSignList: [],
       // 弹出层标题
@@ -140,7 +144,6 @@ export default {
   },
   created() {
     this.getList()
-    this.getuserDataList();
   },
   methods: {
     /** 查询师傅签到记录列表 */
@@ -184,11 +187,7 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    getuserDataList(){
-      getUserDataList("2").then(response => {
-        this.userDataList = response.data
-      })
-    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
diff --git a/ruoyi-ui/src/views/system/transfer/index.vue b/ruoyi-ui/src/views/system/transfer/index.vue
index 3ba7865..30a52e5 100644
--- a/ruoyi-ui/src/views/system/transfer/index.vue
+++ b/ruoyi-ui/src/views/system/transfer/index.vue
@@ -3,14 +3,13 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
       <el-form-item label="用户" prop="uid">
-        <el-select v-model="queryParams.uid"  filterable   placeholder="请选择用户" clearable>
-          <el-option
-            v-for="user in userDataList"
-            :key="user.id"
-            :label="user.name"
-            :value="user.id"
-          ></el-option>
-        </el-select>
+        <user-select
+          v-model="queryParams.uid"
+          placeholder="请选择用户"
+          user-type="1"
+          dialog-title="选择用户"
+          style="width: 200px;"
+        />
       </el-form-item>
 
       <el-form-item label="金额" prop="priceRange">
@@ -217,7 +216,7 @@
 </template>
 
 <script>
-import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer,getUserDataList} from "@/api/system/transfer"
+import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer} from "@/api/system/transfer"
 export default {
   name: "Transfer",
   dicts: ['money_status'],
@@ -236,7 +235,7 @@ export default {
       // 总条数
       total: 0,
 
-      userDataList: [],
+
       // wechat_transfer表格数据
       transferList: [],
       // 弹出层标题
@@ -284,7 +283,6 @@ export default {
   },
   created() {
     this.getList()
-    this.getUserDataList()
   },
   methods: {
     /** 查询wechat_transfer列表 */
@@ -358,11 +356,7 @@ export default {
       })
     },
 
-    getUserDataList () {
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data
-      })
-    },
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
diff --git a/替换完成总结.md b/替换完成总结.md
new file mode 100644
index 0000000..703b98c
--- /dev/null
+++ b/替换完成总结.md
@@ -0,0 +1,160 @@
+# 用户选择组件替换完成总结
+
+## 已完成替换的页面列表
+
+### 1. GoodsOrder - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 替换添加/修改表单中的用户选择下拉框
+- 移除userDataList数据属性
+- 移除fetchUserDataList方法
+- 移除getUserDataList导入
+- 添加handleUserSelectChange方法
+
+### 2. IntegralOrder - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 替换添加/修改表单中的用户选择下拉框
+- 移除userDataList数据属性
+- 移除getuserDataList方法
+- 移除getUserDataList导入
+
+### 3. WorkerSign - ✅ 已完成
+- 替换查询表单中的师傅选择下拉框（user-type="2"）
+- 移除userDataList数据属性
+- 移除getuserDataList方法
+- 移除getUserDataList导入
+
+### 4. UserAddress - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 替换添加/修改表单中的用户选择下拉框
+- 移除userDataList数据属性
+- 移除getuserDataList方法
+- 移除getUserDataList导入
+
+### 5. transfer - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 移除userDataList数据属性
+- 移除getUserDataList方法
+- 移除getUserDataList导入
+
+### 6. PayMoneyLog - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 替换添加/修改表单中的用户输入框为用户选择组件
+- 移除userDataList数据属性
+- 移除getUserDataList方法
+- 移除getUserDataList导入
+
+### 7. OrderRework - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 替换添加/修改表单中的用户输入框为用户选择组件
+- 移除userDataList数据属性
+- 移除getUserDataList方法
+- 移除getUserDataList导入
+
+### 8. OrderComment - ✅ 已完成
+- 替换查询表单中的用户输入框为用户选择组件
+- 替换添加/修改表单中的用户输入框为用户选择组件
+
+### 9. IntegralLog - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 替换添加/修改表单中的用户输入框为用户选择组件
+- 移除userDataList数据属性
+- 移除getUserDataList导入
+
+### 10. GoodsCart - ✅ 已完成
+- 替换查询表单中的用户输入框为用户选择组件
+- 替换添加/修改表单中的用户输入框为用户选择组件
+
+### 11. CouponUser - ✅ 已完成
+- 替换查询表单中的用户输入框为用户选择组件
+- 替换添加/修改表单中的用户输入框为用户选择组件
+
+### 12. Cooperate - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 替换添加/修改表单中的用户选择下拉框
+- 移除getUserDataList导入
+
+### 13. WorkerApply - ✅ 已完成
+- 替换查询表单中的用户选择下拉框
+- 移除userDataList数据属性
+- 移除getUserDataList导入
+
+### 14. WorkerApplyEdit - ✅ 已完成
+- 替换表单中的用户选择下拉框
+- 移除userDataList数据属性
+- 移除getUserList方法
+- 移除getUserDataList导入
+
+## 替换统计
+
+- **总计页面数：** 14个页面
+- **完成替换：** 14个页面 ✅
+- **完成率：** 100%
+
+## 替换内容说明
+
+### 组件特性
+- **组件名称：** `user-select`
+- **支持类型：** 
+  - `user-type="1"` - 普通用户
+  - `user-type="2"` - 师傅用户
+- **功能特性：**
+  - 弹窗式分页选择
+  - 支持搜索（姓名、电话、状态）
+  - 直接点击选择
+  - 响应式设计
+  - 清空选择功能
+
+### 替换模式
+
+#### 1. 查询表单替换模式
+```vue
+<!-- 原来 -->
+<el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
+  <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
+</el-select>
+
+<!-- 替换后 -->
+<user-select
+  v-model="queryParams.uid"
+  placeholder="请选择用户"
+  user-type="1"
+  dialog-title="选择用户"
+  style="width: 200px;"
+/>
+```
+
+#### 2. 表单输入框替换模式
+```vue
+<!-- 原来 -->
+<el-input v-model="form.uid" placeholder="请输入用户" />
+
+<!-- 替换后 -->
+<user-select
+  v-model="form.uid"
+  placeholder="请选择用户"
+  user-type="1"
+  dialog-title="选择用户"
+/>
+```
+
+#### 3. JavaScript清理
+- 移除 `userDataList` 数据属性
+- 移除 `getUserDataList`、`getuserDataList`、`fetchUserDataList` 等方法
+- 移除相关API导入
+- 添加用户选择变化处理方法（如需要）
+
+## 性能优化效果
+
+通过这次替换，实现了以下优化：
+1. **按需加载：** 用户数据仅在需要时加载，不在页面初始化时全量加载
+2. **分页显示：** 大量用户数据分页显示，避免DOM性能问题
+3. **搜索功能：** 支持服务端搜索，快速定位目标用户
+4. **统一体验：** 所有页面使用统一的用户选择体验
+5. **代码复用：** 减少重复代码，便于维护
+
+## 注意事项
+
+1. 所有页面已成功注册UserSelect组件（在main.js中全局注册）
+2. 组件支持clearable、disabled等常用属性
+3. 师傅选择使用user-type="2"，普通用户使用user-type="1"
+4. 组件内部处理了用户选择的所有逻辑，包括API调用和分页 
\ No newline at end of file