From 5965bab5a2355da4bdf96e600eae885bb8699bc0 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 27 Sep 2023 18:58:19 +0800
Subject: [PATCH] fix:责任单位修改
---
src/route/authority.router.ts | 2
src/views/passport/login/successLoginRoutee.ts | 2
src/locales/zh_CN.ts | 4 +-
src/views/list/Unit.vue | 63 ++++++-------------------------
4 files changed, 17 insertions(+), 54 deletions(-)
diff --git a/src/locales/zh_CN.ts b/src/locales/zh_CN.ts
index e061256..27655d9 100644
--- a/src/locales/zh_CN.ts
+++ b/src/locales/zh_CN.ts
@@ -91,7 +91,7 @@
'menu.list.searchtable': '������������',
'menu.list.role': '������������',
'menu.list.menu': '������������',
- 'menu.list.unit': '������������',
+ 'menu.list.unit': '������������������',
'menu.list.devicesBasic': '������������',
'menu.list.devicesVersion': '������������',
'menu.list.devicesMonitorPoint': '������������������',
@@ -122,7 +122,7 @@
'menu.account.logout': '������������',
'menu.list.basic':'������������',
'menu.list.changeunit':'������������',
- 'menu.system': '������������',
+ 'menu.system': '������������������',
'menu.system.account': '������������',
'menu.system.logmanage':'������������',
'menu.system.dictmanage':'������������',
diff --git a/src/route/authority.router.ts b/src/route/authority.router.ts
index 4a62265..84afd32 100644
--- a/src/route/authority.router.ts
+++ b/src/route/authority.router.ts
@@ -36,7 +36,7 @@
name: '/authority/unit',
component: () => import('@/views/list/Unit.vue'),
meta: {
- title: '������������',
+ title: '������������������',
routerGuard: true,
i18n:`menu.list.unit`
},
diff --git a/src/views/list/Unit.vue b/src/views/list/Unit.vue
index 511d816..57c01f8 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,7 +201,7 @@
unitName:'',
parentCode: [],
areaCode:'',
- state:Number,
+ state:'0',
}
private pagination:any={
@@ -295,7 +296,8 @@
page:1,
size: 20
}).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);
@@ -326,7 +328,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 +336,7 @@
unitName:'',
parentCode: [],
areaCode:'',
- state: Number,
+ state: '0',
parentCodeList:[]
}
}).catch((err)=>{
@@ -355,7 +357,7 @@
unitName:'',
parentCode: [],
areaCode:'',
- state: Number,
+ state: '0',
parentCodeList:[]
}
}
@@ -364,7 +366,7 @@
unitName:'',
parentCode: [],
areaCode:'',
- state: Number,
+ state: '0',
parentCodeList:[]
}
this.visibleInvalidityModal = false;
@@ -488,46 +490,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 +502,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();
}
diff --git a/src/views/passport/login/successLoginRoutee.ts b/src/views/passport/login/successLoginRoutee.ts
index b85f864..68c01ef 100644
--- a/src/views/passport/login/successLoginRoutee.ts
+++ b/src/views/passport/login/successLoginRoutee.ts
@@ -68,7 +68,7 @@
name: '/authority/unit',
component: () => import(/* webpackChunkName: "list" */ '@/views/list/Unit.vue'),
meta: {
- title: '������������',
+ title: '������������������',
routerGuard: true
},
}
--
Gitblit v1.8.0