From d229e3f60f857a01715278f793fde4a354544234 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 12 Feb 2019 10:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/ProcessingStatus/index.vue | 9 +++++++--
 .../ManufacturingCenter/ProcessingStatusEdit/index.vue   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 420f993c..52ddebc1 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -456,14 +456,19 @@ export default {
           for (let i = 0; i < this.零件图号.length; i++) {
             getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], 1).then(response => {
               this.liushuihao = response.data[0].工艺计划流水号
-              console.log(response.data)
               for (let k = 0; k < response.data.length; k++) {
                 if (response.data[k].工艺计划流水号 === this.liushuihao) {
                   this.process[i][k] = response.data[k].工艺名称简称
                   this.planDate[i][k] = response.data[k].计划日期_短
                   this.realDate[i][k] = response.data[k].完成日期_短
+                  if (response.data[k].工艺编号 === 29) {
+                    response.data[k].员工姓名 = '备料'
+                  }
+                  if (response.data[k].工序间是否外协 === 2) {
+                    response.data[k].员工姓名 = '外协'
+                  }
                   if (response.data[k].员工姓名 === '超级管理员') {
-                    response.data[k].员工姓名 = '请选择'
+                    response.data[k].员工姓名 = '无'
                   }
                   this.worker[i][k] = response.data[k].员工姓名
                   if (response.data[k].工序状态 === 5) { // 灰色是已经完成 未入库
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index fc808831..58846b1c 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -561,6 +561,7 @@ export default {
             for (let i = 0; i < this.零件图号.length; i++) {
               getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i]).then(response => {
                 this.liushuihao = response.data[0].工艺计划流水号
+                console.log(response.data)
                 for (let k = 0; k < response.data.length; k++) {
                   if (response.data[k].工艺计划流水号 === this.liushuihao) {
                     this.kaoqinbianhao[i][k] = response.data[k].工作者考勤编号