From aafbfae868cdf1e18de0fb4ff3527bd49f95eeee Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Wed, 4 Mar 2020 17:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessingStatusNew/index.vue                    |  7 ++++++-
 .../ManufacturingCenter/SparePartsForScrap/index.vue |  1 -
 .../OutsourcingPaymentPlanManagement/index.vue       | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index ea0a7946..9b6ac9c5 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -90,11 +90,16 @@
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="计划数" width="70">
+            <el-table-column align="center" label="投产数" width="70">
               <template slot-scope="scope">
                 {{ scope.row.投产数量 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="报废数" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.报废数量 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="加工完成" width="100">
               <template slot-scope="scope">
                 {{ scope.row.机加工实际完成时间 }}
diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index cf85a7f3..7f91e8ea 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -41,7 +41,6 @@
             height="520"
             highlight-current-row
             border
-            stripe
             style="width: 850px; text-align: center"
             @current-change="fetchTableData2">
             <el-table-column
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index b637e299..9a715fa3 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -68,8 +68,8 @@
           </el-table-column>
           <el-table-column align="center" label="操作" fixed="right" width="200px">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" icon="el-icon-edit" @click="ChangeOpen1(scope.row)">编辑</el-button>
-              <el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete1(scope.row)">删除</el-button>
+              <el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen1(scope.row)">编辑</el-button>
+              <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete1(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -103,8 +103,8 @@
           </el-table-column>
           <el-table-column align="center" label="操作" fixed="right" width="200px">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" icon="el-icon-edit" @click="ChangeOpen2(scope.row)">编辑</el-button>
-              <el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete2(scope.row)">删除</el-button>
+              <el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen2(scope.row)">编辑</el-button>
+              <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete2(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -131,7 +131,7 @@
         </el-row>
         <el-row>
           <el-form-item label="开票金额(元)" prop="开票金额">
-            <el-input v-model="form1.开票金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
+            <el-input v-positive="'float'" v-model="form1.开票金额" placeholder="开票金额" type="float" style="width:200px" clearable size="small"/>
           </el-form-item>
         </el-row>
         <el-row>
@@ -158,7 +158,7 @@
       <el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
         <el-row>
           <el-form-item label="付款金额(元)" prop="付款金额">
-            <el-input v-model="form2.付款金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
+            <el-input v-positive="'float'" v-model="form2.付款金额" placeholder="付款金额" type="float" style="width:200px" clearable size="small"/>
           </el-form-item>
         </el-row>
         <el-row>