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] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E8=A1=A5=E6=8A=95=E9=87=91?=
 =?UTF-8?q?=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 @@
             </el-table-column>
             <el-table-column align="center" label="操作者" width="70" show-overflow-tooltip="">
               <template slot-scope="scope">
-                <!--{{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}-->
                 {{ scope.row.工序间是否外协 === 2 ? '外协' : (scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名) }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="数量" show-overflow-tooltip min-width="50">
               <template slot-scope="scope">
-                {{ scope.row.投产数量 }}
+                {{ scope.row.投产数 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="质检数" show-overflow-tooltip min-width="65">
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 @@
             </el-table-column>
             <el-table-column align="center" label="投产数" width="70">
               <template slot-scope="scope">
-                {{ scope.row.投产数量 }}
+                {{ scope.row.总投产数 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="质检数" width="70">
@@ -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 @@
         </el-table-column>
         <el-table-column label="批次投产数" align="center" width="100">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.投产数 }}
           </template>
         </el-table-column>
         <el-table-column label="投产时间" align="center" width="100" show-overflow-tooltip>
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 @@
         </el-table-column>
         <el-table-column label="加工数" align="center">
           <template slot-scope="scope">
-            {{ scope.row.投产数量 }}
+            {{ scope.row.投产数 }}
           </template>
         </el-table-column>
         <el-table-column label="质检数量" align="center">
@@ -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