暂存终审

src/assets/icons/column.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>自定义列</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="64" height="64"></rect>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-1986.000000, -6758.000000)">
+            <g id="自定义列" transform="translate(1986.000000, 6758.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="蒙版"></g>
+                <path d="M36.9854854,42.6064492 C37.5377701,42.6064492 37.9854854,43.0541645 37.9854854,43.6064492 L37.9854854,56 C37.9854854,56.5522847 37.5377701,57 36.9854854,57 L33.9854854,57 C33.4332006,57 32.9854854,56.5522847 32.9854854,56 L32.985,52.303 L7,52.3032246 C6.44771525,52.3032246 6,51.8555094 6,51.3032246 L6,48.3032246 C6,47.7509399 6.44771525,47.3032246 7,47.3032246 L32.985,47.303 L32.9854854,43.6064492 C32.9854854,43.0541645 33.4332006,42.6064492 33.9854854,42.6064492 L36.9854854,42.6064492 Z M54.4637884,47.3032246 C55.0160731,47.3032246 55.4637884,47.7509399 55.4637884,48.3032246 L55.4637884,51.3032246 C55.4637884,51.8555094 55.0160731,52.3032246 54.4637884,52.3032246 L44.6371044,52.3032246 C44.0848196,52.3032246 43.6371044,51.8555094 43.6371044,51.3032246 L43.6371044,48.3032246 C43.6371044,47.7509399 44.0848196,47.3032246 44.6371044,47.3032246 L54.4637884,47.3032246 Z M29.8824782,24.8032246 C30.4347629,24.8032246 30.8824782,25.2509399 30.8824782,25.8032246 L30.882,29.5 L57,29.5 C57.5522847,29.5 58,29.9477153 58,30.5 L58,33.5 C58,34.0522847 57.5522847,34.5 57,34.5 L30.882,34.5 L30.8824782,38.1967754 C30.8824782,38.7490601 30.4347629,39.1967754 29.8824782,39.1967754 L26.8824782,39.1967754 C26.3301934,39.1967754 25.8824782,38.7490601 25.8824782,38.1967754 L25.8824782,25.8032246 C25.8824782,25.2509399 26.3301934,24.8032246 26.8824782,24.8032246 L29.8824782,24.8032246 Z M19.2308592,29.5 C19.7831439,29.5 20.2308592,29.9477153 20.2308592,30.5 L20.2308592,33.5 C20.2308592,34.0522847 19.7831439,34.5 19.2308592,34.5 L7,34.5 C6.44771525,34.5 6,34.0522847 6,33.5 L6,30.5 C6,29.9477153 6.44771525,29.5 7,29.5 L19.2308592,29.5 Z M36.9854854,7 C37.5377701,7 37.9854854,7.44771525 37.9854854,8 L37.9854854,20.3935508 C37.9854854,20.9458355 37.5377701,21.3935508 36.9854854,21.3935508 L33.9854854,21.3935508 C33.4332006,21.3935508 32.9854854,20.9458355 32.9854854,20.3935508 L32.985,16.696 L7,16.6967754 C6.44771525,16.6967754 6,16.2490601 6,15.6967754 L6,12.6967754 C6,12.1444906 6.44771525,11.6967754 7,11.6967754 L32.985,11.696 L32.9854854,8 C32.9854854,7.44771525 33.4332006,7 33.9854854,7 L36.9854854,7 Z M54.4637884,11.6967754 C55.0160731,11.6967754 55.4637884,12.1444906 55.4637884,12.6967754 L55.4637884,15.6967754 C55.4637884,16.2490601 55.0160731,16.6967754 54.4637884,16.6967754 L44.6371044,16.6967754 C44.0848196,16.6967754 43.6371044,16.2490601 43.6371044,15.6967754 L43.6371044,12.6967754 C43.6371044,12.1444906 44.0848196,11.6967754 44.6371044,11.6967754 L54.4637884,11.6967754 Z" id="形状结合" fill="#666666" fill-rule="nonzero" mask="url(#mask-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/views/final/content/Content.vue

@@ -46,7 +46,7 @@ const emit = defineEmits(['changeShow'])
 function changeContent() {
   emit('changeShow')
 }
