+ 需求描述：
需求名称：{{tableName}}
+ @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..db95e8d 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
+
@@ -44,84 +76,89 @@
-
-
-
+
+
+ 新增模块
-
+
+ :dict-code="functionx"
+ style="width: 100%" @change="fillFunctionName()">
+ 新增功能
-
- -->
+
-
-
-
-
-
+ 新增规则
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
+
@@ -131,15 +168,11 @@
-
-
-
-
-
-
-
+
+
+
@@ -150,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: {
//表单禁用
@@ -167,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,
@@ -175,14 +225,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 +326,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
@@ -255,6 +342,8 @@ export default {
}
,
fillTaskName() {
+ this.modulex = "modulex,module_name,id,project_id='"+this.model.projectId+"'";
+
let that = this;
let fillTaskName = "";
let param = {
@@ -280,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() // 当前中国标准时间
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
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;
/**
* 中文名称
*/
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