From 7e5b6cfafd16909f3cb7ddb7045cb98bdd8b03a7 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 9 Jan 2020 16:40:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompletionOfWorkshopComponents/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index 8b9c687d..2317f21a 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -30,7 +30,8 @@
- {{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}
+
+ {{ scope.row.工序间是否外协 === 2 ? '外协' : (scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名) }}
From b715812418d3d1f8984aa6dd415906d7e365ba3b Mon Sep 17 00:00:00 2001
From: liushuai
Date: Thu, 9 Jan 2020 18:08:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index b38cd4df..d0c3d10c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -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.104:8074/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service