From 986baeb3d7f2706b6541d24e7432f2ad6e00d070 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Mon, 5 Jun 2023 15:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/task/TaskList.vue               |  2 +-
 .../src/views/task/modules/TaskForm.vue       | 24 ++++---------------
 jeecg-boot/jeecg-boot-module-system/pom.xml   |  2 +-
 .../org/jeecg/modules/task/entity/Task.java   |  1 +
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/task/TaskList.vue b/ant-design-vue-jeecg/src/views/task/TaskList.vue
index c5a0e78..58e21fb 100644
--- a/ant-design-vue-jeecg/src/views/task/TaskList.vue
+++ b/ant-design-vue-jeecg/src/views/task/TaskList.vue
@@ -138,7 +138,7 @@ export default {
         {
           title: '任务层级',
           align: "center",
-          dataIndex: 'level'
+          dataIndex: 'level_dictText'
         },
         {
           title: '任务类型',
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 a68fcf5..99b6b74 100644
--- a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
+++ b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
@@ -127,25 +127,11 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-<!--            <a-form-model-item label="任务描述" style="width: 700px" prop="taskDescribe">-->
-<!--              <j-editor v-model="model.taskDescribe"/>-->
-<!--            </a-form-model-item>-->
-<!--            <a-form-model-item label="任务描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskDescribe">-->
-<!--              <j-editor style='width: 100%;' v-model="model.taskDescribe" />-->
-<!--            </a-form-model-item>-->
-            <a-form-item label="任务描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <!-- <j-editor style="width: 200%" v-decorator="['synopsis', { trigger: 'input' }]" /> -->
-              <!-- 修改 -->
-              <el-input
-                :rows="8"
-                type="textarea"
-                placeholder="请输入内容"
-                v-model="taskDescribe"
-                maxlength="300"
-                show-word-limit
-                style="width: 200%">
-              </el-input>
-            </a-form-item>
+            <a-form-model-item label="任务描述" style="width: 700px" prop="taskDescribe">
+              <a-input type="textarea" v-model="model.taskDescribe" :rows="5"/>
+<!--              <a-input type="textarea" v-model="form.reason" :rows="4" />-->
+
+            </a-form-model-item>
           </a-col>
         </a-row>
       </a-form-model>
diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
index 1d3b295..47eb4bf 100644
--- a/jeecg-boot/jeecg-boot-module-system/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -125,7 +125,7 @@
     </dependencies>
 
     <build>
-<!--        <finalName>projectManagement</finalName>-->
+        <finalName>pm</finalName>
         <plugins>
             <plugin>
                 <!--				<groupId>org.springframework.boot</groupId>-->
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 d93549b..486cc62 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
@@ -77,6 +77,7 @@ public class Task implements Serializable {
      */
     @Excel(name = "任务层级", width = 15)
     @ApiModelProperty(value = "任务层级")
+    @Dict(dicCode = "task_type_level")
     private java.lang.Integer level;
     /**
      * 项目id