diff --git a/admin-hanhai-vue/dist.zip b/admin-hanhai-vue/dist.zip
deleted file mode 100644
index 33758f4..0000000
Binary files a/admin-hanhai-vue/dist.zip and /dev/null differ
diff --git a/admin-hanhai-vue/src/views/workorderUser/WorkorderUserList.vue b/admin-hanhai-vue/src/views/workorderUser/WorkorderUserList.vue
new file mode 100644
index 0000000..0813237
--- /dev/null
+++ b/admin-hanhai-vue/src/views/workorderUser/WorkorderUserList.vue
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserForm.vue b/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserForm.vue
new file mode 100644
index 0000000..b72861e
--- /dev/null
+++ b/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserForm.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserModal.Style#Drawer.vue
new file mode 100644
index 0000000..c3a6fa0
--- /dev/null
+++ b/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserModal.vue b/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserModal.vue
new file mode 100644
index 0000000..3df3104
--- /dev/null
+++ b/admin-hanhai-vue/src/views/workorderUser/modules/WorkorderUserModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/controller/WorkorderUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/controller/WorkorderUserController.java
index 3305521..133e61c 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/controller/WorkorderUserController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/controller/WorkorderUserController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 用户信息表
* @Author: jeecg-boot
- * @Date: 2024-11-28
+ * @Date: 2025-01-08
* @Version: V1.0
*/
@Api(tags="用户信息表")
@@ -66,6 +66,11 @@ public class WorkorderUserController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(workorderUser, req.getParameterMap());
Page page = new Page(pageNo, pageSize);
IPage pageList = workorderUserService.page(page, queryWrapper);
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/entity/WorkorderUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/entity/WorkorderUser.java
index a0706a4..99bb39e 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/entity/WorkorderUser.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/entity/WorkorderUser.java
@@ -1,6 +1,9 @@
package org.jeecg.modules.workorderUser.entity;
import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -8,7 +11,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole;
+import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
@@ -19,7 +24,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 用户信息表
* @Author: jeecg-boot
- * @Date: 2024-11-28
+ * @Date: 2025-01-08
* @Version: V1.0
*/
@Data
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/mapper/WorkorderUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/mapper/WorkorderUserMapper.java
index 8551e8b..417a6e1 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/mapper/WorkorderUserMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/mapper/WorkorderUserMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 用户信息表
* @Author: jeecg-boot
- * @Date: 2024-11-28
+ * @Date: 2025-01-08
* @Version: V1.0
*/
public interface WorkorderUserMapper extends BaseMapper {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/IWorkorderUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/IWorkorderUserService.java
index 5a4c510..89f65cd 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/IWorkorderUserService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/IWorkorderUserService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 用户信息表
* @Author: jeecg-boot
- * @Date: 2024-11-28
+ * @Date: 2025-01-08
* @Version: V1.0
*/
public interface IWorkorderUserService extends IService {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/impl/WorkorderUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/impl/WorkorderUserServiceImpl.java
index 0acaf96..ea50df8 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/impl/WorkorderUserServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/service/impl/WorkorderUserServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 用户信息表
* @Author: jeecg-boot
- * @Date: 2024-11-28
+ * @Date: 2025-01-08
* @Version: V1.0
*/
@Service
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/vue/WorkorderUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/vue/WorkorderUserList.vue
index aa05b24..0813237 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/vue/WorkorderUserList.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/vue/WorkorderUserList.vue
@@ -4,6 +4,26 @@
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/vue3/WorkorderUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/vue3/WorkorderUser.data.ts
index 82de74a..af856ca 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/vue3/WorkorderUser.data.ts
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderUser/vue3/WorkorderUser.data.ts
@@ -28,6 +28,21 @@ export const columns: BasicColumn[] = [
];
//查询数据
export const searchFormSchema: FormSchema[] = [
+ {
+ label: "用户名称",
+ field: "name",
+ component: 'Input',
+ colProps: {span: 6},
+ },
+ {
+ label: "关联角色id",
+ field: "roleId",
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"workorder_role,name,id"
+ },
+ colProps: {span: 6},
+ },
];
//表单数据
export const formSchema: FormSchema[] = [