Merge branch 'test' into al_bak

# Conflicts:
#	src/views/final/content/Content.vue

src/views/final/comp/RepeatTaskTableModal.vue

@@ -184,7 +184,7 @@ async function query(page: number, pageSize: number) {
   const result = await getRepeatList({
     sortorder: 'asc',
     pageSize: pagination.pageSize,
-    pageNo: 1,
+    pageNo: pagination.page,
     sortname: '',
   })
   console.log(666666)
@@ -362,6 +362,15 @@ function goDetail(row) {
   router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
 }
 
+const showActions = computed(() => {
+  return selectionIds.value.length
+})
+
+function switchBatch() {
+  selectionIds.value = []
+  checkedRowKeys.value = []
+}
+
 defineExpose({
   showModal,
 })
@@ -387,10 +396,26 @@ defineExpose({
                 <span>任务信息</span>
               </div>
             </div>
+
             <div class="batch">
-              <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
+              <div v-show="!showActions" style="display: flex; align-items: center">
-              <SvgIcon size="24" name="vs" />
+                <div class="btn-batch">
-              <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
+                  <SvgIcon style="margin-right: 6px" size="22" name="batch" />
+                  批量审批
+                </div>
+              </div>
+              <div v-show="showActions" style="display: flex; align-items: center">
+                <NButton text @click="switchBatch()">
+                  <template #icon>
+                    <SvgIcon name="revoke" />
+                  </template>
+                  取消
+                </NButton>
+
+                <img class="btn-approval btn-left" style="margin-left: 16px" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
+                <SvgIcon size="24" name="vs" />
+                <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
+              </div>
             </div>
             <div class="wrapper-content">
               <NDataTable
@@ -530,4 +555,18 @@ defineExpose({
   border: 1px solid #cad2dd;
   background-color: #fff;
 }
+
+.btn-batch {
+  width: 118px;
+  height: 36px;
+  background: linear-gradient(135deg, #5b85f8, #3c6cf0);
+  border-radius: 17px;
+  box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  margin-right: 6px;
+  cursor: pointer;
+}
 </style>

src/views/final/content/Content.vue

@@ -618,6 +618,10 @@ function getSelectItems() {
   return tableData.value.filter((item) => selectionIds.value.includes(item.id));
 }
 
+const showActions = computed(() => {
+  return selectionIds.value.length
+})
+
 // 单个审批通过
 function singleApproval(row) {
   const param = {
@@ -716,6 +720,11 @@ function doAudit(param: any) {
   });
 }
 
+function switchBatch() {
+  selectionIds.value = []
+  checkedRowKeys.value = []
+}
+
 function reload() {
   selectionIds.value = [];
   checkedRowKeys.value = [];
@@ -758,20 +767,26 @@ defineExpose({
         <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
-        <SvgIcon
+        <SvgIcon style="margin-right: 6px;" size="13" name="summary" @click="showModal(repeatModalRef)" />
-          style="margin-right: 6px"
+        <NButton class="xjcc" text @click="showModal(repeatModalRef)">
-          size="13"
+          小结查重
-          name="summary"
+        </NButton>
-          @click="showModal(repeatModalRef)"
+
-        />
+        <div v-show="!showActions" style="display: flex; align-items: center">
-        <NButton class="xjcc" text @click="showModal(repeatModalRef)"> 小结查重 </NButton>
+          <div class="btn">
-        <div class="batch">
+            <SvgIcon style="margin-right: 6px" size="22" name="batch" />
-          <img
+            批量审批
-            class="btn-approval btn-left"
+          </div>
-            src="@/assets/images/task/btn-not-pass.png"
+        </div>
-            alt=""
+        <div v-show="showActions" class="batch">
-            @click.stop="batchReject"
+          <NButton text @click="switchBatch()">
-          />
+            <template #icon>
+              <SvgIcon name="revoke" />
+            </template>
+            取消
+          </NButton>
+
+          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
           <SvgIcon size="24" name="vs" />
           <img
             class="btn-approval"
@@ -780,10 +795,7 @@ defineExpose({
             @click.stop="batchApproval"
           />
         </div>
-        <!-- <div class="btn" @click="batchApproval">
+
-          <SvgIcon style="margin-right: 6px" size="14" name="tf" />
-          批量审批
-        </div> -->
         <n-popover
           ref="popover"
           :style="{ padding: '0px' }"

src/views/worksheet/content/Content.vue

@@ -222,8 +222,9 @@ async function queryDetail(checkDuplicateId: any) {
 
   refreshHandler();
 }
+// 点击任务包图片，查看详情
 async function handleSelect(item: any) {
-  taskDetailInfo.value = await getTaskDetailInfo(item.id)
+  // taskDetailInfo.value = await getTaskDetailInfo(item.id)
   const packageid = workStore.getActiveId;
   if (isEmpty(packageid)) {
     listData.value.length = 0;