fix: 入库单位可选择

spring

7 天以前 5fffe75d01be84ad2de0b097f41428698384e218

 src/views/inventoryManagement/stockManagement/Subtract.vue

@@ -31,17 +31,90 @@
        </el-form-item>

        <el-form-item
            label="车牌号"
            prop="licensePlateNo"
            :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>
        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
          <el-select
              v-model="formState.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
          >
            <el-option label="吨" value="吨" />
            <el-option label="公斤" value="公斤" />
          </el-select>
        </el-form-item>
        <el-form-item
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
        >
          <el-input-number
              v-model="formState.grossWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeight"
          />
        </el-form-item>

        <el-form-item
            label="数量"
            prop="qualitity"
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
        >
          <el-input-number v-model="formState.qualitity" :step="1" :min="1" :max="maxQuality" style="width: 100%" />
          <el-input-number
              v-model="formState.tareWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeight"
          />
        </el-form-item>

        <el-form-item
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
        >
          <el-input-number
              v-model="formState.netWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              disabled
          />
        </el-form-item>

        <el-form-item
            label="过磅日期"
            prop="weighingDate"
            :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]"
        >
          <el-date-picker
              style="width: 100%"
              v-model="formState.weighingDate"
              value-format="YYYY-MM-DD HH:mm:ss"
              format="YYYY-MM-DD HH:mm:ss"
              type="datetime"
              placeholder="请选择过磅日期"
              clearable
          />
        </el-form-item>

        <el-form-item
            label="过磅员"
            prop="weighingOperator"
            :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]"
        >
          <el-input v-model="formState.weighingOperator" />
        </el-form-item>

        <el-form-item label="备注" prop="remark">
@@ -66,9 +139,10 @@
</template>

<script setup>
import {ref, computed, getCurrentInstance} from "vue";
import {ref, computed, getCurrentInstance, onMounted} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {subtractStockInventory} from "@/api/inventoryManagement/stockInventory.js";
import {subtractStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";

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

const emit = defineEmits(['update:visible', 'completed']);
@@ -87,15 +166,22 @@
  initFormData()
})

const maxQuality = computed(() => {
  return props.record.qualitity ? props.record.qualitity :  0;
const isRawMaterial = computed(() => {
  return props.record.parentName === '原材料';
})

const ledgerNetWeight = computed(() => {
  const n = Number(props.record?.netWeight ?? 0);
  return Number.isFinite(n) ? n : 0;
});

const initFormData = () => {
  if (props.record) {
    formState.value = {
      ...props.record,
    }
    // 初始化时也触发一次净重计算，避免接口回填后净重为空
    computeNetWeight()
  }
}

@@ -106,7 +192,13 @@
  productName: "",
  model: "",
  unit: "",
  qualitity: 0,
  // 过磅相关字段
  licensePlateNo: "",
  grossWeight: undefined,
  tareWeight: undefined,
  netWeight: undefined,
  weighingDate: undefined,
  weighingOperator: "",
  remark: '',
});

@@ -129,10 +221,42 @@
    productId: undefined,
    productModelId: undefined,
    productName: "",
    productModelName: "",
    description: '',
    model: "",
    unit: "",
    licensePlateNo: "",
    grossWeight: undefined,
    tareWeight: undefined,
    netWeight: undefined,
    weighingDate: undefined,
    weighingOperator: "",
    remark: '',
  };
  isShow.value = false;
};

// 净重 = 毛重 - 皮重
const computeNetWeight = () => {
  const { grossWeight, tareWeight } = formState.value;
  if (grossWeight != null && tareWeight != null) {
    const net = Number(grossWeight) - Number(tareWeight);
    const safeNet = Number(net.toFixed(2));
    const computedNet = safeNet > 0 ? safeNet : 0;
    const maxNet = ledgerNetWeight.value;
    if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
      const cappedNet = Number(maxNet.toFixed(2));
      formState.value.netWeight = cappedNet;
      // 同步毛重，保持：净重 = 毛重 - 皮重
      const tare = Number(tareWeight);
      if (Number.isFinite(tare)) {
        formState.value.grossWeight = Number((tare + cappedNet).toFixed(2));
      }
      proxy?.$modal?.msgWarning?.(`领用净重不能超过台账净重（${maxNet.toFixed(2)} 吨）`);
      return;
    }
    formState.value.netWeight = computedNet;
  } else {
    formState.value.netWeight = undefined;
  }
};

// 产品选择处理
@@ -163,13 +287,29 @@
        proxy.$modal.msgError("请选择规格");
        return;
      }
      subtractStockInventory(formState.value).then(res => {
        // 关闭模态框
        isShow.value = false;
        // 告知父组件已完成
        emit('completed');
        proxy.$modal.msgSuccess("提交成功");
      })
      const maxNet = ledgerNetWeight.value;
      const usedNet = Number(formState.value.netWeight ?? 0);
      if (Number.isFinite(maxNet) && maxNet > 0 && Number.isFinite(usedNet) && usedNet > maxNet) {
        proxy.$modal.msgError(`领用净重不能超过台账净重（${maxNet.toFixed(2)} 吨）`);
        return;
      }
      if (props.type === 'qualified') {
        subtractStockInventory(formState.value).then(res => {
          // 关闭模态框
          isShow.value = false;
          // 告知父组件已完成
          emit('completed');
          proxy.$modal.msgSuccess("提交成功");
        })
      } else {
        subtractStockUnInventory(formState.value).then(res => {
          // 关闭模态框
          isShow.value = false;
          // 告知父组件已完成
          emit('completed');
          proxy.$modal.msgSuccess("提交成功");
        })
      }
    }
  })
};