任务审批修改

src/views/tasks/hc-data.vue

@@ -48,7 +48,7 @@
             <div class="hc-card-body-flex">
                 <div v-if="batchPdfUrl" class="flex-iframe">
                     <!-- <HcPdf :src="batchPdfUrl" @change="changeSealStrategy" /> -->
-                    <HcPdf v-if="pdfItem.pdfUrl" :sign="logoName" :src="pdfItem.pdfUrl" :dom="pdfItem.hcSignImageArr" :is-batch="isBatch" @change="pdfChange" />
+                    <HcPdf v-if="pdfItem.pdfUrl" :sign="logoName" :src="pdfItem.pdfUrl" :dom="pdfItem.hcSignImageArr" @change="pdfChange" />
                 </div>
                 <div v-else class="flex-iframe hc-no-table-form">
                     <div class="table-form-no">
@@ -63,9 +63,6 @@
                         <HcTable :column="taskReviewColumns" :datas="taskReviewData" @row-click="rowTaskReviewClick" />
                     </div>
                     <div v-if="taskReviewType === '2'" class="data-table checkedRowsRef">
-                        <el-button :loading="isBatchLoaing" hc-btn type="primary" @click="clickBatch">
-                            批量电签
-                        </el-button>
                         <HcTable :column="checkedRowsColumns" :datas="checkedRowsRef" @row-click="rowTaskReviewClick" />
                     </div>
                     <div v-if="sbTableKey === 'key1'" class="radio-group-box">
@@ -170,7 +167,7 @@ const activeName = routerQuery?.active || 'key1'
 const projectId = ref(useAppState.getProjectId)
 const contractId = ref(useAppState.getContractId)
 const projectInfo = ref(useAppState.getProjectInfo)
-const sealStrategy = ref([])//签章数据列表
+
 
 //渲染完成
 onMounted(() => {
@@ -221,13 +218,6 @@ const taskReviewColumns = ref([
 const pdfItem = ref({})
 const pdfIndex = ref(-1)
 const logoName = ref('')
-//const clickBatch
-const isBatchLoaing = ref(false)
-const isBatch = ref(false)//是否批量电签
-const clickBatch = async ()=>{
-   await queryCurrentUserData()
-   isBatch.value = true
-}
 //获取用户信息
 const queryCurrentUserData = async () => {
     const { error, code, data } = await userApi.queryCurrentUserData()
@@ -244,14 +234,21 @@ const pdfDataClick = (item, index) => {
         pdfItem.value = item
     })
 }
+const signArr = ref([])
 //签章数据改变
 const pdfChange = (data) => {
     // pdfData.value[pdfIndex.value].hcSignImageArr = data
-    checkedRowsRef.value.forEach((ele)=>{
-        if (ele.id === pdfIndex.value) {
-            ele.hcSignImageArr = data
-        }
-    })
+    if (taskReviewType.value === '2') {
+        checkedRowsRef.value.forEach((ele)=>{
+            if (ele.id === pdfIndex.value) {
+                ele.hcSignImageArr = data
+            }
+        })
+      
+    } else {
+        signArr.value = data
+    }
+ 
     console.log('签章数据', data)
 }
 //任务审核
@@ -266,10 +263,14 @@ const rowTaskName = async (row) => {
             taskReviewData.value = approvalFileList
             if (approvalFileList.length > 0) {
                 batchPdfUrl.value = approvalFileList[0].pdfUrl
+                await queryCurrentUserData()
+                pdfItem.value.pdfUrl = approvalFileList[0].pdfUrl
+
+               
             }
             taskReviewType.value = '1'
             showTaskReviewModal.value = true
-        
+
            
         } else {
             taskReviewData.value = []
@@ -292,8 +293,8 @@ const taskId = ref([])
 const batchApprovalTaskClick = (rows) => {
     taskReviewType.value = '2'
     showTaskReviewModal.value = true
-  
-  
+
+    
     checkedRowsRef.value = rows
     let taskids = []
     rows.forEach((item) => {
@@ -305,6 +306,7 @@ const batchApprovalTaskClick = (rows) => {
 
 //行被点击
 const rowTaskReviewClick = async ({ row }) => {
+    console.log(row, 'rpw')
     const type = taskReviewType.value
     if (type === '1') {
         batchPdfUrl.value = row.pdfUrl
@@ -330,8 +332,12 @@ const queryTaskInfo = async (row, taskids) => {
         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'] = ''
@@ -347,21 +353,39 @@ const queryTaskInfo = async (row, taskids) => {
 //确认审批
 const ConfirmApprovalClick = async () => {
     const formData = taskReviewForm.value
-    if (formData.flag === 'NO' && !formData.comment) {
+    let objarr = []
+    if (taskReviewType.value === '1') {
+        //单个废除任务
+        console.log(111111)
+        console.log( checkedRowsRef.value, '  checkedRowsRef.value')
+        objarr.push({
+            taskId:taskReviewInfo.value.id,
+            comment:formData.comment,
+            flag:formData.flag,
+            sealStrategy:signArr.value, 
+         
+        })
+        console.log(objarr, 'objarr')
+    } else if (taskReviewType.value === '2') {
+        //上报任务
+        if (formData.flag === 'NO' && !formData.comment) {
         window?.$message?.warning('请先输入审核意见')
-    } else {
-        formData.taskId = taskId.value
-        let objarr = []
-        checkedRowsRef.value.forEach((ele)=>{
-            objarr.push({
-                taskId:ele.id,
-                comment:formData.comment,
-                flag:formData.flag,
-                sealStrategy:ele.hcSignImageArr,
+            } else {
+                formData.taskId = taskId.value
+                console.log(checkedRowsRef.value, 'checkedRowsRef.value')
+                checkedRowsRef.value.forEach((ele)=>{
+                    objarr.push({
+                        taskId:ele.id,
+                        comment:formData.comment,
+                        flag:formData.flag,
+                        sealStrategy:ele.hcSignImageArr,
 
-            })
-        })
+                    })
+                })
         console.log(objarr, 'objarr')
+    }
+    }
+
         SMSAuthLoading.value = true
         const { error, code, msg, data } = await tasksApi.batchApproval({ taskArchiveDtoList:objarr }, false)
         //判断数据
@@ -376,7 +400,7 @@ const ConfirmApprovalClick = async () => {
         } else {
             window.$message?.warning(msg)
         }
-    }
+   
 }
 
 //短信验证有效期