From 0d1b162b5e3d339d2a644c62659f2d58e9ce47e9 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 7 Dec 2023 19:42:08 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E8=81=94=E8=B0=83=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workCenter.js                         |  2 +-
 .../processCenter/table/DoneList.vue          | 22 +++++++-------
 .../processCenter/table/MonitorList.vue       | 28 ++++++++---------
 .../processCenter/table/SentList.vue          | 30 +++++++++----------
 .../processCenter/table/TodoList.vue          |  4 +--
 5 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index d1779ff7..f75bed0c 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -158,7 +158,7 @@ const enStandardStartUseGetDataDraft = (params) => getAction('/process/es/enable
 
 // 流程中心
 // 已发-强制撤回
-const compulsoryWithdrawal = (params) => postAction('', params)
+const compulsoryWithdrawal = (params) => postAction('/workCenter/delete', params)
 
 /* 标准法规入库/变更流程 */
 // 发起
diff --git a/src/views/workCenter/processCenter/table/DoneList.vue b/src/views/workCenter/processCenter/table/DoneList.vue
index fc197c90..85a8c6c9 100644
--- a/src/views/workCenter/processCenter/table/DoneList.vue
+++ b/src/views/workCenter/processCenter/table/DoneList.vue
@@ -13,15 +13,15 @@
           <!--  流程编号  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.id"></a-input>
             </a-form-item>
           </a-col>
-          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
+          <!--  流程类型  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
-                dict-code="esp_project_status"
+                dict-code="prc_type"
                 v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
@@ -81,56 +81,56 @@ export default {
           title: this.$t('workCenter.processCenter.processNumber'),
           align: 'center',
           width: 180,
-          dataIndex: 'processNumber',
+          dataIndex: 'id',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程类型
           title: this.$t('workCenter.processCenter.processType'),
           align: 'center',
           width: 180,
-          dataIndex: 'processType_dictText',
+          dataIndex: 'prcType_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程名称
           title: this.$t('processName'),
           align: 'center',
           width: 180,
-          dataIndex: 'processName',
+          dataIndex: 'prcName',
           scopedSlots: { customRender: 'text' }
         },
         { // 发起人
           title: this.$t('workCenter.processCenter.initiator'),
           align: 'center',
           width: 180,
-          dataIndex: 'initiator',
+          dataIndex: 'createUserId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 当前处理人
           title: this.$t('workCenter.processCenter.currentProcessor'),
           align: 'center',
           width: 180,
-          dataIndex: 'currentProcessor',
+          dataIndex: 'handleUserId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 接收任务时间
           title: this.$t('workCenter.processCenter.receivingTaskTime'),
           align: 'center',
           width: 180,
-          dataIndex: 'receivingTaskTime',
+          dataIndex: 'receivedTaskTime',
           scopedSlots: { customRender: 'text' }
         },
         { // 完成时间
           title: this.$t('workCenter.processCenter.finishTime'),
           align: 'center',
           width: 180,
-          dataIndex: 'finishTime',
+          dataIndex: 'endTime',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程状态
           title: this.$t('workCenter.processCenter.processState'),
           align: 'center',
           width: 180,
-          dataIndex: 'processState_dictText',
+          dataIndex: 'prcStatus_dictText',
           scopedSlots: { customRender: 'text' }
         },
         {
diff --git a/src/views/workCenter/processCenter/table/MonitorList.vue b/src/views/workCenter/processCenter/table/MonitorList.vue
index cd7e3cc9..235c2253 100644
--- a/src/views/workCenter/processCenter/table/MonitorList.vue
+++ b/src/views/workCenter/processCenter/table/MonitorList.vue
@@ -13,15 +13,15 @@
           <!--  流程编号  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.id"></a-input>
             </a-form-item>
           </a-col>
-          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
+          <!--  流程类型  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
-                dict-code="esp_project_status"
+                dict-code="prc_type"
                 v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
@@ -85,63 +85,63 @@ export default {
           title: this.$t('workCenter.processCenter.processNumber'),
           align: 'center',
           width: 180,
-          dataIndex: 'processNumber',
+          dataIndex: 'id',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程类型
           title: this.$t('workCenter.processCenter.processType'),
           align: 'center',
           width: 180,
-          dataIndex: 'processType_dictText',
+          dataIndex: 'prcType_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程名称
           title: this.$t('processName'),
           align: 'center',
           width: 180,
-          dataIndex: 'processName',
+          dataIndex: 'prcName',
           scopedSlots: { customRender: 'text' }
         },
         { // 发起人
           title: this.$t('workCenter.processCenter.initiator'),
           align: 'center',
           width: 180,
-          dataIndex: 'initiator',
+          dataIndex: 'createUserId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 当前处理人
           title: this.$t('workCenter.processCenter.currentProcessor'),
           align: 'center',
           width: 180,
-          dataIndex: 'currentProcessor',
+          dataIndex: 'handleUserId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 接收任务时间
           title: this.$t('workCenter.processCenter.receivingTaskTime'),
           align: 'center',
           width: 180,
-          dataIndex: 'receivingTaskTime',
+          dataIndex: 'receivedTaskTime',
           scopedSlots: { customRender: 'text' }
         },
         { // 完成时间
           title: this.$t('workCenter.processCenter.finishTime'),
           align: 'center',
           width: 180,
-          dataIndex: 'finishTime',
+          dataIndex: 'endTime',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程耗时(小时)
           title: this.$t('workCenter.processCenter.processTime'),
           align: 'center',
           width: 180,
-          dataIndex: 'processTime',
+          dataIndex: 'overTime',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程状态
           title: this.$t('workCenter.processCenter.processState'),
           align: 'center',
           width: 180,
-          dataIndex: 'processState_dictText',
+          dataIndex: 'prcStatus_dictText',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -153,7 +153,7 @@ export default {
         }
       ],
       url: {
-        list: '/process/center/monitorTaskList'
+        list: '/workCenter/getAllList'
       }
     }
   },
