From 3ddf35ba98443266e19f20a0cf788ce6e8128ae3 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 22 May 2024 09:19:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containerRecordMain/containerRecordMain.data.ts  |  1 +
 .../unplannedreceiptRequestMain/index.vue            | 12 ++++++++----
 .../purchasereturnRequestMain.data.ts                |  3 +++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
index f29e5788f..eee4eb48f 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
@@ -274,6 +274,7 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     hiddenInMain:true,
     isTableForm: false,
+    isTable: false,
     table: {
       width: 150,
       fixed: 'right'
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index f51f37065..7986b0870 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -464,10 +464,14 @@ const handleAgree = async (id: number) => {
 const handleHandle = async (id: number) => {
   await message.confirm(t('common.confirmHandle'))
   tableObject.loading = true
-  await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id)
-  message.success(t('common.handleSuccess'))
-  tableObject.loading = false
-  await getList()
+  try {
+    await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 /** 添加/修改操作 */
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index daf309ff7..39441468d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -608,6 +608,9 @@ export const PurchasereturnRequestMainRules = reactive({
   supplierCode: [
     { required: true, message: '请输入供应商代码', trigger: 'blur' }
   ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'blur' }
+  ],
   purchaseReceiptRecordNumber: [
     { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
   ],