Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/product/workbench/workReport-feed.vue

@@ -35,13 +35,13 @@
    >
      <el-table-column label="报工单号" prop="productNo" align="center">
      </el-table-column>
      <el-table-column
      <!-- <el-table-column
        label="序列号"
        prop="partBatchNo"
        align="center"
        :show-overflow-tooltip="true"
      >
      </el-table-column>
      </el-table-column> -->
      <el-table-column
        label="零件编号"
        prop="partNo"
@@ -306,6 +306,7 @@
                // currRow.id = data.data
                // 刷新投料信息
                this.$emit('refreshFeedsForDel')
                this.$emit('refreshTable')
              } else {
                this.$message.error('添加投入失败')
              }