diff --git a/src/utils/request.js b/src/utils/request.js index 92890169..867f7256 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.102:8005/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.103:8005/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index 04d7d21f..cb6dcf4e 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -437,34 +437,34 @@ height="300" highlight-current-row border> - + - + - + - + - + - + - + @@ -98,12 +98,12 @@ {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }} - + - + diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index b9df8aeb..e766fa6b 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -39,10 +39,10 @@ - 查看详情 + 查看详情 - 通过 - 不通过 + 通过 + 不通过 diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index 80e6f0b3..7dbeb250 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -75,11 +75,11 @@ :data="tableData1" size="mini" border - style="width: 100%;max-height: 350px;" - height="350px" + style="width: 100%" + height="500px" highlight-current-row @row-click="searchTable2"> - + - + @@ -139,12 +139,12 @@ 未通过 - + - + @@ -171,7 +171,7 @@ {{ scope.row.姓名 }} - +