diff --git a/src/utils/request.js b/src/utils/request.js index 03220e7d..04a0d5f7 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.103:8074/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.103:8074/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 @@ -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.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 1d2b5b89..09ab1481 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -2,17 +2,24 @@
- + - - - - + + + + + + + - - + + 成组采购 取消成组采购 @@ -49,7 +56,7 @@ - + @@ -79,35 +86,35 @@ - - + + - + - + - + - + - + @@ -122,7 +129,7 @@ @change="update(scope.row)"/> - + @@ -337,6 +344,7 @@ export default { contractNumValue: '', contractNumType: 0, RequisitionNumber: '', + supplierNames: [], contract: [{ label: '合同模板1', value: 1 @@ -356,6 +364,7 @@ export default { supplierName: '', // 供应商 supplier: [], supplierValue: '', // 供应商流水号 + supplierValues: [], enterpriseNature: '', // 企业性质 createDate: '', // 创立日期 registeredCapital: '', // 注册资本 @@ -439,6 +448,7 @@ export default { }, created() { this.fetchData() + this.searchSupplier() }, methods: { linkGroup() { @@ -472,6 +482,7 @@ export default { }) }, searchData() { + this.contractSum = 0.00 for (let i = 0; i < this.contractNum.length; i++) { if (this.contractNum[i].value === this.contractNumValue) { this.contractNumType = this.contractNum[i].id @@ -486,6 +497,7 @@ export default { console.log(this.tableData5) }) searchData2(this.contractNumValue).then(response => { + console.log(response, 2233) this.tableData4 = response.data this.machineValue = response.data[0].机床流水号 this.form3.机床 = response.data[0].机床图号 @@ -570,6 +582,12 @@ export default { 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].供应商流水号 + }) + } this.tableData01 = response.data }) },