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

hutongqing

2025-01-11 ecd1c9119991888c6ffeac9d1d228d7bce88deb9

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

@@ -28,35 +28,32 @@
    });

    const searchFormFields = ref({
      orderNo: "",
      upperOrderNo: "",
      orderType: "",
      orderStatus: "",
      createType: "",
      receiveOrderNo: "",
      receiveOrderType: "",
      receiveOrderStatus: "",
      creater: "",
      createDate: "",
    });
    const searchFormOptions = ref([
      [
        { title: "单据编号", field: "orderNo", type: "like" },
        { title: "单据编号", field: "receiveOrderNo", type: "like" },
        {
          title: "单据类型",
          field: "orderType",
          field: "receiveOrderType",
          type: "select",
          dataKey: "inOrderType",
          dataKey: "receiveOrderTypeEnum",
          data: [],
        },
        {
          title: "单据状态",
          field: "orderStatus",
          type: "select",
          dataKey: "inboundState",
          field: "receiveOrderStatus",
          type: "selectList",
          dataKey: "receiveStatus",
          data: [],
        },
      ],
      [
        { title: "供应商", field: "suppliersId", type: "select",dataKey:"suppliers",data:[]},
        { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);

@@ -139,8 +136,9 @@
        field: "receiveOrderStatus",
        title: "订单状态",
        type: "string",
        width: 150,
        width: 120,
        align: "left",
        bind: { key: "receiveStatus", data: [] },
      },
      {
        field: "customerId",
@@ -148,6 +146,7 @@
        type: "string",
        width: 90,
        align: "left",
        hidden:true
      },
      {
        field: "suppliersId",
@@ -158,23 +157,24 @@
      },
      {
        field: "warehouseId",
        title: "仓库主键",
        title: "仓库",
        type: "string",
        width: 90,
        align: "left",
        bind:{key: "warehouses", data: []}
      },
      {
        field: "receiveDate",
        title: "收货日期",
        type: "string",
        width: 90,
        width: 160,
        align: "left",
      },
      {
        field: "deliveryCode",
        title: "送货单号",
        type: "string",
        width: 90,
        width: 150,
        align: "left",
      },
      {
@@ -183,6 +183,7 @@
        type: "string",
        width: 90,
        align: "left",
        bind:{key:"enable",data:[]}
      },
      {
        field: "creater",