|
@@ -23,15 +23,15 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="业务单号">
|
|
|
- <a-input id="warehousingConfirmationList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
|
|
|
+ <a-input id="warehousingConfirmationList-putBizNo" v-model.trim="queryParam.putBizNo" allowClear placeholder="请输入业务单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="入库类型">
|
|
|
<v-select
|
|
|
- v-model="queryParam.incomingType"
|
|
|
- id="warehousingConfirmationList-incomingType"
|
|
|
- code="PUT_CONFIRM_STATE"
|
|
|
+ v-model="queryParam.putBizType"
|
|
|
+ id="warehousingConfirmationList-putBizType"
|
|
|
+ code="PUT_STOCK_TYPE"
|
|
|
placeholder="请选择入库类型"
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
@@ -135,6 +135,8 @@ export default {
|
|
|
loading: false,
|
|
|
queryParam: { // 查询条件
|
|
|
stockPutNo: '', // 入库单号
|
|
|
+ putBizNo: '', // 业务单号
|
|
|
+ putBizType: undefined, // 入库类型
|
|
|
auditState: undefined, // 状态
|
|
|
warehouseSn: undefined // 仓库
|
|
|
},
|
|
@@ -169,7 +171,7 @@ export default {
|
|
|
const arr = [
|
|
|
{ title: '入库时间', dataIndex: 'putTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '入库单号', scopedSlots: { customRender: 'stockPutNo' }, width: '12%', align: 'center' },
|
|
|
- { title: '业务单号', dataIndex: 'stockPutNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '业务单号', dataIndex: 'putBizNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '商户名称', dataIndex: 'providerName', align: 'left', width: '18%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '入库数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -197,6 +199,8 @@ export default {
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.queryParam.stockPutNo = ''
|
|
|
+ this.queryParam.putBizNo = ''
|
|
|
+ this.queryParam.putBizType = undefined
|
|
|
this.queryParam.auditState = undefined
|
|
|
this.queryParam.warehouseSn = undefined
|
|
|
this.$refs.table.refresh(true)
|