|
@@ -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-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入采购单号"/>
|
|
|
|
|
|
+ <a-input id="warehousingAuditList-putBizNo" v-model.trim="queryParam.putBizNo" 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-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入采购入库单号"/>
|
|
|
|
|
|
+ <a-input id="warehousingAuditList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入采购入库单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -20,7 +20,7 @@
|
|
style="width:100%"
|
|
style="width:100%"
|
|
id="warehousingAuditList-creatDate"
|
|
id="warehousingAuditList-creatDate"
|
|
:disabledDate="disabledDate"
|
|
:disabledDate="disabledDate"
|
|
- v-model="createDate"
|
|
|
|
|
|
+ v-model="auditTime"
|
|
:format="dateFormat"
|
|
:format="dateFormat"
|
|
:placeholder="['开始时间', '结束时间']" />
|
|
:placeholder="['开始时间', '结束时间']" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -29,9 +29,9 @@
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="财务审核状态">
|
|
<a-form-item label="财务审核状态">
|
|
<v-select
|
|
<v-select
|
|
- v-model="queryParam.billStatus"
|
|
|
|
- ref="billStatus"
|
|
|
|
- id="warehousingAuditList-billStatus"
|
|
|
|
|
|
+ v-model="queryParam.auditState"
|
|
|
|
+ ref="auditState"
|
|
|
|
+ id="warehousingAuditList-auditState"
|
|
code="PAYMENT_TYPE"
|
|
code="PAYMENT_TYPE"
|
|
placeholder="请选择财务审核状态"
|
|
placeholder="请选择财务审核状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
@@ -63,21 +63,17 @@
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
- :scroll="{ x: 1460 }"
|
|
|
|
|
|
+ :scroll="{ x: 1420, y: tableHeight }"
|
|
bordered>
|
|
bordered>
|
|
- <!-- 采购单号 -->
|
|
|
|
- <template slot="purchaseBillNo" slot-scope="text, record">
|
|
|
|
- <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseBillNo }}</span>
|
|
|
|
- </template>
|
|
|
|
<!-- 采购入库单号 -->
|
|
<!-- 采购入库单号 -->
|
|
- <template slot="purchaseNos" slot-scope="text, record">
|
|
|
|
- <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
|
|
|
|
|
|
+ <template slot="stockPutNo" slot-scope="text, record">
|
|
|
|
+ <span v-if="record.stockPutNo" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.stockPutNo }}</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-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" type="link" class="button-warning" @click="handleExamine(record, 2)" id="warehousingAudit-unadopt-btn">不通过</a-button>
|
|
- <a-button size="small" type="link" class="button-success" @click="handleDetail(record)" id="warehousingAudit-detail-btn">详情</a-button>
|
|
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
</a-card>
|
|
</a-card>
|
|
@@ -94,37 +90,41 @@ export default {
|
|
return {
|
|
return {
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
- createDate: [
|
|
|
|
|
|
+ auditTime: [
|
|
moment(getDate.getLastThreeMonthDays().starttime, this.dateFormat),
|
|
moment(getDate.getLastThreeMonthDays().starttime, this.dateFormat),
|
|
moment(getDate.getLastThreeMonthDays().endtime, this.dateFormat)
|
|
moment(getDate.getLastThreeMonthDays().endtime, this.dateFormat)
|
|
- ], // 创建时间
|
|
|
|
|
|
+ ], // 入库时间
|
|
dateFormat: 'YYYY-MM-DD',
|
|
dateFormat: 'YYYY-MM-DD',
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
// 查询参数
|
|
// 查询参数
|
|
- queryParam: {},
|
|
|
|
|
|
+ queryParam: {
|
|
|
|
+ putBizNo: '',
|
|
|
|
+ stockPutNo: '',
|
|
|
|
+ auditState: undefined
|
|
|
|
+ },
|
|
// 表头
|
|
// 表头
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
- { title: '采购单号', dataIndex: 'putBizNo', align: 'center' },
|
|
|
|
- { title: '采购入库单号', scopedSlots: { customRender: 'purchaseNos' }, width: 220, 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: '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: '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: '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: 'putTime', 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' },
|
|
|
|
- { title: '操作', scopedSlots: { customRender: 'action' }, width: 180, align: 'center', fixed: 'right' }
|
|
|
|
|
|
+ { title: '财务审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
|
|
],
|
|
],
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
if (this.tableHeight == 0) {
|
|
if (this.tableHeight == 0) {
|
|
- this.tableHeight = window.innerHeight - 440
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - 370
|
|
}
|
|
}
|
|
- // 创建时间
|
|
|
|
- if (this.createDate && this.createDate.length > 0) {
|
|
|
|
- this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat)
|
|
|
|
- this.queryParam.endDate = moment(this.createDate[1]).format(this.dateFormat)
|
|
|
|
|
|
+ // 入库时间
|
|
|
|
+ if (this.auditTime && this.auditTime.length > 0) {
|
|
|
|
+ this.queryParam.beginDate = moment(this.auditTime[0]).format(this.dateFormat)
|
|
|
|
+ this.queryParam.endDate = moment(this.auditTime[1]).format(this.dateFormat)
|
|
} else {
|
|
} else {
|
|
this.queryParam.beginDate = undefined
|
|
this.queryParam.beginDate = undefined
|
|
this.queryParam.endDate = undefined
|
|
this.queryParam.endDate = undefined
|
|
@@ -148,20 +148,17 @@ export default {
|
|
},
|
|
},
|
|
// 详情
|
|
// 详情
|
|
handleDetail (row) {
|
|
handleDetail (row) {
|
|
- this.$router.push({ path: `/financialManagement/warehousingAudit/detail/${row.id}` })
|
|
|
|
|
|
+ this.$router.push({ path: `/financialManagement/warehousingAudit/detail/${row.putBizSn}/${row.putBizType}` })
|
|
},
|
|
},
|
|
// 审核
|
|
// 审核
|
|
handleExamine (row, type) {
|
|
handleExamine (row, type) {
|
|
const _this = this
|
|
const _this = this
|
|
this.$confirm({
|
|
this.$confirm({
|
|
title: '提示',
|
|
title: '提示',
|
|
- content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
|
|
|
|
|
|
+ content: '确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
|
|
centered: true,
|
|
centered: true,
|
|
onOk () {
|
|
onOk () {
|
|
- // delectRolePower({
|
|
|
|
- // id: row.id
|
|
|
|
- // }).then(res => {
|
|
|
|
- // console.log(res, 'res1111')
|
|
|
|
|
|
+ // delectRolePower({ id: row.id }).then(res => {
|
|
// if (res.status == 200) {
|
|
// if (res.status == 200) {
|
|
// _this.$message.success(res.message)
|
|
// _this.$message.success(res.message)
|
|
// _this.$refs.table.refresh()
|
|
// _this.$refs.table.refresh()
|
|
@@ -172,12 +169,10 @@ export default {
|
|
},
|
|
},
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
- this.queryParam.orderBundleNo = ''
|
|
|
|
- this.queryParam.orderBundle.custMobile = ''
|
|
|
|
- this.queryParam.bundleName = ''
|
|
|
|
- this.queryParam.itemName = ''
|
|
|
|
- this.oldTime = undefined
|
|
|
|
- this.newTime = undefined
|
|
|
|
|
|
+ this.queryParam.putBizNo = ''
|
|
|
|
+ this.queryParam.stockPutNo = ''
|
|
|
|
+ this.queryParam.auditState = undefined
|
|
|
|
+ this.auditTime = []
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
}
|
|
}
|
|
}
|
|
}
|