外购备料查询

src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js

@@ -27,8 +27,7 @@ export function searchTable(check, supplierNameValue, check1, partNumber, check2
       type: '1',
       name: '备料管理_外购备料_综合查询数据',
       param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue +
-      '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order,
+      '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue

@@ -35,27 +35,9 @@
       </div>
     </el-card>
     <el-card style="width: 100%">
-      <el-table
+      <el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%" height="750" @sort-change="sortChange">
-        v-loading="loading"
+        <el-table-column label="序号" align="center" type="index" width="50"/>
-        :data="tableData"
+        <el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">
-        highlight-current-row
-        border
-        stripe
-        size="mini"
-        style="width: 100%"
-        height="750"
-        @sort-change="sortChange">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column
-          label="进程"
-          align="center"
-          prop="进程"
-          sortable="custom"
-          width="80px">
           <template slot-scope="scope">
             <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>
             <span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>
@@ -200,8 +182,8 @@ export default {
     // this.getTableData()
   },
   methods: {
-    formatJson(filterVal, jsonData) {
+    formatJson(column, tableData) {
-      return jsonData.map(v => filterVal.map(j => {
+      return tableData.map(v => column.map(j => {
         return v[j]
       }))
     },
@@ -283,9 +265,8 @@ export default {
         check2 = 0
       }
       searchTable(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order, this.pageSize, this.pageCurrent).then(response => {
-        console.log(response)
+        this.tableData = response.data.result
-        this.tableData = response.data.rows
+        this.total = parseInt(response.data.output[0].ItemCount)
-        this.total = response.data.total
         this.loading = false
       })
     },