自制件出入库记录

src/views/Inventory/StockInquiry/index.vue

@@ -194,11 +194,11 @@ export default {
       this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
       this.tableData1 = []
       getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
-        if (response.data.total === 0) {
+        if (response.data.result.length === 0) {
           this.listLoading1 = false
         } else {
-          this.tableData1 = response.data.rows
-          this.total = response.data.total
+          this.tableData1 = response.data.result
+          this.total = parseInt(response.data.output[0].ItemCount)
           this.listLoading1 = false
         }
       })

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -28,7 +28,7 @@
     <el-row>
       <el-col style="width: 37%">
         <el-card>
-          <el-table v-loading="loading2" :data="tableData1" :row-class-name="tableRowClassName1" class="table" style="max-height: 830px" highlight-current-row empty-text="   " border @row-click="getRow">
+          <el-table v-loading="loading2" :data="tableData1" :row-class-name="tableRowClassName1" class="table" height="660" style="max-height: 830px" highlight-current-row empty-text="   " border @row-click="getRow">
             <el-table-column align="center" label="工序" show-overflow-tooltip width="50">
               <template slot-scope="scope">
                 {{ scope.row.工序顺序 }}