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

hutongqing

2025-01-11 ecd1c9119991888c6ffeac9d1d228d7bce88deb9

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

@@ -21,10 +21,10 @@
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "入库单",
      cnName: "采购单",
      name: "purchaseOrder",
      url: "/PurchaseOrder/",
      sortName: "CreateDate",
      sortName: "id",
    });
    const editFormFields = ref({
      // orderType: "",
@@ -60,44 +60,28 @@
      // ],
    ]);
    const searchFormFields = ref({
      inboundOrderNo: "",
      upperOrderNo: "",
      orderType: "",
      orderStatus: "",
      createType: "",
      creater: "",
      createDate: "",
      purchaseOrderNo: "",
      purchaseOrderType: "",
      purchaseOrderStatus: "",
    });
    const searchFormOptions = ref([
      [
        { title: "单据编号", field: "inboundOrderNo", type: "like" },
        { title: "上游单据编号", field: "upperOrderNo", type: "like" },
        { title: "采购单号", field: "purchaseOrderNo", type: "like" },
        {
          title: "单据类型",
          field: "orderType",
          field: "purchaseOrderType",
          type: "select",
          dataKey: "inOrderType",
          dataKey: "purchaseType",
          data: [],
        },
        {
          title: "单据状态",
          field: "orderStatus",
          field: "purchaseOrderStatus",
          type: "select",
          dataKey: "inboundState",
          dataKey: "purchaseOrderStatus",
          data: [],
        },
      ],
      [
        {
          title: "创建方式",
          field: "createType",
          type: "select",
          dataKey: "createType",
          data: [],
        },
        { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
      ]
    ]);
    const columns = ref([
      {
@@ -114,7 +98,7 @@
        field: "purchaseOrderNo",
        title: "采购单号",
        type: "string",
        width: 120,
        width: 150,
        align: "left",
        link: true,
      },
@@ -124,12 +108,14 @@
        type: "string",
        width: 150,
        align: "left",
        bind: { key: "", data: [{key:'S',value:"标准入库"},{key:'V',value:"寄售补给入库"}] },
      },
      
      {
        field: "supplierCode",
        title: "供应商编号",
        type: "string",
        width: 150,
        width: 120,
        align: "left",
      },
      {
@@ -145,12 +131,13 @@
        type: "string",
        width: 90,
        align: "left",
        bind: { key: "purchaseOrderStatus", data: [] },
      },
      {
        field: "orderDate",
        title: "下单日期",
        type: "string",
        width: 90,
        width: 160,
        align: "left",
      },
      {
@@ -190,7 +177,7 @@
      },
    ]);
    const detail = ref({
      cnName: "入库单明细",
      cnName: "采购单明细",
      table: "InboundOrderDetail",
      columns: [
        {
@@ -260,10 +247,11 @@
        },
        {
          field: "warehouseId",
          title: "仓库编号",
          title: "仓库",
          type: "string",
          width: 200,
          width: 100,
          align: "left",
          bind: { key: "warehouses", data: [] },
        },
        {
          field: "purchaseDetailStatus",
@@ -271,6 +259,7 @@
          type: "string",
          width: 180,
          align: "left",
          bind: { key: "purchaseOrderStatus", data: [] },
        },
        {
          field: "creater",