【nev-pad】间距等适配暂存

fe/PC/public/config.js

@@ -21,7 +21,7 @@ window.SITE_CONFIG['company'] = 'DongYang'
 window.SITE_CONFIG['client_secret'] = '1q2w3E*'
 window.SITE_CONFIG['reportsUrl'] = 'http://dev.ccwin-in.com:60079/#/',//74/#/reports/
 window.SITE_CONFIG['versionUrl'] = 'http://dev.ccwin-in.com:60070'
-window.SITE_CONFIG['companyName'] = '长春一汽富维东阳汽车塑料零部件（安徽）有限公司'
+window.SITE_CONFIG['companyName'] = '长春富维东阳汽车零部件有限公司（长春卓越工厂）'
 //pad-kitting组包页面刷新时间（毫秒）
 window.SITE_CONFIG['padKittingPackUpdate'] = 180000 
 // 高拍仪获取地址

fe/PC/src/views/padManage/components/padListPage/index.vue

@@ -116,7 +116,7 @@
     <el-empty v-if="(!padListData || padListData.length <= 0) && !padListLoading" description="暂无数据"></el-empty>
     <!-- 页脚 -->
     <div class="padListPager" v-if="padListData && padListData.length > 0">
-      <div v-loading="padListLoading" element-loading-text="拼命加载中"><span v-if="!noPager">当前页:{{padListPager.currentPage}}/{{padListPager.totalPage}}（</span>共{{padListPager.totalCount}}条数据<span v-if="!noPager">）</span></div>
+      <div v-loading="padListLoading" element-loading-text="拼命加载中"><span v-if="!noPager">当前已加载页面:{{padListPager.currentPage}}/{{padListPager.totalPage}}（</span>共{{padListPager.totalCount}}条数据<span v-if="!noPager">）</span></div>
     </div>
     <!-- 查看明细 -->
     <el-dialog

fe/PC/src/views/padManage/isPadForTransferLibJob.vue

@@ -33,13 +33,15 @@
       :visible="compeletHandleVisible"
       v-loading="compeletLoading"
       top="5vh"
-      width="90%">
+      class="compeletHandlePop"
-      <div style="height:calc(100vh - 280px);overflow:auto">
+      width="90%"
+      >
+      <div style="height:calc(95vh - 200px);overflow:auto">
         <currenForm
           :labelWidth="'90px'"
           ref="compeletHandleForm_Ref"
           :style="'width:calc(100% - 100px)'"
-          size="medium"
+          size="mini"
           :searchData="compeletFormData"
           :searchForm="compeletForm"
           :rules="compeletRule"
@@ -49,6 +51,7 @@
           v-if="compeletHandleVisible"
           :border="true"
           :column="3"
+          size="mini"
           :direction="'horizontal'"
           :colon="false"
           :tabsDesTions="padDeatilColumn"
@@ -68,7 +71,7 @@
       :visible="showInventoryVisible"
       top="5vh"
       width="90%">
-      <div v-loading="showInventoryLoading" style="height:calc(100vh - 220px);overflow:auto">
+      <div v-loading="showInventoryLoading" style="height:calc(95vh - 200px);overflow:auto">
         <div 
           class="showInventoryRow"
           v-for="(item,index) in inventoryTableData"
@@ -79,6 +82,7 @@
           </div>
           <curren-descriptions
             :column="2"
+            size="mini"
             :border="true"
             :direction="'horizontal'"
             :tabsDesTions="inventoryColumn"
@@ -472,6 +476,9 @@ export default {
 <style lang="scss" scoped>
 @import "@/styles/padMain.scss";
 .showInventoryPop{
+  ::v-deep .el-dialog{
+    margin-bottom:0 !important
+  }
   ::v-deep .el-dialog__body{
     padding:0 15px !important;
   }
@@ -502,5 +509,17 @@ export default {
     height:28px;
     overflow:hidden
   }
+  
+  .compeletHandlePop{
+    ::v-deep .el-dialog{
+      margin-bottom:0 !important
+    }
+    ::v-deep .el-dialog__body{
+      padding:0 !important
+    }
+    .el-form-item--mini.el-form-item{
+      margin-bottom:10px !important
+    }
+  }
 }
 </style>