From e57e645d24a89adb3391be16f6948b292183fa04 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 11 二月 2025 14:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectEngineering/projectLibrary/index.vue |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 6abcd02..8979528 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -92,7 +92,7 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="椤圭洰鐮�">
-                    <el-select v-model="queryParams.projectColorCode" clearable placeholder="璇烽�夋嫨" class="select-option"
+                    <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"/>
@@ -196,13 +196,14 @@
       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"/>
       <!-- 鍔ㄦ�佸垪 -->
       <el-table-column
         v-for="item in columns"
+        :key="item.id"
         v-if="item.visible"
         :prop="item.id"
         :label="item.label"
@@ -215,9 +216,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'">
+              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
             </template>
             <!-- projectType鎻掓Ы -->
             <template v-if="item.slotName === 'projectType'">
@@ -235,12 +236,16 @@
             <template v-if="item.slotName === 'planStartTime'">
               {{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '骞�' : '' }}
             </template>
+            <!-- usedStatus鎻掓Ы -->
+            <template v-if="item.slotName === 'usedStatus'">
+              <dict-tag :options="dict.type.sys_used_status" :value="scope.row.usedStatus"/>
+            </template>
           </template>
           <!-- 榛樿鏄剧ず -->
           <span v-else>{{ scope.row[item.id] }}</span>
         </template>
       </el-table-column>
-
+      <el-table-column v-if="this.$route.query.projectCategory==6" label="瀹℃牳澶囨敞" width="140" align="center" prop="remark"/>
       <!-- 鎿嶄綔鍒� -->
       <el-table-column label="鎿嶄綔" width="140" align="center">
         <template slot-scope="scope">
@@ -253,6 +258,7 @@
           </el-button>
           <el-button
             v-if="isReserve"
+            v-hasRole="['user']"
             size="medium"
             type="text"
             icon="el-icon-edit"
@@ -274,7 +280,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+      :page.sync="queryParams.currentPage"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -284,6 +290,7 @@
       :isImportOrExport="isImportOrExport"
       @fileDialogCancel="fileDialogCancel"
       :currentColumns="columns"
+      :dataIdList="ids"
     />
   </div>
 </template>
@@ -297,7 +304,7 @@
 export default {
   dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',
     'sys_funding_type', 'sys_association_status', 'sys_project_status', 'sys_project_code',
-    'sys_project_tags', 'sys_key_categories', 'sys_project_type'],
+    'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status'],
   name: "ProjectInfo",
   components: {
     FileDialog
@@ -337,7 +344,7 @@
       timeRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        pageNum: 1,
+        currentPage: 1,
         pageSize: 10,
         projectName: null,
         projectCode: null,
@@ -348,7 +355,7 @@
         projectType: '', // 椤圭洰绫诲瀷
         importanceType: '', // 閲嶇偣鍒嗙被
         projectStatus: '', // 椤圭洰鐘舵��
-        projectColorCode: '', // 椤圭洰鐮�
+        coding: '', // 椤圭洰鐮�
         investmentType: '', // 璧勯噾绫诲瀷
         projectPhase: '', // 椤圭洰闃舵
         investType: '', // 鎶曡祫绫诲埆
@@ -372,7 +379,7 @@
   created() {
     this.queryParams.importanceType = this.$route.query.importanceType;
     const projectCategory = this.$route.query.projectCategory;
-    if (!projectCategory || projectCategory === '1') {
+    if (!projectCategory || projectCategory === '1' || projectCategory === '6') {
       this.isReserve = true;
     }
     if (projectCategory) {
@@ -399,7 +406,8 @@
     },
     handleDetail(row) {
       this.removeStore();
-      this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true' }});
+      const audit = this.$route.query.projectCategory==='6'? 1:0
+      this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true',audit: audit }});
     },
     // 鏂板椤甸潰
     add() {
@@ -531,7 +539,7 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.currentPage = 1;
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */

--
Gitblit v1.8.0