diff --git a/src/utils/request.js b/src/utils/request.js index d440babd..8ff60856 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.0.101:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index e721d1db..5b78fece 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -55,7 +55,7 @@

领料单明细:{{ pickingListNumberShow }}

- 备料确认 + 备料确认 领料确认 diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 8a1d7031..925eb56f 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -391,7 +391,7 @@ - +
询价单号: @@ -408,11 +408,13 @@ size="small" style="margin-left: 10px" @click="createInquirySheet">创建询价单 - 选入 + + 选入物料 +

询价单

询价单基础信息维护 @@ -486,7 +488,9 @@ @current-change="handleCurrentChange2"/> 打印 导出 - 保存 + + 保存 +

询价单明细

@@ -547,7 +551,9 @@ @@ -1941,7 +1947,7 @@ export default { text-align: center; } .el-card{ - margin-bottom: 15px; + margin-bottom: 0px; } .el-select{ width:200px diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 1f0569c1..e7690880 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -162,7 +162,7 @@ - + ①选择合同模板: @@ -176,7 +176,9 @@ ②递交审批: - 递交 + + 递交 +
{{ content }}
diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue index cddacadd..2a4a471b 100644 --- a/src/views/PurchasingCenter/FundApproval1/index.vue +++ b/src/views/PurchasingCenter/FundApproval1/index.vue @@ -26,7 +26,7 @@ @@ -365,7 +365,7 @@ export default {