From 9dbe2fde3f09a73b96aa56cbfc107ead62030f64 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 28 Oct 2022 11:15:37 +0800
Subject: [PATCH] BUG 31140

---
 .../apps/AppOrganizationChange/components/List.vue  |  2 +-
 .../AppOrganizationChange/components/history.vue    |  6 ++++--
 .../AppOrganizationChange/components/moment.vue     | 13 +------------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/project/pingchang/apps/AppOrganizationChange/components/List.vue b/project/pingchang/apps/AppOrganizationChange/components/List.vue
index fc307bc8..0dd6d85c 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/List.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/List.vue
@@ -3,7 +3,7 @@
     <template slot="title">
       <ai-title title="组织换届" isShowBottomBorder>
         <template #rightBtn>
-          <el-button size="small" type="primary" @click="toAdd(selected.id)" v-if="!hasConfig&&permissions('app_apporganizationchangeconfig')">换届设置
+          <el-button size="small" type="primary" @click="toAdd(selected.id)" v-if="hasConfig&&permissions('app_apporganizationchangeconfig')">换届设置
           </el-button>
         </template>
       </ai-title>
diff --git a/project/pingchang/apps/AppOrganizationChange/components/history.vue b/project/pingchang/apps/AppOrganizationChange/components/history.vue
index 20f9dd48..c02d2e95 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/history.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/history.vue
@@ -1,9 +1,8 @@
 <template>
   <section class="history">
-
     <ai-search-bar>
       <template #left>
-        <el-button type="primary" icon="iconfont iconEdit" @click="$router.push({hash:'#makeup',query:{oid}})">补录</el-button>
+        <el-button type="primary" icon="iconfont iconEdit" v-if="hasConfig" @click="$router.push({hash:'#makeup',query:{oid}})">补录</el-button>
       </template>
       <template #right>
         <el-input size="small" placeholder="请输入届次" v-model="search.name" clearable
@@ -29,6 +28,9 @@ export default {
     instance: {},
     dict: {}
   },
+  props: {
+    hasConfig: Boolean
+  },
   data() {
     return {
       search: {
diff --git a/project/pingchang/apps/AppOrganizationChange/components/moment.vue b/project/pingchang/apps/AppOrganizationChange/components/moment.vue
index dd64c15b..cf868d77 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/moment.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/moment.vue
@@ -34,16 +34,6 @@ export default {
       totalJob: 0,
       current: 1,
       size: 10,
-      dialogJob: false,
-      dialogCandidate: false,
-      jobForm: {
-        job: '',
-        name: '',
-      },
-      CandFrom: {
-        job: '',
-        name: '',
-      },
     }
   },
   computed: {
@@ -72,9 +62,8 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.detail = res.data
-          this.$emit("update:hasConfig")
         }
-      })
+      }).catch(() => this.detail = {}).finally(() => this.$emit("update:hasConfig", !!this.detail.id))
     },
   },
   created() {