|
@@ -53,6 +53,11 @@
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-model-item label="退货仓库">
|
|
|
+ <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
</template>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<span class="table-page-search-submitButtons">
|
|
@@ -142,6 +147,7 @@ import custList from '@/views/common/custList.vue'
|
|
|
import employee from '../../expenseManagement/expenseReimbursement/employee.js'
|
|
|
import verifyModal from './verifyModal.vue'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
+import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
import { pickUpQueryPage, pickUpDelete, pickUpAgainEdit } from '@/api/pickUp'
|
|
|
export default {
|
|
|
name: 'BillOfLadingList',
|
|
@@ -152,7 +158,8 @@ export default {
|
|
|
custList,
|
|
|
employee,
|
|
|
rangeDate,
|
|
|
- verifyModal
|
|
|
+ verifyModal,
|
|
|
+ warehouse
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
@@ -173,7 +180,8 @@ export default {
|
|
|
salesReturnBillNo: undefined, // 总部销退单号
|
|
|
logisticsPoint: undefined, // 物流点
|
|
|
senderSn: undefined, // 发货人
|
|
|
- state: undefined // 业务状态
|
|
|
+ state: undefined ,// 业务状态
|
|
|
+ warehouseSn:undefined//退货仓库
|
|
|
},
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -206,6 +214,7 @@ export default {
|
|
|
{ title: '提货单号', scopedSlots: { customRender: 'pickUpNo' }, width: '10%', align: 'center' },
|
|
|
{ title: '关联销退单', dataIndex: 'salesReturnNum', scopedSlots: { customRender: 'salesReturnNum' }, width: '6%', align: 'center' },
|
|
|
{ title: '申请人', dataIndex: 'applyPersonName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '退货仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '主题', dataIndex: 'theme', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '物流公司', dataIndex: 'logisticsCompany', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '物流点', dataIndex: 'logisticsPoint', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -309,6 +318,7 @@ export default {
|
|
|
this.queryParam.logisticsPoint = undefined
|
|
|
this.queryParam.salesReturnBillNo = flag ? this.$route.query.billNo : ''
|
|
|
this.queryParam.state = undefined
|
|
|
+ this.queryParam.warehouseSn = undefined
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
pageInit () {
|