|
@@ -47,11 +47,22 @@
|
|
|
v-model="queryParam.state"
|
|
|
ref="state"
|
|
|
id="chainTransferInList-state"
|
|
|
- code="PAYMENT_TYPE"
|
|
|
+ code="ALLOCATION_LINKAGE_PUT_STATUS"
|
|
|
placeholder="请选择业务状态"
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="财务状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.settleState"
|
|
|
+ ref="settleState"
|
|
|
+ id="chainTransferInList-settleState"
|
|
|
+ code="FINANCIAL_PAY_STATUS"
|
|
|
+ placeholder="请选择财务状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
</template>
|
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 24px;">
|
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chainTransferInList-refresh">查询</a-button>
|
|
@@ -72,12 +83,16 @@
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ x: 1850 }"
|
|
|
+ :scroll="{ x: 1870 }"
|
|
|
bordered>
|
|
|
<!-- 连锁调入单号 -->
|
|
|
<template slot="allocationLinkagePutNo" slot-scope="text, record">
|
|
|
<span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocationLinkagePutNo }}</span>
|
|
|
</template>
|
|
|
+ <!-- 财务状态 -->
|
|
|
+ <template slot="settleState" slot-scope="text, record">
|
|
|
+ <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<a-button size="small" type="link" class="button-primary" @click="handleWarehousing(record)" id="chainTransferInList-warehousing-btn">入库</a-button>
|
|
@@ -101,7 +116,8 @@ export default {
|
|
|
queryParam: { // 查询条件
|
|
|
outTenantName: undefined, // 调出对象
|
|
|
allocationType: undefined, // 调拨产品类型
|
|
|
- state: undefined // 业务状态
|
|
|
+ state: undefined, // 业务状态
|
|
|
+ settleState: undefined
|
|
|
},
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
dateFormat: 'YYYY-MM-DD',
|
|
@@ -109,7 +125,7 @@ export default {
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
|
|
|
{ title: '连锁调入单号', scopedSlots: { customRender: 'allocationLinkagePutNo' }, width: 220, align: 'center' },
|
|
|
- { title: '店内单号', dataIndex: 'allocatiosnLinkagePutNo', width: 200, align: 'center' },
|
|
|
+ { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: 220, align: 'center' },
|
|
|
{ title: '调出对象', dataIndex: 'outTenantName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -117,7 +133,7 @@ export default {
|
|
|
{ title: '入库时间', dataIndex: 'putWarehouseTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center' },
|
|
|
- { title: '财务状态', dataIndex: 'settleStateDictValue', width: 100, align: 'center' },
|
|
|
+ { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -147,6 +163,7 @@ export default {
|
|
|
this.queryParam.outTenantName = undefined
|
|
|
this.queryParam.allocationType = undefined
|
|
|
this.queryParam.state = undefined
|
|
|
+ this.queryParam.settleState = undefined
|
|
|
this.time = undefined
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|