From ba97c6ce65fd83fd7d57bb409c770815640ad475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 26 Jun 2024 17:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pad=E3=80=91=E9=97=B4=E8=B7=9D?=
 =?UTF-8?q?=E7=AD=89=E9=80=82=E9=85=8D=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/public/config.js                        |  2 +-
 .../components/padListPage/index.vue          |  2 +-
 .../padManage/isPadForTransferLibJob.vue      | 27 ++++++++++++++++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js
index 788283122..ea2f7a384 100644
--- a/fe/PC/public/config.js
+++ b/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 
 // 高拍仪获取地址
diff --git a/fe/PC/src/views/padManage/components/padListPage/index.vue b/fe/PC/src/views/padManage/components/padListPage/index.vue
index 9c920963e..3dea30d29 100644
--- a/fe/PC/src/views/padManage/components/padListPage/index.vue
+++ b/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
diff --git a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
index 701c6fd4b..7ad6e5eec 100644
--- a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
+++ b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
@@ -33,13 +33,15 @@
       :visible="compeletHandleVisible"
       v-loading="compeletLoading"
       top="5vh"
-      width="90%">
-      <div style="height:calc(100vh - 280px);overflow:auto">
+      class="compeletHandlePop"
+      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>
\ No newline at end of file