任务审批修改

src/global/components/hc-report-modal/index.vue

@@ -15,10 +15,13 @@
                 </div>
             </el-form-item>
             <el-form-item label="上传附件">
-                <HcFormItemUpload
+                <HcFormUpload
                     v-model="formModel.pdfUrl"
                     accept="application/pdf,.doc,.docx,application/msword"
                     format-tip="PDF、Word格式文件"
+                    @item="formItemClick"
+                    @upload="formItemUpload"
+                    @change="formItemChange"
                 />
             </el-form-item>
             <el-form-item label="验收专家信息" prop="experts">
@@ -51,6 +54,7 @@
                 </el-button>
             </div>
         </template>
+        <HcUploadFile ref="HcUploadFileRef" :options="UploadFileOptions" @finish="HcUploadFileFinish" />
     </hc-new-dialog>
 </template>
 
@@ -58,6 +62,7 @@
 import { onMounted, ref, watch } from 'vue'
 import tasksFlowApi from '~api/tasks/flow'
 import { arrIndex, formValidate, getArrValue } from 'js-fast-way'
+import { getTokenHeader } from '~src/api/request/header'
 
 const props = defineProps({
     show: {
@@ -263,6 +268,32 @@ const batchApprovalApi = async () => {
         processData.value = []
     }*/
 }
+//上传配置
+const UploadFileOptions = {
+    //此处设置header
+    headers: getTokenHeader(),
+}
+const HcUploadFileRef = ref(null)
+//上传
+const formItemUpload = () => {
+    HcUploadFileRef.value?.selectFile()
+}
+
+
+
+const formItemClick = ({ item, index }) => {
+
+}
+
+//文件变化
+const formItemChange = (src) => {
+    formModel.value.key5 = src
+}
+// 文件全部上传完成
+const HcUploadFileFinish = () => {
+  
+    HcUploadFileRef?.value.setModalShow(false)
+}
 </script>
 
 <style lang="scss">

src/views/tasks/hc-data.vue

@@ -263,7 +263,7 @@ const BatchClick = (val)=>{
 }
 //任务审核
 const rowTaskName = async (row) => {
-    if (row.id) {
+    if (row.id && row.type !== 2) {
         taskReviewInfo.value = row
         const { error, code, data } = await tasksApi.queryTaskInfo({
             taskIds:row.id,
@@ -296,7 +296,7 @@ const rowTaskName = async (row) => {
         taskReviewInfo.value = {}
         taskReviewData.value = []
         batchPdfUrl.value = ''
-        window?.$message?.warning('此数据异常')
+        // window?.$message?.warning('此数据异常')
     }
 }
 
@@ -307,19 +307,29 @@ const checkedRowsColumns = ref([
 const checkedRowsRef = ref([])
 const taskId = ref([])
 const batchApprovalTaskClick = (rows) => {
-    taskReviewType.value = '2'
-    showTaskReviewModal.value = true
-    isBatch.value = false
+     //不同任务类型不能一起批量审批
+    let types = arrToKey(rows, 'type', ',').split(',')
+    let newTypes = Array.from(new Set(types))
+    if (newTypes.length > 1) {
+        window.$meaasge.warning('不同任务类型不能一起批量审批')
+    } else {
+        taskReviewType.value = '2'
+        showTaskReviewModal.value = true
+        isBatch.value = false
 
 
 
-    checkedRowsRef.value = rows
-    let taskids = []
-    rows.forEach((item) => {
-        taskids.push(item.id)
-    })
-    taskids = taskids.join()
-    queryTaskInfo(rows[0], taskids)
+        checkedRowsRef.value = rows
+        let taskids = []
+        rows.forEach((item) => {
+            taskids.push(item.id)
+        })
+        taskids = taskids.join()
+        queryTaskInfo(rows[0], taskids)
+   
+    }
+  
+
 }
 
 //行被点击
@@ -341,31 +351,39 @@ const rowTaskReviewClick = async ({ row }) => {
 //获取PDF数据
 const queryTaskInfo = async (row, taskids) => {
     taskId.value = taskids && taskids.length > 0 ? taskids : row['id']
-    const { error, code, data } = await tasksApi.queryTaskInfo({
-        taskIds: taskids && taskids.length > 0 ? taskids : row['id'],
+    //验收任务类型不能获取pdf
+    if (row.type !== 2) {
+        const { error, code, data } = await tasksApi.queryTaskInfo({
+            taskIds: taskids && taskids.length > 0 ? taskids : row['id'],
 
-    })
-    //处理数据
-    if (!error && code === 200) {
-        const alldata = getArrValue(data)
-        let approvalFileList = alldata
-        if (approvalFileList.length > 0) {
-            await queryCurrentUserData()
-            pdfDataClick(row, row.id)
-            pdfItem.value.pdfUrl = approvalFileList[0].pdfUrl
-            batchPdfUrl.value = approvalFileList[0].pdfUrl
-            row['pdfUrl'] = approvalFileList[0].pdfUrl
+        })
+        //处理数据
+        if (!error && code === 200) {
+            const alldata = getArrValue(data)
+            let approvalFileList = alldata
+            if (approvalFileList.length > 0) {
+                await queryCurrentUserData()
+                pdfDataClick(row, row.id)
+                pdfItem.value.pdfUrl = approvalFileList[0].pdfUrl
+                batchPdfUrl.value = approvalFileList[0].pdfUrl
+                row['pdfUrl'] = approvalFileList[0].pdfUrl
 
+            } else {
+                batchPdfUrl.value = ''
+                row['pdfUrl'] = ''
+                window?.$message?.warning('PDF获取异常')
+            }
         } else {
             batchPdfUrl.value = ''
             row['pdfUrl'] = ''
-            window?.$message?.warning('PDF获取异常')
+            window?.$message?.warning(data.msg || 'PDF异常')
         }
     } else {
         batchPdfUrl.value = ''
         row['pdfUrl'] = ''
-        window?.$message?.warning(data.msg || 'PDF异常')
     }
+ 
+
 }
 const finalArr = ref([])
 //确认审批