|
@@ -13,8 +13,8 @@
|
|
|
</template>
|
|
|
</a-page-header>
|
|
|
<a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont">
|
|
|
- <a-collapse :activeKey="['1']">
|
|
|
- <a-collapse-panel key="1" header="基础信息">
|
|
|
+ <a-collapse :activeKey="['0']">
|
|
|
+ <a-collapse-panel key="0" header="基础信息">
|
|
|
<a-descriptions :column="3">
|
|
|
<a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
|
|
@@ -30,7 +30,7 @@
|
|
|
<!-- 选择产品 -->
|
|
|
<a-card size="small" :bordered="false" class="allocateBillEdit-cont">
|
|
|
<a-collapse :activeKey="['1']">
|
|
|
- <a-collapse-panel key="1" header="选择产品">
|
|
|
+ <a-collapse-panel key="1" forceRender header="选择产品">
|
|
|
<!-- 筛选条件 -->
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
@@ -62,15 +62,16 @@
|
|
|
class="sTable"
|
|
|
ref="table"
|
|
|
size="small"
|
|
|
+ index="0"
|
|
|
+ tableId="table1"
|
|
|
:rowKey="(record) => record.stockSn"
|
|
|
:columns="columns"
|
|
|
:customRow="handleClickRow"
|
|
|
- :defaultLoadData="false"
|
|
|
:data="loadData"
|
|
|
:scroll="{ x: 990, y: 300 }"
|
|
|
bordered>
|
|
|
<!-- 操作 -->
|
|
|
- <template slot="action" slot-scope="text, record">
|
|
|
+ <template slot="action1" slot-scope="text, record">
|
|
|
<a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="allocateBillEdit-add-btn">添加</a-button>
|
|
|
</template>
|
|
|
</s-table>
|
|
@@ -79,8 +80,8 @@
|
|
|
</a-card>
|
|
|
<!-- 已选产品 -->
|
|
|
<a-card size="small" :bordered="false" class="allocateBillEdit-cont">
|
|
|
- <a-collapse :activeKey="['1']">
|
|
|
- <a-collapse-panel key="1" header="已选产品">
|
|
|
+ <a-collapse :activeKey="['2']">
|
|
|
+ <a-collapse-panel key="2" forceRender header="已选产品">
|
|
|
<!-- 总计 -->
|
|
|
<a-alert type="info" style="margin-bottom:10px">
|
|
|
<div slot="message">
|
|
@@ -123,10 +124,11 @@
|
|
|
class="sTable"
|
|
|
ref="chooseTable"
|
|
|
size="small"
|
|
|
+ index="1"
|
|
|
+ tableId="table2"
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="chooseColumns"
|
|
|
:data="chooseLoadData"
|
|
|
- :defaultLoadData="false"
|
|
|
:scroll="{ x: 1160, y: 300 }"
|
|
|
bordered>
|
|
|
<!-- 售价 -->
|
|
@@ -267,7 +269,7 @@ export default {
|
|
|
{ title: '售价', dataIndex: 'productPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '库存数量', dataIndex: 'currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
|
|
|
+ { title: '操作', scopedSlots: { customRender: 'action1' }, width: 80, align: 'center', fixed: 'right' }
|
|
|
]
|
|
|
if (this.$hasPermissions('B_isShowCost')) {
|
|
|
arr.splice(4, 0, { title: '成本价', dataIndex: 'lastStockCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
@@ -526,8 +528,6 @@ export default {
|
|
|
pageInit () {
|
|
|
this.getDetail()
|
|
|
this.getDetailCount()
|
|
|
- this.resetSearchForm()
|
|
|
- this.chooseResetSearchForm()
|
|
|
}
|
|
|
},
|
|
|
mounted () {
|
|
@@ -535,9 +535,10 @@ export default {
|
|
|
},
|
|
|
beforeRouteEnter (to, from, next) {
|
|
|
next(vm => {
|
|
|
- // 获取促销活动
|
|
|
+ vm.pageInit()
|
|
|
if (!vm.disabled) {
|
|
|
- vm.pageInit()
|
|
|
+ vm.resetSearchForm()
|
|
|
+ vm.chooseResetSearchForm()
|
|
|
}
|
|
|
})
|
|
|
}
|