202505301641444

ruoyi-system/src/main/java/com/ruoyi/system/controller/IntegralProductController.java

@@ -71,8 +71,10 @@ public class IntegralProductController extends BaseController
         util.exportExcel(response, list, "积分商品数据");
     }
 
+
+
     /**
-     * 获取积分商品详细信息
+     * 获取商品下拉选择分类
      */
     @PreAuthorize("@ss.hasPermi('system:IntegralProduct:query')")
     @GetMapping(value = "/{id}")
@@ -81,6 +83,17 @@ public class IntegralProductController extends BaseController
         return success(integralProductService.selectIntegralProductById(id));
     }
 
+
+    /**
+     * 获取积分商品详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:IntegralProduct:query')")
+    @GetMapping(value = "/getIntegralCateList")
+    public AjaxResult getIntegralCateList()
+    {
+        return success(integralCateService.selectIntegralCateList(new IntegralCate()));
+    }
+
     /**
      * 新增积分商品
      */

ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java

@@ -70,6 +70,19 @@ public class UserAddressController extends BaseController
         util.exportExcel(response, list, "用户收货地址数据");
     }
 
+
+
+    /**
+     * 获取用户收货地址详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:UserAddress:query')")
+    @GetMapping(value = "/getuserAddressList")
+    public AjaxResult getuserAddressList()
+    {
+        return success(userAddressService.selectUserAddressList(new UserAddress()));
+    }
+
+
     /**
      * 获取用户收货地址详细信息
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java

@@ -41,6 +41,7 @@ public interface IUsersService
      * @param users 【请填写功能名称】
      * @return 结果
      */
+
     public int updateUsers(Users users);
 
     /**

ruoyi-ui/src/api/system/IntegralProduct.js

@@ -16,6 +16,18 @@ export function getIntegralProduct(id) {
     method: 'get'
   })
 }
+
+// 查询积分商品详细
+export function getIntegralCateList() {
+  return request({
+    url: '/system/IntegralProduct/getIntegralCateList',
+    method: 'get'
+  })
+}
+
+
+
+
 // 任务状态修改
 export function changetypeStatus(id, status) {
   const data = {

ruoyi-ui/src/api/system/UserAddress.js

@@ -16,6 +16,15 @@ export function getUserAddress(id) {
     method: 'get'
   })
 }
+// 查询用户收货地址详细
+export function getuserAddressList() {
+  return request({
+    url: '/system/UserAddress/getuserAddressList',
+    method: 'get'
+  })
+}
+
+
 
 // 新增用户收货地址
 export function addUserAddress(data) {

ruoyi-ui/src/views/system/Cooperate/index.vue

@@ -53,7 +53,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+<!-- 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -88,7 +88,7 @@
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="CooperateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -154,8 +154,13 @@
     <!-- 添加或修改企业合作对话框 -->
     <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="ID" prop="id" v-if="form.id">
+          <el-input v-model="form.id" disabled />
+        </el-form-item>
         <el-form-item label="用户" prop="uid">
-          <el-input v-model="form.uid" placeholder="请输入用户" />
+          <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>
         </el-form-item>
         <el-form-item label="公司名称" prop="company">
           <el-input v-model="form.company" placeholder="请输入公司名称" />
@@ -170,33 +175,14 @@
           <el-input v-model="form.address" placeholder="请输入地址" />
         </el-form-item>
         <el-form-item label="合作意向" prop="info">
-          <el-input v-model="form.info" placeholder="请输入合作意向" />
+          <el-input type="textarea" v-model="form.info" placeholder="请输入合作意向" :rows="3" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.coupons_status"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
+            <el-radio :label="1">待处理</el-radio>
+            <el-radio :label="0">已处理</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="${comment}" prop="createdAt">
-          <el-date-picker clearable
-                          v-model="form.createdAt"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="updatedAt">
-          <el-date-picker clearable
-                          v-model="form.updatedAt"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -248,33 +234,33 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        uid: [
-          { required: true, message: "用户不能为空", trigger: "blur" }
-        ],
-        company: [
-          { required: true, message: "公司名称不能为空", trigger: "blur" }
-        ],
         name: [
           { required: true, message: "姓名不能为空", trigger: "blur" }
         ],
         phone: [
           { required: true, message: "电话不能为空", trigger: "blur" }
         ],
+        company: [
+          { required: true, message: "公司名称不能为空", trigger: "blur" }
+        ],
         address: [
           { required: true, message: "地址不能为空", trigger: "blur" }
         ],
         info: [
           { required: true, message: "合作意向不能为空", trigger: "blur" }
         ],
-        status: [
-          { required: true, message: "状态不能为空", trigger: "change" }
+        uid: [
+          { required: true, message: "请选择用户", trigger: "change" }
         ],
+        status: [
+          { required: true, message: "请选择状态", trigger: "change" }
+        ]
       }
     }
   },
   created() {
     this.getList()
-    this.getuserDataList()
+    this.getUserDataList()
   },
   methods: {
     /** 查询企业合作列表 */
