feat: 调整批量审批

src/api/dictionary/index.ts

@@ -312,6 +312,6 @@ export async function getBackList() {
     method: 'get',
   })
 
-  const list = res.data[0].distionaryList
+  const list = res.data
   return list
 }

src/api/work/work.ts

@@ -71,8 +71,6 @@ export async function getTaskDetailPictureList(packageid: string, taskchildpictu
 
   const { data: { records, pages, total } } = res
 
-  debugger
-
   // 精简一下数据
   const list = records.map((item) => {
     return {

src/utils/http/axios/index.ts

@@ -201,7 +201,6 @@ const transform: AxiosTransform = {
     // eslint-disable-next-line ts/no-use-before-define
     const instance = http.getAxios()
     const config = response.config
-
     const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token']
     const expirationTime = storage.get(TOKEN_EXPIRATION_TIME)
     // console.log('剩余失效时间(分):', (expirationTime - Date.now()) / 1000 / 60, config.url)

src/views/final/comp/RepeatTaskTableModal.vue

@@ -184,19 +184,19 @@ function approvalHandler() {
 
 function rejectHandler(idOrDesc: string, isOther: boolean) {
   // TODO:实现批量拒绝
-  const param: ApprovalParam = {
-    formid: '',
-    taskId: '',
-    approvd: false,
-    taskComment: '',
-  }
-
-  if (isOther)
-    param.taskComment = idOrDesc
-  else
-    param.taskComment = idOrDesc
-
-  audit(param)
+  // const param: ApprovalParam = {
+  //   formid: '',
+  //   taskId: '',
+  //   approvd: false,
+  //   taskComment: '',
+  // }
+
+  // if (isOther)
+  //   param.taskComment = idOrDesc
+  // else
+  //   param.taskComment = idOrDesc
+
+  // audit(param)
 }
 
 query(pagination.page, pagination.pageSize)

src/views/final/content/Content.vue

@@ -259,19 +259,19 @@ function approvalHandler() {
 
 function rejectHandler(idOrDesc: string, isOther: boolean) {
   // TODO:实现批量拒绝
-  const param: ApprovalParam = {
-    formid: '',
-    taskId: '',
-    approvd: false,
-    taskComment: '',
-  }
-
-  if (isOther)
-    param.taskComment = idOrDesc
-  else
-    param.taskComment = idOrDesc
-
-  audit(param)
+  // const param: ApprovalParam = {
+  //   formid: '',
+  //   taskId: '',
+  //   approvd: false,
+  //   taskComment: '',
+  // }
+
+  // if (isOther)
+  //   param.taskComment = idOrDesc
+  // else
+  //   param.taskComment = idOrDesc
+
+  // audit(param)
 }
 </script>
 

src/views/task/content/Content.vue

@@ -57,20 +57,21 @@ const taskDetailInfo = ref<any>({})
 const taskDetailPictureList = ref<any[]>([])
 let processItems: any[] = []
 
+// states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
   if (items.length === 0)
     return '至少选中一个任务'
 
   for (const item of items) {
-    // const { iztrueorfalse, history, states } = item
-    // if (iztrueorfalse !== null)
-    //   return '存在已经辨识过的任务'
+    const { iztrueorfalse, history, states } = item
+    if (iztrueorfalse !== null)
+      return '未判别真假'
+
+    else if (states !== 2)
+      return '审批状态不合法'
 
     // else if (history)
     //   return '包含历史数据'
-
-    // else if (states !== 1 && states !== 2)
-    //   return '审批状态不合法'
   }
 
   return null
@@ -123,14 +124,14 @@ function rejectHandler() {
 
 function approval() {
   const formIds: string[] = processItems.map(item => item.id)
-  const taskIds: string[] = processItems.map(item => item.taskid)
-  const tasknames: string[] = processItems.map(item => item.taskname)
+  const taskIds: string[] = processItems.map(item => item.taskId)
+  const tasknames: string[] = processItems.map(item => item.buessinessno)
 
   const param: ApprovalParam = {
     formid: formIds,
     taskId: taskIds,
     approvd: true,
-    taskComment: '',
+    taskComment: 'approval',
     taskname: tasknames,
   }
 
@@ -139,8 +140,8 @@ function approval() {
 
 function reject(idOrDesc: string, backId: string, isOther: boolean) {
   const formIds: string[] = processItems.map(item => item.id)
-  const taskIds: string[] = processItems.map(item => item.taskid)
-  const tasknames: string[] = processItems.map(item => item.taskname)
+  const taskIds: string[] = processItems.map(item => item.taskId)
+  const tasknames: string[] = processItems.map(item => item.buessinessno)
 
   const param: ApprovalParam = {
     formid: formIds,

src/views/task/modal/ConfrimModal.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, onBeforeMount, ref } from 'vue'
+import { computed, onBeforeMount, ref, unref } from 'vue'
 import { useDictionary } from '@/store/modules/dictonary'
 
 const emit = defineEmits<{
@@ -43,7 +43,7 @@ const comomitValue = computed(() => {
 async function handleSumbit(e: MouseEvent) {
   e.preventDefault()
   closeModal()
-  emit('commit', comomitValue, selectBackId, selectRejectId.value === 'other')
+  emit('commit', unref(comomitValue), unref(selectBackId), selectRejectId.value === 'other')
 }
 
 onBeforeMount(async () => {