Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-m...

huminmin

2026-03-19 f92e790af99264551dd13cfa10abd1f833ee8429

 src/views/inventoryManagement/stockManagement/New.vue

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

        <!-- 半成品：允许手动填写数量入库 -->
        <el-form-item
            v-if="type === 'qualified' && (formState.parentName === '半成品' || formState.parentName === '成品' || formState.productType === 1)"
            label="数量"
            prop="qualitity"
            :rules="[
              { required: true, message: '请输入数量', trigger: ['blur', 'change'] }
            ]"
        >
          <el-input-number v-model="formState.qualitity" :step="1" :min="0" style="width: 100%" />
          <el-input-number
              v-model="formState.qualitity"
              :min="0"
              :step="1"
              :precision="0"
              style="width: 100%"
              controls-position="right"
              placeholder="请输入数量"
          />
        </el-form-item>

        <!-- productType === 0：原材料 -->
        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="车牌号"
            prop="licensePlateNo"
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>

        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="毛重(吨)"
            prop="grossWeight"
        >
          <el-input-number
              v-model="formState.grossWeight"
              :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="tareWeight"
        >
          <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"
        >
          <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"
        >
          <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"
        >
          <el-input v-model="formState.weighingOperator" />
        </el-form-item>

        <el-form-item label="备注" prop="remark">
@@ -52,6 +140,7 @@
      <!-- 产品选择弹窗 -->
      <ProductSelectDialog
          v-model="showProductSelectDialog"
          :excludeParentNames="['耗材']"
          @confirm="handleProductSelect"
          single
      />
@@ -93,7 +182,17 @@
  productName: "",
  productModelName: "",
  unit: "",
  qualitity: 0,
  productType: undefined,
  parentName: "",
  // 库存数量（半成品合格入库可手动填写）
  qualitity: undefined,
  // 过磅相关字段（仅原材料合格品使用）
  licensePlateNo: "",
  grossWeight: undefined,
  tareWeight: undefined,
  netWeight: undefined,
  weighingDate: undefined,
  weighingOperator: "",
  remark: '',
});

@@ -117,13 +216,28 @@
    productModelId: undefined,
    productName: "",
    productModelName: "",
    description: '',
    unit: "",
    productType: undefined,
    parentName: "",
    qualitity: undefined,
    licensePlateNo: "",
    grossWeight: undefined,
    tareWeight: undefined,
    netWeight: undefined,
    weighingDate: undefined,
    weighingOperator: "",
    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;
  if (products && products.length > 0) {
    const product = products[0];
    formState.value.productId = product.productId;
@@ -131,12 +245,27 @@
    formState.value.productModelName = product.model;
    formState.value.productModelId = product.id;
    formState.value.unit = product.unit;
    formState.value.productType = product.productType;
    formState.value.parentName = product.parentName || "";
    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;
  }
};

const handleSubmit = () => {
  proxy.$refs["formRef"].validate(valid => {
    if (valid) {