From 8c2bc4c9cfac26210dd9018482586112469c44c8 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 11 九月 2023 17:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/items.vue | 130 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 64 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 850693c..be13f12 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,97 +1,99 @@
<template>
- <el-container>
- <el-aside>
- <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
-<!-- 鏍戠粍浠�-->
- <master-tree @codeClassifyOid="codeClassifyOidList"
- @coderuleoid="coderuleoidList"
- :pageSize="this.pageSize"
- :currentPage="this.currentPage"
- @tableDataArray="tableDataArrays"
- @tableHeadDataFateher="tableHeadDatas"
- @total="totals"
- @nodeClick="nodeClick"
- ></master-tree>
- </basic-container>
- </el-aside>
- <el-main>
-<!-- 琛ㄦ牸缁勪欢-->
- <TableCrud :page="this.page"
- :codeClassifyOid="this.codeClassifyOid"
- :coderuleoid="this.coderuleoid"
- @pageSize="pageSizes"
- @currentPage="currentPages"
- :tableDataArray="tableDataArray"
- :total="this.total"
- :tableHeadDataFateher="this.tableHeadDataFateher"
- :isLoading="isLoading"
- :templateOid="templateOid"
- ></TableCrud>
- </el-main>
- </el-container>
+ <el-container>
+ <el-aside>
+ <basic-container style="overflow: hidden;">
+ <!-- 鏍戠粍浠�-->
+ <master-tree @codeClassifyOid="codeClassifyOidList" @coderuleoid="coderuleoidList" :pageSize="this.pageSize"
+ :currentPage="this.currentPage" @tableDataArray="tableDataArrays" @tableHeadDataFateher="tableHeadDatas"
+ @tableHeadBttoms="tableHeadBttoms" @total="totals" @nodeClick="nodeClick"
+ @tableHeadFindData="tableHeadFindDatas" @Treedata="TreedataList"></master-tree>
+ </basic-container>
+ </el-aside>
+ <el-main>
+ <!-- 琛ㄦ牸缁勪欢-->
+ <VciMasterCrud :page="this.page" :codeClassifyOid="this.codeClassifyOid" :coderuleoid="this.coderuleoid"
+ @pageSize="pageSizes" @currentPage="currentPages" :tableDataArray="tableDataArray" :total="this.total"
+ :tableHeadDataFateher="this.tableHeadDataFateher" :isLoading="isLoading" :templateOid="templateOid"
+ :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList" :Treedata="Treedata"></VciMasterCrud>
+ </el-main>
+ </el-container>
</template>
<script>
export default {
name: "items.vue",
- data(){
- return{
+ data() {
+ return {
// 鍒嗛〉
page: {
total: 0,
currentPage: 1,
- pageSize: 10,
+ pageSize: 100,
pageSizes: [10, 30, 50, 100, 200],
},
- pageSize:"10",
- currentPage:"1",
- codeClassifyOid:"",
- coderuleoid:"",
- templateOid:"",
- tableDataArray:[],
- tableHeadDataFateher:[],
- total:"",
+ pageSize: "100",
+ currentPage: "1",
+ codeClassifyOid: "",
+ coderuleoid: "",
+ Treedata:[],
+ templateOid: "",
+ tableDataArray: [],
+ masterVrBtnList: [],
+ tableHeadDataFateher: [],
+ total: "",
isLoading: false,
-
+ tableHeadFindData: {}
}
},
created() {
},
- methods:{
- codeClassifyOidList(val){
- this.codeClassifyOid=val;
- console.log(val)
+ methods: {
+ codeClassifyOidList(val) {
+ this.codeClassifyOid = val;
},
- coderuleoidList(val){
- this.coderuleoid=val;
+ coderuleoidList(val) {
+ this.coderuleoid = val;
},
- pageSizes(val){
- this.pageSize=val
+ TreedataList(val){
+ this.Treedata=val
},
- currentPages(val){
- this.currentPage=val
+ pageSizes(val) {
+ this.pageSize = val
},
- tableDataArrays(val){
- this.tableDataArray=val
+ currentPages(val) {
+ this.currentPage = val
},
- totals(val){
- this.total=val
+ tableDataArrays(val) {
+ this.tableDataArray = val
},
- tableHeadDatas(val){
- this.tableHeadDataFateher=val
+ totals(val) {
+ this.total = val
},
- nodeClick(val){
- this.templateOid=val;
- console.log('val',val)
- this.isLoading=true;
+ tableHeadDatas(val) {
+ this.tableHeadDataFateher = val
+ },
+ tableHeadFindDatas(val) {
+ this.tableHeadFindData = val
+ },
+ nodeClick(val) {
+ this.templateOid = val;
+ this.isLoading = true;
setTimeout(() => {
this.isLoading = false;
}, 2000);
-}
+ },
+ tableHeadBttoms(val) {
+ this.masterVrBtnList = val
+ },
}
}
</script>
<style scoped>
-
+.el-aside {
+ height: calc(100% - 30px);
+}
+.el-main {
+ height: calc(100% - 30px);
+}
</style>
--
Gitblit v1.9.3