From 3bd55592b33a86c8b0dce21a9e8ea6126b9c2d94 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:36:44 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/projectEngineering/projectLibrary/index.vue | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 2698103..4e15aeb 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -205,7 +205,6 @@
<!-- 鍔ㄦ�佸垪 -->
<el-table-column
v-for="item in columnsNew"
- :key="item.columns"
v-if="item.visible"
:prop="item.columns"
:label="item.label"
@@ -242,15 +241,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 +447,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 +483,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 +543,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 +582,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