From 681b9ab31eec43045f804ee1d4b808b9a954e08d Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 31 十二月 2024 15:53:20 +0800
Subject: [PATCH] 调整页面赋码展示，新增一个项目中心页面展示

---
 src/views/projectProcess/index.vue |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 18f76a8..05380bc 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -88,7 +88,7 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="椤圭洰鐮�">
-                    <el-select v-model="queryParams.projectColorCode" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+                    <el-select v-model="queryParams.coding" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
                       <el-option v-for="item in dict.type.sys_project_code" :key="item.value" :label="item.label"
                                  :value="item.value"/>
                     </el-select>
@@ -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"/>
@@ -205,9 +205,9 @@
             <template v-if="item.slotName === 'projectStatus'">
               <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"/>
+            <!-- coding鎻掓Ы -->
+            <template v-if="item.slotName === 'coding' || item.slotName === 'coding'">
+              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
             </template>
             <!-- projectType鎻掓Ы -->
             <template v-if="item.slotName === 'projectType'">
@@ -230,6 +230,7 @@
                       size="medium"
                       type="text"
                       icon="el-icon-view"
+                      v-if="scope.row.processInsId"
                       @click="lookProcessDetail(scope.row)"
                     >
                     </el-button>
@@ -258,7 +259,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+      :page.sync="queryParams.currentPage"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -271,7 +272,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">
@@ -304,7 +306,8 @@
       },
       processList: [],
       showRunProcess: false,
-      nowProcessId: '',
+      nowProcessDefId: '',
+      nowProcessInsId: '',
       isImportOrExport: false,
       fileDialogVisible: false,
       //鏄惁闇�瑕佹柊澧炴寜閽�(鍌ㄨ搫椤圭洰闇�瑕�)
@@ -338,7 +341,7 @@
       timeRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        pageNum: 1,
+        currentPage: 1,
         pageSize: 10,
         projectName: null,
         projectCode: null,
@@ -347,7 +350,7 @@
         projectType: '', // 椤圭洰绫诲瀷
         importanceType: '', // 閲嶇偣鍒嗙被
         projectStatus: '', // 椤圭洰鐘舵��
-        projectColorCode: '', // 椤圭洰鐮�
+        coding: '', // 椤圭洰鐮�
         investmentType: '', // 璧勯噾绫诲瀷
         projectPhase: '', // 椤圭洰闃舵
         investType: '', // 鎶曡祫绫诲埆
@@ -389,11 +392,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 +406,8 @@
         projectId: null,
         projectName: ''
       }
+      this.nowProcessDefId = "";
+      this.nowProcessInsId = "";
       this.showRunProcess = false
       this.getList()
     },
@@ -410,7 +416,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 +484,8 @@
       getProjectProcess(this.queryParams).then(response => {
         this.projectInfoList = response.data;
         this.total = response.total;
+        this.loading = false;
       });
-      this.loading = false;
     },
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -528,7 +535,7 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.currentPage = 1;
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */

--
Gitblit v1.8.0