From 686b6f9e7ee9a390e179a3290d70d57c635ac7e1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 31 十二月 2024 15:09:54 +0800
Subject: [PATCH] 流程转办：指定用户组件

---
 src/views/projectProcess/index.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index cab82e0..db7e1d4 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -185,7 +185,7 @@
       v-loading="loading"
       :data="projectInfoList"
       @selection-change="handleSelectionChange"
-      height="60vh"
+      height="100%"
       sortable="custom"
       :show-overflow-tooltip="true">
       <el-table-column type="selection" width="55" align="center"/>
@@ -206,8 +206,13 @@
               <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
             </template>
             <!-- projectColorCode鎻掓Ы -->
-            <template v-if="item.slotName === 'projectColorCode'">
-              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
+            <template v-if="item.slotName === 'projectColorCode' || item.slotName === 'coding'">
+              <div v-if="scope.row.projectColorCode">
+                <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
+              </div>
+              <div v-else>
+                <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
+              </div>
             </template>
             <!-- projectType鎻掓Ы -->
             <template v-if="item.slotName === 'projectType'">
@@ -230,6 +235,7 @@
                       size="medium"
                       type="text"
                       icon="el-icon-view"
+                      v-if="scope.row.processInsId"
                       @click="lookProcessDetail(scope.row)"
                     >
                     </el-button>
@@ -258,7 +264,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+      :page.sync="queryParams.currentPage"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -271,7 +277,8 @@
     />
 
     <RunProcess ref="runProcess" :show="showRunProcess"
-                :now-process-id="nowProcessId"
+                :now-process-def-id="nowProcessDefId"
+                :now-process-ins-id="nowProcessInsId"
                 :project-info="projectRunFrom"
                 :process-list="processList"
                 @close="closeRunProcess">
@@ -281,7 +288,7 @@
 
 <script>
 import { listDefinition } from "@/api/flowable/definition";
-import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
+import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectEngineering/projectInfo";
 import { getProjectProcess } from "@/api/projectProcess/projectProcess"
 import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
 import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
@@ -304,7 +311,8 @@
       },
       processList: [],
       showRunProcess: false,
-      nowProcessId: '',
+      nowProcessDefId: '',
+      nowProcessInsId: '',
       isImportOrExport: false,
       fileDialogVisible: false,
       //鏄惁闇�瑕佹柊澧炴寜閽�(鍌ㄨ搫椤圭洰闇�瑕�)
@@ -338,7 +346,7 @@
       timeRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        pageNum: 1,
+        currentPage: 1,
         pageSize: 10,
         projectName: null,
         projectCode: null,
@@ -389,11 +397,12 @@
   methods: {
     // 鏌ョ湅璇︽儏
     lookProcessDetail(row) {
+      console.log(row.processDefId)
       this.$router.push({
         path: '/projectFlow/detail',
         query: {
           projectId: row.id,
-          processId: row.flowableProcessId
+          processDefId: row.processDefId
         }
       })
     },
@@ -402,6 +411,8 @@
         projectId: null,
         projectName: ''
       }
+      this.nowProcessDefId = "";
+      this.nowProcessInsId = "";
       this.showRunProcess = false
       this.getList()
     },
@@ -410,7 +421,8 @@
       // 鎷垮埌娴佺▼鍒楄〃 TODO 鏍规嵁椤圭洰绫诲瀷鍋氱瓫閫�
       getProcessConfigInfoList().then(response => {
         this.processList = response.data;
-        this.nowProcessId = row.flowableProcessId;
+        this.nowProcessDefId = row.processDefId ? row.processDefId : '';
+        this.nowProcessInsId = row.processInsId ? row.processInsId : '';
         // // 闃叉锛歩d娌″彉涓嶈Е鍙戠洃鍚�
         // this.$refs.runProcess.setSelect(row.flowableProcessId);
         this.projectRunFrom.projectId = row.id;
@@ -477,8 +489,8 @@
       getProjectProcess(this.queryParams).then(response => {
         this.projectInfoList = response.data;
         this.total = response.total;
+        this.loading = false;
       });
-      this.loading = false;
     },
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -528,7 +540,7 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.currentPage = 1;
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */

--
Gitblit v1.8.0