Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

heshaofeng

2025-12-29 266e4bf654c55ce2f7e9271048e4625f1b8b49f6

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/outbound/printForm.vue

@@ -32,25 +32,25 @@
              />
            </el-form-item>

            <el-form-item label="规格" prop="specification">
            <el-form-item label="规格" prop="materialSpec">
              <el-input
                v-model="printForm.specification"
                v-model="printForm.materialSpec"
                placeholder="请输入物料规格"
                clearable
              />
            </el-form-item>

            <el-form-item label="批号" prop="batchNumber">
            <el-form-item label="批号" prop="barcode">
              <el-input
                v-model="printForm.batchNumber"
                v-model="printForm.barcode"
                placeholder="请输入批号（生成二维码用）"
                clearable
              />
            </el-form-item>

            <el-form-item label="厂区" prop="factory">
            <el-form-item label="厂区" prop="factoryArea">
              <el-input
                v-model="printForm.factory"
                v-model="printForm.factoryArea"
                placeholder="请输入厂区名称"
                clearable
              />
@@ -59,33 +59,33 @@

          <!-- ç¬¬äºŒåˆ— -->
          <el-col :span="12">
            <el-form-item label="供应商编码" prop="supplierCode">
            <el-form-item label="供应商编码" prop="suplierCode">
              <el-input
                v-model="printForm.supplierCode"
                v-model="printForm.suplierCode"
                placeholder="请输入供应商编码"
                clearable
              />
            </el-form-item>

            <el-form-item label="采购单号" prop="purchaseOrderNo">
            <el-form-item label="采购单号" prop="pruchaseOrderNo">
              <el-input
                v-model="printForm.purchaseOrderNo"
                v-model="printForm.pruchaseOrderNo"
                placeholder="请输入采购单号"
                clearable
              />
            </el-form-item>

            <el-form-item label="数量/总数" prop="quantityTotal">
            <el-form-item label="数量/总数" prop="quantity">
              <el-input
                v-model="printForm.quantityTotal"
                v-model="printForm.quantity"
                placeholder="例：100/5000"
                clearable
              />
            </el-form-item>

            <el-form-item label="批次" prop="batch">
            <el-form-item label="批次" prop="batchNo">
              <el-input
                v-model="printForm.batch"
                v-model="printForm.batchNo"
                placeholder="请输入批次号"
                clearable
              />
@@ -141,14 +141,14 @@
      // è¡¨å•æ•°æ®ï¼ˆå¯¹åº”printView所需的参数）
      printForm: {
        materialCode: "", // æ–™å·
        supplierCode: "", // ä¾›åº”商编码
        suplierCode: "", // ä¾›åº”商编码
        materialName: "", // å“å
        purchaseOrderNo: "", // é‡‡è´­å•å·
        specification: "", // è§„æ ¼
        quantityTotal: "", // æ•°é‡/总数
        batchNumber: "", // æ‰¹å·ï¼ˆäºŒç»´ç å†…容）
        batch: "", // æ‰¹æ¬¡
        factory: "", // åŽ‚区
        pruchaseOrderNo: "", // é‡‡è´­å•å·
        materialSpec: "", // è§„æ ¼
        quantity: "", // æ•°é‡/总数
        barcode: "", // æ‰¹å·ï¼ˆäºŒç»´ç å†…容）
        batchNo: "", // æ‰¹æ¬¡
        factoryArea: "", // åŽ‚区
        date: "", // æ—¥æœŸï¼ˆé»˜è®¤å½“前日期）
      },
      // æ‰“印份数（支持批量生成多条相同数据）
@@ -157,7 +157,7 @@
      formRules: {
        materialCode: [{ required: true, message: "请输入料号", trigger: "blur" }],
        materialName: [{ required: true, message: "请输入品名", trigger: "blur" }],
        batchNumber: [{ required: true, message: "请输入批号", trigger: "blur" }],
        barcode: [{ required: true, message: "请输入批号", trigger: "blur" }],
        date: [{ required: true, message: "请选择日期", trigger: "change" }],
      },
    };