From b4a3430b5e409ffe386431557b2e67d5b9ab73b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 4 Apr 2023 11:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseReceipt/SupplierAsn-msQuery.vue        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
index 2416b205a..e44ee95d7 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
@@ -25,6 +25,19 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      methodValue="0"
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
     <!-- 抽屉 -->
     <curren-Drawer
       :title="tableColumns"
@@ -75,6 +88,7 @@ export default {
       //常用按钮数据
       currenButtonData: [
         // this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选