Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

zss

6 天以前 2bee81442387717d425ffde1dea3d2e9c4b7a00e

 src/views/productionManagement/productionOrder/components/MaterialSupplementDialog.vue

@@ -19,9 +19,15 @@
      <el-table-column label="计量单位"
                       prop="unit"
                       width="100" />
      <el-table-column label="需求数量"
                       prop="demandedQuantity"
                       width="100" />
      <el-table-column label="领用数量"
                       prop="pickQuantity"
                       width="100" />
      <el-table-column label="已补数量"
                       prop="feedingQty"
                       width="100" />
      <el-table-column label="补料数量"
                       min-width="150">
        <template #default="{ row }">