新增
导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
返回
@@ -141,12 +86,12 @@ export default {
{
title: '工号',
align: "center",
- dataIndex: 'workNo_dictText'
+ dataIndex: 'workNo'
},
{
title: '成员名称',
align: "center",
- dataIndex: 'userId_dictText'
+ dataIndex: 'userId'
},
{
title: '加入时间',
@@ -253,6 +198,6 @@ export default {
}
}
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue
index 5eadd80c..9c8d1857 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue
@@ -39,15 +39,16 @@ export default {
confirmLoading: false,
validatorRules: {
- userId: [
- {required: true, message: "成员不能为空"},
- ],
+ // userId: [
+ // {required: true, message: "成员不能为空"},
+ // ],
// joinTime: [
// {required: true},
// ]
},
url: {
add: "/groupxMember/add",
+ list: "/sys/user/listByDepartId",
addBatch: "/groupxMember/addBatch",
edit: "/groupxMember/edit",
}
@@ -58,10 +59,9 @@ export default {
add(groupxId) {
this.model.groupxId = groupxId;
console.log("Modal层接收到上级参数-groupxId:" + this.model.groupxId);
- this.$refs["modalForm"].loadData2(this.model.groupxId);
this.edit(this.model);
},
- // add () {
+ // add() {
// //初始化默认值
// this.edit({});
// },
@@ -76,13 +76,8 @@ export default {
this.$refs.form.clearValidate();
},
handleOk2() {
- // this.$refs["modalForm2"].loadData(this.model.groupxId);
this.model.userId = this.$refs["modalForm"].selectedRowKeys.toString();
- // console.log("model.toolids:"+this.model.toolsId);
const that = this;
- // 触发表单验证
- // this.$refs.form.validate(valid => {
- // if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
@@ -104,53 +99,12 @@ export default {
}).finally(() => {
that.confirmLoading = false;
that.close();
- })
- // } else {
- // return false;
- // }
- // })
- },
- handleOk() {
- const that = this;
- // 触发表单验证
- this.$refs.form.validate(valid => {
- if (valid) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if (!this.model.id) {
- httpurl += this.url.addBatch;
- method = 'post';
- } else {
- httpurl += this.url.edit;
- method = 'put';
- }
- console.log("----------the add() model:", this.model);
- httpAction(httpurl, this.model, method).then((res) => {
- if (res.success) {
- that.$message.success(res.message);
- that.$emit('ok');
- } else {
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- that.close();
- })
- } else {
- return false;
- }
+ that.loadData();
})
},
handleCancel() {
this.close()
},
-
-
- }
+ },
}
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
index e1e47dc5..e0a7a31a 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
@@ -67,7 +67,7 @@ export default {
},
data() {
return {
- enterprisesManager: "sys_user,username,id",
+ enterprisesManager: "sys_user,realname,id",
title: "操作",
visible: false,
// mobileVal: "",
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index f6da8b10..d09d1523 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -20,6 +20,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.common.system.query.QueryGenerator;
@@ -34,6 +35,10 @@ import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.service.*;
import org.jeecg.modules.system.vo.SysDepartUsersVO;
import org.jeecg.modules.system.vo.SysUserRoleVO;
+import org.jeecg.modules.team.entity.Groupx;
+import org.jeecg.modules.team.entity.Station;
+import org.jeecg.modules.team.service.IGroupxService;
+import org.jeecg.modules.team.service.IStationService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -41,6 +46,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -95,6 +101,9 @@ public class SysUserController {
@Autowired
private ICollectTypeService collectTypeService;
+ @Autowired
+ private IGroupxService iGroupxService;
+
@Value("${jeecg.path.upload}")
private String upLoadPath;
@@ -149,30 +158,19 @@ public class SysUserController {
*/
@RequestMapping(value = "/listByDepartId", method = RequestMethod.GET)
public Result