Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-04-29 c38154df95a2c2fa1bd32c45f6be9c0d98e37440

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue

@@ -26,14 +26,41 @@
      url: "/MaterielCodeInfo/",
      sortName: "id",
    });
    const editFormFields = ref({});
    const editFormFields = ref({
      lotNo: "",
      warehouseId: "",
      purchaseOrderNo: "",
      materielCode: "",
      productionDate: "",
      effectiveDate: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "物料编码",
          field: "materielCode",
          title: "仓库",
          field: "warehouseId",
          type: "select",
          dataKey: "areainfo",
          data: [],
          required: true,
        },
      ],
      [
        
        {
          title: "物料编码",
          field: "materielCode",
          type: "string",
        },
      ],
      [
        {
          title: "采购单号",
          field: "purchaseOrderNo",
          type: "string",
        },
      ],
      [
        {
          title: "批次号",
          field: "lotNo",
@@ -42,27 +69,24 @@
      ],
      [
        {
          title: "采购单号",
          field: "purchaseOrderNo",
          required: true,
        },
        {
          title: "数量",
          field: "quantity",
          required: true,
          type:"int"
        },
      ],
      [
        {
          title: "生产日期",
          field: "productionDate",
          type:"date",
          // type: "date",
          required: true,
        },
      ],
      [
        {
          title: "有效期",
          field: "effectiveDate",
          type:"date",
          // type: "date",
          required: true,
        },
      ],
@@ -71,7 +95,10 @@
      palletCode: "",
    });
    const searchFormOptions = ref([
      [{ title: "批次号", field: "lotNo", type: "like" }],
      [
        { title: "采购单号", field: "purchaseOrderNo", type: "like" },
        { title: "物料编号", field: "materielCode", type: "like" },
      ],
    ]);
    const columns = ref([
      {
@@ -92,8 +119,30 @@
        align: "left",
      },
      {
        field: "materielName",
        title: "物料名称",
        type: "string",
        width: 100,
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库",
        type: "string",
        width: 90,
        align: "left",
        bind: { key: "areainfo", data: [] },
      },
      {
        field: "purchaseOrderNo",
        title: "采购单号",
        type: "string",
        width: 160,
        align: "left",
      },
      {
        field: "supplierCode",
        title: "供应商编号",
        type: "string",
        width: 160,
        align: "left",
@@ -148,7 +197,7 @@
        title: "修改人",
        type: "string",
        width: 100,
        hidden:true,
        hidden: true,
        align: "left",
      },
      {
@@ -157,7 +206,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        hidden:true,
        hidden: true,
        sort: true,
      },
    ]);