+
@@ -54,6 +56,11 @@
{{ scope.row.零件名称 }}
+
+
+ {{ scope.row.入库时间 }}
+
+
{{ scope.row.出库数量1 }}
@@ -69,16 +76,6 @@
-
-
-
-
-
-
-
-
-
-
共{{ totalnumber }}条信息，选择{{ gouxuan }}条
@@ -95,7 +92,6 @@
-
diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue
index 3ea32627..51b405e6 100644
--- a/src/views/WorkshopProcurement/FundApproval2/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval2/index.vue
@@ -62,10 +62,10 @@
- 查看详情
+ 查看详情
- 通过
- 不通过
+ 通过
+ 不通过
From b4fa8eba966fc742a0e0f6e79ec88463ec0c0d6e Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 20 May 2020 15:36:13 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E8=A1=A5=E6=8A=95?=
=?UTF-8?q?=E9=87=91=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompletionOfWorkshopComponents/index.vue | 3 +--
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue | 5 +++--
src/views/ManufacturingCenter/ProductionPlanQuery/index.vue | 2 +-
.../ScrappedSupplementaryInvestment/index.vue | 3 +--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index aafc820d..e67dbe36 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -30,13 +30,12 @@
-
{{ scope.row.工序间是否外协 === 2 ? '外协' : (scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名) }}
- {{ scope.row.投产数量 }}
+ {{ scope.row.投产数 }}
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index d754ce4b..31f28ca2 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -94,7 +94,7 @@
- {{ scope.row.投产数量 }}
+ {{ scope.row.总投产数 }}
@@ -409,7 +409,6 @@ 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].工序顺序,
@@ -551,6 +550,8 @@ export default {
}
this.Group = response.data[0].组件流水号
})
+ this.pageCurrent = 1
+ this.pageSize = 100
this.getTableData()
},
// 按条件查询
diff --git a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
index ac2a1bf7..034742c7 100644
--- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
@@ -70,7 +70,7 @@
- {{ scope.row.批次数量 }}
+ {{ scope.row.投产数 }}
diff --git a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
index fe6d0c2e..59e1c3fa 100644
--- a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
+++ b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
@@ -86,7 +86,7 @@
- {{ scope.row.投产数量 }}
+ {{ scope.row.投产数 }}
@@ -276,7 +276,6 @@ export default {
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
this.ProcessingResultValue ? check10 = 1 : check10 = 0
searchtable(check, this.machineNameValue, check1, this.partName, check7, this.outTime[0], this.outTime[1], check10, this.ProcessingResultValue, this.pageCurrent, this.pageSize).then(response => {
- console.log(response.data, 123)
this.tableData = response.data.result
this.totalnumber = this.tableData.length
this.loading = false
From a1d19c9fc8bc32bb083321c72a4f71ed71ab1519 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 20 May 2020 15:55:16 +0800
Subject: [PATCH 10/12] a
---
src/views/ManufacturingCenter/GroupMatching/index.vue | 11 +----------
src/views/ManufacturingCenter/StatusQuery/index.vue | 2 +-
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 0bdf62c6..cca95312 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -27,7 +27,6 @@
-
@@ -41,7 +40,7 @@
- {{ scope.row.投产数量 }}
+ {{ scope.row.投产数 }}
@@ -536,14 +535,6 @@ export default {
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
- // searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
- // console.log(response.data, 123243)
- // for (let i = 0; i < response.data.length; i++) {
- // if (response.data[i].入库时间 !== null) {
- // this.totalNum += 1
- // }
- // }
- // })
searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
this.tableData1 = response.data.rows
this.total5 = parseInt(response.data.total)
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index b08916ef..53ba9053 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -52,7 +52,7 @@
- {{ scope.row.批次数量 }}
+ {{ scope.row.投产数 }}
From 4635bb93a90cfa1f1bd5ae651a4e5365961d8711 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 20 May 2020 16:21:13 +0800
Subject: [PATCH 11/12] a
---
.../index.vue | 61 +------------------
1 file changed, 2 insertions(+), 59 deletions(-)
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 5a42429e..02bf0b95 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -27,7 +27,6 @@
:label="item.label"
:value="item.value"/>
-
-
-
- {{ scope.row.批次数量 }}
+ {{ scope.row.投产数 }}
@@ -446,7 +443,7 @@
- {{ scope.row.批次数量 }}
+ {{ scope.row.投产数 }}
@@ -770,8 +767,6 @@ export default {
'id' // 人员编号
])
},
- created() {
- },
mounted() {
this.initProject()
this.QualityType()
@@ -782,7 +777,6 @@ export default {
// 表内编辑取消
cancel(row) {
row.edit = !row.edit
- console.log(row, 8888)
row.备注 = row.备注_原
row.不合格数量 = row.不合格数量_原
row.是否合格 = row.是否合格_原
@@ -792,7 +786,6 @@ export default {
},
// 表内编辑确定
confirmEdit(row) {
- console.log(this.$store.state.user.id, 787878)
confirmEdit(row.质检流水号, row.质检类型代码, row.零部件流水号, row.是否合格, row.数量, row.不合格数量, row.不合格原因, row.处理结果, row.备注, this.$store.state.user.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
@@ -805,8 +798,6 @@ export default {
},
// 删除质检
deleterow(row) {
- // this.plan = row.计划流水号
- console.log(row, 4545)
this.$confirm('是否删除该质检记录?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -949,31 +940,6 @@ export default {
var Data = this.CreateData('2001', '报表_质检管理_质量情况_查询数据', param)
this.exportExcel_NPOI(Data)
},
- // exportExcel1() {
- // if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
- // if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
- // if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
- // if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
- // if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
- // if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
- // if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
- // if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
- // selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum).then(response => {
- // import('@/vendor/Export2Excel').then(excel => {
- // const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注']
- // const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
- // const list = response.data
- // const data = this.formatJson(filterVal, list)
- // excel.export_json_to_excel({
- // header: tHeader,
- // data,
- // filename: '质检情况表',
- // autoWidth: true,
- // bookType: 'xlsx'
- // })
- // })
- // })
- // },
fetchData() {
searchData().then(response => {
this.tableData10 = response.data
@@ -982,7 +948,6 @@ export default {
},
fetchData1() {
searchData1().then(response => {
- console.log(response)
this.tableData20 = response.data
this.total2 = response.data.total
})
@@ -1070,7 +1035,6 @@ export default {
searchTableDetail(type, num).then(response => {
this.gridData = response.data
})
- console.log(type)
},
selecttable() {
this.loading = true
@@ -1094,7 +1058,6 @@ export default {
this.$set(v, '不合格原因文本_原', v.不合格原因文本)
this.$set(v, '不合格处理文本_原', v.不合格处理文本)
})
- console.log(this.tableData1, 8979)
this.loading = false
this.total = parseInt(response.data.output[0].ItemCount)
})
@@ -1103,10 +1066,8 @@ export default {
this.dialogFormVisible = true
this.urls = []
searchPic(row.质检流水号).then(response => {
- // this.URL = readFile + response.data[0].文件标识 + '.' + response.data[0].文件后缀
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].文件内容 !== null) {
- // this.urls.push(readFile + response.data[i].文件标识 + '.' + response.data[i].文件后缀)
this.urls.push('data:image/png;base64,' + response.data[i].文件内容)
}
}
@@ -1130,24 +1091,6 @@ export default {
this.pageCurrent = val
this.selecttable()
}
- // handleSizeChange1(val) {
- // this.pageCurrent1 = 1
- // this.pageSize1 = val
- // this.fetchData()
- // },
- // handleCurrentChange1(val) {
- // this.pageCurrent1 = val
- // this.fetchData()
- // },
- // handleSizeChange2(val) {
- // this.pageCurrent2 = 1
- // this.pageSize2 = val
- // this.fetchData1()
- // },
- // handleCurrentChange2(val) {
- // this.pageCurrent2 = val
- // this.fetchData1()
- // }
}
}
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 12/12] =?UTF-8?q?=E6=88=90=E7=BB=84=E9=85=8D=E5=A5=97?=
=?UTF-8?q?=E6=9F=A5=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