|
@@ -28,13 +28,13 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
- <custList id="salesReturn-buyerSn" defValKey="customerSn" v-model="queryParam.buyerSn"></custList>
|
|
|
+ <custList id="salesReturn-buyerSn" ref="custList" @change="custChange"></custList>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="退货单号">
|
|
|
- <a-input id="salesReturn-salesReturnNo" v-model.trim="queryParam.salesReturnNo" allowClear placeholder="请输入退货单号"/>
|
|
|
+ <a-form-item label="销退单号">
|
|
|
+ <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入销退单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -48,6 +48,17 @@
|
|
|
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="salesManagementList-settleState"
|
|
|
+ code="FINANCIAL_STATUS"
|
|
|
+ placeholder="请选择财务状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
</template>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<span class="table-page-search-submitButtons">
|
|
@@ -83,14 +94,14 @@
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ x: 1810, y: tableHeight }"
|
|
|
+ :scroll="{ x: 2300, y: tableHeight }"
|
|
|
bordered>
|
|
|
<!-- 单号 -->
|
|
|
- <template slot="salesReturnNo" slot-scope="text, record">
|
|
|
- <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnNo }}</span>
|
|
|
+ <template slot="salesReturnBillNo" slot-scope="text, record">
|
|
|
+ <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
|
|
|
</template>
|
|
|
<!-- 财务状态 -->
|
|
|
- <template slot="financialStatus" slot-scope="text, record">
|
|
|
+ <template slot="settleState" slot-scope="text, record">
|
|
|
<a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
@@ -127,7 +138,7 @@
|
|
|
<script>
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import chooseCustomModal from './chooseCustomModal.vue'
|
|
|
-import custList from '@/views/common/custList.js'
|
|
|
+import custList from '@/views/common/custList.vue'
|
|
|
import { salesReturnList, salesReturnQueryCount, salesReturnAudit, salesReturnDel } from '@/api/salesReturn'
|
|
|
import moment from 'moment'
|
|
|
export default {
|
|
@@ -151,8 +162,9 @@ export default {
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
buyerSn: undefined, // 客户名称
|
|
|
- salesReturnNo: undefined, // 销售退货单号
|
|
|
+ salesReturnBillNo: undefined, // 总部销退单号
|
|
|
billStatus: undefined, // 业务状态
|
|
|
+ settleState: undefined, // 财务状态
|
|
|
beginDate: undefined,
|
|
|
endDate: undefined,
|
|
|
auditBeginDate: undefined,
|
|
@@ -163,15 +175,18 @@ export default {
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
|
|
|
- { title: '销售退货单号', scopedSlots: { customRender: 'salesReturnNo' }, width: 260, align: 'center' },
|
|
|
- { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '退款总金额', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '总款数', dataIndex: 'totalCategory', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: 120, align: 'center' },
|
|
|
+ { title: '客户采退单号', dataIndex: 'purchaseReturnBillNo', width: 260, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: 260, align: 'center' },
|
|
|
+ { title: '退货客户', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '退货数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '坏件数量', dataIndex: 'totalBadQty', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '返库数量', dataIndex: 'totalCategory', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '退款金额', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '是否抓单', dataIndex: 'grabFlag', width: 100, align: 'center', customRender: function (text) { return ['否', '是'][text] } },
|
|
|
{ title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '业务状态', dataIndex: 'stateDictValue', width: 110, align: 'center' },
|
|
|
- { title: '财务状态', dataIndex: 'settleStateDictValue', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
|
|
|
+ { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
|
|
|
+ { title: '财务状态', dataIndex: 'settleStateDictValue', scopedSlots: { customRender: 'settleState' }, width: 110, align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -211,6 +226,9 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ custChange (val) {
|
|
|
+ this.queryParam.buyerSn = val.key
|
|
|
+ },
|
|
|
// 不可选日期
|
|
|
disabledDate (date, dateStrings) {
|
|
|
return date && date.valueOf() > Date.now()
|
|
@@ -268,8 +286,10 @@ export default {
|
|
|
},
|
|
|
resetSearchForm () {
|
|
|
this.queryParam.buyerSn = undefined
|
|
|
- this.queryParam.salesReturnNo = ''
|
|
|
- this.queryParam.billStatus = ''
|
|
|
+ this.$refs.custList.resetForm()
|
|
|
+ this.queryParam.salesReturnBillNo = ''
|
|
|
+ this.queryParam.billStatus = undefined
|
|
|
+ this.queryParam.settleState = undefined
|
|
|
this.queryParam.beginDate = undefined
|
|
|
this.endDate = undefined
|
|
|
this.auditBeginDate = undefined
|