diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js index d9442abe..20649ab8 100644 --- a/src/api/ManufacturingCenter/InitialProduction.js +++ b/src/api/ManufacturingCenter/InitialProduction.js @@ -13,14 +13,14 @@ export function getEntryNameValue() { }) } // 机床名称 -export function getToolNum(num) { +export function getToolNum() { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_机床名称_查询数据', - param: '项目流水号=' + num + '=int&是否传递=1=int' + name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + param: '是否传递=1' } }) } diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js index 2a897c9b..95fa4391 100644 --- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js +++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js @@ -24,14 +24,14 @@ export function getProject0() { }) } // 获取机床图号(全部) -export function getGraphNum(num) { +export function getGraphNum() { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_机床名称_查询数据', - param: '项目流水号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0' + name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + param: '是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0' } }) } diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 6d16fc7c..dff9fd8a 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -11,26 +11,20 @@ 整改件投产 - - - - - - - + + + :value="item.value"> +
{{ item.label }}
+
{{ item.value2 }}
+
- - + + { + getToolNum().then(response => { for (let i = 0; i < response.data.length; i++) { this.toolNum.push({ label: response.data[i].机床图号, - value: response.data[i].机床流水号 + value: response.data[i].机床流水号, + value2: response.data[i].项目名称 }) } }) diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index ba2098b1..923a8cf8 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -5,34 +5,19 @@ 当天 全部 - 项目名称: - - - 机床图号: - + + :value="item.value"> +
{{ item.label }}
+
{{ item.value2 }}
+
组号: - + { + getGraphNum().then(response => { for (let i = 0; i < response.data.length; i++) { this.graphNum.push({ label: response.data[i].机床图号, - value: response.data[i].机床流水号 + value: response.data[i].机床流水号, + value2: response.data[i].项目名称 }) } })