fix: 修改3.22客户提出的修改需求

spring

9 天以前 b9b69ab04e9f10550c57d31e5017e482c7c96c39

 src/views/consumablesLogistics/stockManagement/New.vue

@@ -37,85 +37,30 @@
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>

        <!-- productType === 0：原材料 -->
        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="车牌号"
            prop="licensePlateNo"
            :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>

        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="毛重(吨)"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
            v-if="type === 'qualified'"
            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
            v-if="type === 'qualified' && formState.productType === 0"
            label="皮重(吨)"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
            v-if="type === 'qualified'"
            label="采购员"
            prop="purchaser"
            :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
            v-if="type === 'qualified' && formState.productType === 0"
            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
            v-if="type === 'qualified' && formState.productType === 0"
            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
            v-if="type === 'qualified' && formState.productType === 0"
            label="过磅员"
            prop="weighingOperator"
            :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]"
        >
          <el-input v-model="formState.weighingOperator" />
          <el-input v-model="formState.purchaser" placeholder="请输入采购员" />
        </el-form-item>

        <el-form-item label="备注" prop="remark">
@@ -169,13 +114,8 @@
  productModelName: "",
  unit: "",
  productType: undefined,
  // 过磅相关字段（仅原材料合格品使用）
  licensePlateNo: "",
  grossWeight: undefined,
  tareWeight: undefined,
  netWeight: undefined,
  weighingDate: undefined,
  weighingOperator: "",
  qualitity: undefined,
  purchaser: "",
  remark: '',
});

@@ -193,23 +133,24 @@
let { proxy } = getCurrentInstance()

const closeModal = () => {
  // 重置表单数据
  formState.value = {
    productId: undefined,
    productModelId: undefined,
    productName: "",
    productModelName: "",
    description: '',
    unit: "",
    productType: undefined,
    qualitity: undefined,
    purchaser: "",
    remark: '',
  };
  isShow.value = false;
};

// 产品选择处理
const handleProductSelect = async (products) => {
  formState.value.weighingDate = undefined;
  formState.value.grossWeight = undefined;
  formState.value.tareWeight = undefined;
  formState.value.netWeight = undefined;
  formState.value.qualitity = undefined;
  formState.value.purchaser = "";
  if (products && products.length > 0) {
    const product = products[0];
    formState.value.productId = product.productId;
@@ -221,19 +162,6 @@
    showProductSelectDialog.value = false;
    // 触发表单验证更新
    proxy.$refs["formRef"]?.validateField('productModelId');
  }
};

// 净重 = 毛重 - 皮重
const computeNetWeight = () => {
  const { grossWeight, tareWeight } = formState.value;
  if (grossWeight != null && tareWeight != null) {
    const net = Number(grossWeight) - Number(tareWeight);
    // 保留两位小数，且不为负
    const safeNet = Number(net.toFixed(2));
    formState.value.netWeight = safeNet > 0 ? safeNet : 0;
  } else {
    formState.value.netWeight = undefined;
  }
};