页面修改

This commit is contained in:
bryan sun
2019-11-09 14:18:56 +08:00
parent 3c87327400
commit 6d8379c8da
13 changed files with 167 additions and 102 deletions

View File

@@ -29,7 +29,7 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2,
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '采购管理_合同_查询数据_采购部采购', name: '采购管理_合同_查询数据_采购部采购_新',
param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number + '&审核情况流水号_check=' + check6 + '&审核情况流水号=' + review, param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number + '&审核情况流水号_check=' + check6 + '&审核情况流水号=' + review,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }

View File

@@ -70,22 +70,22 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="保证金金额" width="100"> <el-table-column align="center" label="保证金金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag style="width: 80px" size="mini">{{ scope.row.保证金金额 }}</el-tag> <el-tag style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="中标服务费" width="100"> <el-table-column align="center" label="中标服务费" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.中标服务费 }} {{ Number(scope.row.中标服务费).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="转履约保证金金额" width="140"> <el-table-column align="center" label="转履约保证金金额" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.转履约保证金金额 }} {{ Number(scope.row.转履约保证金金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="应收回金额" width="100"> <el-table-column align="center" label="应收回金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.应收回金额 }} {{ Number(scope.row.应收回金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="实收回金额" width="100"> <el-table-column align="center" label="实收回金额" width="100">

View File

@@ -287,7 +287,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="开票金额(含税)" width="150"> <el-table-column align="center" label="开票金额(含税)" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.开票金额 }} {{ Number(scope.row.开票金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="开票时间" width="150"> <el-table-column align="center" label="开票时间" width="150">
@@ -352,7 +352,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="运费"> <el-table-column align="center" label="运费">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.运费 }} {{ Number(scope.row.运费).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="签收人"> <el-table-column align="center" label="签收人">
@@ -402,27 +402,27 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="保证金金额" width="100"> <el-table-column align="center" label="保证金金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag style="width: 80px" size="small">{{ scope.row.保证金金额 }}</el-tag> <el-tag style="width: 80px" size="small">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="中标服务费" width="100"> <el-table-column align="center" label="中标服务费" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.中标服务费 }} {{ Number(scope.row.中标服务费).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="转履约保证金金额" width="150"> <el-table-column align="center" label="转履约保证金金额" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.转履约保证金金额 }} {{ Number(scope.row.转履约保证金金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="应收回金额" width="100"> <el-table-column align="center" label="应收回金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.应收回金额 }} {{ Number(scope.row.应收回金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="实收回金额" width="100"> <el-table-column align="center" label="实收回金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否收回) === 2" size="small" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</el-tag> <el-tag v-if="parseInt(scope.row.是否收回) === 2" size="small" type="success" style="width: 66px">{{ Number(scope.row.应收回金额).toFixed(2) }}</el-tag>
<el-tag v-else slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag> <el-tag v-else slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag>
</template> </template>
</el-table-column> </el-table-column>
@@ -480,7 +480,7 @@
size="mini"> size="mini">
<el-table-column align="center" label="履约保证金金额"> <el-table-column align="center" label="履约保证金金额">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="primary" size="small">{{ scope.row.履约保证金金额 }}</el-tag> <el-tag type="primary" size="small">{{ Number(scope.row.履约保证金金额).toFixed(2) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="保证金类型"> <el-table-column align="center" label="保证金类型">
@@ -552,7 +552,7 @@
size="mini"> size="mini">
<el-table-column align="center" label="保证金金额" width="100"> <el-table-column align="center" label="保证金金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="primary" size="small">{{ scope.row.保证金金额 }}</el-tag> <el-tag type="primary" size="small">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="交付日期" width="150"> <el-table-column align="center" label="交付日期" width="150">
@@ -572,17 +572,17 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="扣款金额" width="100"> <el-table-column align="center" label="扣款金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.扣款金额 }} {{ Number(scope.row.扣款金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="应收回金额" align="center" width="120"> <el-table-column label="应收回金额" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.应收回金额 }} {{ Number(scope.row.应收回金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际收回金额" align="center" width="120"> <el-table-column label="实际收回金额" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : scope.row.应收回金额 }} {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : Number(scope.row.应收回金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否收回" width="100"> <el-table-column align="center" label="是否收回" width="100">

View File

@@ -74,17 +74,17 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同总金额(万元)" width="130"> <el-table-column align="center" label="合同总金额(万元)" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同总金额 }} {{ Number(scope.row.合同总金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="已到账金额(万元)" width="130"> <el-table-column align="center" label="已到账金额(万元)" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.已支付 }} {{ Number(scope.row.已支付).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="未到账金额(万元)" width="130"> <el-table-column align="center" label="未到账金额(万元)" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="mini" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag> <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="付款进度" width="150"> <el-table-column align="center" label="付款进度" width="150">

View File

@@ -68,13 +68,13 @@
<el-table-column align="center" label="合同总金额(含税)" width="130"> <el-table-column align="center" label="合同总金额(含税)" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag> <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
<el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ scope.row.合同总金额 }} </el-tag> <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.合同总金额).toFixed(2) }} </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="已到账金额" width="120"> <el-table-column align="center" label="已到账金额" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag> <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
<el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ scope.row.已支付 }} </el-tag> <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已支付).toFixed(2) }} </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="税率" width="100"> <el-table-column align="center" label="税率" width="100">
@@ -159,7 +159,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="开票金额(含税)" width="120"> <el-table-column align="center" label="开票金额(含税)" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.开票金额 }} {{ Number(scope.row.开票金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="开票时间" width="100"> <el-table-column align="center" label="开票时间" width="100">

View File

@@ -127,7 +127,7 @@
size="mini"> size="mini">
<el-table-column align="center" label="履约保证金金额"> <el-table-column align="center" label="履约保证金金额">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="primary" size="mini">{{ scope.row.履约保证金金额 }}</el-tag> <el-tag type="primary" size="mini">{{ Number(scope.row.履约保证金金额).toFixed(2) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="保证金类型"> <el-table-column align="center" label="保证金类型">

View File

@@ -127,7 +127,7 @@
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column align="center" label="保证金金额" width="100"> <el-table-column align="center" label="保证金金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="primary" size="mini">{{ scope.row.保证金金额 }}</el-tag> <el-tag type="primary" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="交付日期" width="120"> <el-table-column align="center" label="交付日期" width="120">
@@ -147,17 +147,17 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="扣款金额" width="100"> <el-table-column align="center" label="扣款金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.扣款金额 }} {{ Number(scope.row.扣款金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="AmountReceivable" align="center" width="120"> <el-table-column :label="AmountReceivable" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.应收回金额 }} {{ Number(scope.row.应收回金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际收回金额" align="center" width="120"> <el-table-column label="实际收回金额" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : scope.row.应收回金额 }} {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : Number(scope.row.应收回金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column align="center" label="计划收回日期" width="150">--> <!--<el-table-column align="center" label="计划收回日期" width="150">-->

View File

@@ -1888,7 +1888,8 @@ export default {
this.supplierName = '' this.supplierName = ''
this.supplierValue = '' this.supplierValue = ''
this.dialogVisible2 = false this.dialogVisible2 = false
this.searchTable2() this.inquirySheetNum = this.form2.inquirySheetNum
this.searchTable2(this.inquirySheetNum)
} else { this.$message.error('操作失败!该询价单已存在,请重新输入') } } else { this.$message.error('操作失败!该询价单已存在,请重新输入') }
}) })
} }

