Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

heshaofeng

7 天以前 461524a7a1def4532b9af4ab40733f899f360db7

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue

@@ -23,22 +23,20 @@
      inboundOrderNo: "",
      upperOrderNo: "",
      remark: "",
      orderStatus: "",
      warehouseId: "",
      supplierId: "",
      createType: "",
      isTestMaterials: "",
      operator: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "单据类型",
          required: true,
          field: "orderType",
          type: "select",
          dataKey: "inOrderType",
          data: [],
          hidden: true
        },
        {
          field: "inboundOrderNo",
          title: "单据编号",
          type: "string",
          readonly: true,
        },
        {
          title: "上游单据编号",
@@ -51,6 +49,29 @@
          type: "textarea",
        },
      ],
      [
        {
          title: "业务类型",
          field: "businessType",
          type: "select",
          dataKey: "businessType",
          data: [],
          require: true,
        },
        {
          title: "是否分批",
          field: "isBatch",
          type: "select",
          dataKey: "enable",
          data: [],
          require: true,
        },
        {
          title: "厂区",
          field: "factoryArea",
          type: "string",
        },
      ]
    ]);
    const searchFormFields = ref({
      inboundOrderNo: "",
@@ -70,7 +91,7 @@
          title: "业务类型",
          field: "businessType",
          type: "select",
          dataKey: "documentTypeEmun",
          dataKey: "inboundbusinessType",
          data: [],
        },
        {
@@ -181,6 +202,12 @@
        align: "left"
      },
      {
        field: "isTestMaterials",
        title: "是否试产",
        width: 120,
        bind: { key: "isTestMaterials", data: [{ key: 0, value: "非试产物料" }, { key: 1, value: "试产物料" }] },
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
@@ -246,7 +273,7 @@
          type: "string",
          width: 150,
          align: "left",
          bind: { key: "materielInfo", data: [] },
          edit: { type: "" },
        },
        {
          field: "batchNo",
@@ -272,6 +299,7 @@
          type: "decimal",
          width: 90,
          align: "left",
          edit: { type: "" },
          required: true
        },
        {
@@ -289,7 +317,7 @@
          type: "decimal",
          width: 90,
          align: "left",
          required: true,
          edit: { type: "" },
        },
        {
          field: "orderQuantity",
@@ -298,6 +326,24 @@
          width: 90,
          align: "left",
          edit: { type: "number" },
          required: true,
        },
        {
          field: "barcodeQty",
          title: "条码数量",
          type: "decimal",
          width: 90,
          align: "left",
          edit: { type: "number" },
          required: true,
        },
        {
          field: "barcodeUnit",
          title: "条码单位",
          type: "string",
          width: 90,
          align: "left",
          edit: { type: "" },
          required: true,
        },
        {
@@ -320,6 +366,8 @@
          type: "string",
          width: 90,
          align: "left",
          edit: { type: "" },
          required: true,
        },
        {
          field: "orderDetailStatus",
@@ -329,14 +377,13 @@
          align: "left",
          bind: { key: "orderDetailStatusEnum", data: [] },
        },
        // {
        //   field: "returnToMESStatus",
        //   title: "回传状态",
        //   type: "string",
        //   width: 90,
        //   align: "left",
        //   bind: { key: "returnStatus", data: [{ key: 0, value: "未回传" }, { key: 1, value: "已回传成功" }, { key: 2, value: "回传失败" }] }
        // },
        {
          field: "palletCode",
          title: "已组托盘号",
          type: "string",
          width: 100,
          align: "left",
        },
        {
          field: "creater",
          title: "创建人",