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

更新

Browse Source
This commit is contained in:
liushuai
2020-04-24 08:45:08 +08:00
parent 6bb56595b2
commit 4bb41367fa
4 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js
View File

@@ -11,7 +11,7 @@ export function searchTable1(...group) {
UserID: state.state.user.id, UserID: state.state.user.id,
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '采购管理_发票结算申请单_查询数据', name: '采购管理_发票结算申请单_查询数据_查询',
param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`, param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`,
Pagination: group[3] + '&' + group[4] Pagination: group[3] + '&' + group[4]
} }

37
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
View File

@@ -46,12 +46,12 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款金额(元)" align="center" min-width="60"> <el-table-column label="请款金额(元)" align="center" min-width="110">
<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="60"> <el-table-column label="提交时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '' }} {{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '' }}
</template> </template>
@@ -61,19 +61,19 @@
{{ scope.row.审核人姓名 }} {{ scope.row.审核人姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核时间" align="center" min-width="60"> <el-table-column label="审核时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审核时间 ? scope.row.审核时间.split(' ')[0] : '' }} {{ scope.row.审核时间 ? scope.row.审核时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核结果" align="center" min-width="60"> <el-table-column label="审核结果" align="center" min-width="80">
<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="60"> <el-table-column label="未过原因" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过审核原因 }} {{ scope.row.未通过审核原因 === '通过' ? '' : scope.row.未通过审核原因 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批人" align="center" width="90"> <el-table-column label="审批人" align="center" width="90">
@@ -81,31 +81,41 @@
{{ scope.row.审批人姓名 }} {{ scope.row.审批人姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="60"> <el-table-column label="审批时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }} {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批结果" align="center" min-width="60"> <el-table-column label="审批结果" align="center" min-width="80">
<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="60"> <el-table-column label="未过原因" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.付款人 }} {{ scope.row.未通过审批原因 === '通过' ? '' : scope.row.未通过审批原因 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="财务审批时间" align="center" min-width="60"> <el-table-column label="财务审批" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.付款人姓名 }}
</template>
</el-table-column>
<el-table-column label="财务审批时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }} {{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="财务审批结果" align="center" min-width="60"> <el-table-column label="财务审批结果" align="center" min-width="80">
<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="60">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="90px" fixed="right"> <el-table-column label="操作" align="center" width="90px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
@@ -276,6 +286,9 @@ export default {
</script> </script>
<style scoped> <style scoped>
.app-container{
width: 1400px;
}
.el-card{ .el-card{
margin-bottom: 0px; margin-bottom: 0px;
} }

6
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -75,7 +75,7 @@
</el-table-column> </el-table-column>
<el-table-column label="采购审批" align="center" min-width="70"> <el-table-column label="采购审批" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人1结果 }} {{ scope.row.审批人1姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" width="100"> <el-table-column label="审批时间" align="center" width="100">
@@ -85,7 +85,7 @@
</el-table-column> </el-table-column>
<el-table-column label="总经理审批" align="center" min-width="90"> <el-table-column label="总经理审批" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人4结果 }} {{ scope.row.审批人4姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" width="100"> <el-table-column label="审批时间" align="center" width="100">
@@ -95,7 +95,7 @@
</el-table-column> </el-table-column>
<el-table-column label="财务审批" align="center" min-width="70"> <el-table-column label="财务审批" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人3结果 }} {{ scope.row.审批人3姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" width="100"> <el-table-column label="审批时间" align="center" width="100">

6
src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue
View File

@@ -75,7 +75,7 @@
</el-table-column> </el-table-column>
<el-table-column label="采购审批" align="center" min-width="70"> <el-table-column label="采购审批" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人1结果 }} {{ scope.row.审批人1姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" width="100"> <el-table-column label="审批时间" align="center" width="100">
@@ -85,7 +85,7 @@
</el-table-column> </el-table-column>
<el-table-column label="总经理审批" align="center" min-width="90"> <el-table-column label="总经理审批" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人4结果 }} {{ scope.row.审批人4姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" width="100"> <el-table-column label="审批时间" align="center" width="100">
@@ -95,7 +95,7 @@
</el-table-column> </el-table-column>
<el-table-column label="财务审批" align="center" min-width="70"> <el-table-column label="财务审批" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人3结果 }} {{ scope.row.审批人3姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" width="100"> <el-table-column label="审批时间" align="center" width="100">