From 41aacf110288329a6beb494ccccaeabd217a08b9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/loge.vue |   83 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 136ec29..023a104 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -3,7 +3,7 @@
   <basic-container>
     <avue-crud :option="option"
                :table-loading="loading"
-               :data="data"
+               :data="data || getList"
                :page.sync="page"
                :permission="permissionList"
                ref="crud"
@@ -16,14 +16,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot-scope="scope" slot="menuLeft">
-        <vci-docking-search :SearchObject="SearchObject" :page="page"></vci-docking-search>
+        <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
       </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-import {getList} from "@/api/docking/loge";
+import {getLogoList} from "@/api/docking/loge";
 import {validatenull} from "@/util/validate";
 import {mapGetters} from "vuex";
 
@@ -32,8 +32,23 @@
   data(){
     return {
       value:'',
-      SearchObject:{
+      //鍚勪釜绫诲瀷鐘舵��
+      status:{
         type:'loge',
+        typeFlag:false,
+        dateFlag:false,
+        stateFlag:false,
+      },
+      //model缁戝畾
+      formInline:{
+        type:'',
+        cut:'',
+        text:'',
+        Date:'',
+        state:''
+      },
+      //闆嗘垚绫诲瀷姝绘暟鎹�
+      SearchObject:{
         searchData:[
           {
             label:'鏁版嵁缂栫爜',
@@ -75,6 +90,20 @@
             prop: 'interfaceStatus',
             value:7
           },
+          {
+            label: '鏍囧噯鐢宠',
+            prop: 'applyCodeForBZ',
+            value:8          },
+          {
+            label: '閮ㄩ棬鐢宠',
+            prop: 'syncDataForOrg',
+            value:9
+          },
+          {
+            label: '浜哄憳鐢宠',
+            prop: 'syncDataForPerson',
+            value:10
+          },
         ],
       },
       loading: false,
@@ -89,9 +118,9 @@
       option: {
         height:'auto',
         calcHeight: 0,
+        columnBtn:false,
         tip: false,
         searchShow: false,
-        // searchMenuSpan: 12,
         border: true,
         index: true,
         viewBtn: true,
@@ -125,6 +154,24 @@
             sortable:true,
             overHidden: true,
             width: 140
+          },
+          {
+            label: '鏍囧噯鐢宠',
+            prop: 'applyCodeForBZ',
+            sortable:true,
+            width: 130
+          },
+          {
+            label: '閮ㄩ棬鐢宠',
+            prop: 'syncDataForOrg',
+            sortable:true,
+            width: 130
+          },
+          {
+            label: '浜哄憳鐢宠',
+            prop: 'syncDataForPerson',
+            sortable:true,
+            width: 130
           },
           {
             label: '闆嗘垚绯荤粺缂栧彿',
@@ -184,7 +231,7 @@
               value: "key"
             },
             formatter : function (row, column) {
-              return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: limegreen;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: red;font-size: 20px;font-weight: 800"></i>'
+              return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
             }
           },
         ]
@@ -203,6 +250,12 @@
     }
   },
   methods: {
+    dockingGetList(val){
+      this.data=val.records;
+      this.page.pageSize=val.size;
+      this.page.currentPage=val.current;
+      this.page.total=val.total;
+    },
     async cellDbClick(row, column, cell, event) {
       for (const key in row) {
         if (key === column.property) {
@@ -250,7 +303,7 @@
           query['conditionMap["' + key + '"]'] = this.query[key];
         }
       }
-      getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+      getLogoList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
@@ -266,6 +319,20 @@
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+// 婊氬姩鏉℃牱寮忎慨鏀�
+// 婊氬姩鏉＄殑瀹藉害
+   /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+     height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+   background: white;
+     border: white;
+     width: 10px;
 
+   }
+// 婊氬姩鏉＄殑婊戝潡
+   /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+     background-color: #ececec;
+     border-radius: 20px;
+     border: #ececec;
+   }
 </style>

--
Gitblit v1.9.3