From 270a6e31a94cdb25e1c6691be1e3c7bbee53574b Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 25 Dec 2022 00:43:42 +0800
Subject: [PATCH] =?UTF-8?q?clay=20commit=20:=20workflow=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=81=9A=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml    |  6 +-
 .../main/resources/mapper/FlowDataMapper.xml  |  2 +-
 .../src/views/workspace/DisposalTask.vue      | 77 +++++++++++++------
 3 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/flowable-engine-java/src/main/resources/application-dev.yml b/flowable-engine-java/src/main/resources/application-dev.yml
index f3a5a69..05b0f30 100644
--- a/flowable-engine-java/src/main/resources/application-dev.yml
+++ b/flowable-engine-java/src/main/resources/application-dev.yml
@@ -13,9 +13,9 @@ spring:
     max-lifetime: 1800000
     connection-test-query: SELECT 1
   datasource:
-    url: jdbc:mysql://162.14.111.170:3306/flowable_web?userUnicode=true&characterEncodinf=UTF-8&autoReconnect=true
-    username: flowable_web
-    password: 3SZ3tBeEG5TXBSGp
+    url: jdbc:mysql://192.168.101.108:3306/flowable_web?userUnicode=true&characterEncodinf=UTF-8&autoReconnect=true
+    username: activiti7
+    password: activiti7
 
 logging:
   config: classpath:logback-dev.xml
diff --git a/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml b/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml
index f494165..0bc356d 100644
--- a/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml
+++ b/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml
@@ -32,7 +32,7 @@
             <if test="isDelete != null">is_delete,</if>
             <if test="isStop != null">is_stop,</if>
             <if test="logo != null and logo !=''">logo,</if>
-            <if test="process != null and process !=''">flowData.process,</if>
+            <if test="process != null and process !=''">process,</if>
             <if test="remark != null and remark !=''">remark,</if>
             <if test="settings != null and settings !=''">settings,</if>
             <if test="sort != null">sort,</if>
diff --git a/flowable-engine-web/src/views/workspace/DisposalTask.vue b/flowable-engine-web/src/views/workspace/DisposalTask.vue
index bee0562..815765a 100644
--- a/flowable-engine-web/src/views/workspace/DisposalTask.vue
+++ b/flowable-engine-web/src/views/workspace/DisposalTask.vue
@@ -31,11 +31,40 @@
       </el-table-column>
     </el-table>
 
-<!--    <el-dialog title="发起审批" width="800px" :visible.sync="openItemDl" :close-on-click-modal="false">-->
-<!--      <initiate-process ref="processForm" :code="selectForm.formId" v-if="openItemDl"></initiate-process>-->
-<!--      <span slot="footer" class="dialog-footer">-->
-<!--				<el-button size="mini" @click="openItemDl = false">取 消</el-button>-->
-<!--			</span>-->
+    <el-drawer
+        title="审批详情"
+        :visible.sync="approveOpen"
+        direction="rtl">
+      <div class="top" style="display:flex;padding: 0 10px 10px 10px;">
+        <div style="display: flex;flex-direction: column;">
+          <el-avatar size="medium" src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png"></el-avatar>
+          <span>Clay</span>
+        </div>
+        <div >
+          <div>
+            <span>未命名表单1</span>
+            <span>进行中</span>
+          </div>
+          <div>
+            <span>编号:</span>
+            <span>442bbc6a-83a6-11ed-a551-fa28000d2c27</span>
+          </div>
+
+        </div>
+      </div>
+      <div class="center_up">
+
+      </div>
+      <div class="center_down">
+
+      </div>
+      <div class="bottom">
+
+      </div>
+    </el-drawer>
+
+<!--    <el-dialog title="发起审批" width="800px" :visible.sync="approveOpen" :close-on-click-modal="false">-->
+
 <!--    </el-dialog>-->
   </div>
 </template>
@@ -47,7 +76,8 @@ export default {
   name: "DisposalTask",
   data() {
     return {
-      tableData: []
+      tableData: [],
+      approveOpen: false,
     }
   },
   created() {
@@ -71,23 +101,24 @@ export default {
       })
     },
     clickRow(row){
-      axios({
-        method: "get",
-        url: "http://localhost:8000/workflow/process/task/"+ row.taskId,
-        // data: this.setup.process,
-        headers: {
-          'Content-Type': 'application/json',
-          "authorization": sessionStorage.getItem("token")
-        },
-      }).then(res => {
-        let data = res.data;
-        if (data.code == 401){
-          this.getToken()
-        }
-        console.log(data)
-      })
-
-      console.log(row)
+      this.approveOpen = true;
+      // axios({
+      //   method: "get",
+      //   url: "http://localhost:8000/workflow/process/task/"+ row.taskId,
+      //   // data: this.setup.process,
+      //   headers: {
+      //     'Content-Type': 'application/json',
+      //     "authorization": sessionStorage.getItem("token")
+      //   },
+      // }).then(res => {
+      //   let data = res.data;
+      //   if (data.code == 401){
+      //     this.getToken()
+      //   }
+      //   console.log(data)
+      // })
+      //
+      // console.log(row)
     },
     getList(){
       let token = sessionStorage.getItem("token");