|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <div class="accountStatement-wrap">
|
|
|
+ <div class="accountStatement-query-wrap">
|
|
|
<!-- 搜索条件 -->
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<div style="width:100%">
|
|
@@ -7,94 +7,51 @@
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="时间">
|
|
|
- <rangeDate id="accountStatement-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
|
|
|
+ <rangeDate id="accountStatement-query-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="业务单号">
|
|
|
- <a-input id="accountStatement-productCode" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入业务单号"/>
|
|
|
+ <a-input id="accountStatement-query-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
|
|
|
</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"
|
|
|
+ v-model="queryParam.changeType"
|
|
|
+ ref="jdType"
|
|
|
+ id="accountStatement-query-jdType"
|
|
|
code="FINANCE_BOOK_STATE"
|
|
|
placeholder="请选择借贷类型"
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="单据类型">
|
|
|
+ <a-form-item label="业务类型">
|
|
|
<v-select
|
|
|
- v-model="queryParam.status"
|
|
|
- ref="status"
|
|
|
- id="accountStatement-status"
|
|
|
+ v-model="queryParam.bizType"
|
|
|
+ ref="bizType"
|
|
|
+ id="accountStatement-query-bizType"
|
|
|
code="FINANCE_BOOK_STATE"
|
|
|
placeholder="请选择单据类型"
|
|
|
allowClear></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="备货单状态">
|
|
|
+ <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="请选择费用报销单状态"
|
|
|
+ v-model="queryParam.bizStatus"
|
|
|
+ ref="bizStatus"
|
|
|
+ id="accountStatement-query-bizStatus"
|
|
|
+ :code="['DISPATCH_BILL_STATUS','SALES_RETURN_BILL_STATUS','ALLOCATE_STATUS','EXPENSE_STATE'][0]"
|
|
|
+ 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="accountStatement-refresh">查询</a-button>
|
|
|
- <a-button style="margin-left: 5px" @click="resetSearchForm" id="accountStatement-reset">重置</a-button>
|
|
|
+ <a-button type="primary" @click="$refs.chooseTable.refresh(true)" id="accountStatement-query-refresh">查询</a-button>
|
|
|
+ <a-button style="margin-left: 5px" @click="resetSearchForm" id="accountStatement-query-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>
|
|
@@ -121,7 +78,7 @@
|
|
|
:scroll="{ y: 300 }"
|
|
|
bordered>
|
|
|
<!-- 备注 -->
|
|
|
- <template slot="remark" slot-scope="text, record">
|
|
|
+ <template slot="remarks" slot-scope="text, record">
|
|
|
<div @dblclick.stop>
|
|
|
<a-input
|
|
|
size="small"
|
|
@@ -137,10 +94,8 @@
|
|
|
type="link"
|
|
|
class="button-info"
|
|
|
:loading="newLoading"
|
|
|
- v-if="record.currentStockQty != 0 && !record.isCheckedFlag"
|
|
|
@click="handleAdd(record)"
|
|
|
- >添加</a-button>
|
|
|
- <span v-else>--</span>
|
|
|
+ >选择</a-button>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</div>
|
|
@@ -166,14 +121,12 @@ export default {
|
|
|
return {
|
|
|
buyerSn: '',
|
|
|
queryParam: { // 查询条件
|
|
|
- productName: '', // 产品名称
|
|
|
- productCode: '', // 产品编码
|
|
|
beginDate: '',
|
|
|
endDate: '',
|
|
|
- sparePartsNo: '',
|
|
|
- isZero: 0,
|
|
|
- createDate: undefined,
|
|
|
- grabFlag: ''
|
|
|
+ bizNo: '',
|
|
|
+ changeType: undefined,
|
|
|
+ bizType: undefined,
|
|
|
+ bizStatus: undefined
|
|
|
},
|
|
|
creatDate: [], // 创建时间
|
|
|
rowSelectionInfo: null,
|
|
@@ -182,9 +135,6 @@ export default {
|
|
|
warehouseSn: null,
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
- this.queryParam.supplierSn = this.buyerSn
|
|
|
- this.queryParam.createDate = '2023-01-01 00:00:00'
|
|
|
- this.queryParam.warehouseSn = this.warehouseSn
|
|
|
return queryDetailStockPage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
@@ -192,8 +142,6 @@ export default {
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
|
data.list[i].no = no + i + 1
|
|
|
- data.list[i].qty = data.list[i].currentStockQty
|
|
|
- data.list[i].isCheckedFlag = this.repeatList.findIndex(item => { return item == data.list[i].sparePartsDetailSn }) > -1
|
|
|
}
|
|
|
}
|
|
|
return data
|
|
@@ -205,18 +153,18 @@ export default {
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
{ 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: 'year', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '月', dataIndex: 'month', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '日', dataIndex: 'day', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '业务单号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '业务类型', dataIndex: 'bizType', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '业务状态', dataIndex: 'bizStatus', 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: '摘要', dataIndex: 'digestInfo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客诉索赔编码', dataIndex: 'productCode', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
+ { title: '借方', dataIndex: 'debitAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
|
|
|
+ { title: '贷方', dataIndex: 'creditorAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } },
|
|
|
+ { title: '备注', scopedSlots: { customRender: 'remarks' }, width: '15%', align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
|
]
|
|
|
return arr
|
|
@@ -233,28 +181,18 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.queryParam.productName = ''
|
|
|
- this.queryParam.productCode = ''
|
|
|
- this.queryParam.sparePartsNo = ''
|
|
|
+ this.queryParam.bizNo = ''
|
|
|
+ this.queryParam.beginDate = ''
|
|
|
+ this.queryParam.endDate = ''
|
|
|
+ this.queryParam.bizNo = ''
|
|
|
+ this.queryParam.changeType = undefined
|
|
|
+ this.queryParam.bizType = undefined
|
|
|
+ this.queryParam.bizStatus = undefined
|
|
|
this.creatDate = []
|
|
|
this.$refs.rangeDate.resetDate(this.creatDate)
|
|
|
this.$refs.chooseTable.refresh(true)
|
|
|
},
|
|
|
- onChange (e) {
|
|
|
- this.isChecked = !this.isChecked
|
|
|
- this.queryParam.isZero = e.target.checked ? 1 : 0
|
|
|
- this.$refs.chooseTable.refresh()
|
|
|
- },
|
|
|
- // 入库时间 change
|
|
|
- dateChange (date) {
|
|
|
- this.queryParam.beginDate = date[0] ? date[0] : ''
|
|
|
- this.queryParam.endDate = date[1] ? date[1] : ''
|
|
|
- },
|
|
|
- pageInit (buyerSn, returnSn, warehouseSn, grabFlag) {
|
|
|
- this.buyerSn = buyerSn
|
|
|
- this.queryParam.grabFlag = grabFlag
|
|
|
- this.warehouseSn = warehouseSn
|
|
|
- this.getRepeatResult(returnSn)
|
|
|
+ pageInit () {
|
|
|
this.$refs.chooseTable.refresh()
|
|
|
// this.$refs.chooseTable.clearSelected()
|
|
|
},
|
|
@@ -282,26 +220,18 @@ export default {
|
|
|
},
|
|
|
// 批量添加
|
|
|
handleBatchAdd () {
|
|
|
- console.log(this.rowSelectionInfo)
|
|
|
const row = this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys
|
|
|
if (!row || row.length == 0) {
|
|
|
- this.$message.warning('请先选择要添加的产品!')
|
|
|
+ this.$message.warning('请先选择单据!')
|
|
|
return
|
|
|
}
|
|
|
this.$emit('bachAdd', this.rowSelectionInfo.selectedRows)
|
|
|
- },
|
|
|
- getRepeatResult (sn) {
|
|
|
- queryDetailSnListBySn({ sn }).then(res => {
|
|
|
- if (res.status == 200) {
|
|
|
- this.repeatList = res.data
|
|
|
- }
|
|
|
- })
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
<style lang="less" scoped>
|
|
|
- .accountStatement-wrap{
|
|
|
+ .accountStatement-query-wrap{
|
|
|
.redBg-row{
|
|
|
background-color: #f5cdc8;
|
|
|
}
|