From 200cc509b36992d4547efb19ede53ac537494646 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 08 Nov 2023 16:19:52 +0800
Subject: [PATCH] Merge branch 'feature_1.0'

---
 src/views/list/Unit.vue |   76 ++++++++++---------------------------
 1 files changed, 21 insertions(+), 55 deletions(-)

diff --git a/src/views/list/Unit.vue b/src/views/list/Unit.vue
index 511d816..2b831ab 100644
--- a/src/views/list/Unit.vue
+++ b/src/views/list/Unit.vue
@@ -80,6 +80,7 @@
           <a-cascader
             v-model="editForm.parentCode"
             placeholder="���������"
+            change-on-select
             :options="newParentListOptions"
             @change="positionLevel"
             :disabled="pageState === 'view'"
@@ -200,15 +201,16 @@
         unitName:'',
         parentCode: [],
         areaCode:'',
-        state:Number,
+        state:'0',
     }
 
   private pagination:any={
     total:0,
     current:1,
-    pageSize:5,
-    showSizeChanger: false,
-    showQuickJumper: false,
+    pageSize:10,
+    showSizeChanger: true,
+    showQuickJumper: true,
+    showTotal: (total:number) => `������ ${this.pagination.total} ���������`,  //���������������������������
   };
 
     @Watch('serch.name')
@@ -293,17 +295,20 @@
             areaCode:this.serch.areaCode,
             current: this.pagination.current,
             page:1,
-            size: 20
+            size: this.pagination.pageSize
         }).then(res=>{
-          this.dataSource =res.data.data.item
+          this.dataSource = res.data.data.item
+          this.pagination.total = res.data.data.total
         })
         .catch(err=>{
             console.log(err);
         })
     }
 
-    private handlerTableChange(pagination: any, filter: any, sorter: any): void {
+  private handlerTableChange(pagination: any, filter: any, sorter: any): void {
+      console.log(pagination)
       this.pagination.current = pagination.current
+      this.pagination.pageSize = pagination.pageSize
       this.pagination.total = pagination.total
       this.handleSearch()
     }
@@ -326,7 +331,7 @@
             parentCode: code,
             parentCodeList:this.editForm.parentCode,
             areaCode: this.editForm.areaCode,
-            state:this.editForm.state
+            state:parseInt(this.editForm.state)
         }).then((res: any) => {
            this.handleSearch()
           this.visibleCreateModal = false
@@ -334,7 +339,7 @@
             unitName:'',
             parentCode: [],
             areaCode:'',
-            state: Number,
+            state: '0',
             parentCodeList:[]
           }
         }).catch((err)=>{
@@ -355,7 +360,7 @@
         unitName:'',
         parentCode: [],
         areaCode:'',
-        state: Number,
+        state: '0',
         parentCodeList:[]
       }
     }
@@ -364,7 +369,7 @@
         unitName:'',
         parentCode: [],
         areaCode:'',
-        state: Number,
+        state: '0',
         parentCodeList:[]
       }
       this.visibleInvalidityModal = false;
@@ -488,46 +493,8 @@
     console.log('1111',text)
     console.log('2222',record)
     console.log('333', index)
-      if (record.state==='1') { 
-        if (record.isInvalid ===0) {
+       if (record.state ==='0') {
        return   <div>
-            <a onClick = {
-                () => this.handleUpdateModalVisible(true, record)
-            } > ������ </a>
-          <a-divider type='vertical' />
-              <a onClick = {
-                () => this.handleDetailModalVisible(true, record)
-            } > ������ </a>
-            <a-divider type = 'vertical'  / >
-            <a v-show="record.state !=='1'" onClick={ () => this.handleAssert(record)
-              } >������</a>
-            <a-divider type = 'vertical' />
-            <a v-show="record.isInvalid !=='0'" onClick = {
-                () => this.handleInvalidity(record)
-            } >������</a>
-            </div>
-        } else {
-           return   <div>
-            <a onClick = {
-                () => this.handleUpdateModalVisible(true, record)
-            } > ������ </a>
-          <a-divider type='vertical' />
-              <a onClick = {
-                () => this.handleDetailModalVisible(true, record)
-            } > ������ </a>
-            <a-divider type = 'vertical'  / >
-            <a v-show="record.state !=='1'" onClick={ () => this.handleAssert(record)
-              } >������</a>
-           
-            </div>
-        }
-      } else {
-          if (record.isInvalid ===0) {
-       return   <div>
-            <a onClick = {
-                () => this.handleUpdateModalVisible(true, record)
-            } > ������ </a>
-          <a-divider type='vertical' />
               <a onClick = {
                 () => this.handleDetailModalVisible(true, record)
             } > ������ </a>
@@ -538,16 +505,15 @@
             </div>
         } else {
            return   <div>
-            <a onClick = {
-                () => this.handleUpdateModalVisible(true, record)
-            } > ������ </a>
-          <a-divider type='vertical' />
               <a onClick = {
                 () => this.handleDetailModalVisible(true, record)
             } > ������ </a>
+            <a-divider type='vertical' />
+             <a onClick = {
+                () => this.handleUpdateModalVisible(true, record)
+            } > ������ </a>
             </div>
         }
-    }
       this.handleSearch();
     }
 

--
Gitblit v1.8.0