|
@@ -220,11 +220,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
|
import verifyModal from './verifyModal.vue'
|
|
|
import chooseDepartUserModal from './chooseDepartUserModal.vue'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-<<<<<<< HEAD
|
|
|
import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
-=======
|
|
|
-import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
|
->>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
|
|
|
import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnSubmit } from '@/api/salesReturn'
|
|
|
import moment from 'moment'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
@@ -241,11 +237,7 @@ export default {
|
|
|
chooseDepartUserModal,
|
|
|
Area,
|
|
|
subarea,
|
|
|
-<<<<<<< HEAD
|
|
|
warehouse
|
|
|
-=======
|
|
|
- chooseWarehouse
|
|
|
->>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
@@ -315,14 +307,8 @@ export default {
|
|
|
{ title: '退货仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '是否同步给客户', dataIndex: 'syncFlag', width: '5%', align: 'center', customRender: function (text) { return text ? ['否', '是'][text] : '--' } },
|
|
|
{ title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
-<<<<<<< HEAD
|
|
|
{ title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '8%', align: 'center' },
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
-=======
|
|
|
- { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
|
|
|
- { title: '客户名称', dataIndex: 'buyerName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '退货仓库', dataIndex: 'warehouse', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
->>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
|
|
|
{ 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 : '--') } },
|