From f9411b7278664a67fdf0543740d5eb7331841583 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 13 Oct 2022 17:57:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8D=A2=E5=B1=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppOrganizationChange.vue | 1 - .../AppOrganizationChange/components/List.vue | 52 +++++++------------ .../components/history.vue | 13 +++++ .../components/moment.vue | 13 +++++ 4 files changed, 45 insertions(+), 34 deletions(-) diff --git a/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue b/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue index 0db2cedb..f8b5b88b 100644 --- a/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue +++ b/project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue @@ -48,7 +48,6 @@ export default { created() { let {organizationId: id, organizationName: name} = this.user.info this.selected = {id, name} - // this.dict.load("portalUserStatus", "enterpriseStatus", "userEnterpriseStatus","enterpriseType") } } diff --git a/project/pingchang/apps/AppOrganizationChange/components/List.vue b/project/pingchang/apps/AppOrganizationChange/components/List.vue index f07df0f6..cb6079d5 100644 --- a/project/pingchang/apps/AppOrganizationChange/components/List.vue +++ b/project/pingchang/apps/AppOrganizationChange/components/List.vue @@ -16,11 +16,11 @@ @@ -62,27 +62,13 @@ export default { orgName: '', loading: false, total: 0, - colConfigs: [ - {type: 'selection', label: ''}, - {prop: 'name', label: '姓名', align: 'center'}, - {prop: 'sex', label: '性别', align: 'center', dict: 'sex'}, - {prop: 'age', label: '年龄', align: 'center'}, - // { - // prop: 'auditStatus', label: '审核状态', align: 'center', - // render: (h, {row}) => h('span', {class: `audit-${row.auditStatus}`}, this.dict.getLabel('auditStatus', row.auditStatus)) - // }, - {prop: 'partyStatus', label: '党籍状态', align: 'center', dict: 'partyStatus'}, - {prop: 'joinPartyTime', label: '入党日期', align: 'center'}, - {prop: 'partyPosition', label: '党内职务', align: 'center', dict: 'partyPosition'}, - {prop: 'flowStatus', label: '流动状态', align: 'center', dict: 'flowStatus'}, - ], tableData: [], ids: '', tabs: [ {label: '当前届次', name: 'moment', comp: moment, permission: ''}, - {label: '历史届次', name: 'history', comp: history, permission: 'app_appgirdmemberapply_detail'} + {label: '历史届次', name: 'history', comp: history, permission: ''} ], - currIndex: 0 + currIndex: '0' } }, components: { @@ -94,20 +80,20 @@ export default { orgTree() { return this.$refs.tree?.$refs?.partyTree }, - exportQuery() { - let {id: partyOrgId} = this.selected - return { - ids: this.ids ? this.ids.split(',') : [], - ...this.search, partyOrgId - } - }, - isShowAddBtn() { - return this.selected.isLeaf == 1 - } + // exportQuery() { + // let {id: partyOrgId} = this.selected + // return { + // ids: this.ids ? this.ids.split(',') : [], + // ...this.search, partyOrgId + // } + // }, + // isShowAddBtn() { + // return this.selected.isLeaf == 1 + // } }, created() { - this.dict.load('disciplinary', 'partyType', 'sex', 'nation', 'education', 'partyStatus', 'partyPosition', 'flowStatus', 'auditStatus') - this.getList() + // this.dict.load('disciplinary', 'partyType', 'sex', 'nation', 'education', 'partyStatus', 'partyPosition', 'flowStatus', 'auditStatus') + // this.getList() }, methods: { showNeighbourSetting(id) { diff --git a/project/pingchang/apps/AppOrganizationChange/components/history.vue b/project/pingchang/apps/AppOrganizationChange/components/history.vue index e69de29b..a109a175 100644 --- a/project/pingchang/apps/AppOrganizationChange/components/history.vue +++ b/project/pingchang/apps/AppOrganizationChange/components/history.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/project/pingchang/apps/AppOrganizationChange/components/moment.vue b/project/pingchang/apps/AppOrganizationChange/components/moment.vue index e69de29b..cf98bad6 100644 --- a/project/pingchang/apps/AppOrganizationChange/components/moment.vue +++ b/project/pingchang/apps/AppOrganizationChange/components/moment.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file From f9f281234411b25babad5cdd8a6c47f9280e8b2d Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 13 Oct 2022 17:58:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=91=E5=B1=95=E5=85=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppRecruitPartyMembers.vue | 4 - .../AppRecruitPartyMembers/components/Add.vue | 85 +------ .../components/Detail.vue | 82 ++++++- .../components/neighbourSetting.vue | 228 ------------------ 4 files changed, 75 insertions(+), 324 deletions(-) delete mode 100644 project/pingchang/apps/AppRecruitPartyMembers/components/neighbourSetting.vue diff --git a/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue b/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue index 5378382f..a5e0651c 100644 --- a/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue +++ b/project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue @@ -9,13 +9,11 @@ import List from './components/List' import Add from './components/Add' import Detail from './components/Detail' import {mapState} from "vuex"; -import NeighbourSetting from "./components/neighbourSetting"; export default { name: 'AppRecruitPartyMembers', label: '发展党员', components: { - NeighbourSetting, Add, List, Detail @@ -35,8 +33,6 @@ export default { currentPage() { if (this.$route.hash == "#add") { return Add - } else if (this.$route.hash == "#ns") { - return NeighbourSetting } else if (this.$route.query.id) { return Detail } else return List diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue index 09de7731..db1160d8 100644 --- a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue +++ b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue @@ -361,80 +361,6 @@ - - - - - - - - - - - - - @@ -562,13 +488,6 @@ - - - - - - - (v ? v.split(" ")[0] : "-"), }, { prop: "starTime", - label: "姓名", + label: "职位", align: "center", formart: (v) => (v ? v.split(" ")[0] : "-"), }, diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue index ce8ccc30..302d7ded 100644 --- a/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue +++ b/project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue @@ -12,7 +12,7 @@