This commit is contained in:
liushuai
2019-10-09 19:08:24 +08:00
parent 86989987e2
commit 61413afd91
13 changed files with 443 additions and 345 deletions

View File

@@ -34,7 +34,7 @@
@expand-change="searchTable02">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="gridData" class="subTableHeader" stripe border size="mini" style="width: 40%">
<el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 40%">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="供应商">
<template slot-scope="scope">
@@ -46,6 +46,11 @@
{{ scope.row.日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="金额" align="center" prop="到货金额">
<template slot-scope="scope">
{{ scope.row.到货金额 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -100,7 +105,7 @@
type="text"
size="mini"
icon="el-icon-share"
@click="aboutArrival(scope.row)"/>
@click="aboutArrival(scope.row)">关联到货单</el-button>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -138,10 +143,10 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="23%">
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
<el-form-item label="供应商" prop="supplierNameValue">
<el-select v-model="form1.supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable>
<el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable>
<el-option
v-for="item in supplierNames"
:key="item.value"
@@ -171,8 +176,6 @@
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="关联到货单" center style="min-height: 200px" width="45%">
<div>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="Name" placeholder="供应商" size="small" clearable/>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="dateRange"
@@ -201,6 +204,11 @@
{{ scope.row.日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="金额" align="center">
<template slot-scope="scope">
{{ scope.row.到货金额 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -324,9 +332,9 @@ export default {
},
// 查询到货单
searchTable4() {
console.log(this.dateRange)
console.log(this.Name)
this.Name ? this.check = 1 : this.check = 0
this.dateRange ? this.check = 1 : (this.check = 0, this.dateRange = '')
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
this.tableData4 = response.data.rows
this.total4 = response.data.total
@@ -449,8 +457,10 @@ export default {
})
},
aboutArrival(row) {
this.Name = row.供应商
this.发票流水号 = row.发票流水号
this.dialogVisible = true
this.searchTable4()
},
handleSelectionChange(val) {
this.arrest = val