From 02d6ac5bc723b3001d559a87eb8959f6e0e2abba Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 10:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/MasterData/items.vue |  144 +++++++++++++++++++++++++++++++----------------
 1 files changed, 94 insertions(+), 50 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 02ff88b..49816c3 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,74 +1,118 @@
 <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"
-                       :templateOid="this.templateOid"
-                       @tableDataArray="tableDataArrays"
-
-                        ></master-tree>
-        </basic-container>
-      </el-aside>
-      <el-main>
-<!--        琛ㄦ牸缁勪欢-->
-      <TableCrud :page="this.page"
-                 :codeClassifyOid="this.codeClassifyOid"
-                 :coderuleoid="this.coderuleoid"
-                 @pageSize="pageSizes"
-                 @currentPage="currentPages"
-                 @templateOid="templateOids"
-                 :tableDataArray="tableDataArray"
-      ></TableCrud>
-      </el-main>
-    </el-container>
+  <el-container>
+    <el-aside>
+      <basic-container style="overflow: hidden;">
+        <!--          鏍戠粍浠�-->
+        <master-tree
+          :currentPage="this.currentPage"
+          :pageSize="this.pageSize"
+          @TreeValue="TreeValueEmit"
+          @Treedata="TreedataList"
+          @codeClassifyOid="codeClassifyOidList"
+          @coderuleoid="coderuleoidList"
+          @nodeClick="nodeClick"
+          @tableDataArray="tableDataArrays"
+          @tableHeadBttoms="tableHeadBttoms"
+          @tableHeadDataFateher="tableHeadDatas"
+          @tableHeadFindData="tableHeadFindDatas"
+          @total="totals"
+        >
+        </master-tree>
+      </basic-container>
+    </el-aside>
+    <el-main>
+      <!--        琛ㄦ牸缁勪欢-->
+      <VciMasterCrud
+        :TreeValue="TreeValue"
+        :Treedata="Treedata"
+        :codeClassifyOid="this.codeClassifyOid"
+        :coderuleoid="this.coderuleoid"
+        :isLoading="isLoading"
+        :page="this.page"
+        :tableDataArray="tableDataArray"
+        :tableHeadBtnData="masterVrBtnList"
+        :tableHeadDataFateher="this.tableHeadDataFateher"
+        :tableHeadFindData="tableHeadFindData"
+        :templateOid="templateOid"
+        :total="this.total"
+        @currentPage="currentPages"
+        @pageSize="pageSizes"
+      >
+      </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:[]
+      pageSize: "100",
+      currentPage: "1",
+      codeClassifyOid: "",
+      coderuleoid: "",
+      Treedata: [],
+      templateOid: "",
+      tableDataArray: [],
+      masterVrBtnList: [],
+      tableHeadDataFateher: [],
+      total: "",
+      isLoading: false,
+      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
     },
-    templateOids(val){
-      this.templateOid=val
+    pageSizes(val) {
+      this.pageSize = val
     },
-    tableDataArrays(val){
-      this.tableDataArray=val
-    }
+    currentPages(val) {
+      this.currentPage = val
+    },
+    tableDataArrays(val) {
+      this.tableDataArray = val
+    },
+    totals(val) {
+      this.total = val
+    },
+    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