From 7cef1872216f87b574e387d342a7ba3ad65a1b6b Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 1 Apr 2020 15:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=8A=A5=E5=BA=9F=E8=A1=A5?=
 =?UTF-8?q?=E6=8A=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/SparePartsForScrap.js   |  4 ++--
 .../SparePartsForScrap/index.vue                    | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/api/ManufacturingCenter/SparePartsForScrap.js b/src/api/ManufacturingCenter/SparePartsForScrap.js
index 9736b9a3..459ceaef 100644
--- a/src/api/ManufacturingCenter/SparePartsForScrap.js
+++ b/src/api/ManufacturingCenter/SparePartsForScrap.js
@@ -64,7 +64,7 @@ export function editTime(CutCode, StartTime, FinishTime) {
     }
   })
 }
-export function editSpare(CutCode, number, reason, time) {
+export function editSpare(CutCode, number, reason, time, id) {
   return request({
     url: '',
     method: 'post',
@@ -73,7 +73,7 @@ export function editSpare(CutCode, number, reason, time) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理工艺_零件工艺计划_报废零件_增加数据',
-      param: '工艺计划流水号=' + CutCode + '&报废数量=' + number + '&报废原因=' + reason + '&报废时间=' + time
+      param: '工艺计划流水号=' + CutCode + '&报废数量=' + number + '&报废原因=' + reason + '&报废时间=' + time + '&报废人=' + id
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index 98f6e88c..941e7c47 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -319,6 +319,7 @@
 
 <script>
 import { MachineDrawingSelect, TeamSelect, TableDataSelect, editSpare, TableDta2Select, editA } from '@/api/ManufacturingCenter/SparePartsForScrap'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -387,6 +388,14 @@ export default {
       inputD: 1
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
   created() {
     this.fetchMachineDrawingData()
     this.fetchTableData()
@@ -489,11 +498,11 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.form2.报废数量 > 0) {
-            editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间).then(response => {
+            editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间, this.id).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('报废成功')
                 this.dialogeditVisible = false
-                this.tableData[this.index].报废数量 = this.tableData[this.index].报废数量 + this.form2.报废数量
+                this.tableData[this.index].报废数量 = parseInt(this.tableData[this.index].报废数量) + parseInt(this.form2.报废数量)
                 this.tableData[this.index].批次数量 = this.tableData[this.index].批次数量 - this.form2.报废数量
                 if (this.tableData[this.index].批次数量 === 0) {
                   this.tableData[this.index].批次零件状态 = '2'