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: "",
@@ -60,6 +81,7 @@
      createType: "",
      creater: "",
      createDate: "",
      materielCode: "",
    });
    const searchFormOptions = ref([
      [
@@ -69,7 +91,7 @@
          title: "业务类型",
          field: "businessType",
          type: "select",
          dataKey: "documentTypeEmun",
          dataKey: "inboundbusinessType",
          data: [],
        },
        {
@@ -90,6 +112,7 @@
        },
        { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
        { title: "物料编号", field: "materielCode", type: "like" },
      ],
    ]);
    const columns = ref([
@@ -147,7 +170,7 @@
        field: "orderStatistics",
        title: "单据物料统计",
        type: "string",
        width: 230,
        width: 300,
        align: "left",
      },
      {
@@ -169,7 +192,7 @@
        field: "returnToMESStatus",
        title: "回传MES状态",
        width: 120,
        bind: { key: "createType", data: [{ key: 0, value: "未回传" }, { key: 1, value: "已回传成功" }, { key: 2, value: "回传失败" }] },
        bind: { key: "createType", data: [{ key: 0, value: "未回传" }, { key: 1, value: "已回传成功" }, { key: 2, value: "回传失败" },{ key: 3, value: "部分回传成功" },{ key: 4, value: "部分回传失败" },{ key: 5, value: "无需回传" }] },
      },
      {
        field: "factoryArea",
@@ -177,6 +200,12 @@
        type: "string",
        width: 120,
        align: "left"
      },
      {
        field: "isTestMaterials",
        title: "是否试产",
        width: 120,
        bind: { key: "isTestMaterials", data: [{ key: 0, value: "非试产物料" }, { key: 1, value: "试产物料" }] },
      },
      {
        field: "creater",
@@ -193,7 +222,7 @@
        align: "left",
      },
      {
        field: "modifier",
        field: "operator",
        title: "修改人",
        type: "string",
        width: 100,
@@ -239,12 +268,12 @@
          required: true,
        },
        {
          field: "materielCode",
          field: "materielName",
          title: "物料名称",
          type: "string",
          width: 120,
          width: 150,
          align: "left",
          bind: { key: "MaterielNames", data: [] },
          edit: { type: "" },
        },
        {
          field: "batchNo",
@@ -270,6 +299,7 @@
          type: "decimal",
          width: 90,
          align: "left",
          edit: { type: "" },
          required: true
        },
        {
@@ -282,12 +312,38 @@
          required: true,
        },
        {
          field: "outBoxbarcodes",
          title: "外箱条码",
          type: "decimal",
          width: 90,
          align: "left",
          edit: { type: "" },
        },
        {
          field: "orderQuantity",
          title: "单据数量",
          type: "decimal",
          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,
        },
        {
@@ -310,6 +366,8 @@
          type: "string",
          width: 90,
          align: "left",
          edit: { type: "" },
          required: true,
        },
        {
          field: "orderDetailStatus",
@@ -320,6 +378,13 @@
          bind: { key: "orderDetailStatusEnum", data: [] },
        },
        {
          field: "palletCode",
          title: "已组托盘号",
          type: "string",
          width: 100,
          align: "left",
        },
        {
          field: "creater",
          title: "创建人",
          type: "string",