Browse Source

bug修复

chenrui 4 years ago
parent
commit
81f6f6c249

+ 3 - 3
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -118,18 +118,18 @@
         <a-button
           size="small"
           type="link"
-          v-else-if="record.state == 'WAIT_PUT_WAREHOUSE'"
+          v-if="record.state == 'WAIT_PUT_WAREHOUSE'"
           @click="handleWarehouse(record)"
           class="button-warning"
           id="bulkWarehousingOrderList-warehouse-btn">入库</a-button>
         <a-button
           size="small"
           type="link"
-          v-else-if="record.state != 'FINISH'"
+          v-if="record.state != 'FINISH'"
           @click="handleDel(record)"
           class="button-error"
           id="bulkWarehousingOrderList-del-btn">删除</a-button>
-        <span v-else>--</span>
+        <span v-if="(record.state == 'FINISH') && (record.state != 'WAIT_PUT_WAREHOUSE')">--</span>
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->

+ 4 - 1
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -120,7 +120,10 @@ export default {
     },
     itemId (newValue, oldValue) {
       if (this.isShow && newValue) {
-        this.$refs.table.refresh(true)
+        const _this = this
+        setTimeout(() => {
+          _this.$refs.table.refresh(true)
+        }, 300)
       }
     }
   }

+ 0 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -91,7 +91,6 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :showPagination="false"
       :scroll="{ x: 1700, y: tableHeight }"
       bordered>
       <!-- 操作 -->