huang_an пре 2 година
родитељ
комит
95d0993010

+ 31 - 8
src/views/warehouseManagement/outgoingManagement/components/detailSelect.vue

@@ -160,6 +160,19 @@
       <el-table-column label="入库时间" prop="createTime"></el-table-column>
       <el-table-column width="50" type="selection"></el-table-column>
     </el-table>
+    <div style="text-align: right; padding: 10px">
+      <el-pagination
+        background
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        :page-sizes="[5, 10, 20, 50]"
+        :page-size.sync="formData.size"
+        :current-page.sync="formData.pageNum"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+      >
+      </el-pagination>
+    </div>
     <div slot="footer" class="footer">
       <div class="info">
         <div><span>总库存量</span>{{ infoData.availableCountBase }}</div>
@@ -184,6 +197,7 @@
         >
         </el-input-number>
       </div>
+
       <div slot="footer">
         <el-button size="small" @click="batchVisible = false">取消</el-button>
         <el-button size="small" type="primary" @click="multiConfirm"
@@ -223,11 +237,14 @@
           dateType: 1,
           batchNo: '',
           packageNo: '',
-          onlyCode: ''
+          onlyCode: '',
+          pageNum: 1,
+          size: 10
         },
         infoData: {},
         memo: [],
-        memo1: []
+        memo1: [],
+        total: 0
       };
     },
     computed: {
@@ -244,6 +261,13 @@
       }
     },
     methods: {
+      handleCurrentChange() {
+        this.handleList();
+      },
+      handleSizeChange() {
+        this.formData.pageNum = 1;
+        this.handleList();
+      },
       selecctedRow(val) {
         console.log(val);
         this.$emit('mxArgs', val);
@@ -351,14 +375,13 @@
         }
         const res = await outin.getoutDetail({
           ...this.formData,
-          categoryId: this.infoData.id,
-          pageNum: 1,
-          size: 15
+          categoryId: this.infoData.id
         });
         console.log('11', res);
-        this.tableData = res.data;
-        if (res.data.length > 0 && res.data[0].brandNum) {
-          this.infoData.brandNum = res.data[0].brandNum;
+        this.tableData = res.data.list;
+        this.total = res.data.count;
+        if (res.data.list.length > 0 && res.data.list[0].brandNum) {
+          this.infoData.brandNum = res.data.list[0].brandNum;
         }
 
         if (val) {

+ 4 - 0
src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -152,6 +152,10 @@
     methods: {
       handledime(val) {
         this.$set(this, 'isShow', val == 2);
+        this.reload({
+          ...this.$refs.refSeavch.params,
+          dimension: this.$refs.refSeavch.dimension
+        });
       },
       /* 表格数据源 */
       datasource({ page, limit, where }) {