合并代码

gaoluyang

10 小时以前 07f9f8657d057a38792c3822acc9b08d83478967

 src/views/inventoryManagement/stockManagement/Subtract.vue

@@ -38,6 +38,23 @@
        </el-form-item>

        <el-form-item
            label="库存类型"
            prop="type"
            :rules="[
                {
                required: true,
                message: '请选择库存类型',
                trigger: 'change',
              }
            ]"
        >
          <el-select v-model="formState.type" placeholder="请选择库存类型" @change="handleTypeChange">
            <el-option label="合格库存" value="qualified" :disabled="(props.record.qualifiedUnLockedQuantity || 0) + (props.record.qualifiedPendingOutQuantity || 0) <= 0" />
            <el-option label="不合格库存" value="unqualified" :disabled="(props.record.unQualifiedUnLockedQuantity || 0) + (props.record.unQualifiedPendingOutQuantity || 0) <= 0" />
          </el-select>
        </el-form-item>

        <el-form-item
            label="数量"
            prop="qualitity"
        >
@@ -68,8 +85,8 @@
<script setup>
import {ref, computed, getCurrentInstance} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {subtractStockInventory} from "@/api/inventoryManagement/stockInventory.js";
import {subtractStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
import {addStockOutRecordOnly} from "@/api/inventoryManagement/stockInventory.js";
import {addUnqualifiedStockOutRecordOnly} from "@/api/inventoryManagement/stockUninventory.js";

const props = defineProps({
  visible: {
@@ -79,12 +96,7 @@
  record: {
    type: Object,
    default: () => {},
  },
  type: {
    type: String,
    required: true,
    default: 'qualified',
  },
  }
});

const emit = defineEmits(['update:visible', 'completed']);
@@ -94,8 +106,17 @@
})

const maxQuality = computed(() => {
  return props.record.unLockedQuantity ? props.record.unLockedQuantity :  0;
  if (formState.value.type === 'qualified') {
    // 合格可出 = 未冻结量 + 待审核出库量（即已申请但尚未审批的数量）
    return Math.max(1, Number(props.record.qualifiedUnLockedQuantity || 0) + Number(props.record.qualifiedPendingOutQuantity || 0));
  } else {
    return Math.max(1, Number(props.record.unQualifiedUnLockedQuantity || 0) + Number(props.record.unQualifiedPendingOutQuantity || 0));
  }
})

const handleTypeChange = () => {
  formState.value.qualitity = undefined;
}

const initFormData = () => {
  if (props.record) {
@@ -145,7 +166,6 @@
const handleProductSelect = async (products) => {
  if (products && products.length > 0) {
    const product = products[0];
    console.log(product)
    formState.value.productId = product.productId;
    formState.value.productName = product.productName;
    formState.value.productModelName = product.model;
@@ -169,8 +189,8 @@
        proxy.$modal.msgError("请选择规格");
        return;
      }
      if (props.type === 'qualified') {
        subtractStockInventory(formState.value).then(res => {
      if (formState.value.type === 'qualified') {
        addStockOutRecordOnly(formState.value).then(res => {
          // 关闭模态框
          isShow.value = false;
          // 告知父组件已完成
@@ -178,7 +198,7 @@
          proxy.$modal.msgSuccess("提交成功");
        })
      } else {
        subtractStockUnInventory(formState.value).then(res => {
        addUnqualifiedStockOutRecordOnly(formState.value).then(res => {
          // 关闭模态框
          isShow.value = false;
          // 告知父组件已完成
@@ -196,4 +216,4 @@
  handleSubmit,
  isShow,
});
</script>
</script>