From a96e1c7bd911ccbce43dd57381455b01a5b069a7 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Tue, 3 Sep 2024 21:06:22 +0800
Subject: [PATCH] update

---
 src/components/MonitorDrawer/index.vue |  1 -
 src/views/tool/index.vue               |  2 +-
 src/views/workstuff/apply/index.vue    |  2 ++
 src/views/workstuff/dispose/index.vue  | 14 ++++++++++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/MonitorDrawer/index.vue b/src/components/MonitorDrawer/index.vue
index 36931a3..16897b4 100644
--- a/src/components/MonitorDrawer/index.vue
+++ b/src/components/MonitorDrawer/index.vue
@@ -33,7 +33,6 @@
               let protocol = window.location.protocol
               let hostname = window.location.hostname;
               let workflowManageUrl = protocol + '//' + hostname + ':9080' + process.env.VUE_APP_WORKFLOW_MANAGE_URL
-              workflowManageUrl = 'http://124.223.108.21:9080/ebpm-process-manage'
               this.src = workflowManageUrl + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
             }
         }
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index a3f0137..35c938b 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -108,7 +108,7 @@
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
-          <el-table-column label="审核状态" align="center" key="recordStatus" width="90">
+          <el-table-column label="流程状态" align="center" key="recordStatus" width="90">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.flow_status" :value="scope.row.recordStatus"/>
             </template>
diff --git a/src/views/workstuff/apply/index.vue b/src/views/workstuff/apply/index.vue
index f5049c0..546ff79 100644
--- a/src/views/workstuff/apply/index.vue
+++ b/src/views/workstuff/apply/index.vue
@@ -13,6 +13,7 @@
                 <el-option label="全部" value=""></el-option>
                 <el-option label="审核中" value="doing"></el-option>
                 <el-option label="已审核" value="done"></el-option>
+                <el-option label="拟稿" value="draft"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="发起时间">
@@ -48,6 +49,7 @@
           <template slot-scope="scope">
               <el-tag v-if="scope.row.recordStatus === 'doing'">审核中</el-tag>
               <el-tag type="success" v-if="scope.row.recordStatus === 'done'">已审核</el-tag>
+              <el-tag type="info" v-if="scope.row.recordStatus === 'draft'">拟稿</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="发起时间"></el-table-column>
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 00d8ec1..110e3c0 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -22,7 +22,12 @@
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="curActDefName" label="当前环节"></el-table-column>
-            <el-table-column prop="prevActDefName" label="上一环节"></el-table-column>
+            <el-table-column prop="prevActDefName" label="上一环节">
+              <template slot-scope="scope">
+                <span v-if="!scope.row.prevActDefName">/</span>
+                <span v-else>{{ scope.row.prevActDefName }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
             <el-table-column prop="startUserName" label="发起人"></el-table-column>
             <el-table-column prop="sendTime" label="接收时间">
@@ -49,7 +54,12 @@
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="curActDefName" label="处理环节"></el-table-column>
-            <el-table-column prop="prevActDefName" label="上一环节"></el-table-column>
+            <el-table-column label="上一环节">
+              <template slot-scope="scope">
+                <span v-if="!scope.row.prevActDefName">/</span>
+                <span v-else>{{ scope.row.prevActDefName }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
             <el-table-column prop="startUserName" label="发起人"></el-table-column>
             <el-table-column prop="sendTime" label="接收时间">