From fa7c121f5e263836f6d69c3e622b2cafc03b174b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Sep 2022 17:25:51 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../point/icpointnucleicmonitoring.vue | 43 ++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index a4bbccfcf..29bf60173 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -153,13 +153,34 @@
align="center"
show-overflow-tooltip
>
+
+
+
+ {{ item.label }}
+
+
+ {{ scope.row.enableFlag === 'enable' ? '禁用' : '启用' }}
{
+
+ })
+ .catch(() => {});
+ this.loadTable();
+ },
// 新增 / 修改
addOrUpdateHandle(id, title) {
this.dialogTitle = title;
From 92f5188d18a10bcbcf1034453d8c6c14e35fa2c0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 7 Sep 2022 10:05:22 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/plugins/point/icpointnucleicmonitoring.vue | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 29bf60173..8921683fa 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -178,9 +178,7 @@
type="text"
size="small"
class="div-table-button--detail"
- @click="enableOrDisabled(scope.row.id)"
- >{{ scope.row.enableFlag === 'enable' ? '禁用' : '启用' }}
+ @click="enableOrDisabled(scope.row.id)">{{ (scope.row.enableFlag === 'enable' && '禁用') || '启用' }}
{
-
+ this.loadTable();
})
.catch(() => {});
- this.loadTable();
},
// 新增 / 修改
addOrUpdateHandle(id, title) {
From 6715bb7876e10462733e88e751c41ac6ceb45ceb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 7 Sep 2022 17:03:52 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/partymember/icpartyorgtree.vue | 121 ++++++++++++++++++
1 file changed, 121 insertions(+)
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 4b8a5179e..ebc87f1ce 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -17,8 +17,24 @@
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
:height="tableHeight">
+
+
+
+ {{ item.label }}
+
+
+
+
+ {{'负责人'}}
+
+
+
+
+
+
+
+
+
+
+
@@ -67,6 +114,13 @@
export default {
data () {
return {
+ principalShow: false,
+ staffs: [],
+ editPrincipalData: {
+ principal: '',
+ principalMobile: '',
+ partyOrgId: ''
+ },
searchH: 0,
dataForm: {
id: '',
@@ -76,6 +130,36 @@
},
tableLoading: false,
tableData: [],
+ partyOrgTypes: [
+ {
+ value: '0',
+ label: '省委'
+ },
+ {
+ value: '1',
+ label: '市委'
+ },
+ {
+ value: '2',
+ label: '区委'
+ },
+ {
+ value: '3',
+ label: '党工委'
+ },
+ {
+ value: '4',
+ label: '党委'
+ },
+ {
+ value: '5',
+ label: '支部'
+ },
+ {
+ value: '6',
+ label: '党小组'
+ }
+ ],
agencyId: '',
addOrUpdateVisible: false,
lookMemberShow: false,
@@ -93,6 +177,13 @@
const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh
const _h = this.clientHeight - 230 - this.searchH
return this.$store.state.inIframe ? h : _h
+ },
+ principalRules() {
+ return {
+ principal: [
+ {required: true, message: '负责人不能为空', trigger: 'change'},
+ ]
+ }
}
},
mounted() {
@@ -109,6 +200,36 @@
// this.pageLoading = true
},
methods:{
+ principal(row) {
+ this.principalShow = true
+ this.editPrincipalData.partyOrgId = row.id
+ this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{
+ if (res.code !== 0) {
+ return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+ } else {
+ this.staffs = res.data
+ console.log(this.staffs)
+ }
+ }).catch(() => {})
+ },
+ editPrincipal(row) {
+ this.staffs.forEach(s => {
+ if (this.editPrincipalData.principal === s.value){
+ this.editPrincipalData.principal = s.name
+ this.editPrincipalData.principalMobile = s.mobile
+ }
+ })
+ this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{
+ if (res.code !== 0) {
+ return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+ }
+ }).catch(() => {})
+ this.principalShow = false
+ this.getTableData()
+ },
+ handleClose() {
+ this.principalShow = false
+ },
// 查询列表
async getTableData () {
this.tableLoading = true
From 4ef1056df6bc62869953a56b31988ab6f219f295 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 09:20:21 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/partymember/icpartyorgtree.vue | 22 ++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index ebc87f1ce..45d0e6b88 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -82,6 +82,7 @@
+ style="width: 200px"
+ class="item_width_4">
@@ -222,13 +224,23 @@
this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+ }else {
+ this.principalShow = false
+ this.getTableData()
+ this.resetEditPrincipalData()
}
}).catch(() => {})
- this.principalShow = false
- this.getTableData()
},
handleClose() {
- this.principalShow = false
+ this.principalShow = false
+ this.resetEditPrincipalData()
+ },
+ resetEditPrincipalData() {
+ this.editPrincipalData = {
+ principal: '',
+ principalMobile: '',
+ partyOrgId: ''
+ }
},
// 查询列表
async getTableData () {
From bc272b1ff07ef31a8df3f5e161a73b8cfcde9e86 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 13:54:47 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/partymember/icpartyorgtree.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 45d0e6b88..980ef2f7b 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -205,12 +205,12 @@
principal(row) {
this.principalShow = true
this.editPrincipalData.partyOrgId = row.id
+ this.editPrincipalData.principal = row.principal
this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} else {
this.staffs = res.data
- console.log(this.staffs)
}
}).catch(() => {})
},
From 62be514affd260223274e4cd37fe3b4ac55f63f7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 14:10:22 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/partymember/icpartyorgtree.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 980ef2f7b..11f62d4f3 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -12,7 +12,6 @@
:data="tableData"
:default-expand-all="true"
row-key="id"
- border
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
:height="tableHeight">
From b66cf63631ee1bd7cb617cd19a0bfab56ccec5f7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 14:47:01 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/partymember/icpartyorgtree.vue | 31 +++++++++++--------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 11f62d4f3..dd69f1160 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -15,8 +15,8 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
:height="tableHeight">
-
-
+
+
-
-
+
+
- {
- if (res.code !== 0) {
- return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
- }else {
- this.principalShow = false
- this.getTableData()
- this.resetEditPrincipalData()
+ this.$refs['principalRules'].validate((valid) => {
+ if (!valid) {
+ return false
}
- }).catch(() => {})
+ this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{
+ if (res.code !== 0) {
+ return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+ }else {
+ this.principalShow = false
+ this.getTableData()
+ this.resetEditPrincipalData()
+ }
+ }).catch(() => {})
+ })
},
handleClose() {
this.principalShow = false