From 519a4a16fc64fbbe20ca85478715b06046c93436 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 17 Jan 2022 00:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=2070%=20-=20=E5=AE=A1=E6=89=B9=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bpm/processInstance/detail.vue  | 33 +++++++++++++++++--
 yudao-admin-ui/src/views/bpm/task/done.vue    |  2 +-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/yudao-admin-ui/src/views/bpm/processInstance/detail.vue b/yudao-admin-ui/src/views/bpm/processInstance/detail.vue
index d7133b123..b3cc97212 100644
--- a/yudao-admin-ui/src/views/bpm/processInstance/detail.vue
+++ b/yudao-admin-ui/src/views/bpm/processInstance/detail.vue
@@ -1,6 +1,29 @@
 <template>
   <div class="app-container">
-    <!-- TODO 审批信息 -->
+    <!-- 审批信息 -->
+    <el-card class="box-card" v-loading="processInstanceLoading">
+      <div slot="header" class="clearfix">
+        <span class="el-icon-picture-outline">审批任务【TODO】</span>
+      </div>
+      <el-col :span="16" :offset="6" >
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="审批建议" prop="comment">
+                <el-input type="textarea" v-model="form.comment" placeholder="请输入审批建议" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px;">
+          <el-button  icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete">通过</el-button>
+          <el-button  icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">不通过</el-button>
+          <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>
+          <el-button  icon="el-icon-edit-outline" type="info" size="mini" @click="handleDelegate">委派</el-button>
+          <el-button  icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
+        </div>
+      </el-col>
+    </el-card>
     <!-- 申请信息 -->
     <el-card class="box-card" v-loading="processInstanceLoading">
       <div slot="header" class="clearfix">
@@ -92,6 +115,12 @@ export default {
       historicTasksLoad: true,
       historicTasks: [],
 
+      // 审批表单
+      form: {},
+      rules: {
+        comment: [{ required: true, message: "审批建议不能为空", trigger: "blur" }],
+      },
+
       // 数据字典
       categoryDictDatas: getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY),
     };
@@ -174,8 +203,6 @@ export default {
           ...JSON.parse(row.formConf),
           fields: decodeFields(row.formFields)
         }
-
-
       } else if (row.formCustomCreatePath) {
         this.$router.push({ path: row.formCustomCreatePath});
         // 这里暂时无需加载流程图，因为跳出到另外个 Tab；
diff --git a/yudao-admin-ui/src/views/bpm/task/done.vue b/yudao-admin-ui/src/views/bpm/task/done.vue
index c738d2211..09c1b6942 100644
--- a/yudao-admin-ui/src/views/bpm/task/done.vue
+++ b/yudao-admin-ui/src/views/bpm/task/done.vue
@@ -21,7 +21,7 @@
       <el-table-column label="任务编号" align="center" prop="id" width="320" fixed />
       <el-table-column label="任务名称" align="center" prop="name" width="200" />
       <el-table-column label="所属流程" align="center" prop="processInstance.name" width="200" />
-      <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
+      <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" width="120" />
       <el-table-column label="结果" align="center" prop="result">
         <template slot-scope="scope">
           <span>