Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-oa-manage-web into dev-cl

# Conflicts:
#	.env.base

.env.base

@@ -4,9 +4,10 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='http://localhost:48080'
 
-VITE_BASE_URL='http://47.98.161.246:48080'
+# VITE_BASE_URL='http://47.98.161.246:48080'
+# VITE_BASE_URL='http://114.55.169.15:48080'
 #VITE_BASE_URL='http://114.215.207.150:48080'
 
 # 上传路径

.env.dev

@@ -4,8 +4,10 @@ VITE_NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
+#VITE_BASE_URL='http://47.98.161.246:48080'
 VITE_BASE_URL='http://localhost:48080'
 
+
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 

src/permission.js

@@ -62,23 +62,10 @@ router.beforeEach(async (to, from, next) => {
     if (whiteList.indexOf(to.path) !== -1) {
       next()
     } else {
-      const tenantId = getTenantId() || to.query?.tenantId
-      const appId = getAppId() || to.query?.appId
+      const tenantId = getTenantId()
+      const appId = getAppId()
       if (tenantId && appId) {
-        let redirectPath = to.fullPath
-        const p = to.fullPath.split('?')
-        if (p.length > 1) {
-          // 过滤掉query参数中的tenantId和appId
-          redirectPath =
-            p[0] +
-            '?' +
-            p[1]
-              .split('&')
-              .filter((item) => !item.startsWith('tenantId=') && !item.startsWith('appId='))
-              .join('&')
-        }
-
-        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${redirectPath}`) // 否则全部重定向到登录页
+        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
       } else {
         // next(`/login?redirect=${to.fullPath}`)
         // 否则全部重定向到平台登陆页

src/views/OKR/Meeting/MeetingInfo.vue

@@ -225,7 +225,6 @@
 <script setup name="MeetingInfo">
 import { listToTree } from '@/utils/tree'
 import { getAllNodeTree } from '@/api/okr/okr'
-import { getWaitPage } from '@/api/okr/wait'
 import * as MeetingApi from '@/api/okr/meeting'
 import { formatDate } from '@/utils/formatTime'
 import { getEmployeeSimpleList } from '@/api/pers/employee'
@@ -271,7 +270,6 @@ onMounted(async () => {
       }
     ]
     currentContentId.value = 0
-    searchUserWait([userStore.getUser.id])
   }
 })
 
@@ -428,7 +426,6 @@ function meetingSummaryEdit(targetName, action) {
   }
 }
 
-const checkedUsers = ref([])
 function handleUserChange(val) {
   // 当预约参会人员变化时，更新实际参会人员选项
   expectUserOptions.value = userOptions.value.filter((user) =>
@@ -455,39 +452,6 @@ function handleUserChange(val) {
       })
     }
   })
-  if (!form.value.meetingId) {
-    searchUserWait(val)
-  }
-}
-
-function searchUserWait(val) {
-  val.map((item) => {
-    if (!checkedUsers.value.includes(item)) {
-      checkedUsers.value.push(item)
-      // 新增会议时，根据参会人员拉取代办事项
-      getWaitPage({
-        pageNo: 1,
-        pageSize: -1,
-        workUserId: item,
-        creator: userStore.getUser.id,
-        completeStatus: 1
-      }).then((resp) => {
-        joinContent(resp.list)
-      })
-    }
-  })
-}
-
-function joinContent(arr) {
-  arr.map((wait) => {
-    let text = '<p>未完成事项：' + wait.title + '</p>'
-    text += wait.content
-    text += `<p>执行人：${wait.userNameStr}</p>`
-    text += `<p>截止日期：${formatDate(wait.endDate, 'YYYY-MM-DD')}</p>`
-    text += '<p><br></p>'
-    form.value.meetingContentList[0].userMeetingContentList[0].content =
-      text + form.value.meetingContentList[0].userMeetingContentList[0].content
-  })
 }
 
 const router = useRouter()

src/views/OKR/Wait/Components/DialogWait.vue

@@ -4,7 +4,7 @@
       <el-form
         :model="form"
         ref="formRef"
-        :disabled="['do', 'detail'].includes(formType)"
+        :disabled="formType == 'do'"
         :rules="rules"
         label-width="80px"
         class="flex-1"
@@ -239,9 +239,7 @@ const followList = ref([])
 
 function open(type, id) {
   show.value = true
-  title.value = { create: '新增待办', update: '修改待办', do: '更新待办进度', detail: '待办详情' }[
-    type
-  ]
+  title.value = { create: '新增待办', update: '修改待办', do: '更新待办进度' }[type]
   formType.value = type
   resetForm()
   if (id) {

src/views/OKR/Wait/index.vue

@@ -139,15 +139,6 @@
           >
             修改
           </el-button>
-          <el-button
-            v-if="row.completeStatus == 2"
-            style="padding: 0; margin-right: 10px; margin-left: 0"
-            type="primary"
-            text
-            @click="handleDetail(row)"
-          >
-            详情
-          </el-button>
           <el-button
             v-if="row.creator == currentUserId && row.completeStatus == 1"
             style="padding: 0; margin-right: 10px; margin-left: 0"
@@ -280,10 +271,6 @@ function handleEdit(row) {
   waitDialogRef.value.open('update', row.workId)
 }
 
-function handleDetail(row) {
-  waitDialogRef.value.open('detail', row.workId)
-}
-
 function handleDelete(row) {
   message.confirm('确定删除待办事项吗？').then(() => {
     deleteWait(row.workId).then(() => {