修改出入库表格样式以及相关操作定位

src/views/warehouseManagement/common.js

@@ -2,32 +2,32 @@ export const tableHeader = (selectEquiType) => {
   switch (+selectEquiType) {
     case 3:
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' }
       ];
     case 8:
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' }
       ];
     case 4:
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' }
       ];
     case 9:
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' }
       ];
     case 5: //'周转车'
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' },
         {
           label: '材质',
@@ -52,8 +52,8 @@ export const tableHeader = (selectEquiType) => {
       ];
     case 2: //'舟皿'
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' },
         {
           label: '长宽高',
@@ -69,14 +69,14 @@ export const tableHeader = (selectEquiType) => {
       ];
     case 1: //'设备'
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' }
       ];
     case 6: //'模具'
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' },
         {
           label: '收缩系数',
@@ -90,14 +90,14 @@ export const tableHeader = (selectEquiType) => {
       ];
     case 7: //'备品备件'
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' }
       ];
     default:
       return [
-        { label: '型号', prop: 'modelType', width: '100' },
-        { label: '规格', prop: 'specification', width: '50' },
+        { label: '型号', prop: 'modelType', width: '150' },
+        { label: '规格', prop: 'specification', width: '150' },
         { label: '牌号', prop: 'brandNum', width: '50' }
       ];
   }

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -44,8 +44,8 @@
             ></el-input>
           </el-form-item>
         </el-col> -->
-        <el-col :span="6">
-          <el-form-item label="列表维度：" prop="dimension">
+        <el-col :span="5">
+          <el-form-item label="列表维度:" prop="dimension">
             <template>
               <el-select
                 style="width: 100%"
@@ -62,8 +62,8 @@
             </template>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="物品编码">
+        <el-col :span="5">
+          <el-form-item label="物品编码:">
             <el-input
               type="text"
               placeholder="搜索物品编码"
@@ -71,8 +71,8 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="物品名称">
+        <el-col :span="5">
+          <el-form-item label="物品名称:">
             <el-input
               type="text"
               placeholder="搜索物品名称"
@@ -80,8 +80,8 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="批次号">
+        <el-col :span="5">
+          <el-form-item label="批次号:">
             <el-input
               type="text"
               placeholder="搜索批次号"
@@ -89,7 +89,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col style="text-align: right">
+        <el-col :span="4" style="text-align: right">
           <el-button type="primary" @click="doSearch">搜索</el-button>
           <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
         </el-col>

src/views/warehouseManagement/components/selectType.vue

@@ -42,6 +42,8 @@
             :header-cell-style="{ background: '#F0F3F3', border: 'none' }"
             @selection-change="handleSelectionChange"
           >
+            <el-table-column type="selection" width="55" align="center">
+            </el-table-column>
             <el-table-column width="55px" label="序号" type="index">
               <!-- <template slot-scope="{ $index }">
                 {{ $tableIndex($index, pages.pageNum, pages.size) }}
@@ -106,9 +108,6 @@
               label="分类"
               :show-overflow-tooltip="true"
             ></el-table-column>
-
-            <el-table-column type="selection" width="55" align="center">
-            </el-table-column>
           </el-table>
           <div class="right mt10" v-if="bizScene != 5">
             <el-pagination

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -118,6 +118,7 @@
                 :data="warehousingMaterialList"
                 tooltip-effect="dark"
                 style="width: 100%"
+                :max-height="300"
                 stripe
                 :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
               >
@@ -181,7 +182,11 @@
                   label="金额"
                   prop="totalMoney"
                 ></el-table-column>
-                <el-table-column label="领料部门" prop="llbm"></el-table-column>
+                <el-table-column
+                  label="领料部门"
+                  prop="llbm"
+                  :show-overflow-tooltip="true"
+                ></el-table-column>
               </el-table>
             </div>
           </div>
@@ -198,6 +203,7 @@
             :data="materialCodeReqList"
             tooltip-effect="dark"
             style="width: 100%"
+            :max-height="300"
             stripe
             :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
           >
@@ -217,7 +223,7 @@
             <el-table-column
               label="包装编码"
               prop="code"
-              width="80"
+              width="150"
             ></el-table-column>
             <el-table-column label="包装数量" prop="packingCount" width="80">
               <template slot-scope="{ row }">
@@ -281,7 +287,11 @@
                 {{ row.createTime }}
               </template>
             </el-table-column>
-            <el-table-column label="领料部门" prop="">
+            <el-table-column
+              label="领料部门"
+              prop=""
+              :show-overflow-tooltip="true"
+            >
               <template slot-scope="{ row }">
                 {{ row.llbm }}
               </template>
@@ -303,6 +313,7 @@
             :data="metaList"
             tooltip-effect="dark"
             style="width: 100%"
+            :max-height="300"
             stripe
             :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
           >

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -279,7 +279,8 @@
             width: 100,
             align: 'left',
             resizable: false,
