|
@@ -28,7 +28,7 @@
|
|
|
:loading="loading"
|
|
|
@click="openGuideModal=true"
|
|
|
style="margin-right:5px;"
|
|
|
- >导入产品</a-button>
|
|
|
+ >导入产品</a-button>
|
|
|
<a-button type="primary" :loading="loading" class="button-info" @click="openModal = true">新增产品</a-button>
|
|
|
<a-button type="primary" :loading="loading" class="button-error" @click="handlePlss">批量实收</a-button>
|
|
|
<span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys&&rowSelectionInfo.selectedRowKeys.length">已选{{ rowSelectionInfo.selectedRowKeys.length }}项</span>
|
|
@@ -83,6 +83,12 @@
|
|
|
@blur="e => onCellBlurReturnReason(e, record)"></returnReason>
|
|
|
<span v-else>{{ record.returnReason }}</span>
|
|
|
</template>
|
|
|
+ <!-- 备注 -->
|
|
|
+ <template slot="remarks" slot-scope="text, record">
|
|
|
+ <div @dblclick.stop>
|
|
|
+ <a-input :maxLength="50" size="small" v-model="record.remarks" placeholder="请输入备注(最多50字符)"/>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<div>
|
|
@@ -116,8 +122,8 @@
|
|
|
:buyerSn="$route.params.buyerSn"
|
|
|
@close="openModal=false"
|
|
|
@addProduct="addProduct"></chooseProductsModal>
|
|
|
- <!-- 导入产品 -->
|
|
|
- <importGuideModal :params="{salesReturnBillSn: $route.params.sn}" :openModal="openGuideModal" @close="openGuideModal=false" @ok="importOk" />
|
|
|
+ <!-- 导入产品 -->
|
|
|
+ <importGuideModal :params="{salesReturnBillSn: $route.params.sn}" :openModal="openGuideModal" @close="openGuideModal=false" @ok="importOk" />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -191,12 +197,13 @@ export default {
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'productEntity.name', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '申请退货数量', dataIndex: 'initialQty', align: 'center', width: '10%', scopedSlots: { customRender: 'initialQty' } },
|
|
|
- { title: '仓库实收数量', dataIndex: 'receiveQty', align: 'center', width: '10%', scopedSlots: { customRender: 'receiveQty' } },
|
|
|
+ { title: '产品名称', dataIndex: 'productEntity.name', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '申请退货数量', dataIndex: 'initialQty', align: 'center', width: '8%', scopedSlots: { customRender: 'initialQty' } },
|
|
|
+ { title: '仓库实收数量', dataIndex: 'receiveQty', align: 'center', width: '8%', scopedSlots: { customRender: 'receiveQty' } },
|
|
|
{ title: '单位', dataIndex: 'productEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
// { title: '退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '退货原因', dataIndex: 'returnReason', width: '25%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
|
|
|
+ { title: '退货原因', dataIndex: 'returnReason', width: '19%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
|
|
|
+ { title: '备注', dataIndex: 'remarks', width: '19%', align: 'center', scopedSlots: { customRender: 'remarks' } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
|
]
|
|
|
return arr
|
|
@@ -212,10 +219,10 @@ export default {
|
|
|
this.$router.push({ name: 'receiveCheckList' })
|
|
|
},
|
|
|
// 确认导入明细
|
|
|
- importOk(data){
|
|
|
+ importOk (data) {
|
|
|
this.spinning = true
|
|
|
- salesReturnDetailBatchByReceive({detailList:data, salesReturnBillSn: this.orderSn}).then(res => {
|
|
|
- if(res.status == 200){
|
|
|
+ salesReturnDetailBatchByReceive({ detailList: data, salesReturnBillSn: this.orderSn }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
this.resetSearchForm()
|
|
|
this.$message.info(res.message)
|
|
|
}
|