@@ -176,7 +176,7 @@ export default {
     // 强制撤回
     handleWithdrawal (record) {
       const params = {}
-      params.processId = this.currentTurnTo.id
+      params.processInstanceId = record.processInstanceId
       compulsoryWithdrawal(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
diff --git a/src/views/workCenter/processCenter/table/SentList.vue b/src/views/workCenter/processCenter/table/SentList.vue
index 16d0d779..a8119008 100644
--- a/src/views/workCenter/processCenter/table/SentList.vue
+++ b/src/views/workCenter/processCenter/table/SentList.vue
@@ -13,27 +13,27 @@
           <!--  流程编号  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.id"></a-input>
             </a-form-item>
           </a-col>
-          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
+          <!--  流程类型  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
-                dict-code="esp_project_status"
+                dict-code="prc_type"
                 v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <!--  流程状态  todo：流程状态是字典还是什么后端还没确定   -->
+            <!--  流程状态   -->
             <a-col :span="6">
               <a-form-item :label="$t('workCenter.processCenter.processState')" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag
                   :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processState')"
-                  dict-code="esp_project_status"
-                  v-model="queryParam.prcState">
+                  dict-code="prc_status"
+                  v-model="queryParam.prcStatus">
                 </j-dict-select-tag>
               </a-form-item>
             </a-col>
@@ -101,56 +101,56 @@ export default {
           title: this.$t('workCenter.processCenter.processNumber'),
           align: 'center',
           width: 180,
-          dataIndex: 'processNumber',
+          dataIndex: 'id',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程类型
           title: this.$t('workCenter.processCenter.processType'),
           align: 'center',
           width: 180,
-          dataIndex: 'processType_dictText',
+          dataIndex: 'prcType_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程名称
           title: this.$t('processName'),
           align: 'center',
           width: 180,
-          dataIndex: 'processName',
+          dataIndex: 'prcName',
           scopedSlots: { customRender: 'text' }
         },
         { // 发起人
           title: this.$t('workCenter.processCenter.initiator'),
           align: 'center',
           width: 180,
-          dataIndex: 'initiator',
+          dataIndex: 'createUserId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 当前处理人
           title: this.$t('workCenter.processCenter.currentProcessor'),
           align: 'center',
           width: 180,
-          dataIndex: 'currentProcessor',
+          dataIndex: 'handleUserId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 接收任务时间
           title: this.$t('workCenter.processCenter.receivingTaskTime'),
           align: 'center',
           width: 180,
-          dataIndex: 'receivingTaskTime',
+          dataIndex: 'receivedTaskTime',
           scopedSlots: { customRender: 'text' }
         },
         { // 完成时间
           title: this.$t('workCenter.processCenter.finishTime'),
           align: 'center',
           width: 180,
-          dataIndex: 'finishTime',
+          dataIndex: 'endTime',
           scopedSlots: { customRender: 'text' }
         },
         { // 流程状态
           title: this.$t('workCenter.processCenter.processState'),
           align: 'center',
           width: 180,
-          dataIndex: 'processState_dictText',
+          dataIndex: 'prcStatus_dictText',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -186,7 +186,7 @@ export default {
     // 强制撤回
     handleWithdrawal (record) {
       const params = {}
-      params.processId = this.currentTurnTo.id
+      params.processInstanceId = record.processInstanceId
       compulsoryWithdrawal(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue
index e8160776..bdcc12a6 100644
--- a/src/views/workCenter/processCenter/table/TodoList.vue
+++ b/src/views/workCenter/processCenter/table/TodoList.vue
@@ -13,10 +13,10 @@
           <!--  流程编号  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.id"></a-input>
             </a-form-item>
           </a-col>
-          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
+          <!--  流程类型  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag