From 84a14c24edf92f7072e50b51ee37143d658ecfd4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 11 三月 2025 14:28:09 +0800
Subject: [PATCH] 项目库展示总年度投资金额

---
 src/views/projectEngineering/projectLibrary/index.vue |  487 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 346 insertions(+), 141 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index fbbe70d..ac4390f 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -29,10 +29,10 @@
             <el-date-picker
               style="width: 270px"
               size="small"
-              v-model="queryParams[timeRange]"
+              v-model="timeRange"
               type="daterange"
               range-separator="-"
-              value-format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="寮�濮嬫棩鏈�"
               end-placeholder="缁撴潫鏃ユ湡"
               @change="handleQuery"
@@ -50,7 +50,8 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="椤圭洰绫诲瀷">
-                    <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery"
+                    <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option"
+                               @change="handleQuery"
                                size="small">
                       <el-option v-for="item in dict.type.sys_project_type" :key="item.value" :label="item.label"
                                  :value="item.value"/>
@@ -59,7 +60,8 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="閲嶇偣鍒嗙被">
-                    <el-select v-model="queryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+                    <el-select v-model="queryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option"
+                               @change="handleQuery">
                       <el-option v-for="item in dict.type.sys_key_categories" :key="item.value" :label="item.label"
                                  :value="item.value"/>
                     </el-select>
@@ -69,7 +71,8 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="椤圭洰鏍囩">
-                    <el-select v-model="queryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+                    <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>
@@ -77,7 +80,8 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="椤圭洰鐘舵��">
-                    <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable @change="handleQuery"
+                    <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable
+                               @change="handleQuery"
                                placeholder="璇烽�夋嫨" class="select-option">
                       <el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"
                                  :value="item.value"/>
@@ -88,7 +92,8 @@
               <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>
@@ -96,7 +101,8 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="鍏宠仈鐘舵��">
-                    <el-select v-model="queryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+                    <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>
@@ -106,7 +112,8 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="璧勯噾绫诲瀷">
-                    <el-select v-model="queryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+                    <el-select v-model="queryParams.investmentType" 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"/>
                     </el-select>
@@ -114,7 +121,8 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="椤圭洰闃舵">
-                    <el-select v-model="queryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+                    <el-select v-model="queryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option"
+                               @change="handleQuery">
                       <el-option v-for="item in dict.type.sys_project_phases" :key="item.value" :label="item.label"
                                  :value="item.value"/>
                     </el-select>
@@ -124,7 +132,8 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="鎶曡祫绫诲埆">
-                    <el-select v-model="queryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
+                    <el-select v-model="queryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option"
+                               @change="handleQuery">
                       <el-option v-for="item in dict.type.sys_investment_type" :key="item.value" :label="item.label"
                                  :value="item.value"/>
                     </el-select>
@@ -132,15 +141,17 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="琛屾斂鍖哄垝">
-                    <el-select v-model="queryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
-                      <el-option v-for="item in dict.type.sys_administrative_divisions" :key="item.value" :label="item.label"
+                    <el-select v-model="queryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option"
+                               @change="handleQuery">
+                      <el-option v-for="item in dict.type.sys_administrative_divisions" :key="item.value"
+                                 :label="item.label"
                                  :value="item.value"/>
                     </el-select>
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
-            <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff"  slot="reference"
+            <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" slot="reference"
                        size="small">
               鏇村绛涙煡鏉′欢
               <span style="margin-left: 5px">
@@ -169,15 +180,17 @@
           <VisibilityToolbar
             v-model:showSearch="showSearch"
             :columns="defaultColumns"
+            :hiddenTotal="hiddenTotal"
             @queryTable="handleQuery"
             @update:sort="handleUpdateSort"
             @update:columns="handleUpdateColumns"
             @update:resetSort="handleResetSort"
+            @update:page="handlePage"
           ></VisibilityToolbar>
         </div>
       </div>
     </el-form>
-
+<!--  <el-button  type="primary" @click="save">鍒濆鍖栨坊鍔爈ist.js</el-button>-->
     <el-table
       :key="tableKey"
       ref="elTable"
@@ -185,16 +198,16 @@
       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-for="item in columnsNew"
+        :key="item.columns"
         v-if="item.visible"
-        :prop="item.id"
+        :prop="item.columns"
         :label="item.label"
         :min-width="item.minWidth"
       >
@@ -203,56 +216,90 @@
           <template v-if="item.slotName">
             <!-- projectStatus鎻掓Ы -->
             <template v-if="item.slotName === 'projectStatus'">
-              <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
+              <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
             </template>
-            <!-- projectColorCode鎻掓Ы -->
-            <template v-if="item.slotName === 'projectColorCode'">
-              <div class="mx-1 has-dot">{{ '鑷畾涔夋牱寮�' }}<span class="dot" style="margin-left: 5px"></span></div>
+            <!-- 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'">
-              <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
+              <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
+            </template>
+            <!-- attractInvestment鎻掓Ы -->
+            <template v-if="item.slotName === 'attractInvestment'">
+              <dict-tag :options="dict.type.attract_investment" :value="scope.row.attractInvestment"/>
+            </template>
+            <!-- constructionNature鎻掓Ы -->
+            <template v-if="item.slotName === 'constructionNature'">
+              <dict-tag :options="dict.type.construction_nature" :value="scope.row.constructionNature"/>
             </template>
             <!-- investType鎻掓Ы -->
             <template v-if="item.slotName === 'investType'">
-              <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
+              <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
             </template>
-            <!-- planStartTime鎻掓Ы -->
+            <!-- importanceType鎻掓Ы -->
+            <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] + '骞�' : '' }}
+            </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>
+          <span v-else>{{ scope.row[item.columns] }}</span>
         </template>
       </el-table-column>
-
+      <el-table-column v-if="this.$route.query.projectPhase==6" label="瀹℃牳澶囨敞" width="140" align="center" prop="remark"/>
       <!-- 鎿嶄綔鍒� -->
-      <el-table-column label="鎿嶄綔" width="140" align="center" >
+      <el-table-column label="鎿嶄綔" width="140" align="center">
         <template slot-scope="scope">
-          <el-button
-            size="medium"
-            type="text"
-            icon="el-icon-view"
-            @click="handleDetail(scope.row)"
-          >
-          </el-button>
-          <el-button
-            v-if="isReserve"
-            size="medium"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >
-          </el-button>
-          <el-button
-            v-if="isReserve"
-            size="medium"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >
-          </el-button>
+          <el-tooltip class="item" effect="dark" content="瀹℃牳" placement="top">
+            <el-button
+              v-if="scope.row.auditRole && $route.query.projectPhase==='6' && scope.row.usedStatus === 1"
+              size="medium"
+              type="text"
+              icon="el-icon-circle-check"
+              @click="handleDetail(scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="璇︽儏" placement="top">
+            <el-button
+              size="medium"
+              type="text"
+              icon="el-icon-view"
+              @click="handleDetail(scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+            <el-button
+              v-if="isReserve"
+              v-hasRole="['user']"
+              size="medium"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
+            <el-button
+              v-if="isReserve"
+              size="medium"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+
         </template>
       </el-table-column>
     </el-table>
@@ -260,30 +307,33 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+      :page.sync="queryParams.currentPage"
       :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+      @pagination="() => getList(null)"
     />
 
     <FileDialog
       :fileDialogVisible.sync="fileDialogVisible"
       :isImportOrExport="isImportOrExport"
       @fileDialogCancel="fileDialogCancel"
-      :currentColumns="columns"
+      :currentColumns="columnsNew"
+      :dataIdList="ids"
     />
   </div>
 </template>
 
 <script>
-import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
+import {listProject, getProject, delProject, addProject, updateProject,getHiddenList,addList} from "@/api/projectEngineering/projectInfo";
 import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
-import FileDialog from '@/views/projectEngineering/component/FileDialog';
+import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
+import Cookies from "js-cookie";
+import {getChildList} from "@/api/system/dict/data";
 
 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'],
-  name: "projectInfo",
+    'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status', 'construction_nature', 'attract_investment'],
+  name: "ProjectInfo",
   components: {
     FileDialog
   },
@@ -296,8 +346,13 @@
       //椤圭洰鐘舵�佺瓫閫夋潯浠�
       isProjectCategory: false,
       //琛ㄥご
-      columns: [],
+      columnsNew: [],
+      //鏄鹃殣缁勪欢鐨勮〃澶撮泦鍚�
       defaultColumns: [],
+      //閲嶇疆琛ㄥご
+      resetColumns:[],
+      //鏄鹃殣缁勪欢鐨勬煡璇㈡�绘暟
+      hiddenTotal: 0,
       //鎺у埗鏇村绛涢�夋樉闅�
       popoverValue: false,
       // 閬僵灞�
@@ -322,16 +377,23 @@
       timeRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        pageNum: 1,
+        currentPage: 1,
         pageSize: 10,
+        center: 0,  // 1 浠h〃椤圭洰涓績
         projectName: null,
         projectCode: null,
+        projectStartTime: null,
+        projectEndTime: null,
+      },
+      //鏄鹃殣鍒楄〃鏌ヨ鍙傛暟
+      pageQueryParams:{
+        currentPage: 1,
       },
       moreQueryParams: {
         projectType: '', // 椤圭洰绫诲瀷
         importanceType: '', // 閲嶇偣鍒嗙被
         projectStatus: '', // 椤圭洰鐘舵��
-        projectColorCode: '', // 椤圭洰鐮�
+        coding: '', // 椤圭洰鐮�
         investmentType: '', // 璧勯噾绫诲瀷
         projectPhase: '', // 椤圭洰闃舵
         investType: '', // 鎶曡祫绫诲埆
@@ -353,43 +415,215 @@
     };
   },
   created() {
-    const projectCategory = this.$route.query.projectCategory;
-    if(!projectCategory || projectCategory === '1'){
+    this.queryParams.importanceType = this.$route.query.importanceType;
+    const projectPhase = this.$route.query.projectPhase;
+    if (projectPhase === '6') {
+      this.queryParams.center = 1
+    }
+    if (!projectPhase || projectPhase === '1' || projectPhase === '6') {
       this.isReserve = true;
     }
-    if(projectCategory){
+    if (projectPhase) {
       this.isProjectCategory = true;
     }
-    const columns = current.map((item, index) => {
-      item.index = index + 1;
-      item.key = index;
-      item.serialNumber = index + 1;
-      return item;
-    });
-    this.columns = columns;
-    this.defaultColumns = JSON.parse(JSON.stringify(columns));
-    this.getList();
+    // const columns = current.map((item, index) => {
+    //   item.index = index + 1;
+    //   item.key = index;
+    //   item.serialNumber = index + 1;
+    //   if(item.id ==='usedStatus' ){
+    //     if(projectPhase !== '6') {
+    //       item.visible = false
+    //     }  else {
+    //       item.visible = true
+    //     }
+    //   }
+    //   return item;
+    // });
+    // this.columns = columns;
+    // this.defaultColumns = JSON.parse(JSON.stringify(columns));
+    this.hiddenList();
+
+    this.getList(this.$route.query.projectPhase == '5' || this.$route.query.projectPhase == '6' ? null : this.$route.query.projectPhase);
+  },
+  beforeDestroy() {
+    this.removeStore();
   },
   methods: {
+    hiddenList(){
+       getHiddenList().then(res =>{
+        const projectPhase = this.$route.query.projectPhase;
+        //杞崲
+         res.data.forEach((item,index)=>{
+           item.index = index + 1;
+           item.key = index;
+           item.serialNumber = item.sort;
+           item.label = item.name;
+           // item.slotName = item.columns;
+          if(item.display === '0'){
+            item.visible = false
+          }else {
+            item.visible = true;
+          }
+          if(item.columns ==='usedStatus' ){
+            if(projectPhase !== '6') {
+              item.visible = false
+            }  else {
+              item.visible = true
+            }
+          }
+        });
+
+        this.defaultColumns = res.data;
+        this.columnsNew = res.data;
+        console.log(this.columnsNew)
+        this.hiddenTotal = res.total;
+      })
+
+    },
+    // async getProjectSubType(projectType, projectSubType) {
+    //   if (!projectType || !projectSubType) {
+    //     return ''
+    //   }
+    //   let value = '';
+    //   // 鏍规嵁椤圭洰绫诲瀷鏌ュ瓙绫诲瀷
+    //   const projectTypeItem = this.dict.type.sys_project_type.find(item => item.raw.dictValue === projectType);
+    //   if (projectTypeItem) {
+    //     const res = await getChildList(projectTypeItem.raw.dictCode);
+    //     const target = res.data.filter(item => item.dictValue === projectSubType);
+    //     if (target && target.length > 0) {
+    //       value = target[0].dictLabel;
+    //       console.log(value);
+    //     }
+    //   }
+    //   console.log("鎷垮埌鍊间簡", value);
+    //   return value;
+    // },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.removeStore();
+      this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id}});
+    },
+    handleDetail(row) {
+      this.removeStore();
+      const audit = this.$route.query.projectPhase==='6'? 1:0
+      this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true',audit: audit }});
+    },
+    // 鏂板椤甸潰
+    add() {
+      this.removeStore();
+      this.$router.push({path: '/projectEngineering/project/ProjectDetails'});
+    },
+    //娓呯悊缂撳瓨
+    removeStore() {
+      localStorage.removeItem("projectForm")
+      localStorage.removeItem("investmentForm")
+      localStorage.removeItem("investmentFundsForm")
+      localStorage.removeItem("legalPersonForm")
+      localStorage.removeItem("policyInfoForm")
+      localStorage.removeItem("documentsInfoForm")
+    },
+    //闅愯棌鍒楄〃缈婚〉
+    handlePage(page){
+
+      this.pageQueryParams.currentPage = page;
+      getHiddenList(this.pageQueryParams).then(res =>{
+        this.buildColumns(res.data);
+      })
+    },
+    buildColumns(data){
+        const projectPhase = this.$route.query.projectPhase;
+        //杞崲
+        data.forEach((item,index)=>{
+          item.index = index + 1;
+          item.key = index;
+          item.serialNumber = item.sort;
+          item.label = item.name;
+          // item.slotName = item.columns;
+          if(item.display === '0'){
+            item.visible = false
+          }else {
+            item.visible = true;
+          }
+          if(item.columns ==='usedStatus' ){
+            if(projectPhase !== '6') {
+              item.visible = false
+            }  else {
+              item.visible = true
+            }
+          }
+        });
+        this.columnsNew = data;
+        this.defaultColumns = data;
+
+    },
+    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.defaultColumns = currentRest.map((item, index) => {
-        item.index = index + 1;
-        item.key = index;
-        item.serialNumber = index + 1
-        return item;
-      });
-      this.columns = currentRest.map((item, index) => {
-        item.index = index + 1;
-        item.key = index;
-        item.serialNumber = index + 1
-        return item;
-      });
+      this.hiddenList()
+      // const projectPhase = this.$route.query.projectPhase;
+      // this.defaultColumns= currentRest.map((item, index) => {
+      //   item.index = index + 1;
+      //   item.key = index;
+      //   item.serialNumber = index + 1
+      //   if(item.id ==='usedStatus' ){
+      //     if(projectPhase !== '6') {
+      //       item.visible = false
+      //     }  else {
+      //       item.visible = true
+      //     }
+      //   }
+      //   return item;
+      // });
+
+
+      // this.columnsNew = currentRest.map((item, index) => {
+      //   item.index = index + 1;
+      //   item.key = index;
+      //   item.serialNumber = index + 1
+      //   if(item.id ==='usedStatus' ){
+      //     if(projectPhase !== '6') {
+      //       item.visible = false
+      //     }  else {
+      //       item.visible = true
+      //     }
+      //   }
+      //   return item;
+      // });
+      //寮哄埗table娓叉煋
+
+      // this.defaultColumns = this.resetColumns;
+      //
+      //
+      // this.columnsNew = this.resetColumns;
+
+      this.tableKey = this.tableKey + 1;
     },
     // 鏇存柊鍒楃殑鏂规硶
     handleUpdateColumns(row) {
       // this.currentColumns = row;
-      this.columns = this.columns.map(item => {
+      row.key = Number(row.key)
+      this.columnsNew = this.columnsNew.map(item => {
         if (item.key === row.key) {
           return row;
         }
@@ -397,18 +631,18 @@
       });
     },
     handleUpdateSort(row) {
-      console.log( this.columns, '鎺掑簭鍓嶇殑鍒�');
-      this.columns = this.columns.map(item => {
+      console.log(this.columnsNew, '鎺掑簭鍓嶇殑鍒�');
+      this.columnsNew = this.columnsNew.map(item => {
         if (item.key === row.key) {
           return row;
         }
         return item;
       });
-      this.defaultColumns = JSON.parse(JSON.stringify(this.columns)).sort((a, b) => a.index - b.index);
-      this.columns.sort((a, b) => a.serialNumber - b.serialNumber);
+      this.defaultColumns = this.columnsNew.sort((a, b) => a.index - b.index);
+      this.columnsNew.sort((a, b) => a.serialNumber - b.serialNumber);
       //寮哄埗table娓叉煋
-      this.tableKey = this.tableKey +1;
-      console.log( this.columns, '鎺掑簭鍚庣殑鍒�');
+      this.tableKey = this.tableKey + 1;
+      console.log(this.columnsNew, '鎺掑簭鍚庣殑鍒�');
     },
     // 鍏抽棴鏂囦欢澶勭悊寮规鐨勬柟娉�
     fileDialogCancel() {
@@ -424,13 +658,20 @@
       this.popoverValue = false;
     },
     /** 鏌ヨ椤圭洰绠$悊鍩虹淇℃伅鍒楄〃 */
-    getList() {
+    getList(projectPhase) {
       this.loading = true;
-      listInfo(this.queryParams).then(response => {
+      if (projectPhase) {
+        this.queryParams.projectPhase = projectPhase;
+      }
+      if (this.timeRange) {
+        this.queryParams.projectStartTime = this.timeRange[0]
+        this.queryParams.projectEndTime = this.timeRange[1]
+      }
+      listProject(this.queryParams).then(response => {
         this.projectInfoList = response.data;
         this.total = response.total;
+        this.loading = false;
       });
-      this.loading = false;
     },
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -480,8 +721,8 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.currentPage = 1;
+      this.getList(null);
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
@@ -494,47 +735,12 @@
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /** 鏂板鎸夐挳鎿嶄綔 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "娣诲姞椤圭洰绠$悊鍩虹淇℃伅";
-    },
-    /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getInfo(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "淇敼椤圭洰绠$悊鍩虹淇℃伅";
-      });
-    },
-    /** 鎻愪氦鎸夐挳 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateInfo(this.form).then(response => {
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addInfo(this.form).then(response => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
+
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰绠$悊鍩虹淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
-        return delInfo(ids);
+      this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰:"' + row.projectName + '"鐨勬暟鎹」锛�').then(function () {
+        return delProject(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
@@ -548,9 +754,8 @@
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
-      this.download('code/info/export', {
-        ...this.queryParams
-      }, `info_${new Date().getTime()}.xlsx`)
+      this.isImportOrExport = true;
+      this.fileDialogVisible = true;
     }
   }
 };

--
Gitblit v1.8.0