From 6c66123ec863c89a25b3e36e3e4059423beb0854 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 18 三月 2025 09:15:44 +0800 Subject: [PATCH] Merge branch 'dev' --- src/views/projectEngineering/projectLibrary/index.vue | 58 ++++++++++++++-------------- src/views/projectEngineering/projectLibrary/component/legalPerson.vue | 5 +- src/components/VisibilityToolbar/index.vue | 10 +++-- 3 files changed, 38 insertions(+), 35 deletions(-) diff --git a/src/components/VisibilityToolbar/index.vue b/src/components/VisibilityToolbar/index.vue index 9471870..9f875e7 100644 --- a/src/components/VisibilityToolbar/index.vue +++ b/src/components/VisibilityToolbar/index.vue @@ -23,10 +23,10 @@ <span>淇℃伅鏄鹃殣绛涢��</span> </div> <div slot="default" style="margin-left: 20px;margin-top: 20px"> - <el-table :data="getPage" style="width: 95%; height: 80%;;margin-bottom: 40px;"> + <el-table :row-key="row => { return row.id }" :data="getPage" style="width: 95%; height: 80%;;margin-bottom: 40px;" > <el-table-column prop="index" label="搴忓彿" width="80"></el-table-column> <el-table-column prop="label" label="鏁版嵁鍚嶇О"></el-table-column> - <el-table-column prop="visible" label="鏄惁鏄剧ず"> + <el-table-column prop="visible" label="鏄惁鏄剧ず" > <template slot-scope="scope"> <el-switch v-model="scope.row.visible" @@ -37,9 +37,10 @@ ></el-switch> </template> </el-table-column> - <el-table-column prop="date" label="鎺掑簭"> + <el-table-column prop="sort" label="鎺掑簭"> <template slot-scope="scope"> - <el-input-number v-model="scope.row.sort" :min="0" style="width: 120px" @change="sortChange(scope.row, $event)"></el-input-number> + <el-input-number v-model="scope.row.sort" :min="0" style="width: 120px" + @change="sortChange(scope.row, $event)"></el-input-number> </template> </el-table-column> </el-table> @@ -148,6 +149,7 @@ this.saveList.push(row) } } + console this.$emit('update:columns', row); }, handlePageChange(page) { diff --git a/src/views/projectEngineering/projectLibrary/component/legalPerson.vue b/src/views/projectEngineering/projectLibrary/component/legalPerson.vue index 26a9ed0..72aa0c8 100644 --- a/src/views/projectEngineering/projectLibrary/component/legalPerson.vue +++ b/src/views/projectEngineering/projectLibrary/component/legalPerson.vue @@ -246,7 +246,7 @@ } this.legalPersonForm.projectId = this.projectForm.id; - this.handleBlur(); + }, beforeDestroy() { if(Object.keys(this.legalPersonForm).length !==0) localStorage.setItem("legalPersonForm", JSON.stringify(this.legalPersonForm)); @@ -258,6 +258,7 @@ this.options.forEach(item => { if (item.id === row) { this.legalPersonForm = item; + this.legalPersonForm.id = null; } }) } @@ -265,7 +266,7 @@ }, //椤圭洰鍗曚綅杈撳叆鏃惰Е鍙� handleBlur(query){ - console.log(query) + this.legalPersonForm.projectUnit = query; if (this.legalPersonForm.projectUnit !== null && this.legalPersonForm.projectUnit !== '' && this.legalPersonForm.projectUnit !== undefined){ getUnitRegistrationInfoByName(this.legalPersonForm).then(res =>{ diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue index 2698103..307ef4c 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" @@ -442,8 +441,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 +477,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 +537,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 +576,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