lilei 3 gadi atpakaļ
vecāks
revīzija
f307435f33

+ 5 - 4
src/views/allocationManagement/transferOut/list.vue

@@ -131,7 +131,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       time: [
         moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
         moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
@@ -165,9 +164,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -184,6 +180,11 @@ export default {
       openModal: false //  新增编辑  弹框
     }
   },
+  computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    }
+  },
   methods: {
     //  创建时间  change
     dateChange (date) {

+ 4 - 5
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -115,7 +115,7 @@
             class="button-warning"
             @click="goWarehouseDetail(record)"
             id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
-			<span v-if="!$hasPermissions('B_inventoryQuery_detail')&&!$hasPermissions('B_inventoryQuery_rkDetail')">--</span>
+          <span v-if="!$hasPermissions('B_inventoryQuery_detail')&&!$hasPermissions('B_inventoryQuery_rkDetail')">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -137,7 +137,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         productCode: '', //  产品编码
         productName: '', //  产品名称
@@ -171,9 +170,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 370
-        }
         // 排序
         if (parameter.sortField == 'currentStockQty') {
           parameter.sortField = 'qty'
@@ -209,6 +205,9 @@ export default {
     }
   },
   computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    },
     stockQty () { //  库存总数量 合计
       const currentStockQty = this.currentStock && this.currentStock.currentStockQty ? Number(this.currentStock.currentStockQty) : 0
       const freezeQty = this.currentStock && this.currentStock.freezeQty ? Number(this.currentStock.freezeQty) : 0

+ 3 - 4
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -179,7 +179,6 @@ export default {
     return {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
       queryParam: { //  查询条件
         productCode: '',
         productName: '',
@@ -228,6 +227,9 @@ export default {
     }
   },
   computed: {
+    tableHeight () {
+      return window.innerHeight - (this.advanced ? 425 : 370)
+    },
     hasSelected () {
       return this.selectedRowKeys.length > 0
     }
@@ -246,9 +248,6 @@ export default {
     },
     //  列表数据
     pageInit (pageNo) {
-      if (this.tableHeight == 0) {
-        this.tableHeight = window.innerHeight - 380
-      }
       this.disabled = true
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)