Merge remote-tracking branch 'origin/master'

src/api/modules/home/task.js

@@ -14,8 +14,9 @@ export default {
         return httpApi({
             url: '/api/blade-control/approve/task/detail',
             method: 'get',
-            parmas: form
+            params: form
         }, msg);
     },
 
+
 }

src/views/home/components/TaskTable.vue

@@ -1,13 +1,13 @@
 <template>
     <HcCard>
         <template #header>
-            <div class="w-36 mr-4" v-if="isTableKey !== 'to-do'">
+            <div class="w-36 mr-4" v-if="isTableKey !== '1'">
                 <el-select v-model="searchForm.selectStatus" block clearable placeholder="选择审批状态" size="large">
                     <el-option v-for="item in reportTypes" :label="item.name" :value="item.key"/>
                 </el-select>
             </div>
             <div class="w-36 mr-4">
-                <el-select v-model="searchForm.reporting" block clearable placeholder="选择上报类型" size="large">
+                <el-select v-model="searchForm.taskType" block clearable placeholder="选择上报类型" size="large">
                     <el-option v-for="item in reportings" :label="item.name" :value="item.key"/>
                 </el-select>
             </div>
@@ -165,7 +165,7 @@ const rowNameClick = (row) => {
     router.push({
         name: 'home-task-details', query: {
             id: row.id,
-            type: isTableKey.value
+            type: row?.reportTypeName
         }
     })
 }

src/views/home/task/components/trip-info.vue

@@ -0,0 +1,10 @@
+<!--  -->
+<template>
+  <div >出差详情</div>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+</script>
+<style lang='scss' scoped>
+</style>

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

@@ -3,12 +3,12 @@
         <HcCardItem>
             <div class="hac-task-name-box">
                 <div class="label">任务名称</div>
-                <div class="name">【上报人】向您发起【任务审批】审批</div>
+                <div class="name">{{ taskBasicsInfo?.taskName }}</div>
             </div>
             <div class="hac-task-text-box">
-                <span>上报类型：废除任务</span>
-                <span class="ml-10">上报人：张三</span>
-                <span class="ml-10">上报时间：2023-02-23 19:20:22</span>
+                <span>上报类型：{{ taskBasicsInfo?.ReportTypeName }}</span>
+                <span class="ml-10">上报人：{{ taskBasicsInfo?.reportUser }}</span>
+                <span class="ml-10">上报时间：{{ taskBasicsInfo?.reportDate }}</span>
             </div>
         </HcCardItem>
 
@@ -18,7 +18,7 @@
             </div>
         </HcCardItem>
 
-        <HcCardItem title="操作任务" class="mt-4" v-if="dataType === '1'">
+        <HcCardItem title="操作任务" class="mt-4" v-if="dataType === '任务审批'">
             <el-form ref="formRef" :model="formModel" :rules="formRules" label-width="" :disabled="tabsKey !== 'to-do'">
                 <el-form-item label="变更类别：" prop="type" size="large">
                     <el-radio-group v-model="formModel.type" size="large">
@@ -41,15 +41,16 @@
             </el-form>
         </HcCardItem>
 
-        <HcCardItem title="数据详情" class="mt-4" v-if="dataType > 1">
-            <div class="hc-info-list">
-                <HcListItem title="报销金额：" content="1520元"/>
-                <HcListItem title="发生日期：" content="2023-05-15"/>
-                <HcListItem title="费用类型：" content="水电"/>
-                <HcListItem title="费用说明：" content="这是费用说明"/>
+        <HcCardItem title="数据详情" class="mt-4">
+             <!-- 报销 -->
+            <div class="hc-info-list" v-if="dataType=='报销审批'">
+                <HcListItem title="报销金额：" :content="otherInfo?.frMoney"/>
+                <HcListItem title="发生日期：" :content="otherInfo?.frDate"/>
+                <HcListItem title="费用类型：" :content="otherInfo?.frTypeName"/>
+                <HcListItem title="费用说明：" :content="otherInfo?.frDesc"/>
                 <HcListItem title="电子发票：" >
                     <HcImg ui="img" :index="0"
