批量上报接口

src/api/modules/other.js

@@ -121,9 +121,3 @@ export const getContractInfo = (form, msg = true) => httpApi({
     method: 'get',
     params: form,
 }, msg)
-//检查当前审批人是否存在证书
-export const checkFlowUserIsExistPfxFile = (form, msg = true) => httpApi({
-    url: '/api/blade-business/eVisaTaskCheck/checkFlowUserIsExistPfxFile',
-    method: 'get',
-    params: form,
-}, msg)

src/api/modules/tasks/flow.js

@@ -57,4 +57,12 @@ export default {
             params: form,
         }, msg)
     },
+    //批量上报
+    async batchReportTaskArchive(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-business/task/batch-report-task-archive',
+            method: 'post',
+            data: form,
+        }, msg)
+    },
 }

src/views/file/collection.vue

@@ -1594,7 +1594,7 @@ const reportModalClick = () => {
 
 //上报完成
 const reportFinish = () => {
-
+    getTableData()
 }
 
 

src/views/file/components/HcReport.vue

@@ -21,7 +21,7 @@
                     </template>
                 </el-select>
             </el-form-item>
-            <el-form-item v-if="diyProcessUser" label="任务人" prop="userTasks">
+            <el-form-item v-if="diyProcessUser" label="任务人" prop="userIds">
                 <HcTasksUserVue class="w-full" @change="diyProcessUserChange" />
             </el-form-item>
             <el-form-item v-else label="任务人">
@@ -51,8 +51,8 @@
 
 <script setup>
 import { ref, watch } from 'vue'
-//import { ApprovalApi, queryFixedFlow, queryFixedFlow1 } from '~api/other'
-import { arrIndex, formValidate } from 'js-fast-way'
+import tasksFlowApi from '~api/tasks/flow'
+import { arrIndex, arrToId, arrToKey, formValidate } from 'js-fast-way'
 import HcTasksUserVue from './hc-tasks-user/index.vue'
 import { useAppStore } from '~src/store'
 
@@ -75,13 +75,19 @@ const projectId = ref(useAppState.getProjectId)
 const contractId = ref(useAppState.getContractId)
 const isShow = ref(props.show)
 
+const formModel = ref({ batch: 1, restrictDay: 1 })
+
 //监听
 watch(() => [
     props.projectId,
     props.contractId,
+
 ], ([pid, cid]) => {
     projectId.value = pid
     contractId.value = cid
+  
+  
+    
 })
 
 //监听
@@ -93,7 +99,7 @@ watch(() => props.show, (val) => {
 
 //表单
 const formRef = ref(null)
-const formModel = ref({ batch: 1, restrictDay: 1 })
+
 const formRules = ref({
     taskContent: {
         required: false,
@@ -105,7 +111,7 @@ const formRules = ref({
         trigger: 'blur',
         message: '请选择任务流程',
     },
-    userTasks: {
+    userIds: {
         required: true,
         trigger: 'blur',
         message: '请选择任务人',
@@ -121,7 +127,7 @@ const setReportData = (show) => {
         ids = ids ? `${ids},${item.id}` : item.id
         taskName = taskName ? `${taskName},${item.fileName}` : item.fileName
     }
-    formModel.value.ids = ids
+    formModel.value.dataIds = ids
     formModel.value.taskName = taskName
     //获取任务流程
     processData.value = []
@@ -153,7 +159,8 @@ const handleProcessValue = (val) => {
 
 //自定义流程任务人选择完毕
 const diyProcessUserChange = (user) => {
-    formModel.value.userTasks = user
+    let userArr = user
+    formModel.value.userIds = arrToKey(userArr, 'userId', ',')
 }
 
 //取消
@@ -172,12 +179,12 @@ const formReportClick = async () => {
 //上报请求
 const formReportLoading = ref(false)
 const batchApprovalApi = async () => {
-    /*formReportLoading.value = true
+    formReportLoading.value = true
     //发起请求
-    const { error, code, data } = await ApprovalApi(ApiUrl.value, {
-        projectId: projectId.value,
-        contractId: contractId.value,
+    const { error, code, data } = await tasksFlowApi.batchReportTaskArchive( {
         ...formModel.value,
+        contractId:contractId.value,
+        projectId:projectId.value,
     })
     linkUserJoinString.value = ''
     formReportLoading.value = false
@@ -188,7 +195,7 @@ const batchApprovalApi = async () => {
         emit('finish', data)
     } else {
         processData.value = []
-    }*/
+    }
     emit('hide', false)
     emit('finish')
 }

src/views/file/components/hc-tasks-user/index.vue

@@ -302,18 +302,17 @@ const sureSignUserClick = async () => {
         }
     })
     //效验人员
-    console.log(newUserId, 'newUserId')
 
-    // const { error, code, data, msg } = await tasksFlowApi.checkTaskUserCertificateInfo({
-    //     userIds: newUserId.join(','),
-    // })
-    // if (!error && code === 200) {
-    //     emit('change', newUser, newUserId, users)
-    // } else {
-    //     window.$message.warning(msg)
-    // }
-    //关闭弹窗
-    showModal.value = false
+
+    const { error, code, data, msg } = await tasksFlowApi.checkTaskUserCertificateInfo({
+        userIds: newUserId.join(','),
+    })
+    if (!error && code === 200) {
+        emit('change', newUser, newUserId, users)
+        //关闭弹窗
+        showModal.value = false
+    }
+    
     sureSignUserLoading.value = false
     
 }