Merge remote-tracking branch 'origin/master'

86134

2023-11-11 4652431ce329b4dec6c4dcc0758d5c4ff97e0666

 src/views/product/workbench/returnmaterial-form.vue

@@ -32,18 +32,18 @@
          >
          </el-table-column>
          <el-table-column
            prop="partBatchNo"
            prop="ifsBatchNo"
            header-align="center"
            align="center"
            label="零件批号"
            label="批号"
          >
          </el-table-column>
          <el-table-column
          <!-- <el-table-column
            prop="specs"
            header-align="center"
            align="center"
            label="规格型号"
          >
          > -->
          </el-table-column>
          <el-table-column
            prop="returnQuantity"
@@ -162,6 +162,8 @@
        feed.returnQuantity = this.dataList[i].returnQuantity
        feed.returnLocationId = this.dataList[i].returnLocationId
        feed.workstationId = this.workstationId
            feed.ifsWdr = this.dataList[i].ifsWdr
            feed.partNo = this.dataList[i].partNo
        feeds.push(feed)
      }
      if (feeds.length > 0) {