-                           src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+                           :src="otherInfo?.frElectronicInvoiceUrl"
                            :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
                     />
                     <HcImg ui="img" :index="0"
@@ -59,7 +60,7 @@
                 </HcListItem>
                 <HcListItem title="附件文件：" >
                     <HcImg ui="img" :index="0"
-                           src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+                            :src="otherInfo?.frAttachmentUrl"
                            :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
                     />
                     <HcImg ui="img" :index="0"
@@ -75,11 +76,17 @@
                            :srcs="['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg']"
                     />
                 </HcListItem>
-                <HcListItem title="归属人：" content="张三"/>
+                <HcListItem title="归属人：" :content="otherInfo?.userNameVesting"/>
                 <HcListItem title="备注信息：" content="备注数据"/>
             </div>
+             <!-- 出差审批 -->
+            <div class="hc-info-list" v-if="dataType==='出差审批'">
+                <tripInfo />
+            </div>
+          
+          
         </HcCardItem>
-
+  
         <HcCardItem title="操作任务" class="mt-4" v-if="dataType !== '1' && authType">
             <HcListItem ui="items-center" title="支付状态：">
                 <el-radio-group v-model="formPay" size="large">
@@ -108,10 +115,11 @@
             <div class="w-36 mx-6 inline-block">
                 <el-select v-model="dataType" block placeholder="选择模拟类型" size="large">
                     <el-option label="任务详情" value="1"/>
-                    <el-option label="财务报销" value="2"/>
+                    <el-option label="财务报销" value="报销审批"/>
                     <el-option label="采购" value="3"/>
                     <el-option label="外包支付" value="4"/>
                     <el-option label="借款审批" value="5"/>
+                    <el-option label="出差审批" value="出差审批"/>
                 </el-select>
             </div>
             <el-button hc-btn @click="authTypeClick">模拟财务审核</el-button>
@@ -132,6 +140,8 @@
 import {onActivated, ref} from "vue";
 import {useRouter, useRoute} from 'vue-router'
 import taskApi from '~api/home/task.js';
+import {getArrValue,getObjValue} from "js-fast-way"
+import tripInfo from './components/trip-info.vue'
 
 //初始变量
 const router = useRouter()
@@ -147,23 +157,32 @@ onActivated(() => {
     dataType.value = useRoutes?.query?.type ?? ''
     dataId.value = useRoutes?.query?.id ?? ''
     console.log(useRoutes.query)
+    getTaskDatail()
 })
 
 const authTypeClick = () => {
     authType.value = !authType.value
 }
-
+const taskDetail=ref({})
+const taskBasicsInfo=ref({})//基础信息
+const otherInfo=ref({})
+const getTaskDatail=async()=>{
+    const {error, code, data} = await taskApi.getDetail({id: dataId.value})
+    if (!error && code === 200) {
+        taskDetail.value=getObjValue(data)
+        tableData.value=data['planTaskInfoList']
+        taskBasicsInfo.value=data['basicsInfo']
+        otherInfo.value=data['otherInfo']
+    } else {
+        taskDetail.value={}
+    }
+}
 //任务表格
 const tableColumn = [
-    {key: 'taskName', name: '所属项目'},
-    {key: 'description', name: '任务描述'}
+    {key: 'projectName', name: '所属项目'},
+    {key: 'taskDesc', name: '任务描述'}
 ]
-const tableData = ref([
-    {taskName: '所属项目', description: '任务描述。。。。。'},
-    {taskName: '所属项目', description: '任务描述。。。。。'},
-    {taskName: '所属项目', description: '任务描述。。。。。'},
-    {taskName: '所属项目', description: '任务描述。。。。。'}
-])
+const tableData = ref([])
 
 //任务操作数据
 const formRef = ref(null)