From 6847e0e3cbd3c074cfa071bf84022f3df1bd0a0d Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 6 Jan 2020 14:14:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ScheduleCompletionDetails/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index 2e5f07e8..33dde32f 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -19,9 +19,9 @@
查询
-
+
-
+
{{ scope.row.姓名 }}
@@ -63,9 +63,9 @@
-
+
-
+
{{ scope.row.零件图号 }}
From 80496d9d420f68844ba9c39cdf5316a3c68cfe99 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 7 Jan 2020 08:37:28 +0800
Subject: [PATCH 2/3] as
---
.../ManufacturingCenter/ScheduleCompletionDetails/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index 33dde32f..7ad2cb9d 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -161,6 +161,7 @@ export default {
this.tableData2 = []
this.total2 = 0
searchtable(this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
+ console.log(response.data, 111)
if (response.data.total === 0) {
this.loading = false
} else {
@@ -176,6 +177,7 @@ export default {
this.tableData2 = []
this.pageCurrent2 = 1
searchtable2(row.人员编号, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
+ console.log(response.data, 222)
if (response.data.rows.length !== 0) {
this.tableData2 = response.data.rows
}
From 434e66453d6de88c0c93c848d51e4b93977f7b33 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 7 Jan 2020 10:08:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 2 +-
.../ScheduleCompletionDetails/index.vue | 28 +++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..2cb92ad8 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.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index 7ad2cb9d..cbd24494 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -32,17 +32,12 @@
{{ scope.row.定额总工时 }}
-
+
{{ scope.row.设备总工时 }}
-
-
- {{ scope.row.扫码总工时 }}
-
-
-
+
{{ scope.row.修补准结总工时 }}
@@ -52,6 +47,11 @@
{{ scope.row.总数量 }}
+
+
+ {{ scope.row.扫码总工时 }}
+
+
-
+
{{ scope.row.设备工时 }}
-
-
- {{ scope.row.扫码工时 }}
-
-
-
+
{{ scope.row.修补准结工时 }}
@@ -111,6 +106,11 @@
{{ scope.row.操作时间 }}
+
+
+ {{ scope.row.扫码工时 }}
+
+