Merge branch 'debug' of http://8.136.199.33:3000/eta_forum/eta_forum_admin_front into debug

src/plugin/dialog.jsx

@@ -22,6 +22,6 @@ export function $confirmDialog(props){
         reject(false)
         confirmDia.destroy();
       },
-    });
+    }); 
   })
 }

src/views/etaTrial/etaTrialList.vue

@@ -328,9 +328,14 @@ function tableSelectChange(value, ctx) {
   
   if (ctx.type === 'uncheck') {
     if (ctx.currentRowKey === 'CHECK_ALL_BOX') {
-      tableData.value.forEach(i => cancelSelectRowKeys.push(i.EtaTrialId));
+      tableData.value.forEach(i => {
+        cancelSelectRowKeys.push(i.EtaTrialId)
+        cancelKeys.value.push(i.EtaTrialId)
+      }
+    );
     } else {
       cancelSelectRowKeys.push(ctx.currentRowKey);
+      cancelKeys.value.push(ctx.currentRowKey)
     }
     indeterminate.value = selectedRowKeys.value.length > 0;
     checkAll.value = selectedRowKeys.value.length === 0 ? false : checkAll.value;
@@ -343,10 +348,13 @@ function tableSelectChange(value, ctx) {
     } else {
       cancelSelectRowKeys = cancelSelectRowKeys.filter(i => selectedRowKeys.value.includes(i));
     }
+    cancelKeys.value = cancelKeys.value.filter(i => !selectedRowKeys.value.includes(i))
   }
-  cancelKeys.value = cancelSelectRowKeys
+  cancelKeys.value = [...new Set(cancelKeys.value)]
+  console.log(selectedRowKeys.value);
 }
 
+// 列表全选操作
 function handleClickCheckAll(check) {
   if(!check&&indeterminate.value){
     selectedRowKeys.value=[...selectedRowKeys.value,...cancelSelectRowKeys]
@@ -441,7 +449,7 @@ const moveConfirm = (data) => {
   const currentSellerId = parseInt(moveValue);
   const params = {
     currentSellerId,
-    EtaTrialIdList: selectArr,
+    EtaTrialIdList: checkAll.value ? cancelSelectRowKeys : selectArr,
     IsCheckAll: type === 1 ? false : checkAll.value,
     CurrentSellerName: findElementByAdminId(moveInfo.salesArr, currentSellerId).RealName,
   };