获取任务列表

src/api/modules/tasks/data.js

@@ -81,5 +81,20 @@ export default {
             data: form,
         }, msg)
     },
-
+    //获取任务列表分页
+    async getTaskPage(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-archive/archiveTask/page',
+            method: 'post',
+            data: form,
+        }, msg)
+    },
+    //批量审批
+    async batchApproval(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-business/task/batch-complete-approval-task-archive',
+            method: 'post',
+            data: form,
+        }, msg)
+    },
 }

src/views/tasks/components/TableCard.vue

@@ -2,25 +2,25 @@
     <HcCard>
         <template #header>
             <div class="w-32">
-                <el-select v-model="searchForm.taskType" block clearable placeholder="任务类型" size="large">
+                <el-select v-model="searchForm.typeValue" block clearable placeholder="任务类型" size="large">
                     <el-option v-for="item in tasksType" :label="item.dictValue" :value="item.dictKey" />
                 </el-select>
             </div>
             <div class="w-32 ml-3">
-                <el-select v-model="searchForm.taskStatus" block clearable placeholder="任务状态" size="large">
+                <el-select v-model="searchForm.statusValue" block clearable placeholder="任务状态" size="large">
                     <el-option v-for="item in tasksStatus" :label="item.dictValue" :value="item.dictKey" />
                 </el-select>
             </div>
             <div class="w-32 ml-3">
                 <el-select
-                    v-model="searchForm.contractId" block clearable placeholder="合同段" size="large"
+                    v-model="searchForm.contractIdValue" block clearable placeholder="合同段" size="large"
                     @change="ContractIdChange"
                 >
                     <el-option v-for="item in contractList" :label="item.contractName" :value="item.id" />
                 </el-select>
             </div>
             <div class="w-32 ml-3">
-                <el-select v-model="searchForm.batch" block clearable placeholder="上报批次" size="large">
+                <el-select v-model="searchForm.batchValue" block clearable placeholder="上报批次" size="large">
                     <el-option v-for="item in reportBatch" :label="item.batch" :value="item.batch" />
                 </el-select>
             </div>
@@ -87,10 +87,18 @@
             <div class="lr-dialog-footer">
                 <div class="left">
                     <span class="text-success">审批人员中：</span>
-                    <el-tag class="mx-1" effect="dark" type="info">未签字</el-tag>
-                    <el-tag class="mx-1" effect="dark" type="success">已签字</el-tag>
-                    <el-tag class="mx-1" effect="dark" type="warning">已废除</el-tag>
-                    <el-tag class="mx-1" effect="dark" type="danger">签字异常</el-tag>
+                    <el-tag class="mx-1" effect="dark" type="info">
+                        未签字
+                    </el-tag>
+                    <el-tag class="mx-1" effect="dark" type="success">
+                        已签字
+                    </el-tag>
+                    <el-tag class="mx-1" effect="dark" type="warning">
+                        已废除
+                    </el-tag>
+                    <el-tag class="mx-1" effect="dark" type="danger">
+                        签字异常
+                    </el-tag>
                 </div>
                 <div class="right">
                     <HcPages :pages="searchForm" :sizes="[10, 20, 30, 40, 50, 200]" @change="pageChange" />
@@ -140,6 +148,7 @@ watch(() => [
 ], ([Key]) => {
     isTableKey.value = Key
     setQueryData()
+    getTableData()
 })
 
 //渲染完成
