From c42c2ef2970b9e4885b3f24a07ab558ac6146338 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 24 Sep 2019 14:05:37 +0800
Subject: [PATCH] a
---
src/styles/index.scss | 12 ++++++------
src/utils/request.js | 2 +-
.../CreatingProcurementContracts/index.vue | 6 ++----
.../WorkshopProcurement/OfflineContract1/index.vue | 2 +-
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 05d0ef0c..edb9e08d 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -249,14 +249,14 @@ h3 {
border-color: rgb(255,151,89);
color: rgb(255,151,89);
&:hover{
- background: #67C23A;
- border-color: #67C23A;
- color: white;
+ background: #ffffff;
+ border-color: rgb(255,151,89);
+ color: rgb(255,151,89);
}
&:focus{
- background: #67C23A;
- border-color: #67C23A;
- color: white;
+ background: #ffffff;
+ border-color: rgb(255,151,89);
+ color: rgb(255,151,89);
}
}
.el-button--baocun.is-disabled{
diff --git a/src/utils/request.js b/src/utils/request.js
index 8ff60856..d440babd 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.101:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index d45ecb4e..d7df3f20 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -167,9 +167,8 @@
计算合同总额
合同总额(未税):
@@ -187,9 +186,8 @@
:value="item.value"/>
生成采购合同
diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue
index 61aa7329..652262cc 100644
--- a/src/views/WorkshopProcurement/OfflineContract1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue
@@ -124,7 +124,7 @@
style="margin-left: 10px"
@click="addOfflineContract">创建离线合同