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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-03-14 20:28:41 +08:00
parent 95fb83f7cc 7ca8fbef23
commit 7e162bd0ab
9 changed files with 104 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/Inventory/PurchaseInRecord/index.vue
View File

@@ -156,7 +156,7 @@ export default {
param[12] = ['入库时间_check', check7]
param[13] = ['入库开始时间', this.inTime[0]]
param[14] = ['入库结束时间', this.inTime[1]]
var Data = this.CreateData('00', '报表_采购部仓库_入库记录_查询', param)
var Data = this.CreateData('2001', '报表_采购部仓库_入库记录_查询', param)
this.exportExcel_NPOI(Data)
},
fetchData() {

10
src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
View File

@@ -74,6 +74,15 @@
{{ 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
@@ -169,6 +178,7 @@ export default {
this.contractValue = parseInt(row.采购合同流水号)
searchTable2(this.contractValue).then(response => {
this.returns = response.data[0].合同内容
this.dialogFormVisible = true
})
},
handleSizeChange1(val) {

2
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -639,7 +639,7 @@ export default {
if (this.RequisitionList !== '') {
var param = []
param[0] = ['请购单流水号', this.RequisitionList]
var Data = this.CreateData('00', '报表_制造中心-制造_零件分配_查询', param)
var Data = this.CreateData('2001', '报表_制造中心制造_零件分配_查询', param)
this.exportExcel_NPOI(Data)
}
},

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

@@ -25,6 +25,7 @@
<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="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
<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 @row-click="searchTable2">
@@ -58,6 +59,15 @@
{{ 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
@@ -71,6 +81,31 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<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>
</el-dialog>
</div>
</template>
@@ -92,7 +127,7 @@ export default {
tableData1: [],
loading1: false,
dialogFormVisible: false,
returns: ''
gridData1: []
}
},
computed: {
@@ -132,10 +167,33 @@ export default {
this.total1 = response.data.total
})
},
exportTable() {
var check1, check2, check3
this.billNames ? 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.billNames]
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.contractValue = parseInt(row.采购合同流水号)
searchTable2(this.contractValue).then(response => {
this.returns = response.data[0].合同内容
this.gridData1 = []
searchTable2(row.采购合同请款流水号).then(response => {
this.gridData1 = response.data
this.dialogFormVisible = true
})
},
handleSizeChange1(val) {

12
src/views/PurchasingCenter/PurchaseContractApproval/index.vue
View File

@@ -146,6 +146,8 @@
import { initContract, initBuyer, searchTable1, searchTable2, submitApproval } from '@/api/PurchasingCenter/PurchaseContractApproval'
import QRCode from 'qrcode'
import $ from 'jquery'
import { mapGetters } from 'vuex'
export default {
data() {
return {
@@ -194,6 +196,14 @@ export default {
contractValue: '' // 显示表2和变更合同用的变量
}
},
computed: {
...mapGetters([
'sidebar',
'avatar',
'name',
'id' // 人员编号
])
},
created() {
this.fetchData()
this.searchTable1()
@@ -245,7 +255,7 @@ export default {
submitApproval(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因).then(response => {
submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因, this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('审批成功')
this.dialogVisible3 = false

15
src/views/PurchasingCenter/PurchaseContractReview/index.vue
View File

@@ -164,6 +164,7 @@
<script>
import { initContract, initBuyer, searchTable1, searchTable2, submitApproval, initPerson } from '@/api/PurchasingCenter/PurchaseContractReview'
import axios from 'axios'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -222,6 +223,14 @@ export default {
contractValue: '' // 显示表2和变更合同用的变量
}
},
computed: {
...mapGetters([
'sidebar',
'avatar',
'name',
'id' // 人员编号
])
},
created() {
this.fetchData()
this.searchTable1()
@@ -300,7 +309,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
submitApproval(this.ProcurementContractNum, 1, '').then(response => {
submitApproval(this.ProcurementContractNum, 1, '', this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('审核成功')
this.dialogVisible3 = false
@@ -315,7 +324,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '取消操作'
message: '已取消操作'
})
})
},
@@ -326,7 +335,7 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(({ value }) => {
submitApproval(this.ProcurementContractNum, 2, value).then(response => {
submitApproval(this.ProcurementContractNum, 2, value, this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('审核成功')
this.dialogVisible3 = false