修改判断

src/api/repairManager.js

@@ -2,13 +2,13 @@ import request from '@/utils/request'
 import qs from 'qs'
 let api = '/api-web'
 
-export function findTechnician (data) {
-  return request({
-    url: api + '/employee/findTechnician',
-    method: 'get',
-    params: data
-  })
-}
+// export function findTechnician (data) {
+//   return request({
+//     url: api + '/employee/findTechnician',
+//     method: 'get',
+//     params: data
+//   })
+// }
 
 export function findAllTechnician (data) {
   return request({

src/components/serviceRemind/index.vue

@@ -89,21 +89,24 @@ export default {
   methods: {
     __init() {
       const { path, query } = this.$route
-      // 如果是续费页面则不能弹续费, 并且tabrouter 也需要一起判断
-      if(path === '/productService' && query.tabrouter == 1 || path === '/productService' && !query.tabrouter) {
-        this.dialogFormVisible = false
-      }
       const tenantInfo = this.tenantInfo
       this.tInfo = { ...tenantInfo }
       // 有效期如果小于0则不能关闭弹窗
+      console.log(tenantInfo, 'tenantInfo')
       if(tenantInfo.validRemaining <= 0) {
         this.showClose = false
       } else if(tenantInfo.validRemaining <= 30 && tenantInfo.validRemaining > 0) {
         // 只要续费则弹窗
         this.dialogFormVisible = true
       }
+      // 如果是续费页面则不能弹续费, 并且tabrouter 也需要一起判断
+      if(path === '/productService' && query.tabrouter == 1 || path === '/productService' && !query.tabrouter) {
+        this.dialogFormVisible = false
+        return
+      }
     },
     onSubmit() {
+      this.dialogFormVisible = false
       this.$router.push('/productService')
     }
   }
@@ -195,6 +198,7 @@ export default {
     margin: 0 auto;
     width: 227px;
     height: 51px;
+    cursor: pointer;
     background: linear-gradient(270deg, #FFC65E 0%, #FFE8A6 100%);
     border-radius: 26px;
     font-size: 24px;

src/store/modules/selects.js

@@ -15,9 +15,9 @@ import {
   vipGroupCategory,
 
 } from "@/api/vipSeting"
-import {
-  findTechnician
-} from '@/api/repairManager'
+// import {
+//   findTechnician
+// } from '@/api/repairManager'
 
 const loadings = {}
 
@@ -204,20 +204,20 @@ export default {
       }
       getOrganRole
     },
-    async setTechnician({
-      commit,
-      state
-    }, force) {
-      if ((!state.technician.length || force === true) && !loadings.commit_technician) {
-        loadings.commit_technician = findTechnician()
-        try {
-          const res = await loadings.commit_technician
-          commit('commit_technician', res.data)
-        } catch (error) {}
-        loadings.commit_technician = false
-      }
+    // async setTechnician({
+    //   commit,
+    //   state
+    // }, force) {
+    //   if ((!state.technician.length || force === true) && !loadings.commit_technician) {
+    //     loadings.commit_technician = findTechnician()
+    //     try {
+    //       const res = await loadings.commit_technician
+    //       commit('commit_technician', res.data)
+    //     } catch (error) {}
+    //     loadings.commit_technician = false
+    //   }
 
-    },
+    // },
     async setEmploys({
       commit,
       state

src/views/categroyManager/insideSetting/modals/handover.vue

@@ -63,7 +63,7 @@ export default {
     },
     technicianByOrganId() {
       const data = {}
-      for (const item of this.selects.technician) {
+      for (const item of this.selects.roles?.REPAIR) {
         if (item.organIdList) {
           for (const organId of item.organIdList) {
             if (!data[organId]) {
@@ -93,8 +93,7 @@ export default {
   },
   async mounted() {
     this.$store.dispatch('setBranchs')
-    this.$store.dispatch('setTechnician')
-    // await this.$store.dispatch("setOrganRole");
+    await this.$store.dispatch("setOrganRole");
     this.FetchDetail()
   },
   methods: {