修改库存台账相关界面

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -417,16 +417,21 @@
         });
       },
       async handleExit(arr) {
+        console.log('arr=====', arr);
+        console.log('this.dimension', this.dimension);
         let ids = null;
+        let batchIds = null;
         if (this.dimension == 3) {
           ids = arr.map((item) => {
             return item.id;
           });
-        } else if (this.dimension == 2 || this.dimension == 1) {
+        } else if (this.dimension == 2) {
           ids = arr.map((item) => {
             return item.recordId;
           });
-          // this.dimension = 2;
+          batchIds = arr.map((item) => {
+            return item.stockBatchId;
+          });
         } else {
           ids = arr.map((item) => {
             return item.recordId;
@@ -443,8 +448,10 @@
           type: this.dimension,
           categoryIds: categoryIds,
           batchNos: batchNos,
+          batchIds: batchIds,
           ids: ids
         };
+        console.log(parmas);
         const data = await getDetailById(parmas);
         return data;
       },

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -341,6 +341,7 @@
                 :data="warehousingMaterialList"
                 tooltip-effect="dark"
                 style="width: 100%"
+                :max-height="300"
                 stripe
                 :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
               >
@@ -468,6 +469,7 @@
                 :data="materialCodeReqList"
                 tooltip-effect="dark"
                 style="width: 100%"
+                :max-height="300"
                 stripe
                 :header-cell-style="rowClass"
               >
@@ -780,7 +782,6 @@
             }
           }
           this.wlParams = params;
-
           this.materialObj = data;
         } else if (dimension == 3) {
           //包装维度出库
@@ -848,6 +849,10 @@
               weight: 0
             };
           });
+          console.log(
+            'batchDetailsVOList------------',
+            this.batchDetailsVOList
+          );
           //物料维度数据
           let meteArr = [];
           for (const item of packArr) {
@@ -1430,7 +1435,6 @@
         });
         this.fromUserList = res22.list;
 
-        // /
         // const res111 = await warehouseDefinition.list();
         // this.warehouseList = res111.list;
         console.log('res=====', res);

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

@@ -5,11 +5,12 @@
       :data="data"
       tooltip-effect="dark"
       style="width: 100%"
+      :max-height="300"
       stripe
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
     >
       <el-table-column label="序号" type="index" width="50"> </el-table-column>
-      <el-table-column label="编码" prop="code"></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="batchNo"></el-table-column>
       <el-table-column label="包装编码" prop="code"></el-table-column>

src/views/warehouseManagement/stockLedger/allBatchDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="page">
+  <div class="allBatchDetails">
     <!--    <div class="page-title">
       <PageHeader
         :title="`${baseInfo.assetCode || ''} ${baseInfo.assetName || ''}`"
@@ -145,24 +145,29 @@
   };
 </script>
 
-<style lang="scss" scoped>
-  .page {
+<style lang="scss">
+  .allBatchDetails {
     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/stockLedger/components/details/InWarehouse.vue

@@ -1,6 +1,6 @@
 <!-- 入库 -->
 <template>
-  <div class="detail-box">
+  <div class="inWarehouse">
     <!-- <el-form label-width="100px">
       <el-row>
         <el-col :span="6">
@@ -110,6 +110,7 @@
       </el-row>
     </el-form> -->
     <el-table
+      class="table"
       :data="tableData"
       @cell-click="handleCellClick"
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
@@ -137,6 +138,7 @@
       <el-table-column label="入库时间" prop="createTime"></el-table-column>
     </el-table>
     <Pagination
+      class="pagination"
       :total="total"
       :page.sync="page"
       :size.sync="size"
@@ -238,7 +240,25 @@
   };
 </script>
 <style lang="scss" scoped>
-  .detail-box {
-    margin: 20px auto;
+  .inWarehouse {
+    height: 100%;
+    width: 100%;
+    padding-top: 20px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    .table {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      .el-table__body-wrapper {
+        flex: 1;
+      }
+    }
+    .pagination {
+      flex: 0 0 50px;
+      display: flex;
+      align-items: center;
+    }
   }
 </style>

src/views/warehouseManagement/stockLedger/components/details/InventoryAllocation.vue

@@ -1,6 +1,6 @@
 <!-- 调拨 -->
 <template>
-  <div class="detail-box">
+  <div class="inventoryAllocation">
     <!-- <el-form label-width="70px">
       <el-row>
         <el-col :span="6">
@@ -27,6 +27,7 @@
       </el-row>
     </el-form> -->
     <el-table
+      class="table"
       :data="tableData"
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
     >
@@ -68,6 +69,7 @@
       <el-table-column label="审核时间" prop="auditorTime"></el-table-column>
     </el-table>
     <Pagination
+      class="pagination"
       :total="total"
       :page.sync="page"
       :size.sync="size"
@@ -151,8 +153,26 @@
     }
   };
 </script>
