meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20200204创建外购计划，备料分配，外购备料请款界面修改

Browse Source
This commit is contained in:
liulujia@meswork.com
2020-02-05 08:49:01 +08:00
parent abc24b9120
commit a8f4599c8b
15 changed files with 570 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -1,35 +1,34 @@
<template>
<div class="app-container">
<el-card>
<span>请款时间段:</span>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
style="width: 300px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
<el-button
type="success"
<el-card style="margin-left: 0px;width: 68%;float: left">
<el-col>
<span>请款时间段:</span>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</el-tooltip>
</el-card>
<el-card>
type="daterange"
align="center"
style="width: 300px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</el-tooltip>
</el-col>
<el-table
v-loading=""
:data="tableData1"
@@ -37,81 +36,80 @@
:expand-row-keys="expands"
border
stripe
highlight-current-row
style="margin-top: 3px;"
height="600px"
size="mini"
show-summary
@expand-change="searchTable02">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary 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">
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column min-width="150" align="center" label="供应商">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="250" show-overflow-tooltip>
highlight-current-row
@row-click="searchTable02">
<!--@expand-change="searchTable02"-->
<!--<el-table-column type="expand" label="详情">-->
<!--<template slot-scope="scope">-->
<!--<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary 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">-->
<!--{{ scope.row.发票号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column min-width="150" align="center" label="供应商">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.供应商名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.开票金额 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="请款时间" align="center" min-width="150">
<el-table-column label="请款时间" align="center" min-width="90" width="90" prop="date">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
{{ scope.row.请款时间 | formatTime }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="80">
<el-table-column label="请款人" align="center" min-width="80" width="100">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
<el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="请款付款情况" align="center">
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150">
<el-table-column label="未通过审批原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
<el-tooltip effect="dark" content="取消请款" placement="top">
<div style="display: inline-block">
@@ -133,8 +131,29 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="采购计划请款" center style="min-height: 300px" width="800px">
<el-card style="margin-left: 0px;width: 31%;float: left">
<el-table-column type="expand" label="详情">
<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 100%">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="发票号">
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column min-width="150" align="center" label="供应商">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
</el-table>
</el-table-column>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
<span>供应商：</span>
<el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
<el-option
@@ -150,7 +169,7 @@
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="250">
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -160,6 +179,11 @@
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column label="开票时间" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.开票时间 | formatTime }}
</template>
</el-table-column>
</el-table>
<span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
<el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
@@ -237,6 +261,14 @@ export default {
this.searchTable1()
},
methods: {
// dateFormat(row, column) {
// var date = row[column.property]
// console.log(date)
// if (date === undefined) {
// return ''
// }
// return util.formatDate.format(new Date(date), 'yyyy-MM-dd')
// },
fetchData() {
this.supplier = []
searchOfflineContract().then(response => {
@@ -304,23 +336,25 @@ export default {
}
},
searchTable02(row) { // 查看详情（请款信息包含的合同）
if (this.a === 1) {
this.expands.push(row.采购计划请款流水号)
this.b = row.采购计划请款流水号
this.a = 0
} else {
if (this.b === row.采购计划请款流水号) {
this.expands = []
this.a = 1
} else {
this.expands = []
this.expands.push(row.采购计划请款流水号)
this.a = 0
this.b = row.采购计划请款流水号
}
}
console.log(row, 1111)
// if (this.a === 1) {
// this.expands.push(row.采购计划请款流水号)
// this.b = row.采购计划请款流水号
// this.a = 0
// } else {
// if (this.b === row.采购计划请款流水号) {
// this.expands = []
// this.a = 1
// } else {
// this.expands = []
// this.expands.push(row.采购计划请款流水号)
// this.a = 0
// this.b = row.采购计划请款流水号
// }
// }
searchRequsetFundDetail(row.采购计划请款流水号).then(response => {
this.gridData = response.data
console.log(response.data, 2222)
})
},
getRowKeys(row) {