-            slot: 'action'
+            slot: 'action',
+            fixed: 'right'
           }
         ];
         if (this.isShow) {

src/views/warehouseManagement/stockLedger/components/item-search.vue

@@ -1,14 +1,15 @@
 <!-- 搜索表单 -->
 <template>
   <el-form
-    label-width="90px"
+    label-width="80px"
+    label-position="left"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="仓库：" prop="warehouseId" label-width="60px">
+        <el-form-item label="仓库:" prop="warehouseId">
           <template>
             <el-select
               clearable
@@ -77,7 +78,7 @@
         </el-form-item>
       </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="列表维度：" prop="dimension">
+        <el-form-item label="列表维度:" prop="dimension">
           <template>
             <el-select
               style="width: 100%"
@@ -95,7 +96,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物品编码：" prop="code">
+        <el-form-item label="物品编码:" prop="code">
           <el-input
             clearable
             placeholder="请输入"
@@ -104,7 +105,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物品名称：" prop="assetName">
+        <el-form-item label="物品名称:" prop="assetName">
           <el-input
             clearable
             v-model="params.assetName"
@@ -113,7 +114,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="批次号：" prop="assetName">
+        <el-form-item label="批次号:" prop="assetName">
           <el-input
             clearable
             v-model="params.batchNo"

src/views/warehouseManagement/stockManagement/add.vue

@@ -354,7 +354,8 @@
             <el-table
               v-if="isWeight"
               :header-cell-style="rowClass"
-              ref="multipleTable"
+              :max-height="300"
+              ref="warehousingMaterialListTable"
               :key="formData.extInfo.assetType"
               :data="warehousingMaterialList"
               tooltip-effect="dark"
@@ -703,6 +704,7 @@
                       </div>
                       <div v-else>
                         <div
+                          class="fontOmitted"
                           v-for="(item, index) in row.houseList"
                           :key="index"
                         >
@@ -793,21 +795,21 @@
           </header-title>
 
           <el-table
-            ref="multipleTable"
+            ref="materialCodeReqListTable"
             :data="materialCodeReqList"
             tooltip-effect="dark"
             :key="formData.bizType"
             :header-cell-style="rowClass"
             style="width: 100%"
             stripe
-            height="300px"
+            :max-height="300"
             @selection-change="handleSelectionChange"
           >
             <el-table-column
-              label=""
               type="selection"
               align="center"
               width="50"
+              fixed="left"
               v-if="formData.bizType != 5"
             >
             </el-table-column>
@@ -959,7 +961,7 @@
                 width="200"
               ></el-table-column>
             </template>
-            <el-table-column label="操作" width="80">
+            <el-table-column label="操作" width="80" fixed="right">
               <template slot-scope="{ row }">
                 <el-button type="text" @click="packCout(row)">
                   {{ !row.isPack ? '保存' : '编辑' }}
@@ -973,14 +975,14 @@
         <div class="mt20" v-if="isDetail">
           <header-title :title="`物料明细`"> </header-title>
           <el-table
-            ref="multipleTable"
+            ref="resultArrayTable"
             :data="resultArray"
             tooltip-effect="dark"
             :key="formData.bizType"
             :header-cell-style="rowClass"
             style="width: 100%"
             stripe
-            height="300px"
+            :max-height="300"
             @selection-change="handleSelectionChange"
           >
             <el-table-column label="序号" type="index" width="50">
@@ -2154,6 +2156,32 @@
       houseData(argum, idx) {
         this.$set(this.warehousingMaterialList[idx], 'houseList', argum);
       }
+    },
+    watch: {
+      warehousingMaterialList: {
+        handler() {
+          this.$nextTick(() => {
+            this.$refs.warehousingMaterialListTable.doLayout();
+          });
+        },
+        deep: true
+      },
+      materialCodeReqList: {
+        handler() {
+          this.$nextTick(() => {
+            this.$refs.materialCodeReqListTable.doLayout();
+          });
+        },
+        deep: true
+      },
+      resultArray: {
+        handler() {
+          this.$nextTick(() => {
+            this.$refs.resultArrayTable.doLayout();
+          });
+        },
+        deep: true
+      }
     }
   };
 </script>
@@ -2208,4 +2236,21 @@
     border-right: 1px solid rgba(222, 222, 222, 1);
     border-left: 1px solid rgba(222, 222, 222, 1);
   }
+  .fontOmitted {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+    white-space: nowrap;
+  }
+  .table-fixed {
+    .el-table__fixed-right {
+      height: 100% !important;
+    }
+    .el-table__fixed-left {
+      height: 100% !important;
+    }
+    .el-table__fixed {
+      height: 100% !important;
+    }
+  }
 </style>

src/views/warehouseManagement/stockManagement/details.vue

@@ -126,6 +126,7 @@
                 ref="multipleTable"
                 :data="warehousingMaterialList"
                 tooltip-effect="dark"
+                :max-height="300"
                 :key="infoData.assetType"
                 style="width: 100%"
                 stripe
@@ -302,6 +303,7 @@
             ref="multipleTable"
             :data="detailList"
             tooltip-effect="dark"
+            :max-height="300"
             :header-cell-style="rowClass"
             style="width: 100%"
             stripe
@@ -393,6 +395,7 @@
             ref="multipleTable"
             :data="metailList"
             tooltip-effect="dark"
+            :max-height="300"
             :header-cell-style="rowClass"
             style="width: 100%"
             stripe