View File

@@ -10,7 +10,7 @@
</el-table-column> </el-table-column>
<el-table-column label="请款时间" align="center" min-width="140"> <el-table-column label="请款时间" align="center" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.请款时间 }} {{ scope.row.请款时间.substr(0,10) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款人" align="center" min-width="80"> <el-table-column label="请款人" align="center" min-width="80">
@@ -68,7 +68,7 @@
</el-table-column> </el-table-column>
<el-table-column label="请款时间" align="center" min-width="140"> <el-table-column label="请款时间" align="center" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.请款时间 }} {{ scope.row.请款时间.substr(0,10) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款人" align="center" min-width="80"> <el-table-column label="请款人" align="center" min-width="80">

View File

@@ -30,11 +30,11 @@
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="离线合同名称" align="center" min-width="150"> <!-- <el-table-column label="离线合同名称" align="center" min-width="150">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
{{ scope.row.离线合同名称 }} <!-- {{ scope.row.离线合同名称 }}-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="离线合同编号" align="center" min-width="160"> <el-table-column label="离线合同编号" align="center" min-width="160">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同编号 }} {{ scope.row.离线合同编号 }}

View File

@@ -159,6 +159,7 @@ export default {
}) })
}, },
searchTable1() { searchTable1() {
this.tableData1 = []
this.contractNumValue ? this.check1 = 1 : this.check1 = 0 this.contractNumValue ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0 this.supplierName ? this.check2 = 1 : this.check2 = 0
searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => { searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {

View File

@@ -3,7 +3,7 @@
<el-card> <el-card>
<div slot="header"> <div slot="header">
<span>项目名称:</span> <span>项目名称:</span>
<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange"> <el-select v-model="projectValue" style="width:150px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option <el-option
v-for="item in project" v-for="item in project"
:key="item.value" :key="item.value"
@@ -11,21 +11,21 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>机床图号:</span> <span>机床图号:</span>
<el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange"> <el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="searchTable1">
<el-option <el-option
v-for="item in machine" v-for="item in machine"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>组号:</span> <!-- <span>组号:</span>-->
<el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable> <!-- <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>-->
<el-option <!-- <el-option-->
v-for="item in group" <!-- v-for="item in group"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value"/> <!-- :value="item.value"/>-->
</el-select> <!-- </el-select>-->
<el-button <el-button
type="success" type="success"
size="small" size="small"
@@ -35,11 +35,18 @@
</div> </div>
<el-table v-loading="" :data="tableData1" show-summary stripe border style="width: 100%;max-height: 600px;" height="600px" size="mini"> <el-table v-loading="" :data="tableData1" show-summary stripe border style="width: 100%;max-height: 600px;" height="600px" size="mini">
<el-table-column label="序号" align="center" width="80" type="index"/> <el-table-column label="序号" align="center" width="80" type="index"/>
<el-table-column label="项目名称" align="center" min-width="100"> <!-- <el-table-column label="采购状态" align="center" min-width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
{{ scope.row.项目名称 }} <!-- <span>采购</span>-->
</template> <!-- <span>到货</span>-->
</el-table-column> <!-- <span>领用</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="项目名称" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.项目名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="机床图号" width="100px"> <el-table-column align="center" label="机床图号" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
@@ -50,12 +57,12 @@
{{ scope.row.组号 || '—' }} {{ scope.row.组号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" min-width="100"> <el-table-column label="名称" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" min-width="100"> <el-table-column label="图号或型号" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号 }} {{ scope.row.图号 }}
</template> </template>
@@ -70,21 +77,30 @@
{{ scope.row.数量 }} {{ scope.row.数量 }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="单价" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.单价 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="单价" align="center" min-width="100"> <el-table-column label="单价" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.单价 }} {{ Number(scope.row.优惠后单价).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="优惠后单价" align="center" min-width="100"> <el-table-column label="采购小计(元)" align="center" min-width="100" prop="金额">
<template slot-scope="scope">
{{ scope.row.优惠后单价 }}
</template>
</el-table-column>
<el-table-column label="优惠后小计(元)" align="center" min-width="100" prop="金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.金额 = (Number(scope.row.优惠后单价) * Number(scope.row.数量)).toFixed(2) }} {{ scope.row.金额 = (Number(scope.row.优惠后单价) * Number(scope.row.数量)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="领用" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.领用 }}-->
<!-- </template>-->
<!-- </el-table-column><el-table-column label="领用小计" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.领用小计 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
</el-card> </el-card>
</div> </div>
@@ -145,6 +161,7 @@ export default {
}) })
} }
}) })
this.searchTable1()
}, },
machineChange() { machineChange() {
this.group = [] this.group = []
@@ -163,6 +180,7 @@ export default {
let check2, check3 let check2, check3
this.machineValue ? check2 = 1 : check2 = 0 this.machineValue ? check2 = 1 : check2 = 0
this.groupValue ? check3 = 1 : check3 = 0 this.groupValue ? check3 = 1 : check3 = 0
console.log(1, this.projectValue, check2, this.machineValue, check3, this.groupValue)
searchProjectTotal(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => { searchProjectTotal(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => {
this.tableData1 = response.data this.tableData1 = response.data
}) })

View File

@@ -24,7 +24,7 @@
<!--</el-option>--> <!--</el-option>-->
<!--</el-select>--> <!--</el-select>-->
<!--<span>合同编号:</span>--> <!--<span>合同编号:</span>-->
<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px"/> <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px"/>
<!--<span>供应商:</span>--> <!--<span>供应商:</span>-->
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/> <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
<!--<span>采购员:</span>--> <!--<span>采购员:</span>-->
@@ -56,7 +56,7 @@
size="small" size="small"
icon="el-icon-search" icon="el-icon-search"
style="margin-left:10px" style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="打印采购合同" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="打印采购合同" placement="top">
<el-button <el-button
type="warning" type="warning"
@@ -107,75 +107,100 @@
</el-form> </el-form>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" width="150" show-overflow-tooltip> <el-table-column label="供应商" prop="供应商名称" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购合同名称" align="center" min-width="150"> <!-- <el-table-column label="采购合同名称" align="center" min-width="150">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
{{ scope.row.采购合同名称 }} <!-- {{ scope.row.采购合同名称 }}-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="采购合同号" prop="采购合同编号" align="center" min-width="160"> <el-table-column label="采购合同号" prop="采购合同编号" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核情况" prop="审核情况内容" align="center" min-width="100"> <el-table-column label="合同审核" prop="审核情况内容" align="center" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag> <span v-if="scope.row.审核情况内容==='未审核'">未审核</span>
<el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag> <span v-if="scope.row.审核情况内容==='通过审核'">已通过</span>
<el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag> <span v-if="scope.row.审核情况内容==='未通过审核'">未通过</span>
<!-- <el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag>-->
<!-- <el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag>-->
<!-- <el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批情况" prop="审批情况内容" align="center" min-width="100"> <el-table-column label="合同审批" prop="审批情况内容" align="center" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag> <span v-if="scope.row.审批情况内容==='未审批'">未审批</span>
<el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag> <span v-if="scope.row.审批情况内容==='通过审批'">已通过</span>
<el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag> <span v-if="scope.row.审批情况内容==='不通过审批'">未通过</span>
<!-- <el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag>-->
<!-- <el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag>-->
<!-- <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未通过审核原因" align="center" width="150" show-overflow-tooltip> <el-table-column label="未审核原因" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }} {{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未通过审批原因" align="center" width="150" show-overflow-tooltip> <el-table-column label="未审批原因" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }} {{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核时间" align="center" min-width="140"> <el-table-column label="采购员" prop="姓名" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.审核时间 ? scope.row.审核时间 : '—' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审核时间 : '—' }}
</template>
</el-table-column>
<el-table-column label="处理" align="center" min-width="130">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>
<el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" type="primary" size="mini" @click="done(scope.row)">点击处理完成</el-button>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="采购员" prop="姓名" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总金额" align="center" width="100"> <el-table-column label="总金额" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同总额 }} {{ scope.row.合同总额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="100" fixed="right"> <el-table-column label="已付金额" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="false" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button> {{ scope.row.付款金额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.欠款金额 }}
</template>
</el-table-column>
<!-- <el-table-column label="审核时间" align="center" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.审核时间 ? scope.row.审核时间.substr(0,9) : '—' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="审批时间" align="center" min-width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.审批时间 ? scope.row.审核时间.substr(0,9) : '—' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="处理" align="center" width="110">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>
<el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" plain type="primary" size="mini" @click="done(scope.row)">点击处理</el-button>
<span v-else></span>
</template>
</el-table-column>
<!-- <el-table-column label="到货进度" align="center" min-width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <el-progress-->
<!-- :text-inside="true"-->
<!-- :stroke-width="18"-->
<!-- :percentage="scope.row.到货进度 = (100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数) > 100 ? 100 : Number((100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数).toFixed(2))"-->
<!-- status="success"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="70">
<template slot-scope="scope">
<el-button :disabled="false" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -201,7 +226,7 @@
</template> </template>
<script> <script>
import { initContract, initBuyer, searchTable1, searchTable2, deleteContract, handleDone } from '@/api/PurchasingCenter/PurchaseContractSearch' import { initContract, initBuyer, searchTable1, searchTable2, handleDone, deleteContract } from '@/api/PurchasingCenter/PurchaseContractSearch'
import QRCode from 'qrcode' import QRCode from 'qrcode'
import $ from 'jquery' import $ from 'jquery'
// import { exportExcelMethod } from './exportExcel' // import { exportExcelMethod } from './exportExcel'
@@ -392,7 +417,27 @@ export default {
for (let i = 0; i < response.data.rows.length; i++) { for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].审批情况内容 === '未审批' ? this.disable.push(false) : this.disable.push(true) // 删除按钮禁用 response.data.rows[i].审批情况内容 === '未审批' ? this.disable.push(false) : this.disable.push(true) // 删除按钮禁用
} }
this.tableData1 = response.data.rows console.log(response, 12)
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData1.push({
供应商名称: response.data.rows[i].供应商名称,
采购合同编号: response.data.rows[i].采购合同编号,
未通过审核原因: response.data.rows[i].未通过审核原因,
审核情况内容: response.data.rows[i].审核情况内容,
审批情况内容: response.data.rows[i].审批情况内容,
未通过原因: response.data.rows[i].未通过原因,
合同总额: response.data.rows[i].合同总额,
付款金额: response.data.rows[i].付款金额,
是否未通过: response.data.rows[i].是否未通过,
不通过处理: response.data.rows[i].不通过处理,
姓名: response.data.rows[i].姓名,
合同金额: response.data.rows[i].合同金额,
欠款金额: response.data.rows[i].欠款金额,
采购合同流水号: response.data.rows[i].采购合同流水号
})
}
}
this.total1 = response.data.total this.total1 = response.data.total
this.loading1 = false this.loading1 = false
}) })