From b4ba4228c00c367e9dc0d129b17fa0f677c39044 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Mon, 13 Nov 2023 10:41:34 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/list/Unit.vue | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/src/views/list/Unit.vue b/src/views/list/Unit.vue
index 2b831ab..68bb462 100644
--- a/src/views/list/Unit.vue
+++ b/src/views/list/Unit.vue
@@ -210,6 +210,7 @@
pageSize:10,
showSizeChanger: true,
showQuickJumper: true,
+ pageSizeOptions: ['10', '30', '60', '100'],
showTotal: (total:number) => `������ ${this.pagination.total} ���������`, //���������������������������
};
@@ -246,16 +247,28 @@
private title: any = null;
- private columns: any[] = [{
- title: '������',
+ private columns: any[] = [
+ {
+ title: "������",
+ dataIndex: "key",
+ key: "key",
+ align: "center",
+ customRender: (text,record,index) => `${index+1}`,
+ width: 60,
+ },
+ {
+ title: '������',
+ align: "center",
dataIndex: 'unitName',
},
{
- title: '������������',
+ title: '������������',
+ align: "center",
dataIndex: 'parentName',
},
{
- title: '������������',
+ title: '������������',
+ align: "center",
dataIndex: 'areaName',
},
{
@@ -263,16 +276,25 @@
dataIndex: 'updateTime',
},
{
- title: '���������',
+ title: '���������',
+ align: "center",
dataIndex: 'createName',
},
{
title: '������',
- dataIndex: 'state',
+ dataIndex: 'state',
+ align: "center",
customRender: this.progressStateRender,
+ },
+ {
+ title: '������������',
+ dataIndex: 'isInvalid',
+ align: "center",
+ customRender: this.progressIsInvalidRender,
},
{
- title: '������',
+ title: '������',
+ align: "center",
customRender: this.opRender,
},
];
@@ -288,13 +310,13 @@
console.log(this.serch)
const data = this.serch.parentCode
let code =data[data.length-1]
+
get("unit/selectUint",{
name:this.serch.name,
parentCode:code,
parentCodeList:this.serch.parentCode,
areaCode:this.serch.areaCode,
- current: this.pagination.current,
- page:1,
+ page:this.pagination.current,
size: this.pagination.pageSize
}).then(res=>{
this.dataSource = res.data.data.item
@@ -306,7 +328,7 @@
}
private handlerTableChange(pagination: any, filter: any, sorter: any): void {
- console.log(pagination)
+ console.log('pagination',pagination)
this.pagination.current = pagination.current
this.pagination.pageSize = pagination.pageSize
this.pagination.total = pagination.total
@@ -460,13 +482,19 @@
});
}
- private progressStateRender(text: string) {
+ private progressIsInvalidRender(text: Number) {
+ if (text === 0) {
+ return <a-badge status = 'success' text = '���������' />;
+ }
+ return <a-badge status = 'error' text = '���������' />;
+ }
+
+ private progressStateRender(text: string) {
if (text === '0') {
return <a-badge status = 'success' text = '������' />;
}
return <a-badge status = 'processing' text = '���������' />;
}
-
private async handleUpdateModalVisible(visible: boolean, record: any): void {
this.visibleCreateModal = true;
await this.positionLevel(record.parentCodeList)
@@ -490,19 +518,25 @@
}
private opRender(text: string, record: any, index: number) {
// ������console
- console.log('1111',text)
- console.log('2222',record)
- console.log('333', index)
- if (record.state ==='0') {
- return <div>
+ console.log('record',record)
+ if (record.state === '0') {
+ if (Number(record.isInvalid) === 0) {
+ return <div>
<a onClick = {
() => this.handleDetailModalVisible(true, record)
} > ������ </a>
<a-divider type = 'vertical' />
- <a v-show="record.isInvalid !=='0'" onClick = {
+ <a onClick = {
() => this.handleInvalidity(record)
} >������</a>
</div>
+ } else {
+ return <div>
+ <a onClick = {
+ () => this.handleDetailModalVisible(true, record)
+ } > ������ </a>
+ </div>
+ }
} else {
return <div>
<a onClick = {
--
Gitblit v1.8.0