更新
This commit is contained in:
liushuai
@@ -31,6 +31,19 @@ export function searchGroup(num) {
|
||||
}
|
||||
})
|
||||
}
|
||||
export function initLocateName() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
UserID: state.state.user.id,
|
||||
ModularID: router.currentRoute.path,
|
||||
type: '1',
|
||||
// name: 'PDM_项目名称_查询数据'
|
||||
name: '库存管理_货位主文件_查询数据_查询全部'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 查询记录
|
||||
export function searchRecord(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2, pageCurrent, pageSize) {
|
||||
return request({
|
||||
@@ -46,3 +59,17 @@ export function searchRecord(check1, project, check2, machine, check3, group, ch
|
||||
}
|
||||
})
|
||||
}
|
||||
export function submitMaterialReturn(materialNumber, basicNumber, number, name, id) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
UserID: state.state.user.id,
|
||||
ModularID: router.currentRoute.path,
|
||||
type: '2',
|
||||
// name: 'PDM_组件名称_查询数据',
|
||||
name: '采购管理_物料退货_增加数据',
|
||||
param: '物料流水号=' + materialNumber + '&组件零件基本件流水号=' + basicNumber + '&数量=' + number + '&货位流水号=' + name + '&入库人员流水号=' + id
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -45,3 +45,17 @@ export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize
|
||||
}
|
||||
})
|
||||
}
|
||||
// 查询项目详情
|
||||
export function searchtabletotal(projectNum, machineValue) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
UserID: state.state.user.id,
|
||||
ModularID: router.currentRoute.path,
|
||||
type: '1',
|
||||
name: '项目工时统计_合同详情查询_工时综合查询_合计',
|
||||
param: `项目流水号=${projectNum}&机床流水号=${machineValue}`
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -16,3 +16,16 @@ export function searchTable(num, time, time1, order, orderName, check, name, che
|
||||
}
|
||||
})
|
||||
}
|
||||
export function searchtabletotal(num, time, time1, order, orderName, check, name, check1, partNumber) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
UserID: state.state.user.id,
|
||||
ModularID: router.currentRoute.path,
|
||||
type: '1',
|
||||
name: '工艺月底工时核算_查询数据_最新_合计',
|
||||
param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + partNumber
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
61
src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js
Normal file
61
src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js
Normal file
@@ -0,0 +1,61 @@
|
||||
import request from '@/utils/request'
|
||||
import state from '@/store'
|
||||
import router from '@/router'
|
||||
|
||||
// 根据条件查发票结算申请单
|
||||
export function searchTable1(...group) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
UserID: state.state.user.id,
|
||||
ModularID: router.currentRoute.path,
|
||||
type: '1',
|
||||
name: '采购管理_发票结算申请单_查询数据',
|
||||
param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`,
|
||||
Pagination: group[3] + '&' + group[4]
|
||||
}
|
||||
})
|
||||
}
|
||||
// 发票结算申请单明细列表
|
||||
export function searchTable2(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
UserID: state.state.user.id,
|
||||
ModularID: router.currentRoute.path,
|
||||
type: '1',
|
||||
name: '采购管理_发票结算申请单明细_查询数据',
|
||||
param: `发票结算申请单流水号=${num}`
|
||||
}
|
||||
})
|
||||
}
|
||||
// 执行审批
|
||||
export function excuteApprove(...data) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
UserID: state.state.user.id,
|
||||
ModularID: router.currentRoute.path,
|
||||
type: '2',
|
||||
name: '采购管理_发票结算申请单_执行审批',
|
||||
param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}&审批流水号=${data[3]}&未通过原因=${data[4]}`
|
||||
}
|
||||
})
|
||||
}
|
||||
// 查询供应商
|
||||
export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
UserID: state.state.user.id,
|
||||
ModularID: router.currentRoute.path,
|
||||
type: '1',
|
||||
name: '采购管理_供应商_查询数据_根据条件',
|
||||
param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card style="width: 1000px;margin: 0px 0px 5px 0px">
|
||||
<el-card style="width: 1220px;margin: 0px 0px 5px 0px">
|
||||
<el-row style="margin-bottom:10px;margin-top: 10px">
|
||||
<el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 180px" @change="machineChange">
|
||||
<el-option
|
||||
@@ -33,7 +33,6 @@
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
|
||||
<el-button :loading="loading_export" type="success" icon="el-icon-bottom" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
|
||||
</el-row>
|
||||
<el-row v-show="false" style="margin-bottom:10px">
|
||||
<el-date-picker
|
||||
@@ -43,24 +42,24 @@
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="~"
|
||||
style="width:250px;margin-left: 0px"
|
||||
style="width:350px;margin-left: 0px"
|
||||
start-placeholder="开始时间"
|
||||
end-placeholder="结束时间"/>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<el-card style="width: 1000px">
|
||||
<el-card style="width: 1220px">
|
||||
<el-table :data="tableData" border stripe size="mini" height="700">
|
||||
<el-table-column label="名称" align="center" width="180" show-overflow-tooltip>
|
||||
<el-table-column label="名称" align="center" width="160" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="图号或型号" align="center" width="180" show-overflow-tooltip>
|
||||
<el-table-column label="图号或型号" align="center" width="160" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.图号或型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" align="center" width="270" show-overflow-tooltip>
|
||||
<el-table-column label="规格" align="center" width="200" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.规格 }}
|
||||
</template>
|
||||
@@ -75,11 +74,31 @@
|
||||
{{ scope.row.领料人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="出库时间" align="center" min-width="90">
|
||||
<el-table-column label="出库时间" align="center" width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
|
||||
</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="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.领料人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="退货时间" align="center" width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="mini" icon="el-icon-right" @click="yesApproval(scope.row)">退货</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 10px;">
|
||||
<el-pagination
|
||||
@@ -93,25 +112,57 @@
|
||||
@current-change="handleCurrentChange1"/>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-dialog :visible.sync="dialogFormVisible" title="补投" center width="300px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="80px" class="demo-ruleForm">
|
||||
<el-form-item label="退料数量" prop="退料数量">
|
||||
<el-input-number v-model="form.退料数量" :min="1" :max="outNumber" :step="1" style="width: 140px" size="small" />
|
||||
</el-form-item>
|
||||
<el-form-item label="货位名称" prop="货位名称">
|
||||
<el-select v-model="form.货位名称" style="width: 140px" filterable size="small" placeholder="货位名称">
|
||||
<el-option
|
||||
v-for="item in locateName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button :disabled="handleEdit_disable" size="small" type="primary" @click="submit()">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { initMachineProject, searchGroup, searchRecord } from '@/api/Inventory/PurchaseOutRecord'
|
||||
import { initMachineProject, searchGroup, searchRecord, initLocateName, submitMaterialReturn } from '@/api/Inventory/MaterialReturn'
|
||||
import { mapGetters } from 'vuex'
|
||||
export default {
|
||||
name: 'PurchaseOutRecord',
|
||||
data() {
|
||||
return {
|
||||
loading_export: false,
|
||||
handleEdit_disable: false,
|
||||
dialogFormVisible: false,
|
||||
form: {
|
||||
退料数量: '',
|
||||
货位名称: ''
|
||||
},
|
||||
rules: {
|
||||
货位名称: [{ required: true, message: '请选择货位' }]
|
||||
},
|
||||
projectValue: '', // 项目名称
|
||||
project: [],
|
||||
machineValue: '',
|
||||
machine: [],
|
||||
groupValue: '',
|
||||
group: [],
|
||||
outNumber: '',
|
||||
materialNumber: '',
|
||||
basicNumber: '',
|
||||
name: '',
|
||||
spec: '',
|
||||
model: '',
|
||||
locateName: [],
|
||||
tableData: [],
|
||||
pageSize1: 100,
|
||||
pageCurrent1: 1,
|
||||
@@ -119,6 +170,12 @@ export default {
|
||||
outTime: '' // 出库时间
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'id',
|
||||
'token'
|
||||
])
|
||||
},
|
||||
watch: {
|
||||
groupValue() {
|
||||
this.searchRecord()
|
||||
@@ -131,40 +188,6 @@ export default {
|
||||
this.searchRecord()
|
||||
},
|
||||
methods: {
|
||||
// EXCEL 导出
|
||||
// 姜福壮
|
||||
async exportExcel() {
|
||||
this.loading_export = true
|
||||
let check1, check2, check3, check4, check5, check6, check7
|
||||
this.projectValue ? check1 = 1 : check1 = 0
|
||||
this.machineValue ? check2 = 1 : check2 = 0
|
||||
this.groupValue ? check3 = 1 : check3 = 0
|
||||
this.name ? check4 = 1 : check4 = 0
|
||||
this.spec ? check5 = 1 : check5 = 0
|
||||
this.model ? check6 = 1 : check6 = 0
|
||||
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
|
||||
var param = []
|
||||
param[0] = ['项目流水号_check', check1]
|
||||
param[1] = ['项目流水号', this.projectValue]
|
||||
param[2] = ['机床流水号_check', check2]
|
||||
param[3] = ['机床流水号', this.machineValue]
|
||||
param[4] = ['组件流水号_check', check3]
|
||||
param[5] = ['组件流水号', this.groupValue]
|
||||
param[6] = ['名称_check', check4]
|
||||
param[7] = ['名称', this.name]
|
||||
param[8] = ['规格_check', check5]
|
||||
param[9] = ['规格', this.spec]
|
||||
param[10] = ['图号或型号_check', check6]
|
||||
param[11] = ['图号或型号', this.model]
|
||||
param[12] = ['出库时间_check', check7]
|
||||
param[13] = ['出库开始时间', this.outTime[0]]
|
||||
param[14] = ['出库结束时间', this.outTime[1]]
|
||||
var Data = this.CreateData('2001', '报表_采购部仓库_出库记录_查询', param)
|
||||
await this.exportExcel_NPOI(Data)
|
||||
setTimeout(() => {
|
||||
this.loading_export = false
|
||||
}, 5000)
|
||||
},
|
||||
fetchData() {
|
||||
initMachineProject().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
@@ -175,6 +198,14 @@ export default {
|
||||
})
|
||||
}
|
||||
})
|
||||
initLocateName().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.locateName.push({
|
||||
label: response.data[i].货位名称,
|
||||
value: response.data[i].货位流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
machineChange() {
|
||||
this.group = []
|
||||
@@ -205,6 +236,28 @@ export default {
|
||||
this.total1 = res.data.total
|
||||
})
|
||||
},
|
||||
yesApproval(row) {
|
||||
if (this.$refs['form'] !== undefined) {
|
||||
this.$refs['form'].resetFields()
|
||||
}
|
||||
this.dialogFormVisible = true
|
||||
this.materialNumber = row.物料流水号
|
||||
this.basicNumber = row.组件零件基本件流水号
|
||||
this.outNumber = row.出库数量
|
||||
},
|
||||
submit() {
|
||||
submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('退料成功')
|
||||
this.dialogFormVisible = false
|
||||
this.searchRecord()
|
||||
this.handleEdit_disable = false
|
||||
} else {
|
||||
this.handleEdit_disable = false
|
||||
this.$message.error('退料失败')
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSizeChange1(val) {
|
||||
this.pageSize1 = val
|
||||
this.pageCurrent1 = 1
|
||||
@@ -225,4 +278,23 @@ export default {
|
||||
span{
|
||||
margin: 10px 0 10px 10px;
|
||||
}
|
||||
.el-form--label-left >>> .el-form-item__label {
|
||||
text-align: right;
|
||||
}
|
||||
>>>.el-dialog--center .el-dialog__body {
|
||||
text-align: initial;
|
||||
padding: 20px 30px 20px
|
||||
}
|
||||
>>>.el-dialog__header {
|
||||
padding: 20px 20px 0px;
|
||||
}
|
||||
>>>.el-dialog__footer {
|
||||
padding: 0px 20px 20px;
|
||||
/*text-align: right;*/
|
||||
-webkit-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
>>>.el-form-item {
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table v-loading="loading" :data="tableData" highlight-current-row show-summary border style="width: 1360px;" size="mini" height="590">
|
||||
<el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" show-summary highlight-current-row border style="width: 1360px;" size="mini" height="590">
|
||||
<el-table-column label="跟单号" align="center" width="140">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.跟单号 }}
|
||||
@@ -122,7 +122,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { initProject, initMachine, searchatabledata } from '@/api/ManufacturingCenter/ContractDetailsInquiryMetalworking'
|
||||
import { initProject, initMachine, searchatabledata, searchtabletotal } from '@/api/ManufacturingCenter/ContractDetailsInquiryMetalworking'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@@ -133,6 +133,11 @@ export default {
|
||||
loading: false,
|
||||
part: [], // 分組
|
||||
partValue: '',
|
||||
完成总数量: '',
|
||||
投产总数: '',
|
||||
总加工工时: '',
|
||||
总修补工时: '',
|
||||
总扫码工时: '',
|
||||
specificationValue: '', // 规格型号
|
||||
totalProcessingHours: '', // 加工总工时
|
||||
totalPlannedHours: '', // 计划总工时
|
||||
@@ -164,6 +169,7 @@ export default {
|
||||
},
|
||||
// 分页查询
|
||||
searchTable() {
|
||||
this.searchTableTotal()
|
||||
this.tableData = []
|
||||
if (this.machineValue) {
|
||||
this.loading = true
|
||||
@@ -202,6 +208,47 @@ export default {
|
||||
this.$message.warning('请选择要查询的机床')
|
||||
}
|
||||
},
|
||||
searchTableTotal() {
|
||||
searchtabletotal(this.projectValue, this.machineValue).then(response => {
|
||||
console.log(response, 'response1')
|
||||
if (response.data.length !== 0) {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.完成总数量 = response.data[i].总完成数量
|
||||
this.投产总数 = response.data[i].投产总数
|
||||
this.总加工工时 = response.data[i].总加工工时
|
||||
this.总修补工时 = response.data[i].总修补工时
|
||||
this.总扫码工时 = response.data[i].总扫码工时
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
getSummaries(param) { // 合计
|
||||
const { columns } = param
|
||||
const sums = []
|
||||
console.log(this.投产总数, '投产总数')
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = '合计'
|
||||
return
|
||||
} else if (index === 3) {
|
||||
sums[index] = Number(this.投产总数)
|
||||
return
|
||||
} else if (index === 4) {
|
||||
sums[index] = Number(this.完成总数量)
|
||||
return
|
||||
} else if (index === 6) {
|
||||
sums[index] = Number(this.总加工工时)
|
||||
return
|
||||
} else if (index === 7) {
|
||||
sums[index] = Number(this.总修补工时)
|
||||
return
|
||||
} else if (index === 8) {
|
||||
sums[index] = Number(this.总扫码工时)
|
||||
return
|
||||
}
|
||||
})
|
||||
return sums
|
||||
},
|
||||
exportExcel() {
|
||||
if (this.tableData.length === 0) {
|
||||
this.$message.warning('请查询出要导出的数据')
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<el-button size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 590px;width: 1370px" height="720px" border @sort-change="sortChange">
|
||||
<el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" show-summary size="mini" style="max-height: 590px;width: 1370px" height="720px" border @sort-change="sortChange">
|
||||
<el-table-column align="center" label="跟单号" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.跟单号 }}
|
||||
@@ -148,7 +148,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { searchTable } from '@/api/ManufacturingCenter/MonthEndHourAccountingMetalworking'
|
||||
import { searchTable, searchtabletotal } from '@/api/ManufacturingCenter/MonthEndHourAccountingMetalworking'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@@ -160,6 +160,10 @@ export default {
|
||||
partNumber: '',
|
||||
tableData: [],
|
||||
loading: false,
|
||||
完成总数: '',
|
||||
总完成工时: '',
|
||||
总修补工时: '',
|
||||
总扫码工时: '',
|
||||
total: 0, // 总条数
|
||||
pageSize: 50, // 每页显示条数
|
||||
pageCurrent: 1 // 后台获取页
|
||||
@@ -201,7 +205,28 @@ export default {
|
||||
}
|
||||
this.searchTable()
|
||||
},
|
||||
searchTableTotal() {
|
||||
if (this.startTime[0] && this.startTime[1]) {
|
||||
let check, check1, check2
|
||||
this.name ? check = 1 : check = 0
|
||||
this.partNumber ? check1 = 1 : check1 = 0
|
||||
this.loading = true
|
||||
this.check ? check2 = 1 : check2 = 0
|
||||
searchtabletotal(check2, this.startTime[0], this.startTime[1], this.orderName, this.order, check, this.name, check1, this.partNumber).then(response => {
|
||||
console.log(response, 'response1')
|
||||
if (response.data.length !== 0) {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.完成总数 = response.data[i].完成总数
|
||||
this.总完成工时 = response.data[i].总完成工时
|
||||
this.总修补工时 = response.data[i].总修补工时
|
||||
this.总扫码工时 = response.data[i].总扫码工时
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
searchTable() {
|
||||
this.searchTableTotal()
|
||||
if (this.startTime[0] && this.startTime[1]) {
|
||||
let check, check1, check2
|
||||
this.name ? check = 1 : check = 0
|
||||
@@ -212,6 +237,7 @@ export default {
|
||||
response.data.rows.map(v => {
|
||||
this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.完成工时) / parseInt(v.计划工时) * 100) / 100.00))
|
||||
})
|
||||
console.log(response, 'response')
|
||||
this.tableData = response.data.rows
|
||||
this.total = response.data.total
|
||||
this.loading = false
|
||||
@@ -220,6 +246,30 @@ export default {
|
||||
this.$message.warning('请选择时间段')
|
||||
}
|
||||
},
|
||||
getSummaries(param) { // 合计
|
||||
const { columns } = param
|
||||
const sums = []
|
||||
console.log(this.投产总数, '投产总数')
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = '合计'
|
||||
return
|
||||
} else if (index === 6) {
|
||||
sums[index] = Number(this.完成总数)
|
||||
return
|
||||
} else if (index === 8) {
|
||||
sums[index] = Number(this.总完成工时)
|
||||
return
|
||||
} else if (index === 9) {
|
||||
sums[index] = Number(this.总修补工时)
|
||||
return
|
||||
} else if (index === 11) {
|
||||
sums[index] = Number(this.总扫码工时)
|
||||
return
|
||||
}
|
||||
})
|
||||
return sums
|
||||
},
|
||||
// 分页
|
||||
handleSizeChange(val) {
|
||||
this.pageCurrent = 1
|
||||
|
||||
@@ -1,39 +1,125 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<!-- <h3 style="margin-top: 0">采购合同</h3>-->
|
||||
<el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 300px;" height="200px" size="mini" highlight-current-row @row-click="searchTable01">
|
||||
<el-table-column label="供应商" align="center" min-width="170">
|
||||
<!-- <el-input v-model="billNames" clearable filterable size="small" placeholder="供应商或合同编号" style="width: 200px;margin: 5px"/>-->
|
||||
<el-select v-model="supplierValue" placeholder="供应商" filterable size="small" style="margin-left: 5px" clearable @change="totalSum=0;totalPay=0;totalDebt=0;">
|
||||
<el-option
|
||||
v-for="item in supplier"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 120px" clearable>
|
||||
<el-option
|
||||
v-for="item in person"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 0">审核时间:</span>
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
size="small"
|
||||
type="daterange"
|
||||
align="center"
|
||||
style="width: 300px"
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy-MM-dd"
|
||||
range-separator="～"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
|
||||
<el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio>
|
||||
<el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio>
|
||||
<el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio>
|
||||
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
|
||||
</el-card>
|
||||
<el-card style="margin-top: 5px">
|
||||
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
|
||||
<el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款时间" align="center" min-width="140">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.请款时间.substr(0,10) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款人" align="center" min-width="80">
|
||||
<el-table-column label="请款人" align="center" width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款金额(元)" align="center" min-width="80" prop="请款金额">
|
||||
<el-table-column label="请款金额(元)" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.请款金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核" align="center" width="200">
|
||||
<el-table-column label="提交时间" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
|
||||
<el-button type="text" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
|
||||
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核人" align="center" width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审核人姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核时间" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审核时间 ? scope.row.审核时间.split(' ')[0] : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核结果" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审核情况内容 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未过原因" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.未通过审核原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批人" align="center" width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批人姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批时间" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批结果" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批情况内容 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="财务审批" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.付款人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="财务审批时间" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="财务审批结果" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.付款情况内容 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="90px" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
|
||||
<div style="display: inline-block">
|
||||
<el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
|
||||
</div>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 10px;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent1"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-sizes="[50, 100, 150, 200]"
|
||||
:page-size="pageSize1"
|
||||
:total="total1"
|
||||
style="display:inline-block;width:50%"
|
||||
@@ -42,114 +128,60 @@
|
||||
@current-change="handleCurrentChange1"/>
|
||||
</div>
|
||||
</el-card>
|
||||
<!-- <h3 style="">合同明细</h3>-->
|
||||
<el-row>
|
||||
<el-col :span="10">
|
||||
<el-card>
|
||||
<el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
|
||||
<el-table-column min-width="120" align="center" label="合同编号">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="110" align="center" label="合同总额(元)" prop="已付金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.合同总金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="110" align="center" label="到货金额(元)" prop="已付金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.到货金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="105" align="center" label="已付金额(元)" prop="已付金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="105" align="center" label="请款金额(元)" prop="请款金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="14">
|
||||
<el-card>
|
||||
<el-table :data="contractDetail2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
|
||||
<el-table-column label="物料名称" align="center" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料规格" align="center" min-width="260">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料型号" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" align="center" width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货数量" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合计(元)" align="center" min-width="100" prop="合计">
|
||||
<template slot-scope="scope">
|
||||
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单价(元)" align="center" min-width="100" prop="单价">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.单价||0).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" min-width="150" prop="备注">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="请款信息明细" center width="800px">
|
||||
<el-table :data="gridData1" border highlight-current-row size="mini">
|
||||
<el-table-column min-width="150" align="center" label="合同编号">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="120" align="center" label="合同金额(元)" prop="到货金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.合同总金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="120" align="center" label="到货金额(元)" prop="到货金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.到货金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="120" align="center" label="已付金额(元)" prop="已付金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="120" align="center" label="请款金额(元)" prop="请款金额">
|
||||
<template slot-scope="scope">
|
||||
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { initApproval, execApproval, initApprovalOffline, searchRequsetFundDetail1, searchRequsetFundDetail2, execApprovalOffline, searchContactDetail, searchMateriel } from '@/api/PurchasingCenter/FundApproval'
|
||||
import { initBuyer, searchTable1, searchTable2, searchSupplier } from '@/api/ManufacturingCenter/RequestApprovalQuery'
|
||||
import { mapGetters } from 'vuex'
|
||||
|
||||
export default {
|
||||
name: '', // 出纳付款
|
||||
data() {
|
||||
return {
|
||||
contractDetail1: '',
|
||||
contractDetail2: [],
|
||||
tableData1: [],
|
||||
pageSize1: 10,
|
||||
pageCurrent1: 1,
|
||||
radio: '1',
|
||||
billNames: '',
|
||||
supplier: [],
|
||||
supplierValue: '',
|
||||
person: [],
|
||||
personValue: '',
|
||||
dateRange: '',
|
||||
total1: 0,
|
||||
tableData2: [],
|
||||
pageSize2: 10,
|
||||
pageCurrent2: 1,
|
||||
total2: 0,
|
||||
gridData1: [],
|
||||
gridData2: []
|
||||
pageCurrent1: 1,
|
||||
pageSize1: 50,
|
||||
tableData1: [],
|
||||
loading1: false,
|
||||
dialogFormVisible: false,
|
||||
gridData1: []
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -162,230 +194,82 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.fetchData()
|
||||
this.searchTable1()
|
||||
this.searchSupplier()
|
||||
},
|
||||
methods: {
|
||||
getSummaries2(param) { // 合计
|
||||
const { columns, data } = param
|
||||
const sums = []
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = '总价'
|
||||
return
|
||||
} else if (index === 2 || index === 3) {
|
||||
const values = data.map(item => Number(item[column.property]))
|
||||
if (!values.every(value => isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr)
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr
|
||||
} else {
|
||||
return prev
|
||||
}
|
||||
}, 0)
|
||||
sums[index] = sums[index].toFixed(2) + ' 元'
|
||||
} else {
|
||||
sums[index] = 'N/A'
|
||||
}
|
||||
searchSupplier() {
|
||||
this.supplier = []
|
||||
searchSupplier().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.supplier.push({
|
||||
label: response.data[i].供应商名称,
|
||||
value: response.data[i].供应商流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
return sums
|
||||
},
|
||||
searchContactDetail(row) {
|
||||
var check
|
||||
row.采购合同流水号 ? check = 1 : check = 2
|
||||
searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
|
||||
this.contractDetail2 = response.data
|
||||
})
|
||||
},
|
||||
searchOfflineContactDetail(row) { // 查询离线合同明细
|
||||
searchMateriel(row.离线合同流水号).then(response => {
|
||||
this.contractDetail2 = response.data
|
||||
})
|
||||
},
|
||||
getSummaries(param) { // 合计
|
||||
const { columns, data } = param
|
||||
const sums = []
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = '总价'
|
||||
} else if (index === 3) {
|
||||
const values = data.map(item => Number(parseFloat(item['数量'])))
|
||||
if (!values.every(value => isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr)
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr
|
||||
} else {
|
||||
return prev
|
||||
}
|
||||
}, 0)
|
||||
sums[index] = sums[index] + ' 件'
|
||||
} else {
|
||||
sums[index] = '0'
|
||||
}
|
||||
} else if (index === 4) {
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
if (!data[i].到货数量) {
|
||||
data[i].到货数量 = 0
|
||||
}
|
||||
if (!data[i].已到货数量) {
|
||||
data[i].已到货数量 = 0
|
||||
}
|
||||
}
|
||||
const values = data.map(item => Number(parseInt(item['到货数量'])) + Number(parseInt(item['已到货数量'])))
|
||||
if (!values.every(value => isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr)
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr
|
||||
} else {
|
||||
return prev
|
||||
}
|
||||
}, 0)
|
||||
sums[index] = sums[index] + ' 件'
|
||||
} else {
|
||||
sums[index] = '0'
|
||||
}
|
||||
} else if (index === 5) {
|
||||
const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
|
||||
if (!values.every(value => isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr)
|
||||
if (!isNaN(value)) {
|
||||
return prev + curr
|
||||
} else {
|
||||
return prev
|
||||
}
|
||||
}, 0)
|
||||
sums[index] = sums[index].toFixed(2) + ' 元'
|
||||
} else {
|
||||
sums[index] = 'N/A'
|
||||
}
|
||||
}
|
||||
})
|
||||
return sums
|
||||
},
|
||||
fetchData() {
|
||||
this.searchTable1()
|
||||
this.searchTable2()
|
||||
this.person = []
|
||||
initBuyer().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.person.push({
|
||||
label: response.data[i].姓名,
|
||||
value: response.data[i].人员编号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
searchTable1() {
|
||||
initApproval(this.pageCurrent1, this.pageSize1, 2).then(response => {
|
||||
this.loading1 = true
|
||||
var check1, check2, check3
|
||||
this.supplierValue ? check1 = 1 : check1 = 0
|
||||
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
|
||||
this.personValue ? check3 = 1 : check3 = 0
|
||||
searchTable1(this.radio, check1, this.supplierValue, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => {
|
||||
console.log(response.data)
|
||||
this.loading1 = false
|
||||
this.tableData1 = response.data.rows
|
||||
this.total1 = response.data.total
|
||||
})
|
||||
},
|
||||
exportTable() {
|
||||
var check1, check2, check3
|
||||
this.supplierValue ? check1 = 1 : check1 = 0
|
||||
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
|
||||
this.personValue ? check3 = 1 : check3 = 0
|
||||
var param = []
|
||||
param[0] = ['查询全部', this.radio]
|
||||
param[1] = ['供应商流水号_check', check1]
|
||||
param[2] = ['供应商流水号', this.supplierValue]
|
||||
param[3] = ['时间段_check', check2]
|
||||
if (check2 === 0) {
|
||||
param[4] = ['开始时间', '']
|
||||
param[5] = ['结束时间', '']
|
||||
} else {
|
||||
param[4] = ['开始时间', this.dateRange[0]]
|
||||
param[5] = ['结束时间', this.dateRange[1]]
|
||||
}
|
||||
param[6] = ['人员编号_check', check3]
|
||||
param[7] = ['人员编号', this.personValue]
|
||||
var Data = this.CreateData('2001', '报表_采购管理_情况审核查询_查询数据', param)
|
||||
this.exportExcel_NPOI(Data)
|
||||
},
|
||||
searchTable2(row) {
|
||||
this.gridData1 = []
|
||||
searchTable2(row.采购合同请款流水号).then(response => {
|
||||
this.gridData1 = response.data
|
||||
this.dialogFormVisible = true
|
||||
})
|
||||
},
|
||||
handleSizeChange1(val) {
|
||||
this.pageSize1 = val
|
||||
this.pageCurrent1 = 1
|
||||
this.pageSize1 = val
|
||||
this.searchTable1()
|
||||
},
|
||||
handleCurrentChange1(val) {
|
||||
this.pageCurrent1 = val
|
||||
this.searchTable1()
|
||||
},
|
||||
searchTable2() {
|
||||
initApprovalOffline(this.pageCurrent2, this.pageSize2, 2).then(response => {
|
||||
console.log(response.data.rows)
|
||||
this.tableData2 = response.data.rows
|
||||
this.total2 = response.data.total
|
||||
})
|
||||
},
|
||||
handleSizeChange2(val) {
|
||||
this.pageSize2 = val
|
||||
this.pageCurrent2 = 1
|
||||
this.searchTable2()
|
||||
},
|
||||
handleCurrentChange2(val) {
|
||||
this.pageCurrent2 = val
|
||||
this.searchTable2()
|
||||
},
|
||||
searchTable01(row) { // 查看详情（请款信息包含的合同）
|
||||
this.gridData1 = []
|
||||
this.contractDetail2 = []
|
||||
searchRequsetFundDetail1(row.采购合同请款流水号).then(response => {
|
||||
this.gridData1 = response.data
|
||||
})
|
||||
},
|
||||
searchTable02(row) { // 查看详情（请款信息包含的合同）
|
||||
searchRequsetFundDetail2(row.离线合同请款流水号).then(response => {
|
||||
this.gridData2 = response.data
|
||||
})
|
||||
},
|
||||
yesApproval(row) { // 通过付款
|
||||
this.$confirm('确定付款通过?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
execApproval(row.采购合同请款流水号, 1, '通过', this.id, 2).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('执行成功')
|
||||
// 记录付款金额及时间
|
||||
this.searchTable1()
|
||||
} else { this.$message.error('执行失败') }
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '取消操作'
|
||||
})
|
||||
})
|
||||
},
|
||||
noApproval(row) { // 不通过付款
|
||||
this.$prompt('请输入不通过原因', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消'
|
||||
}).then(({ value }) => {
|
||||
execApproval(row.采购合同请款流水号, 2, value, this.id, 2).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('执行成功')
|
||||
this.searchTable1()
|
||||
} else { this.$message.error('执行失败') }
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '取消操作'
|
||||
})
|
||||
})
|
||||
},
|
||||
yesApprovalOffline(row) { // 通过审核
|
||||
this.$confirm('确定审核通过?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
execApprovalOffline(row.离线合同请款流水号, 1, '通过', this.id, 2).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('执行成功')
|
||||
this.searchTable2()
|
||||
} else { this.$message.error('执行失败') }
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '取消操作'
|
||||
})
|
||||
})
|
||||
},
|
||||
noApprovalOffline(row) { // 不通过审核
|
||||
this.$prompt('请输入不通过原因', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消'
|
||||
}).then(({ value }) => {
|
||||
execApprovalOffline(row.离线合同请款流水号, 2, value, this.id, 2).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('执行成功')
|
||||
this.searchTable2()
|
||||
} else { this.$message.error('执行失败') }
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '取消操作'
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,11 +111,11 @@
|
||||
{{ scope.row.不合格处理文本 }}
|
||||
</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">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.不合格处理文本 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="报废工时(分)" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.报废工时 }}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>
|
||||
</div>
|
||||
<!-- <h4 style="margin: 0">发票结算申请单</h4>-->
|
||||
<el-table id="expandTable" :data="tableData1" border highlight-current-row height="330px" style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
|
||||
<el-table id="expandTable" :data="tableData1" border highlight-current-row height="250px" style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
|
||||
<!-- <el-table-column type="expand">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
|
||||
@@ -129,7 +129,7 @@
|
||||
<!--<h4 style="margin: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>-->
|
||||
<!--<span>发票号：</span>-->
|
||||
<!--<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly style="margin: 5px 0 5px 0"/>-->
|
||||
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
|
||||
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 300px;" height="300px" size="mini">
|
||||
<el-table-column label="名称" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
|
||||
@@ -160,6 +160,11 @@
|
||||
<!--{{ scope.row.采购合同名称 || scope.row.离线合同名称 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="采购数量" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到票数量" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.到票数量 }}
|
||||
|
||||
@@ -0,0 +1,247 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<div slot="header">
|
||||
<el-select v-model="supplierValue" placeholder="选择供应商" filterable style="width: 220px;margin-left: 5px" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in supplierValues"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span>申请时间:</span>
|
||||
<el-date-picker v-model="date1" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始日期"/> ~
|
||||
<el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>
|
||||
</div>
|
||||
<!-- <h4 style="margin: 0">发票结算申请单</h4>-->
|
||||
<el-table id="expandTable" :data="tableData1" border highlight-current-row height="250px" style="width: 100%;height: 330px;overflow:auto" size="mini">
|
||||
<!-- <el-table-column type="expand">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
|
||||
<!-- <el-row>-->
|
||||
<!-- <el-col :lg="10" :sm="12">-->
|
||||
<!-- <viewer>-->
|
||||
<!-- <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
|
||||
<!-- </viewer>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="6">-->
|
||||
<!-- <el-form-item label="已付款项">-->
|
||||
<!-- <span>{{ scope.row.已付款项 }}</span>-->
|
||||
<!-- </el-form-item><br>-->
|
||||
<!-- <el-form-item label="尚欠金额">-->
|
||||
<!-- <span>{{ scope.row.尚欠金额 }}</span>-->
|
||||
<!-- </el-form-item><br>-->
|
||||
<!-- <el-form-item label="备注">-->
|
||||
<!-- <span>{{ scope.row.备注 }}</span>-->
|
||||
<!-- </el-form-item><br>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="6">-->
|
||||
<!-- <el-form-item label="是否费用类发票">-->
|
||||
<!-- <span>{{ scope.row.是否费用类 }}</span>-->
|
||||
<!-- </el-form-item><br>-->
|
||||
<!-- <el-form-item label="税额">-->
|
||||
<!-- <span>{{ scope.row.税额 }}</span>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- </el-form>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到票号" align="center" min-width="90">
|
||||
<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-column label="申请人" align="center" min-width="75">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请时间" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="采购审批" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批人1结果 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批时间" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批1时间 ? scope.row.审批1时间.split(' ')[0] : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总经理审批" align="center" min-width="90">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批人4结果 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批时间" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="财务审批" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批人3结果 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批时间" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- <div class="block" style="margin-top: 10px;">-->
|
||||
<!-- <el-pagination-->
|
||||
<!-- :current-page="pageCurrent1"-->
|
||||
<!-- :page-sizes="[10, 20, 30, 40]"-->
|
||||
<!-- :page-size="pageSize1"-->
|
||||
<!-- :total="total1"-->
|
||||
<!-- style="display:inline-block;width:50%"-->
|
||||
<!-- layout="total, sizes, prev, pager, next, jumper"-->
|
||||
<!-- @size-change="handleSizeChange1"-->
|
||||
<!-- @current-change="handleCurrentChange1"/>-->
|
||||
<!-- </div>-->
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { searchTable1, searchSupplier } from '@/api/PurchasingCenter/InvoiceSettlementApproveSearch'
|
||||
import { mapGetters } from 'vuex'
|
||||
import { readFile } from '@/utils/request'
|
||||
import request from '@/utils/request'
|
||||
export default {
|
||||
name: '', // 发票结算审批
|
||||
data() {
|
||||
return {
|
||||
date1: '',
|
||||
date2: '',
|
||||
tableData1: [],
|
||||
total1: 0,
|
||||
pageCurrent1: 1,
|
||||
pageSize1: 10,
|
||||
invoiceNumber: '',
|
||||
tableData2: [],
|
||||
tableData3: [],
|
||||
supplierValues: [],
|
||||
supplierValue: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapGetters([
|
||||
'token',
|
||||
'sidebar',
|
||||
'name',
|
||||
'id' // 人员编号
|
||||
])
|
||||
},
|
||||
created() {
|
||||
this.fetchData()
|
||||
this.searchTable1()
|
||||
this.searchSupplier()
|
||||
},
|
||||
methods: {
|
||||
fetchData() {
|
||||
// console.log(this.token)
|
||||
},
|
||||
searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
|
||||
this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
|
||||
this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
|
||||
this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
|
||||
this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
|
||||
this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
|
||||
this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
|
||||
this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
|
||||
this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
|
||||
this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
|
||||
this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
|
||||
this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
|
||||
this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
|
||||
searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) {
|
||||
response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0]
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.supplierValues.push({
|
||||
label: response.data[i].供应商名称,
|
||||
value: response.data[i].供应商流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
searchTable1() {
|
||||
let check
|
||||
this.date1 && this.date2 ? this.check1 = 1 : (this.check1 = 0, this.date1 = '', this.date2 = '')
|
||||
this.supplierValue ? check = 1 : check = 0
|
||||
searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1, this.token, check, this.supplierValue).then(response => {
|
||||
this.tableData1 = response.data.rows
|
||||
this.tableData1.map(v => {
|
||||
this.$set(v, 'scanSrc', '')
|
||||
return v
|
||||
})
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
this.tableData1[i].scanSrc = this.searchPic(response.data.rows[i], i)
|
||||
}
|
||||
this.total1 = response.data.total
|
||||
})
|
||||
},
|
||||
async searchPic(row, i) {
|
||||
const { data } = await request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '3',
|
||||
name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票结算申请单流水号}`
|
||||
}
|
||||
})
|
||||
this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
|
||||
},
|
||||
handleSizeChange1(val) {
|
||||
this.pageCurrent1 = 1
|
||||
this.pageSize1 = val
|
||||
this.searchTable1()
|
||||
},
|
||||
handleCurrentChange1(val) {
|
||||
this.pageCurrent1 = val
|
||||
this.searchTable1()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-card{
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.el-select{
|
||||
width:200px
|
||||
}
|
||||
.el-input{
|
||||
width:200px
|
||||
}
|
||||
span{
|
||||
margin: 10px 0 10px 10px;
|
||||
}
|
||||
#expandTable .el-form-item{
|
||||
margin: 0;
|
||||
}
|
||||
.el-card{
|
||||
margin: 0px;
|
||||
}
|
||||
</style>
|
||||
@@ -42,6 +42,11 @@
|
||||
{{ scope.row.总金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="提交时间" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.创建时间 ? scope.row.创建时间.split(' ')[0] : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批时间" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
|
||||
|
||||
@@ -51,6 +51,11 @@
|
||||
{{ scope.row.请款金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="请款时间" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column label="审核时间" align="center" min-width="60">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.审核时间 ? scope.row.审核时间.split(' ')[0] : '' }}-->
|
||||
@@ -86,6 +91,21 @@
|
||||
{{ scope.row.未通过审批原因 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款人" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.付款人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款时间" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款情况内容" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.付款情况内容 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="90px" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
|
||||
@@ -216,8 +236,8 @@ export default {
|
||||
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
|
||||
var param = []
|
||||
param[0] = ['查询全部', this.radio]
|
||||
param[1] = ['供应商流水号_check', check1]
|
||||
param[2] = ['供应商流水号', this.supplierValue]
|
||||
param[1] = ['供应商名称_check', check1]
|
||||
param[2] = ['供应商名称', this.supplierValue]
|
||||
param[3] = ['时间段_check', check2]
|
||||
if (check2 === 0) {
|
||||
param[4] = ['开始时间', '']
|
||||
|
||||
Reference in New Issue
Block a user