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] =?UTF-8?q?1.=E6=A8=A1=E5=9D=97=E8=81=94=E5=8A=A8=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E3=80=81=E5=8A=9F=E8=83=BD=E8=81=94=E5=8A=A8=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E3=80=81=E8=A7=84=E5=88=99=E8=81=94=E5=8A=A8=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=B8=94=E4=B8=8E=E4=BB=BB=E5=8A=A1=E5=B1=82?=
=?UTF-8?q?=E7=BA=A7=E8=81=94=E5=8A=A8=EF=BC=8C=E5=8D=B3=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=B1=82=E7=BA=A7=E9=80=89=E6=8B=A9=E5=93=AA=E4=B8=80=E7=BA=A7?=
=?UTF-8?q?=EF=BC=8C=E6=A8=A1=E5=9D=97=E3=80=81=E5=8A=9F=E8=83=BD=E3=80=81?=
=?UTF-8?q?=E8=A7=84=E5=88=99=E6=98=BE=E7=A4=BA=E5=88=B0=E5=93=AA=E4=B8=80?=
=?UTF-8?q?=E7=BA=A7=E3=80=82=203.=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=204.?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=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=E6=A8=A1=E5=9D=97?=
=?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=E6=A8=A1=E5=9D=97=E3=80=82=205.=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=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=E5=8A=9F=E8=83=BD=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=E5=8A=9F=E8=83=BD=E3=80=82=206.=E8=A7=84=E5=88=99?=
=?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E5=90=8E=E6=96=B0=E5=A2=9E=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=8C=89=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E5=BC=B9?=
=?UTF-8?q?=E5=87=BA=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=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() // 当前中国标准时间