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

dengjunjie

2025-01-13 e7037a128a61a6f8d3095960ead68a65dd6d69f2

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

@@ -24,11 +24,11 @@
      cnName: "入库单",
      name: "inboundOrder",
      url: "/InboundOrder/",
      sortName: "CreateDate",
      sortName: "id",
    });
    const editFormFields = ref({
      orderType: "",
      orderNo:"",
      inboundOrderNo: "",
      upperOrderNo: "",
      remark: "",
    });
@@ -43,10 +43,10 @@
          data: [],
        },
        {
        field: "orderNo",
        title: "单据编号",
        type: "string",
      },
          field: "inboundOrderNo",
          title: "单据编号",
          type: "string",
        },
        {
          title: "上游单据编号",
          field: "upperOrderNo",
@@ -60,7 +60,7 @@
      ],
    ]);
    const searchFormFields = ref({
      orderNo: "",
      inboundOrderNo: "",
      upperOrderNo: "",
      orderType: "",
      orderStatus: "",
@@ -70,7 +70,7 @@
    });
    const searchFormOptions = ref([
      [
        { title: "单据编号", field: "orderNo", type: "like" },
        { title: "单据编号", field: "inboundOrderNo", type: "like" },
        { title: "上游单据编号", field: "upperOrderNo", type: "like" },
        {
          title: "单据类型",
@@ -111,7 +111,7 @@
        align: "left",
      },
      {
        field: "orderNo",
        field: "inboundOrderNo",
        title: "单据编号",
        type: "string",
        width: 120,
@@ -124,6 +124,14 @@
        type: "string",
        width: 150,
        align: "left",
      },
      {
          field: "warehouseId",
          title: "仓库",
          type: "string",
          width: 90,
          align: "left",
          bind:{key: "warehouses", data: []}
      },
      {
        field: "orderType",
@@ -145,7 +153,7 @@
        field: "createType",
        title: "创建方式",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
        bind: { key: "createType", data: [] },
      },