|
@@ -95,11 +95,32 @@
|
|
<div style="flex-grow: 1;width: 60%;">
|
|
<div style="flex-grow: 1;width: 60%;">
|
|
<a-form layout="inline" @keyup.enter.native="searchTable">
|
|
<a-form layout="inline" @keyup.enter.native="searchTable">
|
|
<a-row :gutter="15" type="flex">
|
|
<a-row :gutter="15" type="flex">
|
|
- <a-col flex="350px">
|
|
|
|
|
|
+ <a-col flex="300px">
|
|
<a-form-item label="出库仓库">
|
|
<a-form-item label="出库仓库">
|
|
<chooseWarehouse ref="warehouse" v-model="warehouseSn"></chooseWarehouse>
|
|
<chooseWarehouse ref="warehouse" v-model="warehouseSn"></chooseWarehouse>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col flex="300px">
|
|
|
|
+ <a-form-item label="产品类型">
|
|
|
|
+ <a-select v-model.trim="promoFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
|
|
|
|
+ <a-select-option value="0">
|
|
|
|
+ 正常产品
|
|
|
|
+ </a-select-option>
|
|
|
|
+ <a-select-option value="REGULAR">
|
|
|
|
+ 正价产品(活动)
|
|
|
|
+ </a-select-option>
|
|
|
|
+ <a-select-option value="DISCOUNT">
|
|
|
|
+ 特价产品
|
|
|
|
+ </a-select-option>
|
|
|
|
+ <a-select-option value="GIFT">
|
|
|
|
+ 促销产品
|
|
|
|
+ </a-select-option>
|
|
|
|
+ <a-select-option value="GATE">
|
|
|
|
+ 门槛产品
|
|
|
|
+ </a-select-option>
|
|
|
|
+ </a-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-button type="primary" @click="searchTable" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
|
|
<a-button type="primary" @click="searchTable" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
|
|
@@ -119,6 +140,7 @@
|
|
ref="productList"
|
|
ref="productList"
|
|
:detailData="detailData"
|
|
:detailData="detailData"
|
|
:warehouseSn="warehouseSn"
|
|
:warehouseSn="warehouseSn"
|
|
|
|
+ :promoFlag="promoFlag"
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
:authCode="authCode"
|
|
:authCode="authCode"
|
|
:maxHeight="pageHeight"
|
|
:maxHeight="pageHeight"
|
|
@@ -245,7 +267,8 @@ export default {
|
|
spinningAudit: false,
|
|
spinningAudit: false,
|
|
auditText: null,
|
|
auditText: null,
|
|
fromRouter: null,
|
|
fromRouter: null,
|
|
- warehouseSn: undefined
|
|
|
|
|
|
+ warehouseSn: undefined,
|
|
|
|
+ promoFlag: undefined
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -282,6 +305,7 @@ export default {
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
this.warehouseSn = undefined
|
|
this.warehouseSn = undefined
|
|
|
|
+ this.promoFlag = undefined
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
this.searchTable()
|
|
this.searchTable()
|
|
}, 100)
|
|
}, 100)
|