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

heshaofeng

6 天以前 18ca3750ce28d407afb518cadecdd29d79876c8b

 ÏîÄ¿´úÂë/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,
          
        },
      ],
    ]);
@@ -109,12 +124,11 @@
        { title: "单据编号", field: "orderNo", type: "like" },
        { title: "上游单据编号", field: "upperOrderNo", type: "like" },
        {
          title: "单据类型",
          field: "orderType",
          title: "业务类型",
          field: "businessType",
          type: "select",
          dataKey: "outOrderType",
          dataKey: "documentTypeEmun",
          data: [],
          hidden:true
        },
        {
          title: "单据状态",
@@ -153,7 +167,6 @@
        type: "string",
        width: 160,
        align: "left",
        // link: true,
      },
      {
        field: "upperOrderNo",
@@ -196,6 +209,19 @@
        bind: { key: "createType", data: [] },
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 180,
        align: "left"
      },
      {
        field: "returnToMESStatus",
        title: "回传MES状态",
        width: 120,
        bind: { key: "createType", data:[{key:0, value:"未回传"},{key:1, value:"已回传成功"},{key:2, value:"回传失败"}]},
      },
      {
        field: "factoryArea",
        title: "厂区",
        type: "string",
@@ -215,6 +241,13 @@
        title: "部门名称",
        type: "string",
        width: 160,
        align: "left",
      },
      {
        field: "operator",
        title: "操作人",
        type: "string",
        width: 120,
        align: "left",
      },
      {
@@ -245,17 +278,10 @@
        width: 160,
        align: "left",
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 100,
        align: "left",
      },
    ]);
    const detail = ref({
      cnName: "出库明细单",
      table: "OnboundOrderDetail",
      table: "Details",
      columns: [
        {
          field: "id",
@@ -299,7 +325,6 @@
          width: 90,
          align: "left",
          edit: { type: "string" },
          required: true,
        },
        {
          field: "supplyCode",
@@ -308,7 +333,6 @@
          width: 90,
          align: "left",
          edit: { type: "string" },
          required: true,
        },
        {
          field: "orderQuantity",
@@ -320,13 +344,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",
@@ -348,7 +381,9 @@
          type: "string",
          width: 180,
          align: "left",
          edit: { type: "select" },
          bind: { key: "orderDetailStatusEnum", data: [] },
          readonly:true
        },
        {
          field: "creater",