From ff662374d8360b792a77ae5cbb54361605475880 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Fri, 2 Aug 2024 15:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/seaexport/detail/modules/goodsTable.vue     | 5 +++--
 src/views/system/org/OrgModal.vue                         | 8 ++++----
 src/views/system/org/columns.tsx                          | 6 ------
 src/views/system/org/index.vue                            | 1 +
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/views/operation/seaexport/detail/modules/goodsTable.vue b/src/views/operation/seaexport/detail/modules/goodsTable.vue
index 504a515c..d3085587 100644
--- a/src/views/operation/seaexport/detail/modules/goodsTable.vue
+++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue
@@ -1636,7 +1636,7 @@
       // 这里定义了编辑，自动填充和拷贝数据的处理逻辑
       if (source === 'edit' || source === 'Autofill.fill' || source === 'CopyPaste.paste') {
         let dict: any = {}
-
+        // 选择箱型联动逻辑
         if (changes[0][1] === 'ctn') {
           const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
           if (!ctnDict.value.length) ctnDict.value = res
@@ -1644,7 +1644,7 @@
             return item.ctnName === changes[0][3]
           })
           if (item) dict = item[0]
-          
+          console.log(dict)
           list.value[changes[0][0]]['ctn'] = dict?.ctnName
           list.value[changes[0][0]]['ctnCode'] = dict?.edicode
           list.value[changes[0][0]]['size'] = dict?.ctnSize
@@ -1654,6 +1654,7 @@
             OTeu.value = dict.teu
           }
           list.value[changes[0][0]]['tareWeight'] = dict?.ctnWeight
+          console.log(list.value)
         }
         if (changes[0][1] === 'kindPkgsName') {
           const res = kindPkgsDict.value.length
diff --git a/src/views/system/org/OrgModal.vue b/src/views/system/org/OrgModal.vue
index 82508821..892877fa 100644
--- a/src/views/system/org/OrgModal.vue
+++ b/src/views/system/org/OrgModal.vue
@@ -9,11 +9,11 @@
     <a-tabs @change="tabChange" v-model:activeKey="activeKey">
       <a-tab-pane key="0" tab="机构信息">
         <BasicForm @register="registerForm">
-          <template #isDepartment="item">
-            <a-switch @change="changeIsDepartment" v-model:checked="item.values.isDepartment" /> <span class="s-txt" :class="{ 's-active': item.values.isDepartment }">{{ item.values.isDepartment ? '是' : '否'}}</span>
+          <template #isDepartment="{ model }">
+            <a-switch @change="changeIsDepartment" v-model:checked="model.isDepartment" /> <span class="s-txt" :class="{ 's-active': model.isDepartment }">{{ model.isDepartment ? '是' : '否'}}</span>
           </template>
-          <template #status="item">
-            <a-switch @change="changeStatus" v-model:checked="item.values.status" /> <span class="s-txt" :class="{ 's-active': item.values.status }">{{ item.values.status ? '启用' : '禁用'}}</span>
+          <template #status="{ model }">
+            <a-switch @change="changeStatus" v-model:checked="model.status" /> <span class="s-txt" :class="{ 's-active': model.status }">{{ model.status ? '启用' : '禁用'}}</span>
           </template>
         </BasicForm>
       </a-tab-pane>
diff --git a/src/views/system/org/columns.tsx b/src/views/system/org/columns.tsx
index 11d7f894..6c30b4fa 100644
--- a/src/views/system/org/columns.tsx
+++ b/src/views/system/org/columns.tsx
@@ -400,12 +400,6 @@ export const formSchema: FormSchema[] = [
     component: 'Switch',
     label: '是否部门标识',
     required: true,
-    componentProps: {
-      options: [
-        { label: '是', value: true },
-        { label: '否', value: false },
-      ],
-    },
     defaultValue: false,
     colProps: {
       span: 6,
diff --git a/src/views/system/org/index.vue b/src/views/system/org/index.vue
index e33406ff..09d2ef4e 100644
--- a/src/views/system/org/index.vue
+++ b/src/views/system/org/index.vue
@@ -137,6 +137,7 @@
     })
   }
   async function handleSelect(key: string, e) {
+    console.log(e)
     if (e.selectedNodes[0]) {
       ParentId.value = e.selectedNodes[0].value
     } else {