From 4442d15febf485cd82bf6a4803a836575fb43772 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Fri, 20 Sep 2024 15:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business-asn/asn/index.vue         | 4 +++-
 src/views/business-asn/asn/viewAsnDetail.vue | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/business-asn/asn/index.vue b/src/views/business-asn/asn/index.vue
index 9deb83c..63619fc 100644
--- a/src/views/business-asn/asn/index.vue
+++ b/src/views/business-asn/asn/index.vue
@@ -45,6 +45,7 @@
 <!--      >-->
 <!--        新增-->
 <!--      </el-button>-->
+      <viewAsnDetail ref="viewAsnDetail" />
       <crudOperation :permission="permission" :tableKey="this.$options.name">
         <el-button
           slot="left"
@@ -274,12 +275,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <viewAsnDetail ref="viewAsnDetail" />
+
 
       <!--分页组件-->
       <div style="float: right;">
         <pagination/>
       </div>
+
     </div>
   </div>
 </template>
diff --git a/src/views/business-asn/asn/viewAsnDetail.vue b/src/views/business-asn/asn/viewAsnDetail.vue
index 4ca8a77..e125f0f 100644
--- a/src/views/business-asn/asn/viewAsnDetail.vue
+++ b/src/views/business-asn/asn/viewAsnDetail.vue
@@ -1,12 +1,13 @@
 <template>
-  <div class="app-container">
-
+  <div>
     <!--     卡片头   -->
     <el-dialog :visible.sync="dialogInsertAsn"
                center
                top="0.5vh"
                :fullscreen="fullscreen"
                width="80%"
+               :modal="false"
+               :close-on-click-modal="false"
                :before-close="handleClose"
     >
 
@@ -661,8 +662,7 @@ export default {
     ,
     rkAndQxButtonM(num) {
       if (num === 1) {   //整单入库
-        console.log()
-        if (this.asnFrom.id <= 0) {
+        if (this.asnFrom.id <= 0 || (Object.keys(this.asnFrom).length === 0)) {
           this.crud.notify('请先提交入库单', CRUD.NOTIFICATION_TYPE.ERROR)
         }
         this.logining1 = true