From 4ab8ad4edc13e21bb46e5854e17102243004b357 Mon Sep 17 00:00:00 2001
From: cxc <quantulr@outlook.com>
Date: Fri, 6 Jan 2023 10:48:57 +0800
Subject: [PATCH] =?UTF-8?q?detail=20timeline=20=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/package/penal/task/task-components/UserTask.vue | 6 +++---
 src/utils/generator/parser.jsx                              | 4 ----
 src/views/office/detail.vue                                 | 4 ++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/package/penal/task/task-components/UserTask.vue b/src/plugins/package/penal/task/task-components/UserTask.vue
index 497ebce..453bc8c 100644
--- a/src/plugins/package/penal/task/task-components/UserTask.vue
+++ b/src/plugins/package/penal/task/task-components/UserTask.vue
@@ -181,10 +181,10 @@
 import { listUser, deptTreeSelect } from "@/api/system/user";
 import { listRole } from "@/api/system/role";
 import { addDateRange } from "@/utils/ruoyi";
-import TreeSelect from "@/components/TreeSelect";
+// import TreeSelect from "@/components/TreeSelect";
 import { ref, reactive, watch } from "vue";
 import { ElMessage } from "element-plus";
-const testResult = ref([]);
+// const testResult = ref([]);
 const userTaskForm = {
   dataType: "",
   assignee: "",
@@ -296,7 +296,7 @@ function clearOptionsData() {
   deptIds.value = [];
 }
 /**
- * 跟新节点数据
+ * 更新节点数据
  */
 function updateElementTask() {
   const taskAttr = Object.create(null);
diff --git a/src/utils/generator/parser.jsx b/src/utils/generator/parser.jsx
index 644fefd..c7bbdb3 100644
--- a/src/utils/generator/parser.jsx
+++ b/src/utils/generator/parser.jsx
@@ -19,10 +19,8 @@ const ruleTrigger = {
 
 const layouts = {
   colFormItem(h, scheme, disabled) {
-    console.log(disabled);
     const config = scheme.__config__;
     const listeners = buildListeners.call(this, scheme);
-    console.log(config, "28");
     let labelWidth = config.labelWidth ? `${config.labelWidth}px` : null;
     if (config.showLabel === false) labelWidth = "0";
     return (
@@ -104,7 +102,6 @@ function renderFormItem(h, elementList, disabled) {
     const config = scheme.__config__;
     const layout = layouts[config.layout];
 
-    console.log(layout);
     if (layout) {
       return layout.call(this, h, scheme, disabled);
     }
@@ -119,7 +116,6 @@ function renderChildren(h, scheme, disabled) {
 }
 
 function setValue(event, config, scheme) {
-  console.log(event, config, scheme, "serval");
   config.defaultValue = event;
   this[this.formConf.formModel][scheme.__vModel__] = event;
 }
diff --git a/src/views/office/detail.vue b/src/views/office/detail.vue
index 8c0df4b..e9d9ab1 100644
--- a/src/views/office/detail.vue
+++ b/src/views/office/detail.vue
@@ -393,6 +393,8 @@ const commentType = computed(() => {
         return "委派";
       case "5":
         return "转办";
+      case "6":
+        return "撤回";
     }
   };
 });
@@ -409,6 +411,8 @@ const approveTypeTag = computed(() => {
         return "primary";
       case "5":
         return "success";
+      case "6":
+        return "warning";
     }
   };
 });