Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

dengjunjie

10 天以前 dd05ce0fe597c0f4c9e3a02228e1b4f6188546aa

 н¨Îļþ¼Ð/WMS/src/views/stock/Dt_Inventory_Batch.vue

@@ -30,6 +30,7 @@
      productionDate: "",
      validityPeriod: "",
      remark: "",
      AvailableQuantity: "",
    });
    const editFormOptions = ref([
      [
@@ -66,9 +67,15 @@
          type: "number",
        },
        {
          title: "出库数",
          title: "待出库数量",
          required: true,
          field: "outboundQuantity",
          type: "number",
        },
          {
          title: "可用库存数",
          required: true,
          field: "availableQuantity",
          type: "number",
        }
      ],
@@ -93,12 +100,12 @@
        }
      ],
      [
        {
          title: "生产日期",
          field: "productionDate",
          type: "date",
          span: 12
        },
        // {
        //   title: "生产日期",
        //   field: "productionDate",
        //   type: "date",
        //   span: 12
        // },
        {
          title: "有效期至",
          field: "validityPeriod",
@@ -175,7 +182,7 @@
      },
      {
        field: "outboundQuantity",
        title: "出库数",
        title: "待出库数数量",
        type: "number",
        width: 100,
        align: "left",
@@ -187,6 +194,12 @@
        width: 100,
        align: "left",
      },
         {
          title: "可用库存数",
          required: true,
          field: "availableQuantity",
          type: "number",
        },
      {
        field: "erpStockQuantity",
        title: "ERP实际库存数",
@@ -202,13 +215,13 @@
        align: "left",
        bind: { key: "stockDifference", data: [] },
      },
      {
        field: "productionDate",
        title: "生产日期",
        type: "date",
        width: 120,
        align: "left",
      },
      // {
      //   field: "productionDate",
      //   title: "生产日期",
      //   type: "date",
      //   width: 120,
      //   align: "left",
      // },
      {
        field: "validityPeriod",
        title: "有效期至",