导入预览高度问题调整

fe/PC/src/components/importFile/index.vue

@@ -7,8 +7,7 @@
     :visible.sync="show"
     :append-to-body="true"
     :modal-append-to-body="false"
-    top="5vh"
+    width="85%"
-    width="950px"
     :show-close="false"
   >
     <div class="body_header">
@@ -56,13 +55,14 @@
     :modal-append-to-body="false"
     :show-close="false"
     width="85%"
-    top="3vh"
   >
     <div >
       <el-table 
         :data="excelData.results" 
-        border highlight-current-row 
+        :border="true" 
-        style="width: 100%;margin-top:10px;"
+        highlight-current-row 
+        style="width: 100%;
+        margin-top:10px;"
         max-height="400"
       >
         <el-table-column 
@@ -255,7 +255,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-dialog__body {
-  max-height: 50vh;
+  max-height: 100vh;
   display: flex;
   flex-direction: column;
 }

fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue

@@ -25,27 +25,14 @@
       :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> -->
     <!-- 表格导入 -->
-    <upload-excel-component 
+    <!-- <upload-excel-component 
       :DrawerLoading="Loading.DrawerLoading"
       :before-upload="beforeUpload"
       :show="displayDialog.importDialog"
       @postImportDown="importDown()"
       @submitForm="uploadSubmitForm"
-    />
+    /> -->
     <!-- 抽屉 -->
     <curren-Drawer
       :title="tableColumns"
@@ -103,7 +90,7 @@ export default {
       // importUploadURL:"wms/store/supplier-asn/newImport",
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选