diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index e27efdec..2811ed77 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -50,7 +50,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
method: 'post',
data: {
type: '1',
- name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
+ name: '车间生产管理工艺_零件工艺计划_零件状态_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
pagination: pageCurrent + '&' + pageSize
}
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 2b25c733..ccc7bf22 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -83,15 +83,16 @@
- {{ scope.row.传递时间 }}
+ {{ scope.row.传递时间 ? scope.row.传递时间 : '—' }}
-
+
+
-
-
+
+
@@ -351,12 +352,10 @@ export default {
}
this.loading0 = true
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
- for (let i = 0; i < response.data.rows.length; i++) {
- response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
- if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
- response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
- }
- }
+ response.data.rows.map(v => {
+ this.$set(v, '零件状态码', v.考核状态 ? parseInt(v.考核状态) - 2 : 0)
+ v.传递时间 = v.传递时间.split(' ')[0]
+ })
this.loading0 = false
this.tableData = response.data.rows
this.total = parseInt(response.data.total)