From e1e17a458a169be477542646e634db5281b26dda Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 12 Jul 2023 11:15:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/requiremententity/RequirementEntityList1.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList1.vue b/ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList1.vue index 90d1715..0ce9b8b 100644 --- a/ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList1.vue +++ b/ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList1.vue @@ -9,6 +9,7 @@ >
+ 需求描述： 需求名称：{{tableName}} Date: Wed, 12 Jul 2023 11:19:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/RequirementItemForm.vue | 13 +- .../src/views/task/modules/TaskForm.vue | 161 ++++++++++++------ .../org/jeecg/modules/task/entity/Task.java | 11 +- 3 files changed, 125 insertions(+), 60 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue index c5cf02f..3f2c72f 100644 --- a/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue +++ b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue @@ -22,8 +22,7 @@ dest-fields="typeId,typeName" code="typename" :multi="multi" - @input="popupCallback" - /> + @input="popupCallback"/> @@ -48,11 +47,6 @@ - - - - - @@ -76,6 +70,11 @@ + + + + + diff --git a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue index f2212eb..4b216ed 100644 --- a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue +++ b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue @@ -4,28 +4,60 @@ + + + + + + + + + - + + + + + + + + - - - + + + + + + + - + @@ -45,9 +77,8 @@ - - + + @@ -61,67 +92,69 @@ - - - - - - + - + - - + + + + + + + + + + + + + + - + - - - + + + + - - - - + + - - + + - - - + + + - - + + + @@ -131,13 +164,6 @@ - - - - - - - @@ -175,14 +201,48 @@ export default { expectedDuration: 1, // curryUserName: '', }, + // labelCol: { + // xs: {span: 24}, + // sm: {span: 5}, + // }, + // wrapperCol: { + // xs: {span: 24}, + // sm: {span: 16}, + // }, labelCol: { - xs: {span: 24}, - sm: {span: 5}, + xs: {span: 23}, + sm: {span: 6}, }, wrapperCol: { xs: {span: 24}, sm: {span: 16}, }, + // 任务层级 任务类型 任务状态 + labelCol1: { + xs: {span: 24}, + sm: {span: 3}, + }, + wrapperCol1: { + xs: {span: 24}, + sm: {span: 21}, + }, + // 任务描述 + labelCol2: { + xs: {span: 24}, + sm: {span: 3}, + }, + wrapperCol2: { + xs: {span: 24}, + sm: {span: 20}, + }, + labelCol3: { + xs: {span: 24}, + sm: {span: 7}, + }, + wrapperCol3: { + xs: {span: 24}, + sm: {span: 15}, + }, confirmLoading: false, validatorRules: { taskName: [ @@ -242,6 +302,9 @@ export default { this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, methods: { + popupCallback(value,row){ + this.model = Object.assign(this.model, row); + }, handleCheckChange(data, checked, tree) { if (checked) { this.currentNodeData.id = data.id diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/entity/Task.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/entity/Task.java index ff02175..9e3220d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/entity/Task.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/entity/Task.java @@ -60,12 +60,15 @@ public class Task implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /** - * 上级任务id - */ - @Excel(name = "上级任务id", width = 15) + /**上级任务id*/ + @Excel(name = "上级任务id", width = 15, dictTable = "task", dicText = "task_name", dicCode = "id") + @Dict(dictTable = "task", dicText = "task_name", dicCode = "id") @ApiModelProperty(value = "上级任务id") private java.lang.String upperId; + /**上级任务*/ + @Excel(name = "上级任务", width = 15) + @ApiModelProperty(value = "上级任务") + private java.lang.String upperName; /** * 中文名称 */ From 5ac6f03d5bb7ddd70eec472fa8c2e8ea4f28c41c Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 12 Jul 2023 11:21:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml index 7bae0c9..d113636 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -141,10 +141,6 @@ spring: username: root password: ycwl2022. driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:3306/project_management?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai -# username: root -# password: "0517" -# driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: database: 2 From bf2d2cf700ab3ae396f835b3b5f6910ed264b687 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 12 Jul 2023 11:43:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RequirementEntityList.vue | 14 ++++++++++++++ .../RequirementEntityController.java | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList.vue b/ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList.vue index c16119b..3baf893 100644 --- a/ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList.vue +++ b/ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList.vue @@ -94,6 +94,8 @@ 详情 + 废弃 + 删除 @@ -113,6 +115,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import RequirementEntityModal from './modules/RequirementEntityModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' + import { httpAction, getAction } from '@/api/manage' export default { name: 'RequirementEntityList', @@ -176,6 +179,7 @@ deleteBatch: "/requiremententity/requirementEntity/deleteBatch", exportXlsUrl: "/requiremententity/requirementEntity/exportXls", importExcelUrl: "requiremententity/requirementEntity/importExcel", + fq:"/requiremententity/requirementEntity/fq", }, dictOptions:{}, @@ -191,6 +195,16 @@ }, }, methods: { + fq(id){ + getAction(this.url.fq,{id:id}).then((res)=>{ + if (res.success) { + this.$message.success(res.message); + this.loadData(); + }else{ + this.$message.warning(res.message); + } + }); + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requiremententity/controller/RequirementEntityController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requiremententity/controller/RequirementEntityController.java index 264bcd4..bf291b1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requiremententity/controller/RequirementEntityController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requiremententity/controller/RequirementEntityController.java @@ -144,6 +144,25 @@ public class RequirementEntityController extends JeecgController fq(@RequestParam(name="id",required=true) String id) { + RequirementEntity requirementEntity = requirementEntityService.getById(id); + if(requirementEntity==null) { + return Result.error("未找到对应数据"); + }else{ + requirementEntity.setEntityStatus(9); + requirementEntityService.updateById(requirementEntity); + } + return Result.OK("已废弃"); + } /** * 导出excel From ab15bf85cf383e092f60bdf70c1f3c177be38e17 Mon Sep 17 00:00:00 2001 From: chengyufei <1932574737@qq.com> Date: Wed, 12 Jul 2023 15:10:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E6=A8=A1=E5=9D=97=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E5=8A=9F=E8=83=BD=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E3=80=81=E8=A7=84=E5=88=99=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=94=E4=B8=8E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E8=81=94=E5=8A=A8=EF=BC=8C=E5=8D=B3=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B1=82=E7=BA=A7=E9=80=89=E6=8B=A9=E5=93=AA=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E6=A8=A1=E5=9D=97=E3=80=81=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=81=E8=A7=84=E5=88=99=E6=98=BE=E7=A4=BA=E5=88=B0=E5=93=AA?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E3=80=82=203.=E5=8F=91=E5=B8=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=BB=98=E8=AE=A4=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=204.=E6=A8=A1=E5=9D=97=E6=96=87=E6=9C=AC=E6=A1=86=E5=90=8E?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BC=B9=E5=87=BA=E6=96=B0=E5=A2=9E=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97=E3=80=82=205.?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=96=87=E6=9C=AC=E6=A1=86=E5=90=8E=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=BC=B9=E5=87=BA=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E3=80=82=206.=E8=A7=84?= =?UTF-8?q?=E5=88=99=E6=96=87=E6=9C=AC=E6=A1=86=E5=90=8E=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=A7=84=E5=88=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/task/modules/TaskForm.vue | 86 +++++++++++++++---- 1 file changed, 68 insertions(+), 18 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue index 4b216ed..db95e8d 100644 --- a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue +++ b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue @@ -16,13 +16,13 @@ /> - + + + + + + + @@ -76,23 +76,27 @@ - - - + + + 新增模块 - + + :dict-code="functionx" + style="width: 100%" @change="fillFunctionName()"> + 新增功能 - - + + + 新增规则 @@ -125,7 +129,7 @@ - + @@ -166,6 +170,9 @@ + + + @@ -176,12 +183,23 @@ import {httpAction, getAction} from '@api/manage' import {validateDuplicateValue} from '@/utils/util' import JVxeDateCell from "@comp/jeecg/JVxeTable/components/cells/JVxeDateCell"; import JMultiSelectTag from "@/components/dict/JMultiSelectTag" +import TaskModal from "@views/task/modules/TaskModal.vue"; +import {JeecgListMixin} from '@/mixins/JeecgListMixin' +import {mixinDevice} from "@/utils/mixin"; +import modulexModal from "@views/modulex/modules/ModulexModal.vue"; +import FunctionxModal from "@views/functionx/modules/FunctionxModal__Style#Drawer.vue"; +import RulexModal from "@views/rulex/modules/RulexModal__Style#Drawer.vue"; export default { name: 'TaskForm', + mixins: [JeecgListMixin, mixinDevice], components: { + RulexModal, + FunctionxModal, + modulexModal, + TaskModal, JVxeDateCell, - JMultiSelectTag + JMultiSelectTag, }, props: { //表单禁用 @@ -193,6 +211,12 @@ export default { }, data() { return { + modulex: "modulex,module_name,id", + functionx: "functionx,function_name,id", + rulex: "rulex,rule_no,id", + task: "task,task_name,id", + value: new Date(), + model: { workLevel: 2, workStatus: 0, @@ -318,6 +342,8 @@ export default { } , fillTaskName() { + this.modulex = "modulex,module_name,id,project_id='"+this.model.projectId+"'"; + let that = this; let fillTaskName = ""; let param = { @@ -343,7 +369,31 @@ export default { } } , - + fillLevelName(){ + this.task = "task,task_name,id,level='"+this.model.level+"'"; + } + , + handleAdd3: function () { + this.$refs.modalForm3.add(); + this.$refs.modalForm3.title = "新增"; + this.$refs.modalForm3.disableSubmit = false; + }, + handleAdd1: function () { + this.$refs.modalForm1.add(); + this.$refs.modalForm1.title = "新增"; + this.$refs.modalForm1.disableSubmit = false; + }, + handleAdd2: function () { + this.$refs.modalForm2.add(); + this.$refs.modalForm2.title = "新增"; + this.$refs.modalForm2.disableSubmit = false; + }, + fillModuleName() { + this.functionx = "functionx,function_name,id,module_id='"+this.model.moduleId+"'"; + }, + fillFunctionName(){ + this.rulex = "rulex,rule_no,id,function_id='"+this.model.functionId+"'"; + }, // 获取当前日期的方法 getProjectNum() { const projectTime = new Date() // 当前中国标准时间