diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery.js b/src/api/ManufacturingCenter/RequestApprovalQuery.js index bba12053..6e9f60f8 100644 --- a/src/api/ManufacturingCenter/RequestApprovalQuery.js +++ b/src/api/ManufacturingCenter/RequestApprovalQuery.js @@ -30,7 +30,7 @@ export function searchTable1(radio, check1, supplier, check2, start, end, check3 } }) } -// 采购合同明细查询 +// 查询离线合同请款信息明细 export function searchTable2(num) { return request({ url: '', @@ -39,8 +39,8 @@ export function searchTable2(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '采购管理_采购合同内容_查询数据', - param: '采购合同流水号=' + num + name: '采购管理_采购合同_请款明细_查询数据', + param: `采购合同请款流水号=${num}` } }) } diff --git a/src/api/PurchasingCenter/PurchaseContractApproval.js b/src/api/PurchasingCenter/PurchaseContractApproval.js index ffc2c6c5..e19d7dd7 100644 --- a/src/api/PurchasingCenter/PurchaseContractApproval.js +++ b/src/api/PurchasingCenter/PurchaseContractApproval.js @@ -72,7 +72,7 @@ export function searchTable2(num) { }) } // 执行审批 -export function submitApproval(num, num1, num2) { +export function submitApproval(num, num1, num2, id) { return request({ url: '', method: 'post', @@ -81,7 +81,7 @@ export function submitApproval(num, num1, num2) { ModularID: router.currentRoute.path, type: '2', name: '采购管理_合同审批_采购部_修改数据', - param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2 + param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2 + '&审核人=' + id } }) } diff --git a/src/api/PurchasingCenter/PurchaseContractReview.js b/src/api/PurchasingCenter/PurchaseContractReview.js index 10880f5e..14bc80c1 100644 --- a/src/api/PurchasingCenter/PurchaseContractReview.js +++ b/src/api/PurchasingCenter/PurchaseContractReview.js @@ -85,7 +85,7 @@ export function searchTable2(num) { }) } // 执行审核 -export function submitApproval(num, num1, num2) { +export function submitApproval(num, num1, num2, id) { return request({ url: '', method: 'post', @@ -94,7 +94,7 @@ export function submitApproval(num, num1, num2) { ModularID: router.currentRoute.path, type: '2', name: '采购管理_合同审核_采购部_修改数据', - param: '采购合同流水号=' + num + '&审核情况流水号=' + num1 + '&未通过审核原因=' + num2 + param: '采购合同流水号=' + num + '&审核情况流水号=' + num1 + '&未通过审核原因=' + num2 + '&审批人=' + id } }) } diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index 56f9c850..54aa8850 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -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() { diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue index 96389547..ae856b55 100644 --- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue +++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue @@ -74,6 +74,15 @@ {{ scope.row.审核情况内容 }} + + +
{ this.returns = response.data[0].合同内容 + this.dialogFormVisible = true }) }, handleSizeChange1(val) { diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 6334119e..e878789e 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -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) } }, diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue index 2d5fea93..1a4e0788 100644 --- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue +++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue @@ -25,6 +25,7 @@ 通过 未过 查询 + 导出 @@ -58,6 +59,15 @@ {{ scope.row.审核情况内容 }} + + +
+ + + + + + + + + + + + + + + + +
@@ -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) { diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue index 6fdae74f..9ba54063 100644 --- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue @@ -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 diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue index 7125ea6f..0dc3c1f4 100644 --- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue @@ -164,6 +164,7 @@