|
@@ -33,8 +33,8 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24" v-show="isShowWarehouse">
|
|
|
- <a-form-model-item label="出库仓库" >
|
|
|
- <chooseWarehouse ref="warehouse" @change="handleWarehouse" :isPermission="true"></chooseWarehouse>
|
|
|
+ <a-form-model-item label="出库仓库">
|
|
|
+ <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -110,7 +110,7 @@ import { STable, VSelect } from '@/components'
|
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
|
import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-import { salesReturnList } from '@/api/salesReturn'
|
|
|
+import { takeQueryPage } from '@/api/salesReturn'
|
|
|
import printModal from './printModal.vue'
|
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
@@ -141,13 +141,14 @@ export default {
|
|
|
endAuditDate: '',
|
|
|
buyerSn: undefined, // 客户名称
|
|
|
salesReturnBillNo: undefined, // 总部销退单号
|
|
|
- billStatus: undefined // 业务状态
|
|
|
+ billStatus: undefined, // 业务状态
|
|
|
+ warehouseSn: undefined
|
|
|
},
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
- return salesReturnList(Object.assign(parameter, this.queryParam, {
|
|
|
+ return takeQueryPage(Object.assign(parameter, this.queryParam, {
|
|
|
'excludeBillStatusList': ['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT', 'CANCEL']
|
|
|
})).then(res => {
|
|
|
let data
|
|
@@ -176,7 +177,7 @@ export default {
|
|
|
{ title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- // { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ // { title: '出库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -186,16 +187,12 @@ export default {
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
|
|
|
]
|
|
|
if (this.isShowWarehouse) {
|
|
|
- arr.splice(4, 0, { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
|
|
|
+ arr.splice(4, 0, { title: '出库仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
|
|
|
}
|
|
|
return arr
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- // 选择出库仓库
|
|
|
- handleWarehouse (val) {
|
|
|
-
|
|
|
- },
|
|
|
// 审核时间 change
|
|
|
dateExamineChange (date) {
|
|
|
this.queryParam.beginAuditDate = date[0]
|
|
@@ -224,6 +221,7 @@ export default {
|
|
|
this.queryParam.buyerSn = undefined
|
|
|
this.queryParam.salesReturnBillNo = ''
|
|
|
this.queryParam.billStatus = undefined
|
|
|
+ this.queryParam.warehouseSn = undefined
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
pageInit () {
|