From f1f3d933e86c83b28a10ffb79185b9daff31976a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 20 May 2020 17:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=84=E9=85=8D=E5=A5=97=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompletionOfWorkshopComponents/index.vue | 80 ++++++++++++++++++-
.../GroupMatching/index.vue | 9 ++-
2 files changed, 85 insertions(+), 4 deletions(-)
diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index e67dbe36..1f02698d 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -125,10 +125,88 @@ export default {
departmentData: [] // 树状数据
}
},
+ watch: {
+ '$route': {
+ handler(route) {
+ if (this.$route.query.机床流水号) {
+ console.log(this.$route.query.机床流水号)
+ this.getTreeData2(this.$route.query.机床流水号)
+ } else {
+ // var that = this
+ if (!this.MachineValue) {
+ this.getMachine()
+ }
+ }
+ },
+ immediate: true
+ }
+ },
created() {
- this.getMachine()
+ // this.getMachine()
},
methods: {
+ getTreeData2(num) {
+ this.MachineValue = ''
+ this.Machine = []
+ getMachines().then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ this.Machine.push({
+ label: response.data[i].机床图号,
+ value: response.data[i].机床流水号,
+ value2: response.data[i].机床名称
+ })
+ }
+ }).then(() => {
+ this.MachineValue = num
+ getMachinesStatue(num).then(res => {
+ if (res.data[0].是否发货 === 0) {
+ this.MachineColor = 'rgb(126,172,237)'
+ } else {
+ this.MachineColor = 'green'
+ }
+ })
+ this.tableData1 = []
+ this.tableData2 = []
+ for (let i = 0; i < this.Machine.length; i++) {
+ if (this.MachineValue === this.Machine[i].value) {
+ this.机床图号 = this.Machine[i].label
+ this.机床名称 = this.Machine[i].value2
+ }
+ }
+ this.option = []
+ getGroups(num).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ this.option.push({
+ isLeaf: false,
+ label: response.data[i].组号 + '\xa0\xa0\xa0' + (response.data[i].组件名称 ? response.data[i].组件名称 : ''),
+ value: response.data[i].组件流水号,
+ 组件完成状态: response.data[i].组件完成状态,
+ father: true,
+ children: []
+ })
+ }
+ }).then(() => {
+ this.option.map(firstLevel => {
+ // 根据分组查零件
+ selectParts(1, firstLevel.value, 0, 0).then(response => {
+ firstLevel.children = []
+ for (let j = 0; j < response.data.length; j++) {
+ firstLevel.children.push({
+ label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0自制：' + response.data[j].考核状态名称 : (response.data[j].零件类型 === 2 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0制造采购' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购：' + response.data[j].采购状态)),
+ value: response.data[j].工艺计划流水号,
+ 考核状态: response.data[j].考核状态,
+ 采购状态: response.data[j].采购状态,
+ 零件类型: response.data[j].零件类型,
+ father: false
+ })
+ }
+ })
+ })
+ }).then(() => {
+ this.departmentData = this.option
+ })
+ })
+ },
getMachine() {
this.MachineValue = ''
this.Machine = []
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index cca95312..8e73b630 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -86,7 +86,6 @@
-
@@ -291,7 +290,6 @@
-
@@ -511,7 +509,12 @@ export default {
},
methods: {
turnTo() {
- this.$router.push({ path: '/ManufacturingCenter/CompletionOfWorkshopComponents' })
+ this.$router.push({
+ path: '/ManufacturingCenter/CompletionOfWorkshopComponents',
+ query: {
+ 机床流水号: this.Machine
+ }
+ })
},
searchData() {
this.totalNum = 0