修改台账出入库相关样式

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -130,11 +130,13 @@
             label="编码"
             min-width="120"
             v-if="dimension != 3 || dimension != 4"
+            :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column
             prop="name"
             width="200"
             label="名称"
+            :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column
             :width="item.width"
@@ -161,12 +163,14 @@
             prop="onlyCode"
             label="包装编码"
             min-width="120"
+            :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column
             v-if="dimension == 4"
             prop="no"
             label="物料编码"
             min-width="120"
+            :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column
             v-if="dimension == 4"
@@ -225,6 +229,7 @@
             prop="expirationTime"
             label="周期倒计时"
             min-width="120"
+            :show-overflow-tooltip="true"
           ></el-table-column>
           <el-table-column prop="weightUnit" label="质检状态" min-width="120">
             <template slot-scope="{ row }">
@@ -244,6 +249,7 @@
             prop="pathName"
             label="仓库"
             min-width="200"
+            :show-overflow-tooltip="true"
           ></el-table-column>
 
           <!-- <el-table-column prop="pathName" label="仓库"> </el-table-column> -->

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -337,7 +337,7 @@
               :show-message="false"
             >
               <el-table
-                ref="multipleTable"
+                ref="warehousingMaterialListTable"
                 :data="warehousingMaterialList"
                 tooltip-effect="dark"
                 style="width: 100%"
@@ -350,12 +350,14 @@
                 <el-table-column
                   label="编码"
                   prop="assetCode"
+                  width="150"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
-
                 <el-table-column
                   label="名称"
                   width="200"
                   prop="assetName"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
 
                 <el-table-column
@@ -363,8 +365,9 @@
                   :key="index"
                   align="center"
                   :label="item.label"
-                  width="150"
+                  :width="item.width"
                   :prop="item.prop"
