Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

heshaofeng

10 天以前 3762d139e17f5c39f968dccad53d88cff85c863d

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue

@@ -54,14 +54,6 @@
    const editFormOptions = ref([
      [
        {
          title: "单据类型",
          required: true,
          field: "orderType",
          type: "select",
          dataKey: "outOrderType",
          data: [],
        },
        {
        field: "orderNo",
        title: "单据编号",
        type: "string",
@@ -81,17 +73,40 @@
          readonly: true,
        },
        {
          title: "仓库",
          field: "warehouseId",
          type: "select",
          dataKey: "warehouses",
          data: [],
          required: true,
          title: "厂区",
          field: "factoryArea",
          type: "string",
        },
      ],
      [
        {
          title: "备注",
          field: "remark",
          type: "textarea",
        },
        {
          title: "业务类型",
          field: "businessType",
          type: "select",
          dataKey: "businessType",
          data: [],
          require: true,
        },
        {
          title: "是否分批",
          field: "isBatch",
          type: "select",
          dataKey: "enable",
          data: [],
          require: true,
        },
        {
          title: "操作者",
          field: "operator",
          type: "string",
          hidden:true,
          readonly: true,
          
        },
      ],
    ]);
@@ -114,6 +129,7 @@
          type: "select",
          dataKey: "outOrderType",
          data: [],
          hidden:true
        },
        {
          title: "单据状态",
@@ -147,20 +163,11 @@
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库",
        type: "string",
        width: 90,
        align: "left",
        bind:{key: "warehouses", data: []}
      },
      {
        field: "orderNo",
        title: "单据编号",
        type: "string",
        width: 160,
        align: "left",
        // link: true,
      },
      {
        field: "upperOrderNo",
@@ -176,6 +183,15 @@
        width: 150,
        align: "left",
        bind: { key: "outOrderType", data: [] },
        hidden:true
      },
      {
        field: "businessType",
        title: "业务类型",
        type: "string",
        width: 150,
        align: "left",
        bind: { key: "businessType", data: [] },
      },
      {
        field: "orderStatus",
@@ -194,6 +210,13 @@
        bind: { key: "createType", data: [] },
      },
      {
        field: "factoryArea",
        title: "厂区",
        type: "string",
        width: 120,
        align: "left"
      },
      {
        field: "departmentCode",
        title: "修改时间",
        type: "string",
@@ -206,6 +229,13 @@
        title: "部门名称",
        type: "string",
        width: 160,
        align: "left",
      },
      {
        field: "operator",
        title: "操作人",
        type: "string",
        width: 120,
        align: "left",
      },
      {
@@ -246,7 +276,7 @@
    ]);
    const detail = ref({
      cnName: "出库明细单",
      table: "OnboundOrderDetail",
      table: "Details",
      columns: [
        {
          field: "id",
@@ -290,7 +320,14 @@
          width: 90,
          align: "left",
          edit: { type: "string" },
          required: true,
        },
        {
          field: "supplyCode",
          title: "供应商编号",
          type: "string",
          width: 90,
          align: "left",
          edit: { type: "string" },
        },
        {
          field: "orderQuantity",
@@ -302,13 +339,22 @@
          required: true,
        },
        {
          field: "rowNo",
          field: "lineNo",
          title: "行号",
          type: "string",
          width: 90,
          align: "left",
          edit: { type: "number" },
          required: true,
          readonly:true
        },
        {
          field: "rowNo",
          title: "行号2",
          type: "int",
          width: 90,
          align: "left",
          edit: { type: "number" },
          readonly:true
        },
        {
          field: "lockQuantity",
@@ -330,7 +376,9 @@
          type: "string",
          width: 180,
          align: "left",
          edit: { type: "select" },
          bind: { key: "orderDetailStatusEnum", data: [] },
          readonly:true
        },
        {
          field: "creater",