Browse Source

bug 修复

lilei 4 years ago
parent
commit
a6d910bf04

+ 5 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -87,7 +87,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1495 }"
+      :scroll="{ x: 1495, y: tableHeight }"
       bordered>
       <!-- 采购单号 -->
       <template slot="purchaseBillNo" slot-scope="text, record">
@@ -150,6 +150,7 @@ export default {
       supplierList: [],
       dateFormat: 'YYYY-MM-DD',
       time: [], //  创建时间
+      tableHeight: 0,
       // 查询参数
       queryParam: {
         purchaseBillNo: '',
@@ -181,6 +182,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 440
+        }
         // 创建时间
         if (this.time && this.time.length > 0) {
           this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -51,7 +51,7 @@
           class="button-warning"
           :id="'purchaseOrderWarehousing-warehousing-'+bindex"
           @click="handleWarehousing(item,bindex)"
-          v-if="item.auditState=='WAIT_PUT_WAREHOUSE'"
+          v-if="item.auditState=='WAIT_PUT_WAREHOUSE' || item.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT'"
         >确认入库</a-button>
       </div>
     </a-card>