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

wangxinhui

15 小时以前 526b70eecc5dac5aea91bfffbe0b98118f25827f

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue

@@ -48,6 +48,7 @@
        field: "orderNo",
        title: "单据编号",
        type: "string",
        readonly:true
      },
        {
          title: "上游单据编号",
@@ -101,7 +102,7 @@
          title: "单据状态",
          field: "orderStatus",
          type: "select",
          dataKey: "inboundState",
          dataKey: "outboundStatusEnum",
          data: [],
        },
      ],
@@ -115,6 +116,7 @@
        },
        { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
        { title: "所属仓库", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
      ],
    ]);
    const columns = ref([
@@ -129,18 +131,26 @@
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库",
        type: "string",
        width: 90,
        align: "left",
        bind:{key: "warehouses", data: []}
      },
      {
        field: "orderNo",
        title: "单据编号",
        type: "string",
        width: 120,
        width: 160,
        align: "left",
        link: true,
        // link: true,
      },
      {
        field: "upperOrderNo",
        title: "上游单据编号",
        type: "string",
        width: 150,
        width: 160,
        align: "left",
      },
      {
@@ -163,9 +173,24 @@
        field: "createType",
        title: "创建方式",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
        bind: { key: "createType", data: [] },
      },
      {
        field: "departmentCode",
        title: "修改时间",
        type: "string",
        width: 120,
        align: "left",
        hidden:true
      },
      {
        field: "departmentName",
        title: "部门名称",
        type: "string",
        width: 160,
        align: "left",
      },
      {
        field: "creater",
@@ -261,6 +286,15 @@
          required: true,
        },
        {
          field: "rowNo",
          title: "行号",
          type: "string",
          width: 90,
          align: "left",
          edit: { type: "number" },
          required: true,
        },
        {
          field: "lockQuantity",
          title: "锁定数量",
          type: "int",