@@ -149,7 +158,7 @@ nextTick(() => {
 
 //获取相关数据
 const setQueryData = () => {
-    searchForm.value.contractId = contractId.value
+    searchForm.value.contractIdValue = contractId.value
     queryTaskType()
     queryTaskStatus()
     searchClick()
@@ -184,7 +193,7 @@ const queryTaskStatus = async () => {
 
 //合同段
 const ContractIdChange = () => {
-    searchForm.value.batch = null
+    searchForm.value.batchValue = null
     queryBatchList()
     queryUserStartFlow()
     getTableData()
@@ -211,16 +220,16 @@ const queryBatchList = async () => {
 
 //搜索表单
 const searchForm = ref({
-    queryValue: null, taskType: null, taskStatus: null, batch: null, startTime: null, endTime: null,
-    current: 1, size: 200, total: 0,
+    queryValue: null, typeValue: null, statusValue: null, batchValue: null, startTimeValue: null, endTimeValue: null,
+    current: 1, size: 200, total: 0, selectedType:null,
 })
 
 //日期时间被选择
 const betweenTime = ref(null)
 const betweenTimeUpdate = ({ val, arr }) => {
     betweenTime.value = arr
-    searchForm.value.startTime = val['start']
-    searchForm.value.endTime = val['end']
+    searchForm.value.startTimeValue = val['start']
+    searchForm.value.endTimeValue = val['end']
 }
 
 //回车搜索
@@ -263,38 +272,24 @@ const getTableData = () => {
     tableListRef.value?.clearSelection()
     tableCheckedKeys.value = []
     if (key === 'key1') {
-        queryUserToDoTaskList()
+        searchForm.value.selectedType = 1
     } else if (key === 'key2') {
-        queryUserDoneTaskList()
+        searchForm.value.selectedType = 2
     } else if (key === 'key3') {
-        queryUserStartFlow()
+        searchForm.value.selectedType = 3
     }
-}
+    queryPage()
 
-//待办任务列表
-const queryUserToDoTaskList = async () => {
-    tableLoading.value = true
-    const { error, code, data } = await tasksApi.queryUserToDoTaskList({
-        ...searchForm.value,
-        projectId: projectId.value,
-        currentContractId:currentContractId.value,
-    })
-    //处理数据
-    tableLoading.value = false
-    if (!error && code === 200) {
-        tableListData.value = getArrValue(data['records'])
-        searchForm.value.total = data.total || 0
-    } else {
-        tableListData.value = []
-        searchForm.value.total = 0
-    }
 }
-//获取已办任务
-const queryUserDoneTaskList = async () => {
+
+//任务列表
+const queryPage = async () => {
     tableLoading.value = true
-    const { error, code, data } = await tasksApi.queryUserDoneTaskList({
+    const { error, code, data } = await tasksApi.getTaskPage({
         ...searchForm.value,
-        projectId: projectId.value,
+      
+        // projectId: projectId.value,
+        contractIdValue:currentContractId.value,
     })
     //处理数据
     tableLoading.value = false
@@ -306,23 +301,8 @@ const queryUserDoneTaskList = async () => {
         searchForm.value.total = 0
     }
 }
-//获取我发起的
-const queryUserStartFlow = async () => {
-    tableLoading.value = true
-    const { error, code, data } = await tasksApi.queryUserStartFlow({
-        ...searchForm.value,
-        projectId: projectId.value,
-    })
-    //处理数据
-    tableLoading.value = false
-    if (!error && code === 200) {
-        tableListData.value = getArrValue(data?.records) || []
-        searchForm.value.total = data?.total || 0
-    } else {
-        tableListData.value = []
-        searchForm.value.total = 0
-    }
-}
+
+
 
 //多选
 const tableListRef = ref(null)

src/views/tasks/hc-data.vue

@@ -145,7 +145,8 @@ import { useAppStore } from '~src/store'
 import { useRoute, useRouter } from 'vue-router'
 import TableCard from './components/TableCard.vue'
 import notableform from '~src/assets/view/notableform.svg'
-import { checkFlowUserIsExistPfxFile, getContractInfo } from '~api/other'
+import { getContractInfo } from '~api/other'
+import tasksFlowApi from '~api/tasks/flow'
 import { arrToKey, getArrValue, isString } from 'js-fast-way'
 import tasksApi from '~api/tasks/data'
 import dayjs from 'dayjs'
@@ -317,7 +318,7 @@ const ConfirmApprovalClick = async () => {
         window?.$message?.warning('请先输入审核意见')
     } else {
         SMSAuthLoading.value = true
-        const { error, code, msg, data } = await checkFlowUserIsExistPfxFile({}, false)
+        const { error, code, msg, data } = await tasksFlowApi.checkTaskUserCertificateInfo({}, false)
         //判断数据
         SMSAuthLoading.value = false
         if (!error && code === 200 && data === true) {