From 6f073bf36b64ebdfe8c81773c18e820626739f34 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 17 Oct 2019 15:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7=E5=8D=95?=
=?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 6 +++---
.../CreateInquirySheet/index.vue | 21 +++++++++++++++----
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 56ffd77d..7218f9b2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,8 +16,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.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
+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
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
@@ -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.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 5c583e5d..a13838cf 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -34,7 +34,7 @@
-
+
@@ -1068,6 +1068,19 @@ export default {
'id' // 人员编号
])
},
+ watch: {
+ // 如果路由有变化,会再次执行该方法
+ '$route': {
+ handler(route) {
+ const _this = this
+ if (route.name === 'CreateInquirySheet') {
+ setTimeout(() => {
+ _this.Jump()
+ }, 1200)
+ }
+ }
+ }
+ },
created() {
this.getPerson()
this.fetchData()
@@ -1084,7 +1097,7 @@ export default {
},
methods: {
Jump() {
- window.location.hash = '#Jump'
+ window.location.hash = '#PurchasingCenter/CreateInquirySheet'
},
tiaozheng1() {
if (this.标准件和外购件流水号.length !== 0) {
@@ -1150,7 +1163,7 @@ export default {
})
},
clickCard1(project, machine) {
- window.location.hash = '#asd'
+ window.location.hash = '#PurchasingCenter/CreateInquirySheet'
// var hight = this.$refs.height1.offsetHeight
// document.documentElement.scrollTop = hight + 140
this.projectValue = project
@@ -1173,7 +1186,7 @@ export default {
})
},
clickCard2(project, machine) {
- window.location.hash = '#asd'
+ window.location.hash = '#PurchasingCenter/CreateInquirySheet'
// var hight = this.$refs.height1.offsetHeight
// document.documentElement.scrollTop = hight + 140
this.projectValue = project