|
@@ -1,6 +1,7 @@
|
|
|
<template>
|
|
|
<div class="allocateBillEdit-wrap">
|
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
+ <!-- <a-spin :spinning="spinning" tip="Loading..."> -->
|
|
|
+ <div class="ant-spin-nested-loading">
|
|
|
<a-page-header :ghost="false" :backIcon="false" class="allocateBillEdit-back" >
|
|
|
<!-- 自定义的二级文字标题 -->
|
|
|
<template slot="subTitle">
|
|
@@ -42,7 +43,7 @@
|
|
|
<!-- 选择产品 -->
|
|
|
<a-card size="small" :bordered="false" class="allocateBillEdit-cont">
|
|
|
<a-collapse :activeKey="['1']">
|
|
|
- <a-collapse-panel key="1" forceRender header="选择产品">
|
|
|
+ <a-collapse-panel key="1" :forceRender="true" header="选择产品">
|
|
|
<!-- 筛选条件 -->
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
@@ -94,7 +95,7 @@
|
|
|
<!-- 已选产品 -->
|
|
|
<a-card size="small" :bordered="false" class="allocateBillEdit-cont">
|
|
|
<a-collapse :activeKey="['2']">
|
|
|
- <a-collapse-panel key="2" forceRender header="已选产品">
|
|
|
+ <a-collapse-panel key="2" :forceRender="true" header="已选产品">
|
|
|
<!-- 总计 -->
|
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
|
<div slot="message">
|
|
@@ -187,7 +188,8 @@
|
|
|
</a-collapse-panel>
|
|
|
</a-collapse>
|
|
|
</a-card>
|
|
|
- </a-spin>
|
|
|
+ <!-- </a-spin> -->
|
|
|
+ </div>
|
|
|
<div class="affix-cont">
|
|
|
<a-button
|
|
|
type="primary"
|
|
@@ -241,7 +243,8 @@ export default {
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
- return queryStockProductPage(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel })).then(res => {
|
|
|
+ const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
|
|
|
+ return queryStockProductPage(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel })).then(res => {
|
|
|
const data = res.data
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
@@ -575,7 +578,6 @@ export default {
|
|
|
.allocateBillEdit-wrap{
|
|
|
position: relative;
|
|
|
height: 100%;
|
|
|
- padding-bottom: 51px;
|
|
|
box-sizing: border-box;
|
|
|
>.ant-spin-nested-loading{
|
|
|
overflow-y: scroll;
|