From 4c84edeca7c695adb6d9697b3262b25cd09e3e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 25 Jun 2024 17:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E5=B9=B3=E6=9D=BF=E3=80=91?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E8=B0=83=E6=95=B4=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/currenDescriptions/index.vue   |  5 +++
 fe/PC/src/styles/padMain.scss                 | 11 +++++-
 fe/PC/src/views/kittingManage/Kitting.vue     |  9 ++++-
 .../components/padListPage/index.vue          | 38 ++++++++++++++++---
 .../padManage/isPadForOutStockFinish.vue      | 13 ++++---
 .../padManage/isPadForTransferLibJob.vue      | 27 ++++++++++++-
 6 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/fe/PC/src/components/currenDescriptions/index.vue b/fe/PC/src/components/currenDescriptions/index.vue
index ca6677a2c..a21b2bbd2 100644
--- a/fe/PC/src/components/currenDescriptions/index.vue
+++ b/fe/PC/src/components/currenDescriptions/index.vue
@@ -6,6 +6,7 @@
     :colon="colon"
     :border="border"
     v-loading="currenDescriptionsLoading"
+    :size="size"
   >
   <template>
     <el-descriptions-item
@@ -148,6 +149,10 @@ export default {
       type: Boolean,
       default: true
     },
+    size: {
+      type: String,
+      default: null
+    },
     column: {
       type: Number,
       default: 1
diff --git a/fe/PC/src/styles/padMain.scss b/fe/PC/src/styles/padMain.scss
index 1df7aa791..352765373 100644
--- a/fe/PC/src/styles/padMain.scss
+++ b/fe/PC/src/styles/padMain.scss
@@ -50,7 +50,7 @@
   }
 
   .padListCard{
-    height: 100%;
+    height: calc(100% - 4px);
     overflow: auto;
     background: #f8f8f8;
     margin-top: 4px;
@@ -122,15 +122,22 @@
 }
 .commonRowTitle{
   background: #ecf5ff;
-  padding: 10px;
+  padding: 7px 10px;
   border: 1px solid #e6ebf5;
   border-bottom: none;
   display: flex;
+  height: 38px;
+  line-height: 26px;
+  overflow: hidden;
 
   .el-tag{
     margin-right: 10px;
   }
 
+  .indexTag{
+    margin-top: 2px;
+  }
+
   .left{
     width: 100%;
     display: flex;
diff --git a/fe/PC/src/views/kittingManage/Kitting.vue b/fe/PC/src/views/kittingManage/Kitting.vue
index 0fd3d60ff..03a9b1b8d 100644
--- a/fe/PC/src/views/kittingManage/Kitting.vue
+++ b/fe/PC/src/views/kittingManage/Kitting.vue
@@ -9,7 +9,7 @@
       :totalCount="totalCount"
       :multipleSelection="multipleSelection"
       :MaxResultCount="PageListParams.MaxResultCount"
-      @topbutton="topbutton"
+      @topbutton="topbuttonHandle"
       @inlineDialog="inlineDialog"
       @sortChange="sortChange"
       @alertoldSkipCount="alertoldSkipCount"
@@ -186,11 +186,18 @@ export default {
     this.paging();
   },
   methods: {
+    topbuttonHandle(val,item){
+      if (val == 'newly') {
+        this.CreateForm[0].disabled = false
+      }
+      this.topbutton(val,item)
+    },
     addNewDataPush(val){
       console.log(201,val)
     },
     drawerbuttonHandle(val){
       if(val == "edit"){
+        this.CreateForm[0].disabled = true
         this.formTitle = this.$route.meta.title + "编辑";
         this.displayDialog.newDialog = true
         this.CreateFormData = JSON.parse(JSON.stringify(this.propsData));
diff --git a/fe/PC/src/views/padManage/components/padListPage/index.vue b/fe/PC/src/views/padManage/components/padListPage/index.vue
index a68480ede..9c920963e 100644
--- a/fe/PC/src/views/padManage/components/padListPage/index.vue
+++ b/fe/PC/src/views/padManage/components/padListPage/index.vue
@@ -49,14 +49,14 @@
       <el-button circle icon="el-icon-upload2" type="primary" class="pageToTop" @click="pageToTopHandle"></el-button>
     </div>
     <!-- 列表 -->
-    <div class="padListCard" v-show="padListData && padListData.length > 0" id="padListCard" v-loading="padListLoading">
+    <div class="padListCard" v-show="padListData && padListData.length > 0" id="padListCard" >
       <div 
         class="padListRow" 
         v-for="(item,index) in padListData"
         :key="index"
       > 
         <div class="commonRowTitle" :style="{background:getRowTitleBack(item)}">
-          <el-tag size="mini" effect="dark">{{index + 1}}</el-tag>
+          <el-tag size="mini" class="indexTag" effect="dark">{{index + 1}}</el-tag>
           <div v-if="!padMainStaColumn">{{item[padMainColumn[0].prop]}}</div>
           <div v-else class="hasStaTitle">
             <div v-if="padMainStaColumn[0]">{{item[padMainStaColumn[0].prop]}}</div>
@@ -72,20 +72,22 @@
         <!-- 主表 -->
         <div class="mainDataBox">
           <curren-descriptions
+            :size="mainSize"
             :column="mainColumnNum"
             :border="true"
             :tabsDesTions="padMainColumn"
             :propsData="item"
-            :labelStyle="{'margin-right':'5px'}"
+            :labelStyle="mainLabelStyle"
           ></curren-descriptions>
         </div>
         <!-- 主表内直接显示的子表 -->
         <div class="detailDataBox" v-if="mainIsShowDetail">
           <curren-descriptions
+            :size="detailSize"
             :column="detailColumnNum"
             :tabsDesTions="padDeatilColumn"
             :propsData="item.details[0]"
-            :labelStyle="{'margin-right':'5px'}"
+            :labelStyle="detailLabelStyle"
           ></curren-descriptions>
         </div>
         <!-- 按钮 -->
@@ -108,7 +110,9 @@
         </div>
       </div>
     </div>
-    <!-- 无数据 -->
+    <!-- 无数据且正在加载 -->
+    <div class="padListCard" v-if="(!padListData || padListData.length <= 0) && padListLoading" v-loading="padListLoading"></div>
+    <!-- 无数据且加载完成 -->
     <el-empty v-if="(!padListData || padListData.length <= 0) && !padListLoading" description="暂无数据"></el-empty>
     <!-- 页脚 -->
     <div class="padListPager" v-if="padListData && padListData.length > 0">
@@ -284,6 +288,30 @@ export default {
       type: Number,
       default: 2
     },
+    // 主表的标签的样式
+    mainLabelStyle:{
+      type: Object,
+      default: () => {
+        return {'margin-right':'5px'}
+      }
+    },
+    // 主表-明细的标签的样式
+    detailLabelStyle:{
+      type: Object,
+      default: () => {
+        return {'margin-right':'5px'}
+      }
+    },
+    // 主表大小
+    mainSize: {
+      type: String,
+      default: null
+    },
+    // 主表-明细大小
+    detailSize: {
+      type: String,
+      default: null
+    },
   },
   filters:{
     initMainFirstColumn(index,type,filters){
diff --git a/fe/PC/src/views/padManage/isPadForOutStockFinish.vue b/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
index 0a7ec44da..389c66f2f 100644
--- a/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
+++ b/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
@@ -4,10 +4,11 @@
     <div class="bottomBox">
       <el-form @submit.native.prevent class="formBox" :inline="true" :model="formData" size="small">
         <el-form-item label="出库物品条码">
-          <el-input @change="sureItem" ref="itemCode_Ref" clearable v-model="formData.itemCode" placeholder="请扫描出库物品条码"></el-input>
+          <!-- :inputmode="'none'" -->
+          <el-input  @change="sureItem" ref="itemCode_Ref" clearable v-model="formData.itemCode" placeholder="请扫描出库物品条码"></el-input>
         </el-form-item>
         <el-form-item>
-          <p style="color:#999;line-height:30px;margin:0;padding:0">如果不是使用扫码，请点击回车</p>
+          <!-- <p style="color:#999;line-height:30px;margin:0;padding:0">如果不是使用扫码，请点击回车</p> -->
           <!-- <el-button type="primary" @click="sureItem">回车/点击确定</el-button> -->
         </el-form-item>
       </el-form>
@@ -184,15 +185,17 @@ export default {
         padding:0;
 
         li{
-          margin-bottom:10px;
-          padding:10px;
+          line-height:18px;
+          margin-bottom:5px;
+          padding:5px 10px;
           border-bottom:dashed 1px #ddd;
           
           .del-button{
             color:#999;
             margin-right:8px;
             cursor: pointer;
-            font-size:18px
+            font-size:18px;
+            vertical-align: middle;
           }
         }
       }
diff --git a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
index be101c69d..701c6fd4b 100644
--- a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
+++ b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="padListPageOuter">
+  <div class="padListPageOuter isPadForTransferLibJobPage">
     <padListPage
       :listUrl="listUrl"
       ref="padListPage_Ref"
@@ -23,6 +23,8 @@
       :mainColumnNum="4"
       :detailColumnNum="4"
       :padMainStaColumn="[{prop:'number'},{prop:'jobStatus',filters:'jobStatus'}]"
+      :mainSize="'mini'"
+      :detailSize="'mini'"
     ></padListPage>
     <!-- :mainIsShowDetail="true" -->
     <!-- 完成库移弹窗 -->
@@ -231,11 +233,13 @@ export default {
           type: 'success',
           label: '完成库移',
           name: "compelet",
+          size: "mini",
           hide: (row) => { return this.hideRowButton(row,[1,2,4]) },
         },
         {
           type: 'primary',
           label: '查看库存余额',
+          size: "mini",
           name: "showInventory",
         },
       ],
@@ -478,4 +482,25 @@ export default {
     }
   }
 }
+.isPadForTransferLibJobPage{
+  ::v-deep .padListCard .detailDataBox{
+    padding:5px 0 0 10px !important;
+  }
+  ::v-deep .padListRow{
+    padding:10px !important;
+    margin-bottom:10px !important
+  }
+  ::v-deep .el-button--mini{
+    height:28px !important;
+    overflow:hidden !important;
+    line-height:12px !important;
+  }
+  ::v-deep .el-form-item--mini .el-form-item__label{
+    line-height: 28px;
+    font-weight: normal;
+    font-size: 14px;
+    height:28px;
+    overflow:hidden
+  }
+}
 </style>
\ No newline at end of file