xiugai

src/views/modules/inspection/inspectionRequestList.vue

@@ -245,13 +245,25 @@
             height="400px"
             style="width: 100%; margin-top: 10px;"
             @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column type="selection" width="55" align="center"     fixed="left" />
             <el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" width="120"/>
             <el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" width="60"/>
             <el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="100" show-overflow-tooltip/>
             <el-table-column prop="partDesc" label="产品名称" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
             <el-table-column prop="qty" label="订单数量" header-align="center" align="right" width="80"/>
             <el-table-column prop="waitInspectQty" label="未验货数量" header-align="center" align="right" width="80"/>
+            <el-table-column label="此次验货数量" header-align="center" align="center" width="150">
+              <template slot-scope="scope">
+                <el-input-number
+                  v-model="scope.row.inspectQty"
+                  :min="0"
+                  :max="scope.row.waitInspectQty || 999999"
+                  size="mini"
+                  :controls="false"
+                  style="width: 100%; box-sizing: border-box;">
+                </el-input-number>
+              </template>
+            </el-table-column>
             <el-table-column prop="shipMethod" label="运输方式" header-align="center" align="center" width="100">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.shipMethod" placeholder="请选择" size="mini" style="width: 100%; box-sizing: border-box;">
@@ -280,18 +292,6 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column label="此次验货数量" header-align="center" align="center" width="150">
-              <template slot-scope="scope">
-                <el-input-number
-                  v-model="scope.row.inspectQty"
-                  :min="0"
-                  :max="scope.row.waitInspectQty || 999999"
-                  size="mini"
-                  :controls="false"
-                  style="width: 100%; box-sizing: border-box;">
-                </el-input-number>
-              </template>
-            </el-table-column>
           </el-table>
         </div>
       </el-form>

src/views/modules/inspection/myInspectionList.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="customer-css">
+    <div class="toolbar">
+      <el-button type="primary" icon="el-icon-refresh" @click="handleRefresh">刷新</el-button>
+    </div>
     <!-- 列表 -->
     <el-table
+      ref="mainTable"
       :data="dataList"
       :height="height"
       border
@@ -72,19 +76,20 @@ export default {
     }
   },
   mounted () {
-    this.calcHeight()
-    window.addEventListener('resize', this.calcHeight)
+    this.$nextTick(() => {
+
+      this.height = window.innerHeight - 170
+
+    })
+
     this.getList()
   },
   beforeDestroy () {
-    window.removeEventListener('resize', this.calcHeight)
+
   },
   methods: {
-    // 计算表格高度
-    calcHeight () {
-      this.$nextTick(() => {
-        this.height = window.innerHeight - 120
-      })
+    handleRefresh () {
+      this.getList()
     },
 
     // 获取列表数据
@@ -102,6 +107,11 @@ export default {
           this.$message.error((data && data.msg) || '获取列表失败')
         }
         this.loading = false
+        this.$nextTick(() => {
+          if (this.$refs.mainTable) {
+            this.$refs.mainTable.doLayout()
+          }
+        })
       }).catch(() => {
         this.loading = false
       })
@@ -213,17 +223,9 @@ export default {
 <style scoped lang="scss">
 .customer-css {
   padding: 5px;
-  height: calc(100vh - 60px);
-  display: flex;
-  flex-direction: column;
-}
-
-::v-deep .el-table {
-  flex: 1;
 }
 
-::v-deep .el-pagination {
-  margin-top: 5px;
-  flex-shrink: 0;
+.toolbar {
+  margin-bottom: 8px;
 }
 </style>