diff --git a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js
index c06d4713..e0d25e79 100644
--- a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js
+++ b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js
@@ -1,27 +1,27 @@
import request from '@/utils/request'
// 查询人员总工工时
-export function searchtable(num2, num3, num4, num5, pageCurrent, pageSize) {
+export function searchtable(num1, num2, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: '车间生产管理工艺_工时统计_查询数据2_新',
- param: '操作者_check=0&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
+ name: '车间生产管理工艺_工时统计_设备工时_Vue',
+ param: '开始时间=' + num1 + '&结束时间=' + num2,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询人员具体工序
-export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
+export function searchtable2(num1, num2, num3, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: '车间生产管理工艺_工时统计按人员查询_查询数据2_新',
- param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4,
+ name: '车间生产管理工艺_工时统计_设备工时_Vue_详细',
+ param: '人员编号=' + num1 + '&开始时间=' + num2 + '&结束时间=' + num3,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index aa2f6807..2e5f07e8 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -17,24 +17,11 @@
type="date"
placeholder="选择加工完成日期"/>
查询
-
-
-
-
+
-
+
{{ scope.row.姓名 }}
@@ -42,17 +29,27 @@
- {{ scope.row.理论加工时间段 }}
+ {{ scope.row.定额总工时 }}
-
+
- {{ scope.row.设备工时 }}
+ {{ scope.row.设备总工时 }}
+
+
+
+
+ {{ scope.row.扫码总工时 }}
+
+
+
+
+ {{ scope.row.修补准结总工时 }}
- {{ scope.row.完成数量 }}
+ {{ scope.row.总数量 }}
@@ -66,7 +63,7 @@
-
+
@@ -89,34 +86,29 @@
{{ scope.row.完成数量 }}
-
-
- {{ scope.row.质检结果 }}
-
-
-
-
-
-
-
- {{ scope.row.理论加工时间段 }}
+ {{ scope.row.工时总额 }}
-
+
- {{ scope.row.设备工时 ? scope.row.设备工时 : 0 }}
+ {{ scope.row.设备工时 }}
-
+
- {{ scope.row.加工开始时间 }}
+ {{ scope.row.扫码工时 }}
-
+
- {{ scope.row.加工完成时间 }}
+ {{ scope.row.修补准结工时 }}
+
+
+
+
+ {{ scope.row.操作时间 }}
@@ -168,12 +160,7 @@ export default {
this.tableData = []
this.tableData2 = []
this.total2 = 0
- if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) {
- this.timeCheck = 1
- } else {
- this.timeCheck = 0
- }
- searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
+ searchtable(this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) {
this.loading = false
} else {
@@ -188,23 +175,9 @@ export default {
this.loading2 = true
this.tableData2 = []
this.pageCurrent2 = 1
- searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
+ searchtable2(row.人员编号, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
if (response.data.rows.length !== 0) {
- for (let i = 0; i < response.data.rows.length; i++) {
- this.tableData2.push({
- 零件图号: response.data.rows[i].零件图号,
- 零件名称: response.data.rows[i].零件名称,
- 工艺名称: response.data.rows[i].工艺名称,
- 完成数量: response.data.rows[i].完成数量,
- 质检结果: response.data.rows[i].质检结果,
- 设备工时: response.data.rows[i].设备工时,
- 不合格数量: response.data.rows[i].不合格数量,
- 理论加工时间段: response.data.rows[i].理论加工时间段,
- 实际加工时间段: response.data.rows[i].实际加工时间段,
- 加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '',
- 加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : ''
- })
- }
+ this.tableData2 = response.data.rows
}
this.loading2 = false
this.total2 = response.data.total