From cd8b7ff53f570dfe2447028eb2331eb9cbdc00e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 三月 2025 23:43:38 +0800
Subject: [PATCH] 项目查询条件完善

---
 src/views/projectEngineering/projectLibrary/index.vue |  102 ++++++++++++++++++++++++--------------------------
 1 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 2698103..f92d6b6 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -70,15 +70,6 @@
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="椤圭洰鏍囩">
-                    <el-select v-model="queryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option"
-                               @change="handleQuery">
-                      <el-option v-for="item in dict.type.sys_project_tags" :key="item.value" :label="item.label"
-                                 :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
                   <el-form-item label="椤圭洰鐘舵��">
                     <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable
                                @change="handleQuery"
@@ -88,8 +79,6 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
                 <el-col :span="12">
                   <el-form-item label="椤圭洰鐮�">
                     <el-select v-model="queryParams.coding" clearable placeholder="璇烽�夋嫨" class="select-option"
@@ -99,20 +88,13 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
-                  <el-form-item label="鍏宠仈鐘舵��">
-                    <el-select v-model="queryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option"
-                               @change="handleQuery">
-                      <el-option v-for="item in dict.type.sys_association_status" :key="item.value" :label="item.label"
-                                 :value="item.value"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+              </el-row>
+              <el-row>
               </el-row>
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="璧勯噾绫诲瀷">
-                    <el-select v-model="queryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option"
+                    <el-select v-model="queryParams.fundType" clearable placeholder="璇烽�夋嫨" class="select-option"
                                @change="handleQuery">
                       <el-option v-for="item in dict.type.sys_funding_type" :key="item.value" :label="item.label"
                                  :value="item.value"/>
@@ -205,7 +187,6 @@
       <!-- 鍔ㄦ�佸垪 -->
       <el-table-column
         v-for="item in columnsNew"
-        :key="item.columns"
         v-if="item.visible"
         :prop="item.columns"
         :label="item.label"
@@ -221,6 +202,14 @@
             <!-- coding鎻掓Ы -->
             <template v-if="item.slotName === 'coding'">
               <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
+            </template>
+            <!-- 琛屾斂鍖哄垝鎻掓Ы -->
+            <template v-if="item.slotName === 'area'">
+              <dict-tag :options="dict.type.sys_administrative_divisions" :value="scope.row.area"/>
+            </template>
+            <!-- 璧勯噾绫诲瀷鎻掓Ы -->
+            <template v-if="item.slotName === 'fundType'">
+              <dict-tag :options="dict.type.sys_funding_type" :value="scope.row.fundType"/>
             </template>
             <!-- projectType鎻掓Ы -->
             <template v-if="item.slotName === 'projectType'">
@@ -242,15 +231,21 @@
             <template v-if="item.slotName === 'importanceType'">
               <dict-tag :options="dict.type.sys_key_categories" :value="scope.row.importanceType"/>
             </template>
-            <!-- planStartTime -->
-            <template v-if="item.slotName === 'planStartTime'">
-              {{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '骞�' : '' }}
+            <!-- plannedStartDate -->
+            <template v-if="item.slotName === 'plannedStartDate'">
+              {{ scope.row.plannedStartDate ? scope.row.plannedStartDate.split('-')[0] + '骞�' : '' }}
             </template>
             <!-- usedStatus鎻掓Ы -->
             <template v-if="item.slotName === 'usedStatus'">
               <dict-tag :options="dict.type.sys_used_status" :value="scope.row.usedStatus"/>
             </template>
+            <!-- planStartTime -->
+            <template v-else-if="item.slotName === 'planStartTime'">
+              {{ scope.row.planStartTime ? scope.row.planStartTime.split(' ')[0] : '' }}
+            </template>
           </template>
+          <!-- 杞崲璁″垝寮�宸ユ牱寮� 绌烘牸鍒囧壊鏁扮粍 -->
+
           <!-- 榛樿鏄剧ず -->
           <span v-else>{{ scope.row[item.columns] }}</span>
         </template>
@@ -442,8 +437,8 @@
         //杞崲
          res.data.forEach((item,index)=>{
            item.index = index + 1;
-           item.key = index;
            item.label = item.name;
+
           if(item.display === '0'){
             item.visible = false
           }else {
@@ -478,9 +473,7 @@
       //杞崲
       data.forEach((item,index)=>{
         item.index = index + 1;
-        item.key = index;
         item.label = item.name;
-        // item.slotName = item.columns;
         if(item.display === '0'){
           item.visible = false
         }else {
@@ -540,28 +533,28 @@
       localStorage.removeItem("documentsInfoForm")
     },
 
-    save(){
-      const list =current.map((item, index) => {
-            item.name = item.label;
-            item.sort = index + 1;
-            item.columns = item.id;
-            item.id = 0;
-            if(item.slotName === undefined){
-              item.slotName = null;
-            }
-            if(item.visible){
-              item.display = "1";
-            }else {
-              item.display ="0";
-            }
-            return item;
-          });
-      console.log(list)
-      addList(list).then(res=>{
-        console.log(res.msg)
-      })
-
-    },
+    // save(){
+    //   const list =current.map((item, index) => {
+    //         item.name = item.label;
+    //         item.sort = index + 1;
+    //         item.columns = item.id;
+    //         item.id = 0;
+    //         if(item.slotName === undefined){
+    //           item.slotName = null;
+    //         }
+    //         if(item.visible){
+    //           item.display = "1";
+    //         }else {
+    //           item.display ="0";
+    //         }
+    //         return item;
+    //       });
+    //   console.log(list)
+    //   addList(list).then(res=>{
+    //     console.log(res.msg)
+    //   })
+    //
+    // },
     // 閲嶇疆鎺掑簭鐨勬柟娉�
     handleResetSort() {
       this.hiddenColumnsList();
@@ -579,22 +572,25 @@
       });
 
     },
+    //鐐瑰嚮鎺掑簭鍔犲噺鏇存柊
     handleUpdateSort(row) {
       //鏇挎崲琛ㄥご鍏冪礌
       this.columnsNew = this.columnsNew.map(item => {
-        if (item.columns === row.columns) {
+        if (item.id === row.id) {
           return row;
         }
         return item;
       });
       //鏇挎崲浼犲叆鏄鹃殣缁勪欢鏁版嵁
       this.defaultColumns = this.defaultColumns.map(item => {
-        if (item.columns === row.columns) {
+        if (item.id === row.id) {
           return row;
         }
         return item;
       });
-      this.defaultColumns = this.defaultColumns.sort((a, b) => a.sort - b.sort);
+      //鏄鹃殣鎺掑簭
+      this.defaultColumns.sort((a, b) => a.sort - b.sort);
+      //涓婚〉琛ㄥご鏁版嵁鎺掑簭
       this.columnsNew.sort((a, b) => a.sort - b.sort);
 
       //寮哄埗table娓叉煋

--
Gitblit v1.8.0