diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js index 3f52314e..717ff692 100644 --- a/src/api/MarketingCenter/ContractCapitalManagement.js +++ b/src/api/MarketingCenter/ContractCapitalManagement.js @@ -32,15 +32,14 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3) { } }) } -export function searchTable2(pageCurrent, pageSize, num1) { +export function searchTable2(num1) { return request({ url: '', method: 'post', data: { type: '1', - name: '合同资金管理_分批资金_查询', - param: '资金ID=' + num1 + '=int', - Pagination: pageCurrent + '&' + pageSize + name: '基础表_合同资金表明细_查询数据', + param: '资金ID=' + num1 + '=int' } }) } diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js index 5a8ba895..509eb7d9 100644 --- a/src/api/MarketingCenter/ContractInformationManagement.js +++ b/src/api/MarketingCenter/ContractInformationManagement.js @@ -92,7 +92,7 @@ export function editchar() { data: { type: '2', name: '合同信息管理_合同信息_编辑', - param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12] + param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12] + '&合同总额=' + arguments[13] } }) } diff --git a/src/api/PurchasingCenter/OfflineContractSearch.js b/src/api/PurchasingCenter/OfflineContractSearch.js index 1f6bf658..045fbb66 100644 --- a/src/api/PurchasingCenter/OfflineContractSearch.js +++ b/src/api/PurchasingCenter/OfflineContractSearch.js @@ -25,3 +25,15 @@ export function searchOfflineContractContent(num) { } }) } +// 打回离线合同 +export function back(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_离线合同_打回合同', + param: `离线合同流水号=${num}` + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index fc41e22d..2954d36b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,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.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index c9a36133..2c0b264c 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -18,9 +18,9 @@ :value="item.value"/> 查询 - - 查看收款信息 - + + + @@ -88,40 +88,40 @@ {{ scope.row.姓名 }} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - + size="mini"> - + width="100"/> + - + - + - - - @@ -941,47 +869,9 @@ export default { }) }, getTableData2(row) { - this.timetime = row.合同签订日期 this.moneyID = row.资金id - this.max = parseFloat(row.未支付金额) - this.contractTotal = parseFloat(row.合同总金额) - this.listLoading2 = true - searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => { - this.id3 = '' - this.listLoading2 = false - const data = response.data.rows - for (let i = 0; i < data.length; i++) { - data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false - data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false - data[i].执行进度id = parseInt(data[i].执行进度id) - if (data[i].节点日期 !== '' && data[i].节点日期 !== null) { - data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) - } - if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) { - data[i].是否禁用收款 = true - data[i].状态 = '进度未完' - } else { - data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8) - data[i].是否禁用收款 = false - if (data[i].未收金额 === '0') { - data[i].是否禁用收款 = true - data[i].状态 = '已完成' - } else { - if (data[i].状态 === '0') { - data[i].状态 = '未开始' - } - if (data[i].状态 === '1') { - data[i].状态 = '即将拖期' - } - if (data[i].状态 === '2') { - data[i].状态 = '已拖期' - } - } - } - data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false - } - this.tableData2 = data - this.total2 = response.data.total + searchTable2(this.moneyID).then(response => { + this.tableData2 = response.data }) }, handleSizeChange(val) { diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 5cdd64f2..45e5547e 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -119,7 +119,7 @@ {{ scope.row.项目名称 }} - + @@ -289,7 +289,7 @@ - + @@ -367,7 +367,7 @@ - + { + editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber, this.form.contractAmount).then(response => { this.dialogFormVisible1 = false if (response.data[0].result === '1') { this.$message.success('信息更新成功') diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 1d3e3a21..b7914573 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -543,7 +543,7 @@ - + { // 查询询价单号 this.form2.离线合同编号 = response.data[0].单号 @@ -1095,8 +1095,6 @@ export default { }) }, getSupplier1() { - this.supplierNames = [] - this.form2.供应商名称 = '' searchSupplier1(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => { for (let i = 0; i < response.data.length; i++) { this.supplierNames.push({ @@ -1142,7 +1140,7 @@ export default { this.form2.离线合同流水号 = row.离线合同流水号 this.form2.离线合同编号 = row.离线合同编号 this.form2.离线合同名称 = row.离线合同名称 - this.form2.供应商流水号 = row.供应商流水号 + this.form2.供应商流水号 = parseInt(row.供应商流水号) this.form2.供应商名称 = row.供应商名称 this.form2.规定到货时间 = row.规定到货时间 this.form2.离线合同备注 = row.离线合同备注 diff --git a/src/views/PurchasingCenter/OfflineContractSearch/index.vue b/src/views/PurchasingCenter/OfflineContractSearch/index.vue index 648715ea..3d08a313 100644 --- a/src/views/PurchasingCenter/OfflineContractSearch/index.vue +++ b/src/views/PurchasingCenter/OfflineContractSearch/index.vue @@ -11,6 +11,12 @@ icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询 + 打回
@@ -109,7 +115,7 @@