库存盘点

src/views/Inventory/InventoryCheck/index.vue

@@ -24,7 +24,7 @@
           <el-button type="distribution" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
         </el-row>
       </div>
-      <el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 865px" size="mini">
+      <el-table v-loading="loading" :data="tableData1" stripe highlight-current-row border height="550px" style="width: 865px" size="mini">
         <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -185,6 +185,7 @@ export default {
       locateNameValue: '',
       locateName: [],
       tableData1: [],
+      loading: false,
       pageCurrent: 1,
       pageSize: 20,
       total: 0,
@@ -251,6 +252,7 @@ export default {
     },
     // 根据条件查物料货位数量
     searchMaterial() {
+      this.loading = true
       let check1, check2, check3, check4, check5
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
@@ -263,18 +265,19 @@ export default {
         data: {
           type: '1',
           name: `库存管理_库存盘点_物料货位数量_查询数据`,
-          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}`,
+          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}` + `&PageCurrent=${this.pageCurrent}&PageSize=${this.pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
-          Pagination: this.pageCurrent + '&' + this.pageSize
         }
       }
       request(param).then(res => {
-        this.tableData1 = res.data.rows
+        console.log(res.data)
+        this.tableData1 = res.data.result
         this.tableData1.map(v => {
           this.$set(v, 'changeValue', false)
           v.原货位存量 = v.货位存量
           return v
         })
-        this.total = res.data.total
+        this.loading = false
+        this.total = parseInt(res.data.output[0].ItemCount)
       })
     },
     // 分页
@@ -384,4 +387,3 @@ export default {
     width:165px
   }
 </style>
-