diff --git a/src/api/ManufacturingCenter/MonthEndHourAccounting.js b/src/api/ManufacturingCenter/MonthEndHourAccounting.js
index 630819a4..55a2f59f 100644
--- a/src/api/ManufacturingCenter/MonthEndHourAccounting.js
+++ b/src/api/ManufacturingCenter/MonthEndHourAccounting.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
-export function searchTable(time, time1, order, orderName, pageCurrent, pageSize) {
+export function searchTable(time, time1, order, orderName, check, name, check1, partNumber, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -10,8 +10,8 @@ export function searchTable(time, time1, order, orderName, pageCurrent, pageSize
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
- name: '工艺月底工时核算_查询数据',
- param: '开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName,
+ name: '工艺月底工时核算_查询数据_最新',
+ param: '开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + name,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/api/ManufacturingCenter/ProcessingStatusNew.js
index 9806c2b5..4d678da7 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusNew.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusNew.js
@@ -52,7 +52,7 @@ export function gettabledata1(num) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
- name: '车间生产管理工艺_加工进度查询_查询_New',
+ name: '车间生产管理工艺_追溯加工过程_查询工序',
param: '工艺计划流水号=' + num + '=int'
}
})
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index ba8443a5..dd1759f0 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -12,6 +12,8 @@
style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
+
+
查询
导出
@@ -19,12 +21,12 @@
- {{ scope.row.姓名 }}
+ {{ scope.row.操作工 }}
- {{ scope.row.零件图号_零件工艺计划 }}
+ {{ scope.row.零件图号 }}
@@ -42,24 +44,24 @@
{{ scope.row.工艺名称 }}
-
-
- {{ scope.row.修补准结工时 }}
-
-
-
-
- {{ scope.row.设备工时 }}
-
-
+
+
+
+
+
+
+
+
+
+
{{ scope.row.扫码工时 }}
-
+
- {{ scope.row.辅助工时 }}
+ {{ scope.row.完成工时 }}
@@ -67,19 +69,19 @@
{{ scope.row.工时比值 }}
-
+
- {{ scope.row.合格数量 }}
-
-
-
-
- {{ scope.row.不合格数量 }}
+ {{ scope.row.完成数量 }}
+
+
+
+
+
- {{ scope.row.操作时间 }}
+ {{ scope.row.完成日期 }}
@@ -150,6 +152,8 @@ export default {
orderName: 0,
order: 0,
startTime: '',
+ name: '',
+ partNumber: '',
tableData: [],
loading: false,
total: 0, // 总条数
@@ -186,8 +190,11 @@ export default {
},
searchTable() {
if (this.startTime[0] && this.startTime[1]) {
+ let check, check1
+ this.name ? check = 1 : check = 0
+ this.partNumber ? check1 = 1 : check1 = 0
this.loading = true
- searchTable(this.startTime[0], this.startTime[1], this.orderName, this.order, this.pageCurrent, this.pageSize).then(response => {
+ searchTable(this.startTime[0], this.startTime[1], this.orderName, this.order, check, this.name, check1, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
response.data.rows.map(v => {
this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.扫码工时) / parseInt(v.计划工时) * 100) / 100.00))
})
diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
index e206be97..cdfc3b0b 100644
--- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
@@ -29,7 +29,7 @@
是否核准
- 保存
+ 保存
折叠
展开
@@ -1210,6 +1210,7 @@ export default {
this.Specifications = response.data[0].规格
this.spec = response.data[0].原材料规格
this.工艺是否更改 = response.data[0].工艺是否更改
+ console.log(this.工艺是否更改, 111)
if (response.data[0].重量 === null) {
this.weight = ''
} else {
@@ -1513,6 +1514,7 @@ export default {
},
saveApprove() { // 核准保存
if (this.checked === true) {
+ this.loading = true
let 零件图号
let flag = 0
for (let i = 0; i < this.tableData.length; i++) {
@@ -1554,6 +1556,7 @@ export default {
if (this.partNumValue === '') {
this.$message.error('请先选择一个零件')
} else {
+ console.log(this.工艺是否更改, 2222)
if (this.工艺是否更改 === 1) {
insertOne1(this.partNumValue, row.工序流水号).then(response => {
this.searchDetail()
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index 68cbb10c..a0e26d26 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -29,20 +29,29 @@
-
+
+
+ {{ scope.row.工序顺序 }}
+
+
{{ scope.row.工艺名称 }}
-
+
+
+
+
+
+
- {{ scope.row.序间质检 }}
+ {{ scope.row.批次数量 }}
-
+
- {{ scope.row.不合格数量 }}
+ {{ scope.row.完成数量 }}
@@ -50,7 +59,12 @@
{{ scope.row.操作者 }}
-
+
+
+ {{ scope.row.加工开始时间 }}
+
+
+
{{ scope.row.完成日期 }}
@@ -367,15 +381,16 @@ export default {
gettabledata1(row).then(response => {
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
+ console.log(response.data[i])
this.tableData1.push({
工艺名称: response.data[i].工艺名称,
- 序间质检: response.data[i].质检结果,
- 排产日期: response.data[i].排产时间 ? response.data[i].排产时间.split(' ')[0] : '',
- 完成日期: response.data[i].工序完成日期 ? response.data[i].工序完成日期.split(' ')[0] : '',
- 操作者: response.data[i].操作者,
- 不合格数量: response.data[i].不合格数量,
- 质检数量: response.data[i].数量,
+ 工序顺序: response.data[i].工序顺序,
+ 加工开始时间: response.data[i].加工开始时间 ? response.data[i].加工开始时间 : '',
+ 完成日期: response.data[i].加工完成时间 ? response.data[i].加工完成时间 : '',
+ 操作者: response.data[i].姓名,
+ 批次数量: response.data[i].批次数量,
工序流水号: response.data[i].工序流水号,
+ 完成过程流水号: response.data[i].完成过程流水号,
工序状态: response.data[i].工序状态,
完成数量: response.data[i].完成数量
})
@@ -538,13 +553,13 @@ export default {
for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({
工艺名称: response.data[i].工艺名称,
- 序间质检: response.data[i].质检结果,
- 排产日期: response.data[i].排产时间 ? response.data[i].排产时间.split(' ')[0] : '',
- 完成日期: response.data[i].工序完成日期 ? response.data[i].工序完成日期.split(' ')[0] : '',
- 操作者: response.data[i].操作者,
- 不合格数量: response.data[i].不合格数量,
- 质检数量: response.data[i].数量,
+ 工序顺序: response.data[i].工序顺序,
+ 加工开始时间: response.data[i].加工开始时间 ? response.data[i].加工开始时间 : '',
+ 完成日期: response.data[i].加工完成时间 ? response.data[i].加工完成时间 : '',
+ 操作者: response.data[i].姓名,
+ 批次数量: response.data[i].批次数量,
工序流水号: response.data[i].工序流水号,
+ 完成过程流水号: response.data[i].完成过程流水号,
工序状态: response.data[i].工序状态,
完成数量: response.data[i].完成数量
})