Merge pull request #39 from KouShenhai/flowable

Flowable
KouShenhai · Oct 15, 2023 · ece0381 · ece0381
2 parents 4005444 + f6aa2b2
commit ece0381
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 49 deletions.
diff --git a/src/api/v1/resource.js b/src/api/v1/resource.js
@@ -17,6 +17,13 @@ export function getResourceById (id) {
   })
 }
 
+export function getResourceDetailTask (id) {
+  return request({
+    url: '/admin/v1/resource/' + id + '/detail-task',
+    method: 'get'
+  })
+}
+
 // 新增资源
 export function addImage (data) {
   return request({
@@ -26,6 +33,15 @@ export function addImage (data) {
   })
 }
 
+// 资源任务分页
+export function listResourceTask (query) {
+  return request({
+    url: '/admin/v1/resource/task-list',
+    method: 'post',
+    data: query
+  })
+}
+
 // 修改图片
 export function updateResource (data) {
   return request({

diff --git a/src/api/workflow/task.js → src/api/v1/task.js b/src/api/workflow/task.js → src/api/v1/task.js
@@ -1,14 +1,5 @@
 import request from '@/utils/request'
 
-// 分页
-export function pageTask (query) {
-  return request({
-    url: '/admin/workflow/task/api/resource/query',
-    method: 'post',
-    data: query
-  })
-}
-
 // 审批
 export function auditTask (data) {
   return request({

diff --git a/src/views/v1/resource/modules/CreateForm.vue b/src/views/v1/resource/modules/CreateForm.vue
@@ -163,8 +163,9 @@
         this.$refs.form.validate(valid => {
           if (valid) {
             this.submitLoading = true
-            if (this.form.resourceId !== undefined) {
-              updateResource(this.form).then(() => {
+            if (this.form.id !== undefined) {
+              const data = { resourceCO: this.form }
+              updateResource(data).then(() => {
                 this.$message.success(
                   '修改成功',
                   3

diff --git a/...sys/resource/audit/modules/CreateForm.vue → src/views/v1/resource/modules/TaskForm.vue b/...sys/resource/audit/modules/CreateForm.vue → src/views/v1/resource/modules/TaskForm.vue
@@ -5,26 +5,29 @@
     </a-divider>
     <a-form-model ref="form2">
       <a-form-model-item label="编号" prop="id">
-        {{form2.id}}
+        {{ form2.id}}
       </a-form-model-item>
       <a-form-model-item label="类型" prop="code">
-        <span v-show="form2.code == 'image'">图片</span>
-        <span v-show="form2.code == 'video'">视频</span>
-        <span v-show="form2.code == 'audio'">音频</span>
+        <span v-show="form2.code === 'image'">图片</span>
+        <span v-show="form2.code === 'video'">视频</span>
+        <span v-show="form2.code === 'audio'">音频</span>
       </a-form-model-item>
       <a-form-model-item label="标题" prop="title">
-        {{form2.title}}
+        {{ form2.title}}
+      </a-form-model-item>
+      <a-form-model-item label="备注" prop="remark">
+        <a-input v-model="form2.remark" disabled="disabled" type="textarea" allow-clear />
       </a-form-model-item>
       <a-form-model-item label="资源" prop="url">
-        <audio v-show="form2.code == 'audio'" loop='loop' :src="form2.url" controls='controls'><object :data="form2.url" ><embed :src="form2.url" /></object></audio>
-        <img v-show="form2.code == 'image'" :src="form2.url" width="100" height="100"/>
+        <audio v-show="form2.code === 'audio'" loop='loop' :src="form2.url" controls='controls'><object :data="form2.url" ><embed :src="form2.url" /></object></audio>
+        <img v-show="form2.code === 'image'" :src="form2.url" width="100" height="100" alt="暂无图片"/>
         <video
-             v-show="form2.code == 'video'"
-             :src='form2.url'
-             loop='loop'
-             width='250'
-             height='100'
-             controls='controls'><source :src='form2.url' type='video/mp4'><object :data='form2.url' width='200' height='100'><embed :src='form2.url' width='200' height='100' /></object></video>
+          v-show="form2.code === 'video'"
+          :src="form2.url"
+          loop="loop"
+          width="250"
+          height="100"
+          controls="controls"><source :src='form2.url' type="video/mp4"><object :data="form2.url" width="200" height="100"><embed :src="form2.url" width="200" height="100" /></object></video>
       </a-form-model-item>
     </a-form-model>
     <a-form-model ref="form" :model="form" :rules="rules">
@@ -46,10 +49,10 @@
 </template>
 
 <script>
-
-  import { auditTask, detailTask } from '@/api/workflow/task'
+  import { getResourceDetailTask } from '@/api/v1/resource'
+  import { auditTask } from '@/api/v1/task'
 export default {
-  name: 'CreateForm',
+  name: 'TaskForm',
   props: {
 
   },
@@ -103,12 +106,13 @@ export default {
       this.reset()
     },
     getDetail (id) {
-      detailTask(id).then(response => {
+      getResourceDetailTask(id).then(response => {
         this.form2.title = response.data.title
         this.form2.code = response.data.code
         this.form2.id = response.data.id
         this.form2.remark = response.data.remark
         this.form2.url = response.data.url
+        this.form2.id = id
       })
     },
     // 表单重置
@@ -135,10 +139,10 @@ export default {
      /** 新增按钮操作 */
     handleAudit (row) {
       this.form.taskId = row.taskId
-      this.form.instanceId = row.processInstanceId
+      this.form.instanceId = row.instanceId
       this.form.taskName = row.taskName
       this.form.businessKey = row.businessKey
-      this.form.instanceName = row.processInstanceName
+      this.form.instanceName = row.instanceName
       this.getDetail(this.form.businessKey)
       this.open = true
       this.formTitle = '审批'

diff --git a/src/views/sys/resource/audit/view.vue → src/views/v1/resource/task.vue b/src/views/sys/resource/audit/view.vue → src/views/v1/resource/task.vue
@@ -3,11 +3,11 @@
     <a-card :bordered="false">
       <!-- 条件搜索 -->
       <div class="table-page-search-wrapper">
-        <a-form layout="inline" v-hasPermi="['workflow:task:resource:query']">
+        <a-form layout="inline" v-hasPermi="['resource:task-list']">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
               <a-form-item label="流程名称">
-                <a-input v-model="queryParam.processName" placeholder="请输入" allow-clear/>
+                <a-input v-model="queryParam.name" placeholder="请输入" allow-clear/>
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
@@ -53,22 +53,22 @@
         :pagination="false"
         :bordered="tableBordered">
         <span slot="operation" slot-scope="text, record">
-          <a @click="$refs.createForm.handleAudit(record)" v-hasPermi="['workflow:task:resource:audit']">
+          <a @click="$refs.createForm.handleAudit(record)" v-hasPermi="['resource:audit-task']">
             <a-icon type="audit"/>
             审批
           </a>
-          <a-divider type="vertical" v-hasPermi="['workflow:task:resource:resolve']"/>
-          <a @click="resolveProcess(record)" v-hasPermi="['workflow:task:resource:resolve']">
+          <a-divider type="vertical" v-hasPermi="['resource:resolve-task']"/>
+          <a @click="resolveProcess(record)" v-hasPermi="['resource:resolve-task']">
             <a-icon type="user-delete" />
             处理
           </a>
-          <a-divider type="vertical" v-hasPermi="['workflow:task:resource:transfer']"/>
-          <a @click="handleProcess(record,0)" v-hasPermi="['workflow:task:resource:transfer']">
+          <a-divider type="vertical" v-hasPermi="['resource:transfer-task']"/>
+          <a @click="handleProcess(record,0)" v-hasPermi="['resource:transfer-task']">
             <a-icon type="user" />
             转办
           </a>
-          <a-divider type="vertical" v-hasPermi="['workflow:task:resource:delegate']"/>
-          <a @click="handleProcess(record,1)" v-hasPermi="['workflow:task:resource:delegate']">
+          <a-divider type="vertical" v-hasPermi="['resource:delegate-task']"/>
+          <a @click="handleProcess(record,1)" v-hasPermi="['resource:delegate-task']">
             <a-icon type="user-add" />
             委派
           </a>
@@ -91,14 +91,15 @@
 </template>
 
 <script>
-import { pageTask, delegateTask, transferTask, resolveTask } from '@/api/workflow/task'
+import { listResourceTask } from '@/api/v1/resource'
+import { delegateTask, transferTask, resolveTask } from '@/api/v1/task'
 import { listUserOption } from '@/api/v1/user'
 import { tableMixin } from '@/store/table-mixin'
 import { USER_ID } from '@/store/mutation-types'
-import CreateForm from './modules/CreateForm'
+import CreateForm from './modules/TaskForm'
 import storage from 'store'
 export default {
-  name: 'Process',
+  name: 'Task',
   components: {
     CreateForm
   },
@@ -124,7 +125,7 @@ export default {
       queryParam: {
         pageNum: 1,
         pageSize: 10,
-        processName: ''
+        name: ''
       },
       columns: [
         {
@@ -135,7 +136,7 @@ export default {
         },
         {
           title: '流程名称',
-          dataIndex: 'processName',
+          dataIndex: 'name',
           align: 'center',
           ellipsis: true
         },
@@ -147,19 +148,19 @@ export default {
         },
         {
           title: '实例名称',
-          dataIndex: 'processInstanceName',
+          dataIndex: 'instanceName',
           align: 'center',
           ellipsis: true
         },
         {
           title: '任务执行人',
-          dataIndex: 'assigneeName',
+          dataIndex: 'username',
           align: 'center',
           ellipsis: true
         },
         {
           title: '创建时间',
-          dataIndex: 'createTime',
+          dataIndex: 'createDate',
           align: 'center',
           width: '14%'
         },
@@ -209,7 +210,7 @@ export default {
     /** 查询流程定义列表 */
     getList () {
       this.loading = true
-      pageTask(this.queryParam).then(response => {
+      listResourceTask(this.queryParam).then(response => {
           this.list = response.data.records
           this.total = response.data.total - 0
           this.loading = false
@@ -289,7 +290,7 @@ export default {
       this.queryParam = {
         pageNum: 1,
         pageSize: 10,
-        processName: ''
+        name: ''
       }
       this.handleQuery()
     },