|
@@ -114,20 +114,8 @@
|
|
|
</template>
|
|
|
<!-- 退货原因 -->
|
|
|
<template slot="returnReason" slot-scope="text, record">
|
|
|
- <a-select
|
|
|
- size="small"
|
|
|
- v-if="record.isEdit"
|
|
|
- style="width:100%;"
|
|
|
- v-model="record.returnReason"
|
|
|
- placeholder="请选择退货原因"
|
|
|
- allowClear>
|
|
|
- <a-select-option v-for="item in returnReasonList" :value="item.code">
|
|
|
- {{ item.dispName }}
|
|
|
- </a-select-option>
|
|
|
- </a-select>
|
|
|
- <span v-else>
|
|
|
- {{ record.returnReasonDictValue||'--' }}
|
|
|
- </span>
|
|
|
+ <returnReason v-if="record.isEdit" v-model="record.returnReason"></returnReason>
|
|
|
+ <span v-else>{{ record.returnReason||'--' }}</span>
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
@@ -198,6 +186,7 @@
|
|
|
import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import setPriceModal from './setPriceModal.vue'
|
|
|
+import returnReason from '@/views/common/returnReason'
|
|
|
import chooseProductsModal from '../receiveCheck/chooseProductsModal.vue'
|
|
|
import { salesReturnDetail, customerServiceConfirm } from '@/api/salesReturn'
|
|
|
import { salesReturnDetailList, updateByCustomerService, deleteByCustomerService, insertByCustomerService } from '@/api/salesReturnDetail'
|
|
@@ -208,7 +197,8 @@ export default {
|
|
|
STable,
|
|
|
VSelect,
|
|
|
setPriceModal,
|
|
|
- chooseProductsModal
|
|
|
+ chooseProductsModal,
|
|
|
+ returnReason
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
@@ -243,7 +233,6 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
rowSelectionInfo: null,
|
|
|
- returnReasonList: [], // 申请退货列表
|
|
|
showSetPriceModal: false,
|
|
|
chooseData: [],
|
|
|
openProductModal: false
|
|
@@ -254,7 +243,7 @@ export default {
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', align: 'center', width: '13%', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'productEntity.name', width: '25%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '单位', dataIndex: 'productEntity.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '申请退货数量', dataIndex: 'initialQty', align: 'center', width: '10%', scopedSlots: { customRender: 'qty' } },
|
|
|
{ title: '仓库实收数量', dataIndex: 'receiveQty', align: 'center', width: '10%', scopedSlots: { customRender: 'receiveQty' } },
|
|
@@ -264,7 +253,7 @@ export default {
|
|
|
// { title: '实际退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { title: '实际退货金额', dataIndex: 'totalAmount', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '退货单价说明', dataIndex: 'priceRemark', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '退货原因', dataIndex: 'returnReason', width: '15%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
|
|
|
+ { title: '退货原因', dataIndex: 'returnReason', width: '20%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'center' }
|
|
|
]
|
|
|
if (this.$hasPermissions('B_isShowPrice')) { // 售价权限
|
|
@@ -417,7 +406,6 @@ export default {
|
|
|
_this.setTableH()
|
|
|
})
|
|
|
this.orderSn = this.$route.params.sn
|
|
|
- this.returnReasonList = this.$store.state.app.returnReason
|
|
|
this.getOrderDetail()
|
|
|
},
|
|
|
setTableH () {
|