|
@@ -6,12 +6,12 @@
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="采购单号">
|
|
<a-form-item label="采购单号">
|
|
- <a-input id="warehousingAuditList-putBizNo" v-model.trim="queryParam.putBizNo" allowClear placeholder="请输入采购单号"/>
|
|
|
|
|
|
+ <a-input id="warehousingAuditList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="采购入库单号">
|
|
<a-form-item label="采购入库单号">
|
|
- <a-input id="warehousingAuditList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入采购入库单号"/>
|
|
|
|
|
|
+ <a-input id="warehousingAuditList-receivingBillNo" v-model.trim="queryParam.receivingBillNo" allowClear placeholder="请输入采购入库单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -32,7 +32,7 @@
|
|
v-model="queryParam.auditState"
|
|
v-model="queryParam.auditState"
|
|
ref="auditState"
|
|
ref="auditState"
|
|
id="warehousingAuditList-auditState"
|
|
id="warehousingAuditList-auditState"
|
|
- code="PAYMENT_TYPE"
|
|
|
|
|
|
+ code="RECEIVING_BILL_STATUS"
|
|
placeholder="请选择财务审核状态"
|
|
placeholder="请选择财务审核状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -66,14 +66,27 @@
|
|
:scroll="{ x: 1420, y: tableHeight }"
|
|
:scroll="{ x: 1420, y: tableHeight }"
|
|
bordered>
|
|
bordered>
|
|
<!-- 采购入库单号 -->
|
|
<!-- 采购入库单号 -->
|
|
- <template slot="stockPutNo" slot-scope="text, record">
|
|
|
|
- <span v-if="record.stockPutNo" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.stockPutNo }}</span>
|
|
|
|
|
|
+ <template slot="receivingBillNo" slot-scope="text, record">
|
|
|
|
+ <span v-if="record.receivingBillNo" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.receivingBillNo }}</span>
|
|
<span v-else>--</span>
|
|
<span v-else>--</span>
|
|
</template>
|
|
</template>
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
<template slot="action" slot-scope="text, record">
|
|
<template slot="action" slot-scope="text, record">
|
|
- <a-button size="small" type="link" class="button-info" @click="handleExamine(record, 1)" id="warehousingAudit-adopt-btn">通过</a-button>
|
|
|
|
- <a-button size="small" type="link" class="button-warning" @click="handleExamine(record, 2)" id="warehousingAudit-unadopt-btn">不通过</a-button>
|
|
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ v-if="record.auditState=='WAIT_PUT_WAREHOUSE_AUDIT'"
|
|
|
|
+ type="link"
|
|
|
|
+ class="button-info"
|
|
|
|
+ @click="handleExamine(record, 1)"
|
|
|
|
+ id="warehousingAudit-adopt-btn">通过</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ v-if="record.auditState=='WAIT_PUT_WAREHOUSE_AUDIT'"
|
|
|
|
+ type="link"
|
|
|
|
+ class="button-warning"
|
|
|
|
+ @click="handleExamine(record, 2)"
|
|
|
|
+ id="warehousingAudit-unadopt-btn">不通过</a-button>
|
|
|
|
+ <span v-if="record.auditState!='WAIT_PUT_WAREHOUSE_AUDIT'">--</span>
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
</a-card>
|
|
</a-card>
|
|
@@ -83,7 +96,7 @@
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import getDate from '@/libs/getDate'
|
|
import getDate from '@/libs/getDate'
|
|
-import { stockPutList } from '@/api/stockPut'
|
|
|
|
|
|
+import { receivingList, receivingStockInAudit, receivingCount } from '@/api/receiving'
|
|
export default {
|
|
export default {
|
|
components: { STable, VSelect },
|
|
components: { STable, VSelect },
|
|
data () {
|
|
data () {
|
|
@@ -98,19 +111,19 @@ export default {
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParam: {
|
|
queryParam: {
|
|
- putBizNo: '',
|
|
|
|
- stockPutNo: '',
|
|
|
|
|
|
+ purchaseBillNo: '',
|
|
|
|
+ receivingBillNo: '',
|
|
auditState: undefined
|
|
auditState: undefined
|
|
},
|
|
},
|
|
// 表头
|
|
// 表头
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
- { title: '采购单号', dataIndex: 'putBizNo', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '采购入库单号', scopedSlots: { customRender: 'stockPutNo' }, width: 220, align: 'center' },
|
|
|
|
- { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '入库总数量', dataIndex: 'productTotalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '入库总成本', dataIndex: 'productTotalCost', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '入库时间', dataIndex: 'putTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '采购入库单号', scopedSlots: { customRender: 'receivingBillNo' }, width: 220, align: 'center' },
|
|
|
|
+ { title: '总款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '入库总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '入库总成本', dataIndex: 'totalPutAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '入库时间', dataIndex: 'stockPutTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '财务审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '财务审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '财务审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '财务审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
|
|
@@ -129,7 +142,8 @@ export default {
|
|
this.queryParam.beginDate = undefined
|
|
this.queryParam.beginDate = undefined
|
|
this.queryParam.endDate = undefined
|
|
this.queryParam.endDate = undefined
|
|
}
|
|
}
|
|
- return stockPutList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
|
|
|
+ const params = Object.assign(parameter, this.queryParam)
|
|
|
|
+ return receivingList(params).then(res => {
|
|
const data = res.data
|
|
const data = res.data
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
@@ -146,9 +160,19 @@ export default {
|
|
disabledDate (date, dateStrings) {
|
|
disabledDate (date, dateStrings) {
|
|
return date && date.valueOf() > Date.now()
|
|
return date && date.valueOf() > Date.now()
|
|
},
|
|
},
|
|
|
|
+ // 合计
|
|
|
|
+ getTotal (param) {
|
|
|
|
+ receivingCount(param).then(res => {
|
|
|
|
+ if (res.status == 200 && res.data) {
|
|
|
|
+ this.productTotal = res.data
|
|
|
|
+ } else {
|
|
|
|
+ this.productTotal = null
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 详情
|
|
// 详情
|
|
handleDetail (row) {
|
|
handleDetail (row) {
|
|
- this.$router.push({ path: `/financialManagement/warehousingAudit/detail/${row.putBizSn}/${row.putBizType}` })
|
|
|
|
|
|
+ this.$router.push({ path: `/financialManagement/warehousingAudit/detail/${row.receivingBillSn}` })
|
|
},
|
|
},
|
|
// 审核
|
|
// 审核
|
|
handleExamine (row, type) {
|
|
handleExamine (row, type) {
|
|
@@ -158,19 +182,19 @@ export default {
|
|
content: '确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
|
|
content: '确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
|
|
centered: true,
|
|
centered: true,
|
|
onOk () {
|
|
onOk () {
|
|
- // delectRolePower({ id: row.id }).then(res => {
|
|
|
|
- // if (res.status == 200) {
|
|
|
|
- // _this.$message.success(res.message)
|
|
|
|
- // _this.$refs.table.refresh()
|
|
|
|
- // }
|
|
|
|
- // })
|
|
|
|
|
|
+ receivingStockInAudit({ id: row.id, auditState: type == 1 ? 'FINISH' : 'PUT_WAREHOUSE_AUDIT_REJECT' }).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ _this.$message.success(res.message)
|
|
|
|
+ _this.$refs.table.refresh()
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
- this.queryParam.putBizNo = ''
|
|
|
|
- this.queryParam.stockPutNo = ''
|
|
|
|
|
|
+ this.queryParam.purchaseBillNo = ''
|
|
|
|
+ this.queryParam.receivingBillNo = ''
|
|
this.queryParam.auditState = undefined
|
|
this.queryParam.auditState = undefined
|
|
this.auditTime = []
|
|
this.auditTime = []
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|