diff --git a/src/assets/img/img13.png b/src/assets/img/img13.png new file mode 100644 index 00000000..5ba524eb Binary files /dev/null and b/src/assets/img/img13.png differ diff --git a/src/utils/request.js b/src/utils/request.js index d440babd..8eaacaf2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index b49aecf2..f6475a73 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -34,11 +34,13 @@ :value="item.value"/> 查询 - 导出 + + 导出 + - + diff --git a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue index e3a7b54b..06fbb840 100644 --- a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue +++ b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue @@ -32,7 +32,7 @@ - + - 查看详情 + 查看详情 - 取消请款 + 取消请款 @@ -167,9 +167,14 @@ {{ scope.row.已付金额 }} + + + @@ -187,6 +192,7 @@ export default { name: '', // 离线合同 data() { return { + selectContents: [], totalSum: 0, totalPay: 0, totalDebt: 0, @@ -337,7 +343,7 @@ export default { }) this.tableData01.map(v => { this.$set(v, '请款金额', 0) - v.请款金额 = v.合同总额 - v.已付金额 + v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额 return v }) }) @@ -346,6 +352,7 @@ export default { } }, handleSelectionChange(val) { + this.selectContents = val this.SUM = 0 this.contractGroup = [] this.sumGroup = [] @@ -361,13 +368,29 @@ export default { }, submitRequestFund() { // 确认请款 if (this.supplierValue && this.contractGroup.length !== 0) { - submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person - if (response.data[0].result === '1') { - this.$message.success('请款成功') - this.searchTable1() - this.dialogVisible2 = false - } else { this.$message.error('请款失败') } - }) + this.SUM = 0 + this.contractGroup = [] + this.sumGroup = [] + for (let i = 0; i < this.tableData01.length; i++) { + for (let j = 0; j < this.selectContents.length; j++) { + if (this.selectContents[j].离线合同流水号 === this.tableData01[i].离线合同流水号) { + this.SUM += parseFloat(this.tableData01[i].请款金额) + this.contractGroup.push(this.tableData01[i].离线合同流水号) + this.sumGroup.push(this.tableData01[i].请款金额) + } + } + } + if (this.SUM === 0) { + this.$message.error('请款金额不能为0') + } else { + submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person + if (response.data[0].result === '1') { + this.$message.success('请款成功') + this.searchTable1() + this.dialogVisible2 = false + } else { this.$message.error('请款失败') } + }) + } } else { this.$message.error('请选择需要请款的合同') } diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue index 59f8a4d8..dd0b9470 100644 --- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue +++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue @@ -32,7 +32,7 @@ - + - 查看详情 + 查看详情 - 取消请款 + 取消请款 @@ -167,9 +167,14 @@ {{ scope.row.已付金额 }} + + + @@ -187,6 +192,7 @@ import { timeToStamp } from '@/utils/tool' export default { data() { return { + selectContents: [], getDate: null, tableData0: [], pickerOptions: { @@ -319,7 +325,7 @@ export default { this.tableData01 = response.data this.tableData01.map(v => { this.$set(v, '请款金额', 0) - v.请款金额 = v.含税总金额 - v.已付金额 + v.请款金额 = v.含税总金额 - v.已付金额 - v.申请中金额 return v }) }) @@ -331,6 +337,7 @@ export default { return parseInt(row.已请款) !== 1 // 已经请款 }, handleSelectionChange(val) { + this.selectContents = val this.SUM = 0 this.contractGroup = [] this.sumGroup = [] @@ -342,13 +349,31 @@ export default { }, submitRequestFund() { // 确认请款 if (this.supplierValue && this.contractGroup.length !== 0) { - submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { - if (response.data[0].result === '1') { - this.$message.success('请款成功') - this.searchTable1() - this.dialogVisible2 = false - } else { this.$message.error('请款失败') } - }) + this.SUM = 0 + this.contractGroup = [] + this.sumGroup = [] + for (let i = 0; i < this.tableData01.length; i++) { + for (let j = 0; j < this.selectContents.length; j++) { + if (this.selectContents[j].采购合同流水号 === this.tableData01[i].采购合同流水号) { + this.SUM += parseFloat(this.tableData01[i].请款金额) + this.contractGroup.push(this.tableData01[i].采购合同流水号) + this.sumGroup.push(this.tableData01[i].请款金额) + } + } + } + if (this.SUM === 0) { + this.$message.error('请款金额不能为0') + } else { + submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { + if (response.data[0].result === '1') { + this.$message.success('请款成功') + this.searchTable1() + this.dialogVisible2 = false + } else { + this.$message.error('请款失败') + } + }) + } } else { this.$message.error('请选择需要请款的合同') }