新疆-融邦环保 1.仓储物流出入库过磅数据计算逻辑修改

gaoluyang

5 天以前 bf5de0a08c20ff1d96bc166bf1c10596620a5793

新疆-融邦环保
1.仓储物流出入库过磅数据计算逻辑修改

 src/views/inventoryManagement/stockManagement/OilStockInDialog.vue

@@ -157,23 +157,6 @@
                        placeholder="--" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="原出厂数量(吨)"
                          prop="originalQuantity"
                          :rules="[
                {
                required: true,
                message: '请输入原出厂数量',
                trigger: 'change',
              }
            ]">
              <el-input-number v-model="formState.originalQuantity"
                               :precision="2"
                               :step="1"
                               :min="0"
                               style="width: 100%" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="8">
@@ -335,7 +318,7 @@
        </el-row>
        <div class="form-section-title">卸油操作信息</div>
        <el-row :gutter="30">
          <el-col :span="8">
          <el-col :span="12">
            <el-form-item label="车体/铅封检验是否正常"
                          prop="tankInspectionStatus"
                          :rules="[{ required: true, message: '请选择车体/铅封检验是否正常', trigger: 'change' }]">
@@ -345,7 +328,7 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col :span="8">
          <el-col :span="12">
            <el-form-item label="卸车鹤位"
                          prop="unloadingCranePosition"
                          :rules="[{ required: true, message: '请选择卸车鹤位', trigger: 'change' }]">
@@ -362,18 +345,6 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="密度"
                          prop="density"
                          :rules="[
                { required: true, message: '请输入密度', trigger: 'blur' },
                { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
              ]">
              <el-input v-model="formState.density"
                        placeholder="请输入数字，最多保留两位小数"
                        clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="24">
@@ -386,6 +357,37 @@
          </el-col>
        </el-row>
        <div class="form-section-title">过磅数据</div>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="原出厂数量(吨)"
                          prop="originalQuantity"
                          :rules="[
                {
                required: true,
                message: '请输入原出厂数量',
                trigger: 'change',
              }
            ]">
              <el-input-number v-model="formState.originalQuantity"
                               :precision="2"
                               :step="1"
                               :min="0"
                               style="width: 100%" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="密度"
                          prop="density"
                          :rules="[{ required: true, message: '请输入密度', trigger: 'blur' }]">
              <el-input-number v-model="formState.density"
                               :min="0"
                               :precision="3"
                               :controls="false"
                               placeholder="请输入数字，最多保留三位小数"
                               style="width: 100%" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="毛重(吨)"
@@ -533,21 +535,22 @@
    return Number((Number(g) - Number(t)).toFixed(2));
  });

  // 亏量(吨) = 净重的负数，保留两位小数
  // 亏量(吨) = 净重 − 原出厂数量，保留两位小数
  const lossQuantity = computed(() => {
    if (netWeight.value === null) {
    const origin = formState.value.originalQuantity;
    if (netWeight.value === null || origin === null || origin === undefined || origin === "") {
      return null;
    }
    return Number((-netWeight.value).toFixed(2));
    return Number((netWeight.value - Number(origin)).toFixed(2));
  });

  // 实际入库体积(升) = 实际净重(kg) ÷ 密度(kg/L)，净重吨 × 1000 转 kg
  // 实际入库体积(升) = 净重(吨) × 密度，保留两位小数
  const actualVolume = computed(() => {
    const d = formState.value.density;
    if (netWeight.value === null || d === null || d === undefined || d === "" || Number(d) <= 0) {
    if (netWeight.value === null || d === null || d === undefined || d === "") {
      return 0;
    }
    return Math.round(((netWeight.value * 1000) / Number(d)) * 100) / 100;
    return Number((netWeight.value * Number(d)).toFixed(2));
  });

  const showProductSelectDialog = ref(false);