From 8424ae72ff3fc1edc3a41659f3bea6b83385258d Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Fri, 13 Sep 2024 10:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E7=BB=84=E4=BB=B6=E4=BC=A0?=
 =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/seaexport/detail/index.vue      |  2 +-
 .../seaexport/detail/modules/cargoInfo.vue    |  1 +
 .../seaexport/detail/modules/goodsTable.vue   | 30 +++++--------------
 .../seaexport/detail/modules/noteInfo.vue     |  1 +
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index b7a93ce8..526277b4 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -186,7 +186,7 @@
   const operationArea = defineAsyncComponent(() => import("./modules/operationArea.vue"))
   import basicInfo from './modules/basicInfo.vue'
   import mailingInfo from './modules/mailingInfo.vue'
-  import noteInfo from './modules/noteInfo.vue'
+  const noteInfo = defineAsyncComponent(() => import("./modules/noteInfo.vue"))
   const cargoInfo = defineAsyncComponent(() => import("./modules/cargoInfo.vue"))
   const goodsTable = defineAsyncComponent(() => import("./modules/goodsTable.vue"))
   const ediMore = defineAsyncComponent(() => import("./modules/ediMore.vue"))
diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index 47942ae4..ffe60e67 100644
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -407,6 +407,7 @@
   const source = ref(route.query.source || 'edit') 
   onMounted(() => {
     const nval = props.details
+    console.log(nval)
     if (nval.id) {
       setFieldsValue1({ marks: nval.marks, description: nval.description })
       setFieldsValue2(nval)
diff --git a/src/views/operation/seaexport/detail/modules/goodsTable.vue b/src/views/operation/seaexport/detail/modules/goodsTable.vue
index c43413fa..2b9a51f5 100644
--- a/src/views/operation/seaexport/detail/modules/goodsTable.vue
+++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue
@@ -252,7 +252,7 @@
   const route = useRoute()
   const props = defineProps({
     details: { type: Object, default: {} },
-    isLockBooking: { type: Boolean, default: false },
+    isLockBooking: { type: Boolean, default: false }
   })
   // 判断页面进入源
   const source = 'edit'
@@ -1259,7 +1259,6 @@
     },
   ])
   function init(data, hot) {
-    console.log(data)
     const { ctnInfo } = data
     if (ctnInfo && ctnInfo.length > 0) {
       totalPkgs.value = 0
@@ -1618,32 +1617,17 @@
     }
   })
   watch(
-    list.value,
+    () => props.details,
     (val) => {
-      let a = 0
-      let b = 0
-      val.forEach((item) => {
-        if (item.selected) {
-          a += 1
-        } else {
-          b += 1
-        }
-      })
-      if (a == 0) {
-        allCheck.value = false
-      }
-      if (b == 0) {
-        allCheck.value = true
-      }
-      if (a != 0 && b != 0) {
-        someCheck.value = true
-      } else {
-        someCheck.value = false
+      // 渲染表格数据
+      if (val.ctnInfo && val.ctnInfo.length) {
+        const hot = hotmain.value.hotInstance
+        init(val, hot)
       }
     },
     {
       deep: true,
-    },
+    }
   )
   // 表格配置项
   const settings = {
diff --git a/src/views/operation/seaexport/detail/modules/noteInfo.vue b/src/views/operation/seaexport/detail/modules/noteInfo.vue
index f46ebf1c..c0272c78 100644
--- a/src/views/operation/seaexport/detail/modules/noteInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/noteInfo.vue
@@ -80,6 +80,7 @@
         })
       }
     })
+    setFieldsValue(props.details)
     // if (source.value != 'edit') {
     //   noteFormSchema.forEach(item => {
     //     item.dynamicDisabled = true