fix:1.耗材选择产品优化

liding

2026-03-27 04ecdbfb7be63ca4a3d49d3575847e728e3e9ae7

 src/views/inventoryManagement/stockManagement/Subtract.vue

@@ -30,80 +30,115 @@
          <el-input v-model="formState.model"  disabled />
        </el-form-item>

        <!-- 非原材料显示数量字段 -->
        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>

        <el-form-item
            label="车牌号"
            prop="licensePlateNo"
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>

        <el-form-item
            label="毛重(吨)"
            prop="grossWeight"
            v-if="props.record.productType !== 0"
            label="数量"
            prop="qualitity"
            :rules="[
              { required: true, message: '请输入数量', trigger: ['blur', 'change'] }
            ]"
        >
          <el-input-number
              v-model="formState.grossWeight"
              :step="0.01"
              v-model="formState.qualitity"
              :min="0"
              :step="1"
              :precision="0"
              style="width: 100%"
              @change="computeNetWeight"
              controls-position="right"
              placeholder="请输入数量"
          />
        </el-form-item>

        <el-form-item
            label="皮重(吨)"
            prop="tareWeight"
        >
          <el-input-number
              v-model="formState.tareWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeight"
          />
        </el-form-item>
        <!-- 原材料显示过磅相关字段 -->
        <template v-if="props.record.productType === 0">
          <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-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="netWeight"
        >
          <el-input-number
              v-model="formState.netWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              disabled
          />
        </el-form-item>
          <el-form-item
              label="皮重"
              prop="tareWeight"
              :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
          >
            <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="weighingDate"
        >
          <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="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="weighingOperator"
        >
          <el-input v-model="formState.weighingOperator" />
        </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>
        </template>

        <el-form-item label="备注" prop="remark">
          <el-input v-model="formState.remark" type="textarea" />
@@ -168,6 +203,8 @@
    formState.value = {
      ...props.record,
    }
    // 初始化时也触发一次净重计算，避免接口回填后净重为空
    computeNetWeight()
  }
}

@@ -229,7 +266,13 @@
    const computedNet = safeNet > 0 ? safeNet : 0;
    const maxNet = ledgerNetWeight.value;
    if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
      formState.value.netWeight = Number(maxNet.toFixed(2));
      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;
    }