-
+const checkedRowKeys = ref([])
 const dicStore = useDictionary()
 const izstatusList = ref([])
 const router = useRouter()
@@ -170,6 +170,10 @@ async function getColumns() {
       type: 'selection',
       fixed: 'left',
       width: 50,
+      disabled(row: any) {
+        console.log(row)
+        return row.states !== 2
+      },
     },
   ]
 
@@ -663,43 +667,34 @@ function singleApproval(row) {
   doAudit(param)
 }
 
+// 批量通过
 function batchApproval() {
-  const items = getSelectItems()
-  const msg = validate(items)
+  const items: any = getSelectItems()
+  const list: any = []
+  items.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromtaskname,
+    })
+  })
 
-  if (msg !== null) {
-    message.error(msg)
-    return
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
   }
-
-  dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      approval(items)
-    },
-    onNegativeClick: () => {},
-  })
+  console.log(param)
+  reload()
+  checkedRowKeys.value = []
+  console.log(selectionIds.value)
+  // doAudit(param)
 }
 
-// function approval(items) {
-//   const formIds: string[] = items.map(item => item.id)
-//   const taskIds: string[] = items.map(item => item.taskId)
-//   const tasknames: string[] = items.map(item => item.taskname)
-
-//   const param: ApprovalParam = {
-//     formid: formIds,
-//     taskId: taskIds,
-//     approvd: true,
-//     taskComment: 'approval',
-//     taskname: tasknames,
-//   }
-
-//   doAudit(param)
-// }
-
 // 审核不通过
 function rejectHandler(list) {
   const msg = validate(list)
@@ -713,24 +708,8 @@ function rejectHandler(list) {
   modal.showModal(list)
 }
 
-function reject(idOrDesc: string, backId: string, isOther: boolean) {
-  const items = getSelectItems()
-  const formIds: string[] = items.map(item => item.id)
-  const taskIds: string[] = items.map(item => item.fromtaskid)
-  const tasknames: string[] = items.map(item => item.fromtaskname)
-
-  const param: ApprovalParam = {
-    formid: formIds,
-    taskId: taskIds,
-    approvd: false,
-    taskComment: idOrDesc,
-    taskname: isOther ? tasknames : ['其他'],
-  }
-
-  doAudit(param)
-}
-
 function reload() {
+  selectionIds.value = []
   const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
   query(page!, pageSize!)
 }
@@ -786,10 +765,21 @@ function doAudit(param: any) {
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
-        <div class="btn" @click="batchApproval">
+        <div class="batch">
+          <NButton text @click="setBatch(false)">
+            <template #icon>
+              <SvgIcon name="revoke" />
+            </template>
+            返回
+          </NButton>
+          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
+          <SvgIcon size="24" name="vs" />
+          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
+        </div>
+        <!-- <div class="btn" @click="batchApproval">
           <SvgIcon style="margin-right: 6px" size="14" name="tf" />
           批量审批
-        </div>
+        </div> -->
         <n-popover
           ref="popover"
           :style="{ padding: '0px' }"
@@ -839,6 +829,7 @@ function doAudit(param: any) {
     <div class="wrapper-content">
       <NDataTable
         ref="tableRef"
+        v-model:checked-row-keys="checkedRowKeys"
         remote
         :columns="columnsRef"
         :scroll-x="1250"
@@ -874,6 +865,21 @@ function doAudit(param: any) {
 .color-red{
   color: #FF4E4F!important;
 }
+
+.batch {
+  display: flex;
+  align-items: center;
+
+  .btn-approval{
+    width: 68px;
+    height: 28px;
+    cursor: pointer;
+  }
+
+  .btn-left{
+    margin-left: 16px;
+  }
+}
 .wrapper {
   display: flex;
   flex: 1;

src/views/task/content/Content.vue

@@ -212,7 +212,7 @@ async function handleDragEnd(event, item) {
   // 可以在这里添加拖拽结束后的逻辑
   const flag = taskStore.getInFile
   if (flag) {
-    const res = await dubiousfileyd({ pictureid: item.pictureid })
+    const res = await dubiousfileyd({ pictureid: item.pictureId })
     if (res.code === 'OK') {
       message.success('加入成功')
       getTableData()