@@ -286,6 +272,12 @@ export default {
         this.loading = false
       })
     },
+    // 获取用户列表
+    getUserDataList() {
+      getUserDataList("1").then(response => {
+        this.userDataList = response.data
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -323,11 +315,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    getuserDataList(){
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data
-      })
-    },
     // 任务状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用"

ruoyi-ui/src/views/system/IntegralLog/index.vue

@@ -35,7 +35,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+<!-- 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -70,7 +70,7 @@
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="IntegralLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -94,7 +94,7 @@
           <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -111,7 +111,7 @@
             v-hasPermi="['system:IntegralLog:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

ruoyi-ui/src/views/system/IntegralProduct/index.vue

@@ -58,12 +58,14 @@
         />
       </el-form-item>
       <el-form-item label="分类" prop="cateId">
-        <el-input
-          v-model="queryParams.cateId"
-          placeholder="请输入分类"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.cateId" placeholder="请选择分类" clearable style="width: 200px">
+          <el-option
+            v-for="item in integralCateList"
+            :key="item.id"
+            :label="item.title"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
 
       <!-- 新增：状态 -->
@@ -147,7 +149,7 @@
           >删除</el-button
         >
       </el-col>
-     
+
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -361,7 +363,14 @@
         <el-tab-pane label="基本信息" name="base">
           <el-form ref="form" :model="form" :rules="rules" label-width="100px">
             <el-form-item label="分类" prop="cateId">
-              <el-input v-model="form.cateId" placeholder="请输入分类" />
+              <el-select v-model="form.cateId" placeholder="请选择分类" style="width: 100%">
+                <el-option
+                  v-for="item in integralCateList"
+                  :key="item.id"
+                  :label="item.title"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="名称" prop="title">
               <el-input v-model="form.title" placeholder="请输入名称" />
@@ -381,7 +390,7 @@
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="营销配置" name="marketing">
-          
+
             <el-form-item label="市场价" prop="price">
               <el-input-number v-model="form.price" :min="0" :step="0.01" :precision="2" placeholder="请输入市场价" style="width: 200px;" />
             </el-form-item>
@@ -397,7 +406,7 @@
             <el-form-item label="库存" prop="stock">
               <el-input-number v-model="form.stock" :min="0" style="width: 200px;" />
             </el-form-item>
-          
+
         </el-tab-pane>
         <el-tab-pane label="规格配置" name="spec">
             <el-form-item label="规格">
@@ -407,7 +416,7 @@
               </el-radio-group>
             </el-form-item>
             <div v-if="skuType === 'single'">
-             
+
               <el-form-item label="规格名">
                 <el-input v-model="form.skuName" placeholder="请输入规格名" />
               </el-form-item>
@@ -416,7 +425,7 @@
               </el-form-item>
             </div>
             <div v-else>
-             
+
               <Sku :info="form.sku" ref="skuRef"></Sku>
             </div>
           </el-tab-pane>
@@ -479,6 +488,7 @@ import {
   addIntegralProduct,
   updateIntegralProduct,
   changetypeStatus,
+  getIntegralCateList
 } from "@/api/system/IntegralProduct";
 import Editor from "@/components/Editor";
 export default {
@@ -502,6 +512,8 @@ export default {
       IntegralProductList: [],
       // 弹出层标题
       title: "",
+
+      integralCateList: [],
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -561,6 +573,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getintegralCateList()
   },
   methods: {
     /** 查询积分商品列表 */
@@ -629,6 +642,13 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+
+    getintegralCateList () {
+      getIntegralCateList().then((response) => {
+        this.integralCateList = response.data;
+      });
+    },
+
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -668,11 +688,20 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if( this.$refs.skuRef.submit()){
-        this.form.sku=this.$refs.skuRef.submit();
+
+
+      if(this.$refs.skuRef){
+
+        if(this.$refs.skuRef.submit()){
+          this.form.sku=this.$refs.skuRef.submit();
+        }else{
+          return
+        }
+
       }else{
-        return
+        this.form.sku='{}';
       }
+
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {

ruoyi-ui/src/views/system/Order/index.vue

@@ -163,7 +163,7 @@
           v-hasPermi="['system:Order:remove']"
         >删除</el-button>
       </el-col>
-     
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -334,12 +334,26 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="用户" prop="uid">
-              <el-input v-model="form.uid" placeholder="请输入用户" />
+              <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>
             </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">
@@ -380,7 +394,14 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="关联地址" prop="addressId">
-              <el-input v-model="form.addressId" placeholder="请输入关联地址" />
+              <el-select v-model="form.addressId" placeholder="请选择地址" clearable filterable style="width: 100%">
+                <el-option
+                  v-for="item in addressList"
+                  :key="item.id"
+                  :label="item.address"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -388,16 +409,7 @@
               <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>
@@ -454,7 +466,9 @@
 </template>
 
 <script>
+
 import { listOrder, getOrder, delOrder, addOrder, updateOrder,getUserDataList,getGoodsDataList} from "@/api/system/Order"
+import { getuserAddressList } from "@/api/system/UserAddress"
 import CallRecord from './components/CallRecord'
 import AudioRecord from './components/AudioRecord'
 import ReceiveRecord from './components/ReceiveRecord'
@@ -495,6 +509,8 @@ export default {
       OrderList: [],
 
       goodsDataList : [],
+      // 用户地址列表
+      addressList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -597,6 +613,7 @@ export default {
     this.getUserDataList()
     this.getuserGongRenList()
     this.getGoodsDataListList();
+    this.getAddressList();
   },
   methods: {
     /** 查询服务订单列表 */
@@ -822,6 +839,13 @@ export default {
       })
     },
 
+    // 获取用户地址列表
+    getAddressList() {
+      getuserAddressList().then(response => {
+        this.addressList = response.rows || []
+      })
+    },
+
     /** 显示记录详情 */
     showRecordDetails(row, type) {
       this.currentOrder = row

ruoyi-ui/src/views/system/PayMoneyLog/index.vue

@@ -45,7 +45,7 @@
           <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -62,7 +62,7 @@
             v-hasPermi="['system:PayMoneyLog:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

ruoyi-ui/src/views/system/QuoteCraft/index.vue

@@ -114,7 +114,14 @@
     />
 
     <!-- 添加或修改项目报价--服务工艺对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog 
+      :title="title" 
+      :visible.sync="open" 
+      width="600px" 
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="服务" prop="goodsintids">
           <el-select v-model="form.goodsintids" multiple filterable placeholder="请选择服务" style="width: 100%">
@@ -147,9 +154,9 @@
           <el-input v-model="form.unit" placeholder="请输入单位" />
         </el-form-item>
       </el-form>
-      <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 slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -175,23 +182,22 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-
+      // 是否显示弹出层
+      open: false,
+      // 弹出层标题
+      title: "",
+      
       typeDataList: [],
-
       typeSelectDataList: [],
       // 项目报价--服务工艺表格数据
       QuoteCraftList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         goodId: null,
-        goodsintids: null,
-        intstrtypeList: null,
+        goodsintids: [],
+        intstrtypeList: [],
         typeId: null,
         title: null,
         price: null,
@@ -200,7 +206,18 @@ export default {
         updatedAt: null
       },
       // 表单参数
-      form: {},
+      form: {
+        id: undefined,
+        goodId: undefined,
+        goodsintids: [],
+        typeId: undefined,
+        intstrtypeList: [],
+        title: undefined,
+        price: 0,
+        unit: undefined,
+        createdAt: undefined,
+        updatedAt: undefined
+      },
       // 表单校验
       rules: {
         goodsintids: [
@@ -225,17 +242,20 @@ export default {
   created() {
     this.getList();
     this.getTypeList();
-    this.getTypeList1();
   },
   methods: {
     /** 查询项目报价--服务工艺列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       listQuoteCraft(this.queryParams).then(response => {
-        this.QuoteCraftList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+        this.QuoteCraftList = response.rows || [];
+        this.total = response.total || 0;
+      }).catch(() => {
+        this.QuoteCraftList = [];
+        this.total = 0;
+      }).finally(() => {
+        this.loading = false;
+      });
     },
     // 取消按钮
     cancel() {
@@ -245,23 +265,30 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
-        goodId: null,
-        typeId: null,
-        title: null,
-        price: null,
-        unit: null,
-        createdAt: null,
-        updatedAt: null
-      }
-      this.resetForm("form")
+        id: undefined,
+        goodId: undefined,
+        goodsintids: [],
+        typeId: undefined,
+        intstrtypeList: [],
+        title: undefined,
+        price: 0,
+        unit: undefined,
+        createdAt: undefined,
+        updatedAt: undefined
+      };
+      this.typeSelectDataList = [];
+      this.resetForm("form");
     },
     //监听多选下拉选择器
     handelSelectMultiple(position, index) {
-      var ids = this.form.goodsintids;
-      selectQuoteTypeList(ids).then(response => {
-        this.typeSelectDataList = response.data;
-      })  
+      const ids = this.form.goodsintids || [];
+      if (ids.length > 0) {
+        selectQuoteTypeList(ids).then(response => {
+          this.typeSelectDataList = response.data;
+        })
+      } else {
+        this.typeSelectDataList = [];
+      }
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -281,30 +308,51 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = "添加项目报价--服务工艺"
+      this.reset();
+      // 确保重置后再打开弹窗
+      this.$nextTick(() => {
+        this.open = true;
+        this.title = "添加项目报价--服务工艺";
+      });
     },
     getTypeList() {
       getGoodsDataList().then(response => {
-        this.typeDataList = response.data;
-      })
-    },
-
-    getTypeList1() {
-      selectQuoteTypeList("11").then(response => {
-        this.typeSelectDataList = response.data;
-      })  
+        this.typeDataList = response.data || [];
+      }).catch(() => {
+        this.typeDataList = [];
+        this.$modal.msgError("获取服务列表失败");
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      const id = row.id || this.ids
+      this.reset();
+      if (!row || (!row.id && !this.ids)) {
+        this.$modal.msgError("请选择要修改的数据");
+        return;
+      }
+      const id = row?.id || this.ids;
       getQuoteCraft(id).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = "修改项目报价--服务工艺"
-      })
+        if (response.data) {
+          this.form = {
+            ...response.data,
+            goodsintids: response.data.goodsintids || [],
+            intstrtypeList: response.data.intstrtypeList || []
+          };
+          // 如果有服务ID，获取对应的类型列表
+          if (this.form.goodsintids && this.form.goodsintids.length > 0) {
+            this.handelSelectMultiple();
+          }
+          this.$nextTick(() => {
+            this.open = true;
+            this.title = "修改项目报价--服务工艺";
+          });
+        } else {
+          this.$modal.msgError("获取数据失败");
+        }
+      }).catch(error => {
+        console.error('获取数据失败:', error);
+        this.$modal.msgError("获取数据失败");
+      });
     },
     /** 提交按钮 */
     submitForm() {
@@ -328,13 +376,17 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids
+      if (!row && !this.ids.length) {
+        this.$modal.msgError("请选择要删除的数据");
+        return;
+      }
+      const ids = row?.id || this.ids;
       this.$modal.confirm('是否确认删除项目报价--服务工艺编号为"' + ids + '"的数据项？').then(function() {
-        return delQuoteCraft(ids)
+        return delQuoteCraft(ids);
       }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/system/ServiceCate/index.vue

@@ -164,7 +164,14 @@
           <image-upload v-model="form.icon"/>
         </el-form-item>
         <el-form-item label="排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序" />
+          <el-input-number 
+            v-model="form.sort" 
+            :min="0"
+            :max="9999"
+            controls-position="right"
+            style="width: 120px;"
+            placeholder="请输入排序" 
+          />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
@@ -204,6 +211,14 @@
               :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
           </el-radio-group>
+          <el-input-number 
+            v-else-if="editField === 'sort'" 
+            v-model="editFieldValue"
+            :min="0"
+            :max="9999"
+            controls-position="right"
+            style="width: 120px;"
+          />
           <el-input v-else v-model="editFieldValue" />
         </el-form-item>
       </el-form>

ruoyi-ui/src/views/system/ServiceGoods/index.vue

@@ -206,7 +206,7 @@
               <el-input v-model="form.subTitle" placeholder="请输入副标题" />
             </el-form-item>
             <el-form-item label="图标" prop="icon">
-              <image-upload v-model="form.icon"/>
+              <image-upload v-model="form.icon"   :limit="1"/>
             </el-form-item>
             <el-form-item label="轮播图" prop="imgs">
               <image-upload v-model="form.imgs"/>
@@ -441,18 +441,20 @@ export default {
         info: null,
         price: null,
         priceZn: null,
-        sales: null,
-        stock: null,
-        status: null,
+        sales: 0,
+        stock: 0,
+        status: "1",
         description: null,
-        skuType: null,
+        skuType: 'single',
         sku: null,
+        skuName: '',
+        skuValue: '',
         latitude: null,
         longitude: null,
         type: null,
         cateId: null,
         project: null,
-        sort: null,
+        sort: 0,
         material: null,
         postage: null,
         basic: null,
@@ -462,6 +464,7 @@ export default {
         updatedAt: null,
         deletedAt: null
       }
+      this.skuType = 'single'
       this.resetForm("form")
     },
     /** 搜索按钮操作 */
@@ -521,17 +524,21 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if( this.$refs.skuRef.submit()){
-        this.form.sku=this.$refs.skuRef.submit();
-      }else{
-        return
+      // 只有在多规格模式下才调用skuRef的submit方法
+      if (this.skuType === 'multi' && this.$refs.skuRef) {
+        const skuData = this.$refs.skuRef.submit();
+        if (!skuData) {
+          return;
+        }
+        this.form.sku = skuData;
+      } else {
+        // 单规格模式
+        this.form.sku = {
+          type: 'single',
+          name: this.form.skuName,
+          value: this.form.skuValue
+        };
       }
-     
-     
-      
-        
-// if(this.$refs.skuRef.submit()){}
-    
 
       this.$refs["form"].validate(valid => {
         if (valid) {

ruoyi-ui/src/views/system/UsersWorker/UserEditDialog.vue

@@ -0,0 +1,370 @@
+<template>
+  <el-dialog :title="mode==='add' ? '添加' : '编辑'" :visible.sync="visible" width="600px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="ID" v-if="form.id">
+        <el-input v-model="form.id" disabled />
+      </el-form-item>
+      
+      <el-form-item label="昵称" prop="name">
+        <el-input v-model="form.name" placeholder="请输入昵称" />
+      </el-form-item>
+
+      <el-form-item label="电话" prop="phone">
+        <el-input v-model="form.phone" placeholder="请输入电话" />
+      </el-form-item>
+
+      <el-form-item label="头像" prop="avatar">
+        <image-upload v-model="form.avatar" :limit="1"/>
+      </el-form-item>
+
+      <el-form-item label="禁止接单开始时间" prop="prohibitTime">
+        <el-date-picker 
+          v-model="form.prohibitTime" 
+          type="datetime" 
+          placeholder="输入禁止开始时间"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          style="width: 100%"
+        />
+      </el-form-item>
+
+      <el-form-item label="禁止接单时长" prop="prohibitTimeNum">
+        <div class="time-input">
+          <el-button icon="el-icon-minus" @click="decreaseTime" size="small"></el-button>
+          <el-input-number 
+            v-model="form.prohibitTimeNum" 
+            :min="0"
+            :controls="false"
+            placeholder="0" 
+            style="width: 100px; text-align: center;" />
+          <el-button icon="el-icon-plus" @click="increaseTime" size="small"></el-button>
+          <span style="margin-left: 10px;">小时</span>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="服务城市" prop="serviceCityPid">
+        <el-select v-model="form.serviceCityPid" placeholder="请选择服务城市" @change="handleProvinceChange">
+          <el-option
+            v-for="item in selectAreaShenDataList"
+            :key="item.id"
+            :label="item.title"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="服务地区" prop="serviceCityIds">
+        <el-select v-model="selectedAreas" multiple placeholder="请选择服务地区" :disabled="!form.serviceCityPid">
+          <el-option
+            v-for="item in selectAreaShiDataList"
+            :key="item.id"
+            :label="item.title"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="技能" prop="skillIds">
+        <el-select v-model="selectedSkills" multiple placeholder="请选择技能">
+          <el-option
+            v-for="item in skillList"
+            :key="item.id"
+            :label="item.title"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="当前佣金" prop="commission">
+        <el-input v-model="form.commission" placeholder="0.00">
+          <template slot="prepend">￥</template>
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label="状态">
+        <el-switch 
+          v-model="form.status"
+          :active-value="1"
+          :inactive-value="0"
+        />
+      </el-form-item>
+
+      <el-form-item label="创建时间" v-if="form.createdAt">
+        <el-input v-model="createdAtDisplay" disabled />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="resetForm">重置</el-button>
+      <el-button type="primary" @click="submitForm">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { selectAreaList } from "@/api/system/WorkerApply"
+
+export default {
+  name: "UserEditDialog",
+  props: {
+    visible: Boolean,
+    user: Object,
+    mode: String // 'add' or 'edit'
+  },
+  data() {
+    return {
+      form: {
+        id: undefined,
+        name: undefined,
+        phone: undefined,
+        avatar: undefined,
+        prohibitTime: undefined,
+        prohibitTimeNum: 0,
+        serviceCityPid: undefined,
+        serviceCityIds: undefined,
+        skillIds: undefined,
+        commission: undefined,
+        status: 1,
+        createdAt: undefined
+      },
+      rules: {
+        name: [
+          { required: true, message: "昵称不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "电话不能为空", trigger: "blur" }
+        ],
+        serviceCityPid: [
+          { required: true, message: "服务城市不能为空", trigger: "change" }
+        ],
+        serviceCityIds: [
+          { required: true, message: "服务地区不能为空", trigger: "change" }
+        ],
+        skillIds: [
+          { required: true, message: "技能不能为空", trigger: "change" }
+        ]
+      },
+      selectAreaShenDataList: [],
+      selectAreaShiDataList: [],
+      selectedAreas: [],
+      selectedSkills: [],
+      skillList: [
+        { id: 1, title: '水电工' },
+        { id: 2, title: '油工师傅' },
+        { id: 3, title: '改造维修' },
+        { id: 4, title: '工程施工' }
+      ]
+    }
+  },
+  computed: {
+    createdAtDisplay() {
+      if (this.form.createdAt) {
+        return this.parseTime(this.form.createdAt, '{y}-{m}-{d} {h}:{i}:{s}')
+      }
+      return ''
+    }
+  },
+  watch: {
+    user: {
+      handler(val) {
+        if (val) {
+          this.form = { ...val }
+          // 确保status是数字类型
+          if (typeof this.form.status === 'string') {
+            this.form.status = parseInt(this.form.status)
+          }
+          // 处理已选择的地区
+          if (this.form.serviceCityIds) {
+            this.selectedAreas = typeof this.form.serviceCityIds === 'string' 
+              ? this.form.serviceCityIds.split(',').map(Number).filter(n => !isNaN(n))
+              : this.form.serviceCityIds
+          }
+          // 处理已选择的技能
+          if (this.form.skillIds) {
+            this.selectedSkills = typeof this.form.skillIds === 'string'
+              ? this.form.skillIds.split(',').map(Number).filter(n => !isNaN(n))
+              : this.form.skillIds
+          }
+          // 处理禁止接单时长
+          if (this.form.prohibitTimeNum) {
+            this.form.prohibitTimeNum = parseInt(this.form.prohibitTimeNum) || 0
+          }
+        }
+      },
+      immediate: true
+    },
+    visible(val) {
+      if (val) {
+        this.getShenDataList()
+        if (this.form.serviceCityPid) {
+          this.getShiDataList(this.form.serviceCityPid)
+        }
+      }
+    },
+    selectedAreas(val) {
+      this.form.serviceCityIds = val.join(',')
+    },
+    selectedSkills(val) {
+      this.form.skillIds = val.join(',')
+    }
+  },
+  methods: {
+    getShenDataList() {
+      selectAreaList("100000").then(response => {
+        this.selectAreaShenDataList = response.data || []
+      }).catch(() => {
+        // 如果接口失败，使用默认数据
+        this.selectAreaShenDataList = [
+          { id: "610100", title: "西安市" },
+          { id: "610200", title: "铜川市" },
+          { id: "610300", title: "宝鸡市" }
+        ]
+      })
+    },
+    getShiDataList(id) {
+      selectAreaList(id).then(response => {
+        this.selectAreaShiDataList = response.data || []
+      }).catch(() => {
+        // 如果接口失败，使用默认数据
+        if (id === "610100") {
+          this.selectAreaShiDataList = [
+            { id: "610102", title: "新城区" },
+            { id: "610103", title: "碑林区" },
+            { id: "610104", title: "莲湖区" },
+            { id: "610111", title: "灞桥区" },
+            { id: "610112", title: "未央区" },
+            { id: "610113", title: "雁塔区" },
+            { id: "610114", title: "阎良区" },
+            { id: "610115", title: "临潼区" },
+            { id: "610116", title: "长安区" },
+            { id: "610117", title: "高陵区" }
+          ]
+        }
+      })
+    },
+    handleProvinceChange() {
+      if (this.form.serviceCityPid) {
+        this.getShiDataList(this.form.serviceCityPid)
+        this.selectedAreas = []
+        this.form.serviceCityIds = ''
+      }
+    },
+    decreaseTime() {
+      if (this.form.prohibitTimeNum > 0) {
+        this.form.prohibitTimeNum--
+      }
+    },
+    increaseTime() {
+      this.form.prohibitTimeNum++
+    },
+    parseTime(time, pattern) {
+      if (arguments.length === 0 || !time) {
+        return null
+      }
+      const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+      let date
+      if (typeof time === 'object') {
+        date = time
+      } else {
+        if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+          time = parseInt(time)
+        } else if (typeof time === 'string') {
+          time = time.replace(new RegExp(/-/gm), '/')
+        }
+        if ((typeof time === 'number') && (time.toString().length === 10)) {
+          time = time * 1000
+        }
+        date = new Date(time)
+      }
+      const formatObj = {
+        y: date.getFullYear(),
+        m: date.getMonth() + 1,
+        d: date.getDate(),
+        h: date.getHours(),
+        i: date.getMinutes(),
+        s: date.getSeconds(),
+        a: date.getDay()
+      }
+      const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+        let value = formatObj[key]
+        if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+        if (result.length > 0 && value < 10) {
+          value = '0' + value
+        }
+        return value || 0
+      })
+      return time_str
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // 确保必要的字段有值
+          const submitData = {
+            ...this.form,
+            type: '2', // 师傅类型
+            status: this.form.status || 0,
+            prohibitTimeNum: this.form.prohibitTimeNum || 0
+          }
+          this.$emit('confirm', submitData)
+        }
+      })
+    },
+    resetForm() {
+      // 重置表单但保留id
+      const id = this.form.id
+      const createdAt = this.form.createdAt
+      this.$refs["form"].resetFields()
+      this.selectedAreas = []
+      this.selectedSkills = []
+      this.form = {
+        id: id,
+        name: undefined,
+        phone: undefined,
+        avatar: undefined,
+        prohibitTime: undefined,
+        prohibitTimeNum: 0,
+        serviceCityPid: undefined,
+        serviceCityIds: undefined,
+        skillIds: undefined,
+        commission: undefined,
+        status: 1,
+        createdAt: createdAt
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.time-input {
+  display: flex;
+  align-items: center;
+}
+
+.time-input .el-input-number {
+  margin: 0 5px;
+}
+
+.time-input .el-button {
+  padding: 7px;
+  min-width: 32px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+::v-deep .el-input-number .el-input__inner {
+  text-align: center;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 20px 0;
+}
+
+::v-deep .el-form-item {
+  margin-bottom: 18px;
+}
+
+::v-deep .el-input-group__prepend {
+  padding: 0 10px;
+}
+</style> 

ruoyi-ui/src/views/system/WorkerApply/WorkerApplyEdit.vue

@@ -0,0 +1,236 @@
+<template>
+  <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>
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="form.name" placeholder="请输入姓名" />
+      </el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input v-model="form.phone" placeholder="请输入电话" />
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input v-model="form.address" placeholder="请输入地址" />
+      </el-form-item>
+      <el-form-item label="身份证号码" prop="cardNo">
+        <el-input v-model="form.cardNo" placeholder="请输入身份证号码" />
+      </el-form-item>
+      <el-form-item label="技能ID" prop="skillId">
+        <el-input v-model="form.skillId" type="textarea" placeholder="请输入内容" />
+      </el-form-item>
+      <el-form-item label="电子照片" prop="image">
+        <image-upload v-model="form.image" :limit="1"/>
+      </el-form-item>
+      <el-form-item label="技能证书" prop="skill">
+        <image-upload v-model="form.skill" :limit="1"/>
+      </el-form-item>
+      <el-form-item label="无犯罪证明" prop="criminal">
+        <image-upload v-model="form.criminal" :limit="1"/>
+      </el-form-item>
+      <el-form-item label="健康证" prop="health">
+        <image-upload v-model="form.health" :limit="1"/>
+      </el-form-item>
+      <el-form-item label="学历证书" prop="education">
+        <image-upload v-model="form.education" :limit="1"/>
+      </el-form-item>
+      <el-form-item label="驾照" prop="drive">
+        <image-upload v-model="form.drive" :limit="1"/>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="form.status">
+          <el-radio
+            v-for="dict in dict.type.worker_apply_status"
+            :key="dict.value"
+            :label="parseInt(dict.value)"
+          >{{dict.label}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input v-model="form.remarks" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="接单地区" prop="cityIds">
+        <el-select 
+          v-model="selectedAreas" 
+          multiple 
+          filterable
+          clearable
+          placeholder="请选择接单地区"
+          @change="handleAreaChange"
+        >
+          <el-option
+            v-for="item in areaOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserDataList } from "@/api/system/WorkerApply"
+
+export default {
+  name: "WorkerApplyEdit",
+  dicts: ['worker_apply_status'],
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: ''
+    },
+    data: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      form: {
+        id: undefined,
+        uid: undefined,
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        cardNo: undefined,
+        skillId: undefined,
+        image: undefined,
+        skill: undefined,
+        criminal: undefined,
+        health: undefined,
+        education: undefined,
+        drive: undefined,
+        status: 0,
+        remarks: undefined,
+        cityPid: undefined,
+        cityIds: undefined
+      },
+      rules: {
+        uid: [
+          { required: true, message: "用户不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "电话不能为空", trigger: "blur" }
+        ],
+        address: [
+          { required: true, message: "地址不能为空", trigger: "blur" }
+        ],
+        cardNo: [
+          { required: true, message: "身份证号码不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ],
+        cityIds: [
+          { required: true, message: "接单地区不能为空", trigger: "change" }
+        ]
+      },
+      userDataList: [],
+      areaOptions: [
+        { id: 1, name: '未央区' },
+        { id: 2, name: '莲湖区' },
+        { id: 3, name: '新城区' },
+        { id: 4, name: '碑林区' },
+        { id: 5, name: '雁塔区' },
+        { id: 6, name: '灞桥区' },
+        { id: 7, name: '长安区' },
+        { id: 8, name: '高新区' },
+        { id: 9, name: '临潼区' },
+        { id: 10, name: '阎良区' }
+      ], // 地区选项数据
+      selectedAreas: [] // 已选择的地区
+    }
+  },
+  watch: {
+    data: {
+      handler(val) {
+        if (val) {
+          this.form = { ...val }
+          // 如果有已选择的地区数据,转换为数组格式
+          if (this.form.cityIds) {
+            this.selectedAreas = this.form.cityIds.split(',').map(Number)
+          }
+        }
+      },
+      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) {
+        this.form.cityIds = value.join(',')
+        this.form.cityPid = value[0] // 第一个选择的作为主要城市
+      } else {
+        this.form.cityIds = undefined
+        this.form.cityPid = undefined
+      }
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$emit('confirm', this.form)
+        }
+      })
+    },
+    cancel() {
+      this.reset()
+      this.$emit('update:visible', false)
+    },
+    reset() {
+      this.form = {
+        id: undefined,
+        uid: undefined,
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        cardNo: undefined,
+        skillId: undefined,
+        image: undefined,
+        skill: undefined,
+        criminal: undefined,
+        health: undefined,
+        education: undefined,
+        drive: undefined,
+        status: 0,
+        remarks: undefined,
+        cityPid: undefined,
+        cityIds: undefined
+      }
+      this.selectedAreas = []
+      this.resetForm("form")
+    }
+  }
+}
+</script>
+
+<style scoped>
+.el-select {
+  width: 100%;
+}
+</style> 

ruoyi-ui/src/views/system/transfer/index.vue

@@ -122,7 +122,7 @@
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -139,7 +139,7 @@
             v-hasPermi="['system:transfer:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination