From 2a528d078d48e469bc7cd374b847405194a64a39 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 10 十月 2023 10:45:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/MasterData/items.vue |  130 +++++++++++++++++++++----------------------
 1 files changed, 63 insertions(+), 67 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index e6b5d52..83996ca 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,98 +1,94 @@
 <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"
-                       @tableHeadFindData="tableHeadFindDatas"
-                        ></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"
-      ></VciMasterCrud>
-      </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" @TreeValue="TreeValueEmit"></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" :TreeValue="TreeValue"></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:{}
+      tableHeadFindData: {},
+      TreeValue:''
     }
   },
   created() {
   },
-  methods:{
-    codeClassifyOidList(val){
-      this.codeClassifyOid=val;
-      console.log(val)
+  methods: {
+    TreeValueEmit(val){
+      this.TreeValue=val
     },
-    coderuleoidList(val){
-      this.coderuleoid=val;
+    codeClassifyOidList(val) {
+      this.codeClassifyOid = val;
     },
-    pageSizes(val){
-      this.pageSize=val
+    coderuleoidList(val) {
+      this.coderuleoid = val;
     },
-    currentPages(val){
-      this.currentPage=val
+    TreedataList(val){
+      this.Treedata=val
     },
-    tableDataArrays(val){
-      this.tableDataArray=val
+    pageSizes(val) {
+      this.pageSize = val
     },
-    totals(val){
-      this.total=val
+    currentPages(val) {
+      this.currentPage = val
     },
-    tableHeadDatas(val){
-      this.tableHeadDataFateher=val
+    tableDataArrays(val) {
+      this.tableDataArray = val
     },
-    tableHeadFindDatas(val){
-      this.tableHeadFindData=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>

--
Gitblit v1.9.3