|
@@ -1,44 +1,106 @@
|
|
|
<template>
|
|
|
- <div class="salesReturnList-wrap">
|
|
|
+ <div class="accountStatement-wrap">
|
|
|
<!-- 搜索条件 -->
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<div style="width:100%">
|
|
|
<a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
|
|
|
<a-row :gutter="15">
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <a-form-item label="入库单号">
|
|
|
- <a-input id="salesReturnList-productCode" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入入库单号"/>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="时间">
|
|
|
+ <rangeDate id="accountStatement-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <a-form-item label="财务审核时间">
|
|
|
- <rangeDate ref="rangeDate" :value="warehousingDate" @change="dateChange" />
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="业务单号">
|
|
|
+ <a-input id="accountStatement-productCode" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入业务单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <a-form-item label="产品编码">
|
|
|
- <a-input id="salesReturnList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="借贷类型">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.status"
|
|
|
+ ref="status"
|
|
|
+ id="accountStatement-status"
|
|
|
+ code="FINANCE_BOOK_STATE"
|
|
|
+ placeholder="请选择状态"
|
|
|
+ allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
- <a-form-item label="产品名称">
|
|
|
- <a-input id="salesReturnList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="借贷类型">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.status"
|
|
|
+ ref="status"
|
|
|
+ id="accountStatement-status"
|
|
|
+ code="FINANCE_BOOK_STATE"
|
|
|
+ placeholder="请选择借贷类型"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="单据类型">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.status"
|
|
|
+ ref="status"
|
|
|
+ id="accountStatement-status"
|
|
|
+ code="FINANCE_BOOK_STATE"
|
|
|
+ placeholder="请选择单据类型"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="备货单状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.status"
|
|
|
+ ref="status"
|
|
|
+ id="accountStatement-status"
|
|
|
+ code="DISPATCH_BILL_STATUS"
|
|
|
+ placeholder="请选择备货单状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="销售退货单状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.status"
|
|
|
+ ref="status"
|
|
|
+ id="accountStatement-status"
|
|
|
+ code="SALES_RETURN_BILL_STATUS"
|
|
|
+ placeholder="请选择销售退货单状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="调拨单状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.status"
|
|
|
+ ref="status"
|
|
|
+ id="accountStatement-status"
|
|
|
+ code="ALLOCATE_STATUS"
|
|
|
+ placeholder="请选择调拨单状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="费用报销单状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.status"
|
|
|
+ ref="status"
|
|
|
+ id="accountStatement-status"
|
|
|
+ code="EXPENSE_STATE"
|
|
|
+ placeholder="请选择费用报销单状态"
|
|
|
+ allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="4" :sm="24">
|
|
|
- <a-button type="primary" @click="$refs.chooseTable.refresh(true)" id="salesReturnList-refresh">查询</a-button>
|
|
|
- <a-button style="margin-left: 5px" @click="resetSearchForm" id="salesReturnList-reset">重置</a-button>
|
|
|
+ <a-button type="primary" @click="$refs.chooseTable.refresh(true)" id="accountStatement-refresh">查询</a-button>
|
|
|
+ <a-button style="margin-left: 5px" @click="resetSearchForm" id="accountStatement-reset">重置</a-button>
|
|
|
</a-col>
|
|
|
<a-col :md="24" :sm="24" style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between;">
|
|
|
<div>
|
|
|
- <a-button type="primary" style="margin-right: 5px" @click="handleBatchAdd" :loading="addMoreLoading">批量添加</a-button>
|
|
|
+ <a-button type="primary" style="margin-right: 5px" @click="handleBatchAdd" :loading="addMoreLoading">批量选择</a-button>
|
|
|
<span v-if="selNums&&selNums!=0" style="margin:0 10px;">已选中{{ selNums }}项</span>
|
|
|
</div>
|
|
|
- <div v-if="queryParam.grabFlag==1">
|
|
|
- <a-checkbox @change="onChange" :checked="isChecked">
|
|
|
- 显示最大可退数量为0的产品
|
|
|
- </a-checkbox>
|
|
|
- </div>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</a-form>
|
|
@@ -58,18 +120,14 @@
|
|
|
:defaultLoadData="false"
|
|
|
:scroll="{ y: 300 }"
|
|
|
bordered>
|
|
|
- <!-- 申请退货数量 -->
|
|
|
- <template slot="qty" slot-scope="text, record">
|
|
|
+ <!-- 备注 -->
|
|
|
+ <template slot="remark" slot-scope="text, record">
|
|
|
<div @dblclick.stop>
|
|
|
- <a-input-number
|
|
|
+ <a-input
|
|
|
size="small"
|
|
|
- v-model="record.qty"
|
|
|
- :precision="0"
|
|
|
- :min="1"
|
|
|
- :disabled="record.currentStockQty == 0"
|
|
|
- :max="record.currentStockQty"
|
|
|
+ v-model="record.remarks"
|
|
|
style="width: 100%;"
|
|
|
- placeholder="请输入"/>
|
|
|
+ placeholder="请输入备注"/>
|
|
|
</div>
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
@@ -99,15 +157,6 @@ export default {
|
|
|
components: { STable, VSelect, rangeDate },
|
|
|
props: {
|
|
|
newLoading: Boolean,
|
|
|
- isShowPrice: {
|
|
|
- type: Boolean,
|
|
|
- default: true
|
|
|
- },
|
|
|
- // 是否显示仓库实收数量
|
|
|
- showReceiveQty: {
|
|
|
- type: Boolean,
|
|
|
- default: false
|
|
|
- },
|
|
|
addMoreLoading: {
|
|
|
type: Boolean,
|
|
|
default: false
|
|
@@ -126,7 +175,7 @@ export default {
|
|
|
createDate: undefined,
|
|
|
grabFlag: ''
|
|
|
},
|
|
|
- warehousingDate: [], // 入库时间
|
|
|
+ creatDate: [], // 创建时间
|
|
|
rowSelectionInfo: null,
|
|
|
isChecked: false,
|
|
|
repeatList: null,
|
|
@@ -155,25 +204,21 @@ export default {
|
|
|
computed: {
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
- { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
|
|
|
- { title: '入库单号', dataIndex: 'sparePartsNo', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品编码', dataIndex: 'product.code', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'product.name', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '单位', dataIndex: 'product.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '批次号', dataIndex: 'sparePartsBatchNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '入库数量', dataIndex: 'productQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- // { title: '已退数量', dataIndex: 'returnedQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '最大可退数量', dataIndex: 'currentStockQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
- { title: '申请退货数量', width: '10%', align: 'center', scopedSlots: { customRender: 'qty' } },
|
|
|
+ { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
+ { title: '年', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '月', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '日', dataIndex: 'sparePartsNo', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '业务单号', dataIndex: 'sparePartsNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '单据类型', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '单据状态', dataIndex: 'product.name', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '费用/调拨类型', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '摘要', dataIndex: 'sparePartsBatchNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客诉索赔编码', dataIndex: 'currentStockQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
+ { title: '借方', dataIndex: 'productCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
|
|
|
+ { title: '贷方', dataIndex: 'productCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
|
|
|
+ { title: '备注', scopedSlots: { customRender: 'remark' }, width: '15%', align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
|
]
|
|
|
- if (this.$hasPermissions('B_purchaseReturnEdit_costPrice')) {
|
|
|
- arr.splice(6, 0, { title: '入库单价', dataIndex: 'productCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } })
|
|
|
- }
|
|
|
- if (this.queryParam.grabFlag == 1) { // 抓单
|
|
|
- const pos = this.$hasPermissions('B_purchaseReturnEdit_costPrice') ? 8 : 7
|
|
|
- arr.splice(pos, 0, { title: '已退数量', dataIndex: 'returnedQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } })
|
|
|
- }
|
|
|
return arr
|
|
|
},
|
|
|
selNums () {
|
|
@@ -181,13 +226,18 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 创建时间 change
|
|
|
+ dateChange (date) {
|
|
|
+ this.queryParam.beginDate = date[0] ? date[0] : ''
|
|
|
+ this.queryParam.endDate = date[1] ? date[1] : ''
|
|
|
+ },
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.queryParam.productName = ''
|
|
|
this.queryParam.productCode = ''
|
|
|
this.queryParam.sparePartsNo = ''
|
|
|
- this.warehousingDate = []
|
|
|
- this.$refs.rangeDate.resetDate(this.warehousingDate)
|
|
|
+ this.creatDate = []
|
|
|
+ this.$refs.rangeDate.resetDate(this.creatDate)
|
|
|
this.$refs.chooseTable.refresh(true)
|
|
|
},
|
|
|
onChange (e) {
|
|
@@ -251,7 +301,7 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
<style lang="less" scoped>
|
|
|
- .salesReturnList-wrap{
|
|
|
+ .accountStatement-wrap{
|
|
|
.redBg-row{
|
|
|
background-color: #f5cdc8;
|
|
|
}
|