Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/operation/CustomerReconciliation/index.vue

@@ -1,39 +1,41 @@
 <template>
-  <BasicTable
-    @register="registerTable"
-    @row-dbClick="
-      (e) => {
-        GoDetailed(true, e)
-      }
-    "
-  >
-    <!-- <template #form-more>
+  <div>
+    <BasicTable
+      @register="registerTable"
+      @row-dbClick="
+        (e) => {
+          GoDetailed(true, e)
+        }
+      "
+    >
+      <!-- <template #form-more>
         <a-button type="link">多提单号查询</a-button>
         <a-button type="link">高级查询</a-button>
       </template> -->
-    <template #toolbar>
-      <!-- <a-button type="primary" @click="addReconciliation"> 新建 </a-button> -->
-      <div class="buttonGroup">
-        <div class="nav" @click="GoDetailed(false, null)">
-          <i class="iconfont icon-jiahao2fill"></i>新建
-        </div>
-        <div class="nav" @click="FnDel"> <i class="iconfont icon-shanchu"></i>删除 </div>
-        <div class="nav" @click="Lock">
-          <Icon icon="ant-design:lock-outlined" class="iconfont" />
-          锁定
-        </div>
-        <div class="nav" @click="UnLock">
-          <Icon icon="ant-design:unlock-outlined" class="iconfont" />
-          撤销锁定
-        </div>
-        <div class="nav" @click="ExportExcel">
-          <i class="iconfont icon-weibiaoti--"></i>EXCEL导出
+      <template #toolbar>
+        <!-- <a-button type="primary" @click="addReconciliation"> 新建 </a-button> -->
+        <div class="buttonGroup">
+          <div class="nav" @click="GoDetailed(false, null)">
+            <i class="iconfont icon-jiahao2fill"></i>新建
+          </div>
+          <div class="nav" @click="FnDel"> <i class="iconfont icon-shanchu"></i>删除 </div>
+          <div class="nav" @click="Lock">
+            <Icon icon="ant-design:lock-outlined" class="iconfont" />
+            锁定
+          </div>
+          <div class="nav" @click="UnLock">
+            <Icon icon="ant-design:unlock-outlined" class="iconfont" />
+            撤销锁定
+          </div>
+          <div class="nav" @click="ExportExcel">
+            <i class="iconfont icon-weibiaoti--"></i>EXCEL导出
+          </div>
+          <div class="nav" @click="printFee"> <i class="iconfont icon-xiaopiaodayin"></i>打印 </div>
         </div>
-        <div class="nav" @click="printFee"> <i class="iconfont icon-xiaopiaodayin"></i>打印 </div>
-      </div>
-    </template>
-  </BasicTable>
-  <DsPrint ref="dsPrint" name="客户对账"></DsPrint>
+      </template>
+    </BasicTable>
+    <DsPrint ref="dsPrint" name="客户对账"></DsPrint>
+  </div>
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'

src/views/operation/seaexport/detail/modules/preOrder.vue

@@ -328,8 +328,13 @@
                             保存
                           </a-button>
                         </div>
-                        <!-- @click="CopyConsignee" -->
-                        <a-button class="order-btn" size="small" type="primary">
+
+                        <a-button
+                          class="order-btn"
+                          size="small"
+                          type="primary"
+                          @click="CopyConsignee"
+                        >
                           复制通知人
                         </a-button>
                       </div>
@@ -1323,6 +1328,7 @@
       }
     })
   }
+  function CopyConsignee() {}
   function PortChange(data, type) {
     console.log(data, type)
     portList.value.forEach((item) => {