From 0b1837e9b6d1ac8825e9c1acf6f0cd5b2b14a897 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 04 一月 2023 10:41:00 +0800
Subject: [PATCH] 1.列展示设置   静态框架初步搭建完成

---
 src/views/jcsz/zzjg.vue |  103 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 87 insertions(+), 16 deletions(-)

diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 1abccfb..f7bce7a 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -5,14 +5,13 @@
       <div class="bodyTopButtonGroup">
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
       </div>
-
       <div class="bodyTopFormGroup">
         <el-form
           ref="form"
           :model="form"
-          label-width="80px"
+          label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
             <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
@@ -22,7 +21,13 @@
               <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
-              <el-select v-model="form.OrgType" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+              <el-select
+                v-model="form.OrgType"
+                :popper-append-to-body="false"
+                filterable
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
                 <el-option
                   v-for="item in OrgTypeArr"
                   :key="item.value"
@@ -35,14 +40,23 @@
               <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
           </div>
-          <div style="display: flex;align-items: start;margin-top: 5px;">
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
             <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
         </el-form>
+        <div
+          class="bodyTopFormExpand"
+        />
       </div>
       <div class="elTableDiv">
+        <TableColumnSettings :list1="list1" />
         <el-table
+          ref="tableDataRef"
+          class="tableFixed"
           :data="tableData"
           border
           :row-class-name="tableRowClassName"
@@ -68,18 +82,21 @@
             prop="org_code"
             label="缁勭粐缂栫爜"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="110"
           />
           <el-table-column
             prop="org_name"
             label="缁勭粐鍚嶇О"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="110"
           />
           <el-table-column
             prop="description"
             label="缁勭粐绫诲瀷"
             min-width="110"
+            show-tooltip-when-overflow
             sortable="custom"
           >
             <template slot-scope="{row}">
@@ -94,6 +111,7 @@
             prop="parentorg_name"
             label="涓婄骇鍗曚綅"
             sortable="custom"
+            show-tooltip-when-overflow
             min-widt="110"
           >
             <template slot-scope="{row}">
@@ -105,12 +123,14 @@
             prop="lm_user"
             label="鍒涘缓浜哄憳"
             width="110"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
             width="160"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
@@ -121,11 +141,18 @@
             <template slot-scope="{row}">
               <div class="operationClass">
                 <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
-                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+                  <i
+                    :style="{color:$store.state.settings.theme}"
+                    class="el-icon-edit-outline"
+                    @click="edit('edit',row)"
+                  />
                 </el-tooltip>
                 <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                  <i class="el-icon-delete" @click="del(row.id)" />
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
                 </el-tooltip>
+                <!--                <el-button type="primary" size="mini" />-->
+                <!--                <el-button type="danger" size="mini">鍒犻櫎</el-button>-->
+
               </div>
             </template>
           </el-table-column>
@@ -193,7 +220,12 @@
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
           <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+          <el-button
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
         </div>
       </span>
     </el-dialog>
@@ -205,13 +237,14 @@
 import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
 import { getCookie } from '@/utils/auth'
 import { validateCode } from '@/utils/global'
+import TableColumnSettings from '@/components/TableColumnSettings'
 
 // const SER_HZ = /^[\u4e00-\u9fa5]+$/
 // const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
 export default {
   name: 'ZZJG',
   components: {
-    Pagination
+    Pagination, TableColumnSettings
   },
   data() {
     // const validateName = (rule, value, callback) => {
@@ -254,6 +287,14 @@
         { label: '杞﹂棿', value: 'W' }
         // { label: '绉戝', value: 'K' },
         // { label: '鐢熶骇绾�', value: 'L' }
+      ],
+
+      list1: [
+        { name: '棰勮寮�宸ユ椂闂�', id: 1 },
+        { name: '妤兼潕淇�1', id: 2 },
+        { name: '妤兼潕淇�2', id: 3 },
+        { name: '妤兼潕淇�3', id: 4 },
+        { name: '妤兼潕淇�4', id: 5 }
       ],
 
       total: 10,
@@ -318,6 +359,9 @@
     //   })()
     // }
   },
+  destroyed() {
+
+  },
   methods: {
     async getOrganizationSearch() {
       const res = await OrganizationSearch(this.form)
@@ -356,7 +400,6 @@
         this.SupUnitArr = res
       }
     },
-
     // 鏂板鎸夐挳
     async add(operation) {
       this.operation = operation
@@ -426,6 +469,7 @@
     dialogVisibleConfirm() {
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
           const data = {
             OrganType: this.dialogForm.OrgType === '閮ㄩ棬' ? 'D' : 'W',
             OrganCode: this.dialogForm.OrgCode,
@@ -441,11 +485,13 @@
 
           AddUpdateOrganization(data).then(res => {
             if (res.code === '200') {
-              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
               this.getOrganizationSearch()
+              this.$store.state.app.buttonIsDisabled = false
             } else {
               this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+              this.$store.state.app.buttonIsDisabled = false
             }
           })
         }
@@ -455,11 +501,12 @@
     getHeight() {
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 200
+        this.tableHeight = this.mainHeight - 195
         if (window.innerHeight < 769) {
           this.tableHeight = this.tableHeight - 40
         }
         this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+        this.$refs.tableDataRef.doLayout()
       })
     },
     tableRowClassName({ row, rowIndex }) {
@@ -472,13 +519,15 @@
 <!--鍏叡椤甸潰鏍峰紡-->
 <style lang="scss" scoped>
 $main_color: #42b983;
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
   color: $main_color;
   cursor: pointer;
 }
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
   margin-right: 15px;
 }
+
 ::v-deep .el-button--primary, .el-button--default, .el-button--info {
   height: 34px;
   display: flex;
@@ -536,8 +585,8 @@
   background-color: #f8f8fa;
 }
 
-::v-deep .el-table__body .el-table__row.hover-row td{
-  background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
 }
 
 ::v-deep .el-form--inline .el-form-item__label {
@@ -554,8 +603,30 @@
   margin-bottom: 0;
 }
 
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
+}
+
+//::v-deep .cell {
+//  display: flex;
+//  flex-wrap: nowrap;
+//}
+//
+//::v-deep .has-gutter .cell {
+//  display: flex;
+//  flex-wrap: nowrap;
+//}
 </style>
 <style>
+.osloading {
+  font-size: 30px;
+}
 
 .el-table .custom-row {
   background: #f8f8fa;

--
Gitblit v1.9.3