From 0421ee55eb5a2f29fd80366ea4dadabd01aca81a Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 1 Nov 2024 15:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4tob=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/ReconciliationDepositSlip.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/finance/ReconciliationDepositSlip.vue b/src/views/finance/ReconciliationDepositSlip.vue
index f5bc428c..75875c7e 100644
--- a/src/views/finance/ReconciliationDepositSlip.vue
+++ b/src/views/finance/ReconciliationDepositSlip.vue
@@ -235,7 +235,11 @@ import {
   handleTranslationDataSeclect,
   getObjType,
 } from '@/utils/util';
-import { columnList, confirmColumnList,columnListB } from '@/option/finance/ReconciliationDepositSlip';
+import {
+  columnList,
+  confirmColumnList,
+  columnListB,
+} from '@/option/finance/ReconciliationDepositSlip';
 import { useRouter } from 'vue-router';
 import { deepClone } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -460,9 +464,9 @@ const searchChange = () => {
 /** 清空表单 */
 const searchReset = () => {
   // details.query = {};
-  console.log(details,'details');
-  
-  details.pageStatus == 1 ? (details.pageInfo[0].query={}) : (details.pageInfo[1].query={});
+  console.log(details, 'details');
+
+  details.pageStatus == 1 ? (details.pageInfo[0].query = {}) : (details.pageInfo[1].query = {});
   details.page.pageNum = 1;
   handleClearTableQuery(details.pageStatus === 1 ? details.columnList1 : details.columnList2);
   initOnLoad();
@@ -563,6 +567,7 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
 
 /** 生成对账单 */
 const handleConfirm = async () => {
+  await nextTick();
   if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据');
 
   const _errorArr = [];
@@ -583,7 +588,8 @@ const handleConfirm = async () => {
       return ElMessage.warning(`收货单位不一致，请移除不一致数据`);
     if (value.destinationWarehouseName !== _destinationWarehouseName)
       return ElMessage.warning(`目的仓不一致，请移除不一致数据`);
-    if (Number(value.signStatus) !== 2) return ElMessage.warning(`存在未签收完成的数据`);
+    if (details.pageStatus === 2 && Number(value.signStatus) !== 2)
+      return ElMessage.warning(`存在未签收完成的数据`);
   }
 
   details.popUpShow.confirmVisited = true;