From 09fff7d4449fe9fe9e8cd1ffca560ff57e22ed5a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:52:34 +0800
Subject: [PATCH] 解决代码冲突
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 452fabc..4121adf 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,8 +1,8 @@
<template>
- <avue-crud :data="data" :option="option" @sort-change="sortChange" @row-update="addUpdate"
+ <avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"
@cell-click="handleRowClick">
<template slot="menuLeft">
- <el-button v-if="attrEditVisible == false" size="small" type="primary" @click="addVisible=true">锛� 娣诲姞</el-button>
+ <el-button v-if="attrEditVisible == false" size="small" type="primary" @click="addVisible=true">锛� 娣诲姞 {{msg}}</el-button>
<el-dialog :visible.sync="addVisible" append-to-body title="浠庝笟鍔＄被鍨嬩腑閫夋嫨灞炴��">
<avue-crud :data="businessData" :option="businessOption"></avue-crud>
</el-dialog>
@@ -176,9 +176,9 @@
<script>
export default {
name: "attrCrud .vue",
+ props: ['ProData'],
data() {
return {
-
CascadeVisible: false,
attrEditVisible: false,
// 绾ц仈鍗曢��
@@ -539,7 +539,7 @@
cell: false,
labelWidth: 110,
width: 125,
- sortable: true,
+ sortable: false,
},
{
label: "灞炴�т腑鏂囧悕绉�",
@@ -753,6 +753,7 @@
},
mounted() {
console.log(this.attrEditVisible)
+ console.log(this.ProData)
},
methods: {
addsHandler(){
@@ -760,6 +761,7 @@
},
// screenEdit(){
// debugger
+
// this.attrEditVisible=true;
// },
// outEdit(){
@@ -858,16 +860,17 @@
},
// 鎺掑簭
sortChange(val) {
- switch (val.order) {
- // case "ascending":
- // this.data = this.data.sort((a,b) => { return b['name'].localeCompare(a['name']) })
- // this.data = this.data.sort((a,b) => { return b['id'].localeCompare(a['id']) })
- // break;
- // case "descending":
- // this.data = this.data.sort((a,b) => { return a['name'].localeCompare(b['name']) })
- // this.data = this.data.sort((a,b) => { return a['id'].localeCompare(b['id']) })
- // break;
- }
+ console.log(val)
+ // switch (val.order) {
+ // // case "ascending":
+ // // this.data = this.data.sort((a,b) => { return b['name'].localeCompare(a['name']) })
+ // // this.data = this.data.sort((a,b) => { return b['id'].localeCompare(a['id']) })
+ // // break;
+ // // case "descending":
+ // // this.data = this.data.sort((a,b) => { return a['name'].localeCompare(b['name']) })
+ // // this.data = this.data.sort((a,b) => { return a['id'].localeCompare(b['id']) })
+ // // break;
+ // }
}
}
}
--
Gitblit v1.9.3