+                  :show-overflow-tooltip="true"
                 >
                   <template slot-scope="{ row }">
                     <template v-if="item.formatter">{{
@@ -406,6 +409,7 @@
                   label="仓库"
                   width="300"
                   prop="pathName"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
                 <!-- <el-table-column
                 label="出库数量"
@@ -430,7 +434,7 @@
                   </el-row>
                 </template>
               </el-table-column> -->
-                <el-table-column label="操作" width="200">
+                <el-table-column fixed="right" label="操作" width="200">
                   <template slot-scope="{ row, $index }">
                     <el-button type="text" @click="listDel(row, $index)"
                       >删除</el-button
@@ -480,8 +484,14 @@
                   :label="`编码`"
                   min-width="100"
                   prop="assetCode"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
-                <el-table-column label="名称" prop="name" width="200">
+                <el-table-column
+                  label="名称"
+                  prop="name"
+                  width="200"
+                  :show-overflow-tooltip="true"
+                >
                 </el-table-column>
 
                 <el-table-column label="批次号" prop="batchNo">
@@ -491,14 +501,16 @@
                   label="包装编码"
                   min-width="100"
                   prop="onlyCode"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
                   v-for="(item, index) in tableHeader"
                   :key="index"
                   align="center"
                   :label="item.label"
-                  width="150"
+                  :width="item.width"
                   :prop="item.prop"
+                  :show-overflow-tooltip="true"
                 >
                   <template slot-scope="{ row }">
                     <template v-if="item.formatter">{{
@@ -511,6 +523,7 @@
                   label="物料编码"
                   width="250"
                   prop="no"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
 
                 <!-- <el-table-column label="生产日期" width="200">
@@ -630,6 +643,7 @@
   import eom from './components/eom.vue';
 
   import BatchDetail from './components/batchDetail.vue';
+  import { watch } from 'ele-admin/lib/ele-pro-table';
   export default {
     components: {
       BatchDetail,
@@ -1496,6 +1510,17 @@
         this.formData.deptName = data?.name;
         this.formData.deptCode = data?.code;
       }
+    },
+    watch: {
+      // 解决右侧悬浮操作栏不对称问题
+      warehousingMaterialList: {
+        handler() {
+          this.$nextTick(() => {
+            this.$refs.warehousingMaterialListTable.doLayout();
+          });
+        },
+        deep: true
+      }
     }
   };
 </script>

src/views/warehouseManagement/outgoingManagement/components/batchDetail.vue

@@ -10,10 +10,22 @@
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
     >
       <el-table-column label="序号" type="index" width="50"> </el-table-column>
-      <el-table-column label="编码" prop="onlyCode"></el-table-column>
-      <el-table-column label="名称" prop="name"></el-table-column>
+      <el-table-column
+        label="编码"
+        prop="onlyCode"
+        :show-overflow-tooltip="true"
+      ></el-table-column>
+      <el-table-column
+        label="名称"
+        prop="name"
+        :show-overflow-tooltip="true"
+      ></el-table-column>
       <el-table-column label="批次号" prop="batchNo"></el-table-column>
-      <el-table-column label="包装编码" prop="code"></el-table-column>
+      <el-table-column
+        label="包装编码"
+        prop="code"
+        :show-overflow-tooltip="true"
+      ></el-table-column>
       <el-table-column label="包装数量" prop="packingCountBase" width="120">
       </el-table-column>
       <el-table-column label="包装单位" prop="packingUnit"></el-table-column>

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -127,8 +127,13 @@
                 <el-table-column
                   label="编码"
                   prop="categoryCode"
+                  :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                  label="名称"
+                  prop="name"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
-                <el-table-column label="名称" prop="name"></el-table-column>
 
                 <el-table-column
                   v-for="(item, index) in tableHeader"
@@ -136,6 +141,8 @@
                   align="center"
                   :label="item.label"
                   :prop="item.prop"
+                  :width="item.width"
+                  :show-overflow-tooltip="true"
                 >
                   <template slot-scope="{ row }">
                     <template v-if="item.formatter">{{
@@ -217,13 +224,19 @@
             <el-table-column
               :label="`编码`"
               prop="categoryCode"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              :label="`名称`"
+              prop="name"
+              :show-overflow-tooltip="true"
             ></el-table-column>
-            <el-table-column :label="`名称`" prop="name"></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column
               label="包装编码"
               prop="code"
               width="150"
+              :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column label="包装数量" prop="packingCount" width="80">
               <template slot-scope="{ row }">
@@ -319,10 +332,25 @@
           >
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
-            <el-table-column label="编码" prop="assetCode"> </el-table-column>
-            <el-table-column label="名称" prop="assetName"> </el-table-column>
+            <el-table-column
+              label="编码"
+              prop="assetCode"
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
+            <el-table-column
+              label="名称"
+              prop="assetName"
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
             <el-table-column label="批次号" prop="batchNo"> </el-table-column>
-            <el-table-column label="物料编码" prop="no"> </el-table-column>
+            <el-table-column
+              label="物料编码"
+              prop="no"
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
             <el-table-column label="计量数量" prop="">
               <template slot-scope="{ row }">1</template>
             </el-table-column>

src/views/warehouseManagement/outgoingManagement/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ele-body">
+  <div class="outgoingManagement_index">
     <el-card shadow="never">
       <el-form :model="formData" ref="formName" label-width="80px">
         <el-row :gutter="10">
@@ -370,34 +370,54 @@
   };
 </script>
 
-<style lang="scss" scoped>
-  .w100 {
-    width: 100% !important;
-  }
-  .p20 {
-    padding: 20px;
-  }
-  .mt20 {
-    margin-top: 20px;
-  }
-  .mt10 {
-    margin-top: 10px;
-  }
-  .el-form {
-    overflow: hidden;
-  }
-  .float-right {
-    float: right;
-    text-align: right;
-    margin-right: 20px;
-  }
-  .right {
-    text-align: right;
-  }
-  .col {
-    color: #aaa;
-  }
-  .pr10 {
-    padding-right: 10px;
+<style lang="scss">
+  .outgoingManagement_index {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    .el-card {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+        }
+      }
+    }
+    .w100 {
+      width: 100% !important;
+    }
+    .p20 {
+      padding: 20px;
+    }
+    .mt20 {
+      margin-top: 20px;
+    }
+    .mt10 {
+      margin-top: 10px;
+    }
+    .el-form {
+      overflow: hidden;
+    }
+    .float-right {
+      float: right;
+      text-align: right;
+      margin-right: 20px;
+    }
+    .right {
+      text-align: right;
+    }
+    .col {
+      color: #aaa;
+    }
+    .pr10 {
+      padding-right: 10px;
+    }
   }
 </style>

src/views/warehouseManagement/stockLedger/allBatchDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="allBatchDetails">
+  <div class="stockLedger_allBatchDetails">
     <!--    <div class="page-title">
       <PageHeader
         :title="`${baseInfo.assetCode || ''} ${baseInfo.assetName || ''}`"
@@ -146,7 +146,7 @@
 </script>
 
 <style lang="scss">
-  .allBatchDetails {
+  .stockLedger_allBatchDetails {
     background: #fff;
     margin: 10px;
     height: calc(100vh - 116px);

src/views/warehouseManagement/stockLedger/batchDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="page">
+  <div class="stockLedger_batchDetails">
     <!--    <div class="page-title">
       <PageHeader :title="`批次号${baseInfo.batchNum || ''}`"></PageHeader>
     </div> -->
@@ -146,24 +146,29 @@
   };
 </script>
 
-<style lang="scss" scoped>
-  .page {
+<style lang="scss">
+  .stockLedger_batchDetails {
     background: #fff;
-    padding: 10px;
-    margin: 10px 0 10px 0;
-    height: calc(100vh - 80px);
-    padding: 10px;
+    margin: 10px;
+    height: calc(100vh - 116px);
     overflow-y: auto;
-  }
-  .page-title {
-  }
-  .content-detail {
-    padding: 20px;
-  }
-
-  .certificate {
-    height: 65vh;
-    display: block;
-    margin: 10px auto;
+    .content-detail {
+      height: 100%;
+      width: 100%;
+      padding: 10px 20px;
+      box-sizing: border-box;
+      .el-tabs {
+        height: 100%;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        .el-tabs__content {
+          flex: 1;
+          .el-tab-pane {
+            height: 100%;
+          }
+        }
+      }
+    }
   }
 </style>

src/views/warehouseManagement/stockManagement/add.vue

@@ -375,12 +375,14 @@
                 prop="assetCode"
                 align="center"
                 width="130"
+                :show-overflow-tooltip="true"
               ></el-table-column>
               <el-table-column
                 label="名称"
                 align="center"
                 width="200"
                 prop="assetName"
+                :show-overflow-tooltip="true"
               ></el-table-column>
 
               <!-- <el-table-column
@@ -428,8 +430,9 @@
                 :key="index"
                 align="center"
                 :label="item.label"
-                width="150"
+                :width="item.width"
                 :prop="item.prop"
+                :show-overflow-tooltip="true"
               >
                 <template slot-scope="{ row }">
                   <template v-if="item.formatter">{{
@@ -819,11 +822,13 @@
               label="编码"
               prop="assetCode"
               width="130"
+              :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
               label="名称"
               prop="assetName"
               width="150"
+              :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
               label="批次号"
@@ -833,7 +838,8 @@
             <el-table-column
               :label="`包装编码`"
               prop="onlyCode"
-              width="130"
+              width="200"
+              :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
               label="包装数量"
@@ -987,11 +993,17 @@
           >
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
-            <el-table-column label="编码" prop="assetCode"></el-table-column>
+            <el-table-column
+              label="编码"
+              width="150"
+              prop="assetCode"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="名称"
               prop="assetName"
               width="200"
+              :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
               label="批次号"
@@ -1002,6 +1014,7 @@
               label="物料编码"
               prop="no"
               width="200"
+              :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
               label="计量数量"
@@ -2157,7 +2170,9 @@
         this.$set(this.warehousingMaterialList[idx], 'houseList', argum);
       }
     },
+
     watch: {
+      // 解决右侧悬浮操作栏不对称问题
       warehousingMaterialList: {
         handler() {
           this.$nextTick(() => {
@@ -2166,6 +2181,7 @@
         },
         deep: true
       },
+      // 解决右侧悬浮操作栏不对称问题
       materialCodeReqList: {
         handler() {
           this.$nextTick(() => {
@@ -2174,6 +2190,7 @@
         },
         deep: true
       },
+      // 解决右侧悬浮操作栏不对称问题
       resultArray: {
         handler() {
           this.$nextTick(() => {

src/views/warehouseManagement/stockManagement/details.vue

@@ -139,20 +139,23 @@
                   prop="categoryCode"
                   align="center"
                   width="150"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
                   label="名称"
                   align="center"
                   width="170"
                   prop="name"
+                  :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
                   v-for="(item, index) in tableHeader"
                   :key="index"
                   align="center"
                   :label="item.label"
-                  width="150"
+                  :width="item.width"
                   :prop="item.prop"
+                  :show-overflow-tooltip="true"
                 >
                   <template slot-scope="{ row }">
                     <template v-if="item.formatter">{{
@@ -284,6 +287,7 @@
                 <el-table-column
                   label="货位"
                   prop="warehouseName"
+                  width="200"
                   :show-overflow-tooltip="true"
                 >
                   <template slot-scope="{ row, $index }">
@@ -310,10 +314,22 @@
           >
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
-            <el-table-column label="编码" prop="categoryCode"></el-table-column>
-            <el-table-column label="名称" prop="name"></el-table-column>
+            <el-table-column
+              label="编码"
+              prop="categoryCode"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="名称"
+              prop="name"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
-            <el-table-column label="包装编码" prop="code"></el-table-column>
+            <el-table-column
+              label="包装编码"
+              prop="code"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="包装数量"
               prop="packingCount"
@@ -403,11 +419,16 @@
           >
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
-            <el-table-column label="编码" prop="assetCode"></el-table-column>
+            <el-table-column
+              label="编码"
+              prop="assetCode"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="名称"
               prop="assetName"
               width="200"
+              :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
               label="批次号"
@@ -418,6 +439,7 @@
               label="物料编码"
               prop="no"
               width="200"
+              :show-overflow-tooltip="true"
             ></el-table-column>
             <el-table-column
               label="计量数量"

src/views/warehouseManagement/stockManagement/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ele-body">
+  <div class="stockManagement_index">
     <el-card shadow="never">
       <el-form :model="formData" ref="formName" label-width="80px">
         <el-row :gutter="10">
@@ -343,9 +343,11 @@
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        }).then(async () => {
-          console.log('删除了')
-        }).catch(() => {});
+        })
+          .then(async () => {
+            console.log('删除了');
+          })
+          .catch(() => {});
       },
       handleCurrentChange() {
         this.getList();
@@ -366,34 +368,54 @@
   };
 </script>
 
-<style lang="scss" scoped>
-  .w100 {
-    width: 100% !important;
-  }
-  .p20 {
-    padding: 20px;
-  }
-  .mt20 {
-    margin-top: 20px;
-  }
-  .mt10 {
-    margin-top: 10px;
-  }
-  .el-form {
-    overflow: hidden;
-  }
-  .float-right {
-    float: right;
-    text-align: right;
-    margin-right: 20px;
-  }
-  .right {
-    text-align: right;
-  }
-  .col {
-    color: #aaa;
-  }
-  .pr10 {
-    padding-right: 10px;
+<style lang="scss">
+  .stockManagement_index {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    .el-card {
+      height: 100%;
+      .el-card__body {
+        height: 100%;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        .ele-pro-table {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+        }
+      }
+    }
+    .w100 {
+      width: 100% !important;
+    }
+    .p20 {
+      padding: 20px;
+    }
+    .mt20 {
+      margin-top: 20px;
+    }
+    .mt10 {
+      margin-top: 10px;
+    }
+    .el-form {
+      overflow: hidden;
+    }
+    .float-right {
+      float: right;
+      text-align: right;
+      margin-right: 20px;
+    }
+    .right {
+      text-align: right;
+    }
+    .col {
+      color: #aaa;
+    }
+    .pr10 {
+      padding-right: 10px;
+    }
   }
 </style>