From eadcfdceaf1580fed3e3495ec376433a90059ba2 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 21 Jul 2022 09:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/competency-application.vue   | 43 +++++++++++++++++--
 front/src/views/home/DetailsPageconetent.vue  |  6 +++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 0c29bfbd..d35a93c1 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -67,7 +67,7 @@
         </el-radio-group>
         <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
         <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
-         <el-button class="inputBule" @click="agreeOrNot">提交</el-button>
+         <el-button class="inputBule"@click.native="agreeOrNot($store.state.contentTabsActiveName)">提交</el-button>
       </div>
     </div>
 
@@ -79,14 +79,22 @@
 <script>
 // 引入工作流公共方法
 import processModule from '@/mixins/process-module'
+import mixinViewModule from '@/mixins/view-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
 export default {
   // 注入公共方法
-  mixins: [processModule],
+  mixins: [mixinViewModule, processModule],
   data () {
     return {
+      // mixinViewModuleOptions: {
+      //   getDataListURL: '/act/task/myToDoTaskPage',
+      //   getDataListIsPage: true,
+      //   activatedIsNeed: true,
+      //   deleteIsBatch: true,
+      //   deleteIsBatchKey: 'deploymentId'
+      // },
       visible: true,
       showKey: 0,
       // 表单属性是否可编辑
@@ -227,7 +235,8 @@ export default {
         .catch(() => {})
     },
     // 同意与退回
-    agreeOrNot: debounce(function () {
+    agreeOrNot: debounce(function (data) {
+      console.log(data)
       if (this.agreeOrList === '同意') {
         console.log('this.dataForm', this.dataForm)
         const params = qs.stringify({
@@ -281,7 +290,35 @@ export default {
           })
         })
       }
+      this.tabRemoveHandle(data)
+      // this.getDataList(data)
     }, 1000, { leading: true, trailing: false }),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
+    },
     // 启动流程出错回调
     startProcessErrorCallback (data) {
       console.log(data)
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index af2606a0..f6ffaead 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1141,6 +1141,9 @@
         console.log('paramsGetResources', paramsGetResources)
       })
       mybus.on('changeSelcted', () => {
+        // 添加申购车后，返回第一页
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
         getAppResources()
       })
       mybus.on('changeInfo', (info) => {
@@ -1161,6 +1164,9 @@
         getAppResources()
       })
       mybus.on('changeCondition', (condition) => {
+        // 回到第一页，分页页码为1
+        paramsGetResources.pageNum = 1
+        currentPage.value = 1
         //  orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
         // orderType: 'ASC'  ASC 升序  DESC 降序
         paramsGetResources.orderField = condition.orderField