clay commit : workflow开始做审批

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
+    url: jdbc:mysql://192.168.101.108:3306/flowable_web?userUnicode=true&characterEncodinf=UTF-8&autoReconnect=true
-    username: flowable_web
+    username: activiti7
-    password: 3SZ3tBeEG5TXBSGp
+    password: activiti7
 
 logging:
   config: classpath:logback-dev.xml

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>

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">-->
+    <el-drawer
-<!--      <initiate-process ref="processForm" :code="selectForm.formId" v-if="openItemDl"></initiate-process>-->
+        title="审批详情"
-<!--      <span slot="footer" class="dialog-footer">-->
+        :visible.sync="approveOpen"
-<!--				<el-button size="mini" @click="openItemDl = false">取 消</el-button>-->
+        direction="rtl">
-<!--			</span>-->
+      <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({
+      this.approveOpen = true;
-        method: "get",
+      // axios({
-        url: "http://localhost:8000/workflow/process/task/"+ row.taskId,
+      //   method: "get",
-        // data: this.setup.process,
+      //   url: "http://localhost:8000/workflow/process/task/"+ row.taskId,
-        headers: {
+      //   // data: this.setup.process,
-          'Content-Type': 'application/json',
+      //   headers: {
-          "authorization": sessionStorage.getItem("token")
+      //     'Content-Type': 'application/json',
-        },
+      //     "authorization": sessionStorage.getItem("token")
-      }).then(res => {
+      //   },
-        let data = res.data;
+      // }).then(res => {
-        if (data.code == 401){
+      //   let data = res.data;
-          this.getToken()
+      //   if (data.code == 401){
-        }
+      //     this.getToken()
-        console.log(data)
+      //   }
-      })
+      //   console.log(data)
-
+      // })
-      console.log(row)
+      //
+      // console.log(row)
     },
     getList(){
       let token = sessionStorage.getItem("token");