Merge remote-tracking branch 'origin/master'

src/views/home/task/components/cost-budget.vue

@@ -103,7 +103,7 @@ watch(() => [
     console.log(otherInfo, 'otherInfo');
     getdepartmentListData()
     getCostTypeDict()
-    getProcessList(otherInfo.projectId)
+    getProcessList(otherInfo?.projectId)
     getPostDict()
     getBudgetTypeList()
 

src/views/home/task/task-details.vue

@@ -117,11 +117,11 @@
                 <span v-if="tabsKey === 'to-do'">取消并返回</span>
                 <span v-else>返回</span>
             </el-button>
-            <el-button size="large" type="danger" hc-btn @click="groundsShow"   v-if="tabsKey === 1">
+            <el-button size="large" type="danger" hc-btn @click="groundsShow"   v-if="tabsKey === '1'">
                 <HcIcon name="arrow-go-forward"/>
                 <span>驳回申请</span>
             </el-button>
-            <el-button size="large" type="primary" hc-btn @click="doubleClick"  v-if="tabsKey === 1">
+            <el-button size="large" type="primary" hc-btn @click="doubleClick"  v-if="tabsKey === '1'">
                 <HcIcon name="check-double"/>
                 <span>审核通过</span>
             </el-button>
@@ -176,14 +176,15 @@ const useAppState = useAppStore();
 //初始变量
 const router = useRouter()
 const useRoutes = useRoute()
-const tabsKey = ref(useRoutes?.query?.tabKey ?? '')
+const tabsKey = ref(useRoutes?.query?.tabsKey ?? '')
 const dataType = ref(useRoutes?.query?.type ?? '')
 const dataId = ref(useRoutes?.query?.id ?? '')
 const authType = ref(false)//是否是财务人员
 
 //缓存页面被激活时
 onActivated(() => {
-    tabsKey.value = useRoutes?.query?.tabKey ?? ''
+    tabsKey.value = useRoutes?.query?.tabsKey ?? ''
+    console.log( tabsKey.value,' tabsKey.value');
     dataType.value = useRoutes?.query?.type ?? ''
     dataId.value = useRoutes?.query?.id ?? ''