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

hutongqing

2025-01-19 a1ee30471cb90cbea25627d5dddcb979bb612693

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

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/public/webconfig.js

@@ -1,4 +1,4 @@
window.webConfig = {
    "webApiBaseUrl": "http://127.0.0.1:9293/",
    "webApiBaseUrl": "http://10.30.5.60:9293/",
    "webApiProduction":"http://10.30.4.92:9283/"
}

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

@@ -98,7 +98,10 @@
      palletCode: "",
    });
    const searchFormOptions = ref([
      [{ title: "批次号", field: "lotNo", type: "like" }],
      [
        { title: "采购单号", field: "purchaseOrderNo", type: "like" },
        { title: "物料编号", field: "materielCode", type: "like" },
      ],
    ]);
    const columns = ref([
      {
@@ -119,6 +122,14 @@
        align: "left",
      },
      {
        field: "materielCode",
        title: "物料名称",
        type: "string",
        width: 100,
        align: "left",
        bind: { key: "MaterielNames", data: [] },
      },
      {
        field: "warehouseId",
        title: "仓库",
        type: "string",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue

@@ -225,12 +225,12 @@
          required: true,
        },
        {
          field: "materielName",
          field: "materielCode",
          title: "物料名称",
          type: "string",
          width: 150,
          width: 100,
          align: "left",
          edit: { type: "" },
          bind: { key: "MaterielNames", data: [] },
        },
        {
          field: "batchNo",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue

@@ -215,12 +215,12 @@
          required: true,
        },
        {
          field: "materielName",
          field: "materielCode",
          title: "物料名称",
          type: "string",
          width: 150,
          width: 100,
          align: "left",
          edit: { type: "" },
          bind: { key: "MaterielNames", data: [] },
        },
        // {
        //   field: "batchNo",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue

@@ -267,11 +267,12 @@
          required: true,
        },
        {
          field: "materielName",
          field: "materielCode",
          title: "物料名称",
          type: "string",
          width: 150,
          width: 100,
          align: "left",
          bind: { key: "MaterielNames", data: [] },
        },
        {
          field: "lotNo",