Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

yuan

6 小时以前 fc98ee331338c9db4deff3bba7ba3258412f9c23

Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

 src/views/productionManagement/workOrder/index.vue

@@ -208,12 +208,13 @@
        </el-form-item>
        <el-form-item label="检品数量"
                      prop="inspectedQuantity">
          <el-input-number v-model.number="reportForm.inspectedQuantity"
                    :min="0"
                    :step="1"
          <el-input v-model.number="reportForm.inspectedQuantity"
                    type="number"
                    min="0"
                    step="1"
                    style="width: 300px"
                    controls-position="right"
                    placeholder="请输入检品数量"/>
                    placeholder="请输入检品数量"
                    @input="handleInspectedQuantity"/>
        </el-form-item>
        <el-form-item label="班组信息">
          <el-select v-model="reportForm.userId"
@@ -553,6 +554,26 @@
    }
    reportForm.scrapQty = num;
  };

  const handleInspectedQuantity = value => {
    if (value === "" || value === null || value === undefined) {
      reportForm.inspectedQuantity = null;
      return;
    }
    const num = Number(value);
    if (isNaN(num)) {
      return;
    }
    if (num < 0) {
      reportForm.inspectedQuantity = null;
      return;
    }
    if (!Number.isInteger(num)) {
      reportForm.inspectedQuantity = Math.floor(num);
      return;
    }
    reportForm.inspectedQuantity = num;
  };
  const currentReportRowData = ref(null);
  const page = reactive({
    current: 1,
@@ -774,12 +795,12 @@
        return;
      }

      if (quantity > reportForm.planQuantity) {
        ElMessageBox.alert("本次生产数量不能超过待生产数量", "提示", {
          confirmButtonText: "确定",
        });
        return;
      }
      // if (quantity > reportForm.planQuantity) {
      //   ElMessageBox.alert("本次生产数量不能超过待生产数量", "提示", {
      //     confirmButtonText: "确定",
      //   });
      //   return;
      // }

      const submitData = {
        ...reportForm,

 src/views/qualityManagement/finalInspection/index.vue

@@ -109,6 +109,18 @@
    prop: "productName",
  },
  {
    label: "批号",
    prop: "batchNo",
  },
  {
    label: "检品数量",
    prop: "inspectedQuantity",
  },
  {
    label: "请检部门",
    prop: "manufacturingTeam",
  },
  {
    label: "规格型号",
    prop: "model",
  },