更新

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -1,7 +1,7 @@
 <!--零件报废补投-->
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="width: 1360px">
       <el-row>
         <!--<el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:150px;margin-bottom: 3px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">-->
         <!--<el-option-->
@@ -10,34 +10,35 @@
         <!--:label="item.label"-->
         <!--:value="item.value"/>-->
         <!--</el-select>-->
-        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px;margin: 0px 10px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
+        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
           <el-option
             v-for="item in MachineDrawing"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="TeamValue" placeholder="请选择组号" style="width:150px; margin: 0px 10px" clearable size="small">
+        <el-select v-model="TeamValue" placeholder="请选择组号" style="width:150px;margin-left: 10px" clearable size="small">
           <el-option
             v-for="item in Team"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 150px; margin: 0px 10px" clearable/>
+        <el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 150px;margin-left: 10px" clearable/>
         <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="currentPage1=1; fetchTableData()">查询</el-button>
       </el-row>
     </el-card>
     <el-row>
       <el-col style="width: 850px">
-        <el-card style="width: 850px">
+        <el-card style="width: 845px">
           <el-table
             v-loading="loading"
             :data="tableData"
+            :row-class-name="tableRowClassName1"
             element-loading-text="拼命加载中"
             element-loading-spinner="el-icon-loading"
             element-loading-background="rgba(226,223,223,1)"
-            height="600"
+            height="520"
             highlight-current-row
             border
             stripe
@@ -47,7 +48,7 @@
               align="center"
               prop="零件图号"
               label="零件号"
-              width="150px"
+              width="173px"
               show-overflow-tooltip
             >
               <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
@@ -56,7 +57,7 @@
               align="center"
               prop="零件名称"
               label="零件名称"
-              width="140px"
+              width="129px"
               show-overflow-tooltip
             >
               <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
@@ -64,7 +65,16 @@
             <el-table-column
               align="center"
               prop="province4"
-              label="批次数量"
+              label="投产数量"
+              width="80px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.投产数量 }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="province4"
+              label="在产数量"
               width="80px"
               show-overflow-tooltip
             >
@@ -91,21 +101,12 @@
             <el-table-column
               align="center"
               prop="province5"
-              label="开始时间"
-              width="100px"
+              label="计划开始时间"
+              width="110px"
               show-overflow-tooltip
             >
               <template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              prop="province6"
-              label="结束时间"
-              width="100px"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
-            </el-table-column>
             <!--            <el-table-column-->
             <!--              align="center"-->
             <!--              prop="province7"-->
@@ -121,6 +122,7 @@
               align="center"
               label="操作"
               width="80px"
+              fixed="right"
             >
               <template slot-scope="scope" >
                 <el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="mini" @click="handleEdit(scope.row)">报废</el-button>
@@ -147,7 +149,7 @@
             element-loading-text="拼命加载中"
             element-loading-spinner="el-icon-loading"
             element-loading-background="rgba(226,223,223,1)"
-            height="600"
+            height="520"
             border
             style="width: 510px">
             <el-table-column
@@ -159,7 +161,7 @@
               <template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
             </el-table-column>
             <el-table-column
-              width="80px"
+              width="87px"
               prop="province2"
               label="工艺名称"
               align="center"
@@ -198,7 +200,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="scope.row.工序状态 === '4'"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
-                <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完成</div>
+                <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完</div>
               </template>
             </el-table-column>
           </el-table>
@@ -215,7 +217,7 @@
         </el-card>
       </el-col>
     </el-row>
-    <el-card>
+    <el-card style="width: 1360px">
       <div style="margin-top: 10px">报废后,补投的零件号后加B+报废次数</div>
       <!--<div style="margin-top: 10px; display: block">-->
       <!--<span>补投接着加工零件数量</span>-->
@@ -419,8 +421,8 @@ export default {
         this.spareNumber = row.报废数量
         this.inputC = 0
         this.SupplementationNumber = row.补投数量
+        this.inputC = row.报废数量 - row.补投数量
         this.CutCodeBefore = row.工艺计划流水号
-        console.log(this.CutCodeBefore, 222)
         TableDta2Select(row.工艺计划流水号, this.currentPage2, this.pageSize2).then(response => {
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
@@ -436,6 +438,12 @@ export default {
         })
       }
     },
+    tableRowClassName1({ row }) {
+      console.log(row)
+      if (parseInt(row.报废数量) > parseInt(row.补投数量)) {
+        return 'baofei'
+      }
+    },
     handleSizeChange1(val) {
       this.currentPage1 = 1
       this.pageSize1 = val
@@ -511,7 +519,7 @@ export default {
             this.$message.error('补投失败')
           }
         })
-      } else { this.$message.warning('请选择停产零件') }
+      } else { this.$message.warning('请选择报废零件') }
     },
     editB() {
       if (this.spareNumber - this.SupplementationNumber > 0) {
@@ -528,7 +536,7 @@ export default {
         } else {
           this.$message.warning('补投数量不能为零')
         }
-      } else { alert('请选择停产零件') }
+      } else { alert('请选择报废零件') }
     },
     goToCapacityBalance() {
       this.$router.push({ path: '/ProductionCapacityBalance/index' })
@@ -557,3 +565,8 @@ export default {
     width:200px;
   }
 </style>
+<style>
+  .el-table .baofei{
+    background: #FF9797;
+  }
+</style>