Merge branch 'ch/bug7309' of eta_forum/eta_forum_admin_front into master

src/views/etaTrial/etaTrialList.vue

@@ -274,6 +274,7 @@ const getTableData = async (type) => {
   total.value = Paging.Totals;
   approvalNum.value = ApprovalNum || 0;
   tableLoading.value = false;
+  cancelKeys.value = [];
   if(checkAll.value){
     //全选了去除之前记录被手动取消勾选的项
     tableData.value.forEach(item=>{
@@ -449,7 +450,7 @@ const moveConfirm = (data) => {
   const currentSellerId = parseInt(moveValue);
   const params = {
     currentSellerId,
-    EtaTrialIdList: checkAll.value ? cancelSelectRowKeys : selectArr,
+    EtaTrialIdList: type === 2 && checkAll.value ? cancelKeys.value : selectArr,
     IsCheckAll: type === 1 ? false : checkAll.value,
     CurrentSellerName: findElementByAdminId(moveInfo.salesArr, currentSellerId).RealName,
   };