更新

src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue

@@ -32,7 +32,7 @@
             </el-select>
             <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
             <!--<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;loginsession()">session</el-button>-->
-            <el-button type="distribution" icon="el-icon-top" size="small" plain style="margin-left: 10px" @click="submit()">提交补投</el-button>
+            <el-button :disabled="handleEdit_disable || procedureGroup.length === 0" type="distribution" icon="el-icon-top" size="small" plain style="margin-left: 10px" @click="submit()">提交补投</el-button>
           </el-row>
         </el-card>
       </div>
@@ -42,7 +42,6 @@
         v-loading="loading"
         ref="multipleTable"
         :data="tableData"
-        :row-class-name="tableRowClassName"
         height="590"
         style="width: 1390px; margin: 3px 0"
         size="mini"
@@ -50,7 +49,12 @@
         highlight-current-row
         element-loading-text="拼命加载中"
         @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="45"/>
+        <el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
+        <el-table-column label="进程" align="center" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.进程 }}
+          </template>
+        </el-table-column>
         <el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -84,7 +88,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">
@@ -122,6 +126,11 @@
             {{ scope.row.报废时间 ? scope.row.报废时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
+        <el-table-column label="补投数" align="center" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.补投数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="补投时间" align="center" width="90">
           <template slot-scope="scope">
             {{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
@@ -214,9 +223,6 @@ export default {
         }
       })
     },
-    machineChange() {
-      this.searchTable()
-    },
     exportTable() {
       let check7, check8
       if (this.partName !== '' && this.partName !== null) {
@@ -293,14 +299,11 @@ export default {
         })
       })
     },
-    tableRowClassName({ row }) {
-      if (row.是否加急 === '1') {
-        return 'UrgentItem'
-      }
+    selectable(row) {
+      return row.报废时间 === null
     },
     handleSelectionChange(val) {
       this.procedureGroup = val
-      console.log(val, 123)
     },
     // 分页
     handleSizeChange(val) {