|
@@ -17,30 +17,36 @@
|
|
|
<rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <a-form-model-item label="入库单号">
|
|
|
- <a-input id="salesReturnDetailList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
|
|
|
- </a-form-model-item>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="采购退货单号">
|
|
|
+ <a-input id="bulkWarehousingOrderList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
|
|
|
+ </a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <a-form-model-item label="产品编码">
|
|
|
- <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="供应商名称">
|
|
|
+ <custList id="salesReturnsReportList-dealerName" ref="custList" :itemSn="queryParam.dealerSn" @change="custChange"></custList>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="产品名称">
|
|
|
- <a-input id="salesReturnDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
|
- </a-form-model-item>
|
|
|
+ <a-form-item label="退货原因">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.returnReason"
|
|
|
+ ref="returnReason"
|
|
|
+ id="purchaseReturn-returnReason"
|
|
|
+ code="SPARE_PARTS_RETURN_REASON"
|
|
|
+ placeholder="请选择退货原因"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="供应商名称">
|
|
|
- <a-input id="salesReturnDetailList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
+ <a-form-model-item label="产品编码">
|
|
|
+ <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="品牌分类">
|
|
|
- <v-select code="BRAND_TYPE" id="salesReturnDetailList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
|
|
|
+ <a-form-model-item label="产品名称">
|
|
|
+ <a-input id="salesReturnDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -49,6 +55,11 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="品牌分类">
|
|
|
+ <v-select code="BRAND_TYPE" id="salesReturnDetailList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <!-- <a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="产品分类">
|
|
|
<a-cascader
|
|
|
@change="changeProductType"
|
|
@@ -61,7 +72,7 @@
|
|
|
allowClear
|
|
|
v-model="productType" />
|
|
|
</a-form-model-item>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
<!-- <a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="所在区域">
|
|
|
<subarea id="salesReturnDetailList-subareaSn" v-model="queryParam.subareaSn"></subarea>
|
|
@@ -95,13 +106,7 @@
|
|
|
</a-row>
|
|
|
</a-col>
|
|
|
</template>
|
|
|
- <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
|
|
|
- <a-button
|
|
|
- type="primary"
|
|
|
- class="button-info"
|
|
|
- size="small"
|
|
|
- @click="handleStock"
|
|
|
- id="salesReturnDetailList-stockDate">盘点区间日期</a-button>
|
|
|
+ <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
|
<a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnDetailList-refresh">查询</a-button>
|
|
|
<a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnDetailList-reset">重置</a-button>
|
|
|
<a-button
|
|
@@ -234,18 +239,19 @@ export default {
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
{ title: '采购退货单号', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '入库单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '供应商名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '退货原因', dataIndex: 'returnReason', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '补充说明', dataIndex: 'returnReason', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '附件', dataIndex: 'returnReason', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '入库单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '二级分类', dataIndex: 'productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品名称', dataIndex: 'productName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '单位', dataIndex: 'productUnit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '批次号', dataIndex: 'productUnit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '入库数量', dataIndex: 'receiveQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '已退数量', dataIndex: 'badQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '申请退货数量', dataIndex: 'goodQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -253,9 +259,8 @@ export default {
|
|
|
]
|
|
|
|
|
|
if (this.$hasPermissions('B_isShowPrice')) { // 售价权限
|
|
|
- // const ind = this.$hasPermissions('B_isShowCost') ? 29 : 28
|
|
|
- arr.splice(13, 0, { title: '入库单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- arr.splice(17, 0, { title: '退货金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
+ arr.splice(14, 0, { title: '入库单价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
+ arr.splice(18, 0, { title: '退货金额', dataIndex: 'totalPrice', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
}
|
|
|
// if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
|
|
|
// const ind = this.$hasPermissions('B_isShowPrice') ? 27 : 20
|