bug修改

jshERP-web/src/mixins/newTableMixin.js

@@ -5,8 +5,8 @@ export const newTableMixin = {
     return {
       ipagination: {
         current: 1,
-        pageSize: 2,
-        pageSizeOptions: ['2', '20', '30', '50', '100'],
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30', '50', '100'],
         showTotal: (total, range) => {
           return range[0] + '-' + range[1] + ' 共' + total + '条'
         },

jshERP-web/src/views/stock/components/stockModal.vue

@@ -27,9 +27,9 @@
             rowKey="id"
             :columns="columns"
             :dataSource="dataSource"
-            :components="handleDrag(columns)"
-            :pagination="ipagination"
             :loading="loading"
+            :scroll="{ y: 500 }"
+            :pagination="false"
             @change="handleTableChange"
           >
             <span v-if="form.taskType === 2" slot="action" slot-scope="text, record">
@@ -129,7 +129,7 @@ export default {
       if (val) {
         if (this.taskId) {
           this.$nextTick(() => {
-            this.getDetailList(this.taskId)
+            this.getList(this.taskId)
           })
 
           return
@@ -143,8 +143,6 @@ export default {
   },
   computed: {
     isShowBtn() {
-      console.log('==================', this.form.taskStatus)
-
       if (this.openType === 'add') return true
 
       if (this.openType === 'detail') return false
@@ -175,7 +173,7 @@ export default {
       this.$refs.selectModal.queryParam.depotId = this.form.depotId
       this.$refs.selectModal.showModal()
     },
-    getDetailList(id) {
+    getList(id) {
       const url = '/stocktaking/detail/' + id
       const url2 = '/stocktaking/detailByItemList'
       const form = this.$refs['editForm'].form