-<style lang="scss" scoped>
-  .detail-box {
-    margin: 20px auto;
+<style lang="scss">
+  .inventoryAllocation {
+    height: 100%;
+    width: 100%;
+    padding-top: 20px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    .table {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      .el-table__body-wrapper {
+        flex: 1;
+      }
+    }
+    .pagination {
+      flex: 0 0 50px;
+      display: flex;
+      align-items: center;
+    }
   }
 </style>

src/views/warehouseManagement/stockLedger/components/details/OutWarehouse.vue

@@ -1,6 +1,6 @@
 <!-- 出库 -->
 <template>
-  <div class="detail-box">
+  <div class="outWarehouse">
     <!-- <el-form label-width="100px">
       <el-row>
         <el-col :span="6">
@@ -110,6 +110,7 @@
       </el-row>
     </el-form> -->
     <el-table
+      class="table"
       :data="tableData"
       @cell-click="handleCellClick"
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
@@ -139,6 +140,7 @@
       <el-table-column label="出库时间" prop="createTime"></el-table-column>
     </el-table>
     <Pagination
+      class="pagination"
       :total="total"
       :page.sync="page"
       :size.sync="size"
@@ -249,8 +251,26 @@
     }
   };
 </script>
-<style lang="scss" scoped>
-  .detail-box {
-    margin: 20px auto;
+<style lang="scss">
+  .outWarehouse {
+    height: 100%;
+    width: 100%;
+    padding-top: 20px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    .table {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      .el-table__body-wrapper {
+        flex: 1;
+      }
+    }
+    .pagination {
+      flex: 0 0 50px;
+      display: flex;
+      align-items: center;
+    }
   }
 </style>

src/views/warehouseManagement/stockLedger/components/details/ReportLoss.vue

@@ -1,9 +1,9 @@
 <!-- 报损报溢 -->
 <template>
-  <div class="detail-box">
+  <div class="reportLoss">
     <el-form label-width="100px">
       <el-row>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="盈/损/亏"
             ><el-select
               filterable
@@ -21,7 +21,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <!-- <el-form-item
             :label="`${getDictValue('类型用途', baseInfo.assetType)}编码`"
             prop="assetCode"
@@ -40,7 +40,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="盘点工单号" prop="workOrderCode">
             <el-input
               v-model="searchForm.workOrderCode"
@@ -49,7 +49,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="报损溢单号" prop="breakageCode">
             <el-input
               v-model="searchForm.breakageCode"
@@ -58,7 +58,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="text-align: right; margin-bottom: 20px">
+        <el-col :span="4" style="text-align: right; margin-bottom: 20px">
           <el-button
             @click="search"
             type="primary"
@@ -73,6 +73,7 @@
       </el-row>
     </el-form>
     <el-table
+      class="table"
       :data="tableData"
       :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
     >
@@ -140,6 +141,7 @@
       ></el-table-column>
     </el-table>
     <Pagination
+      class="pagination"
       :total="total"
       :page.sync="page"
       :size.sync="size"
@@ -233,8 +235,26 @@
     }
   };
 </script>
-<style lang="scss" scoped>
-  .detail-box {
-    margin: 20px auto;
+<style lang="scss">
+  .reportLoss {
+    height: 100%;
+    width: 100%;
+    padding-top: 20px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    .table {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      .el-table__body-wrapper {
+        flex: 1;
+      }
+    }
+    .pagination {
+      flex: 0 0 50px;
+      display: flex;
+      align-items: center;
+    }
   }
 </style>

src/views/warehouseManagement/stockLedger/index.vue

@@ -6,7 +6,7 @@
         allow-collapse
         :right-style="{ overflow: 'hidden' }"
       >
-        <div>
+        <div class="el-tree_box">
           <div class="ele-border-lighter sys-organization-list">
             <!-- <asset-tree
               @handleNodeClick="onNodeClick"
@@ -31,6 +31,7 @@
             /> -->
 
             <el-tree
+              style="height: 100%"
               :data="treeList"
               :props="defaultProps"
               ref="treeRef"
@@ -121,6 +122,17 @@
   };
 </script>
 <style lang="scss" scoped>
+  .el-tree_box {
+    height: 100%;
+    > div {
+      height: 100%;
+    }
+  }
+
+  .ele-body {
+    padding: 6px;
+  }
+
   .sys-organization-list {
     height: calc(100vh - 264px);
     box-sizing: border-box;

vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
-        target: 'http://192.168.1.108:18086',
+        target: 'http://192.168.1.147:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''