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

wangxinhui

14 小时以前 526b70eecc5dac5aea91bfffbe0b98118f25827f

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue

@@ -27,33 +27,12 @@
      sortName: "id",
    });
    const editFormFields = ref({
      orderType: "",
      inboundOrderNo: "",
      upperOrderNo: "",
      remark: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "单据类型",
          required: true,
          field: "orderType",
          type: "select",
          dataKey: "inOrderType",
          data: [],
        },
        {
          field: "inboundOrderNo",
          title: "单据编号",
          type: "string",
        },
        {
          title: "上游单据编号",
          field: "upperOrderNo",
          type: "string",
        },
        {
          title: "备注",
          title: "信息备注",
          field: "remark",
          type: "textarea",
        },
@@ -67,27 +46,45 @@
      createType: "",
      creater: "",
      createDate: "",
      upErpStatus:"",
      warehouseId:"",
    });
    const searchFormOptions = ref([
      [
        { title: "单据编号", field: "inboundOrderNo", type: "like" },
        { title: "上游单据编号", field: "upperOrderNo", type: "like" },
        {
          title: "单据类型",
          field: "orderType",
          type: "select",
          dataKey: "inOrderType",
          data: [],
        },
        { title: "单据编号", field: "proInOrderNo", type: "like" },
        // { title: "上游单据编号", field: "upperOrderNo", type: "like" },
        // {
        //   title: "单据类型",
        //   field: "orderType",
        //   type: "select",
        //   dataKey: "inOrderType",
        //   data: [],
        // },
        { title: "胶框码", field: "batchNo", type: "like" },
        {
          title: "单据状态",
          field: "orderStatus",
          field: "mesProStatus",
          type: "select",
          dataKey: "inboundState",
          data: [],
        },
        {
          title: "仓库",
          field: "warehouseId",
          type: "select",
          dataKey: "warehouses",
          data: [],
          required: true,
        },
      ],
      [
        {
          title: "上传ERP状态",
          field: "upErpStatus",
          type: "select",
          dataKey: "enable",
          data: [],
        },
        {
          title: "创建方式",
          field: "createType",
@@ -130,7 +127,7 @@
        field: "batchNo",
        title: "胶框码",
        type: "string",
        width: 150,
        width: 120,
        align: "left",
      },

@@ -138,9 +135,9 @@
        field: "mesProStatus",
        title: "入库单状态",
        type: "string",
        width: 150,
        width: 120,
        align: "left",
        // bind: { key: "inOrderType", data: [] },
        bind: { key: "inboundState", data: [] },
      },
      {
        field: "unPackStock",
@@ -148,6 +145,7 @@
        type: "decimal",
        width: 90,
        align: "left",
        hidden:true
      },
      {
        field: "workCenter",
@@ -165,11 +163,20 @@
        bind: { key: "createType", data: [] },
      },
      {
        field: "upErpStatus",
        title: "上传ERP状态",
        type: "string",
        width: 90,
        align: "left",
        bind:{key:"enable",data:[]}
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
        hidden:true
      },
      {
        field: "createDate",
@@ -184,6 +191,7 @@
        type: "string",
        width: 100,
        align: "left",
        hidden: true,
      },
      {
        field: "modifyDate",
@@ -191,10 +199,11 @@
        type: "datetime",
        width: 160,
        align: "left",
        hidden: true,
      },
      {
        field: "remark",
        title: "备注",
        title: "信息备注",
        type: "string",
        width: 100,
        align: "left",
@@ -204,28 +213,28 @@
      cnName: "入库单明细",
      table: "mesProInOrderDetail",
      columns: [
        {
        field: "id",
        title: "Id",
        type: "int",
        width: 90,
        hidden: true,
        readonly: true,
        require: true,
        align: "left",
      },
      {
        field: "orderId",
        title: "入库单主键",
        type: "string",
        width: 90,
        align: "left",
      },
      //   {
      //   field: "id",
      //   title: "Id",
      //   type: "int",
      //   width: 90,
      //   hidden: true,
      //   readonly: true,
      //   require: true,
      //   align: "left",
      // },
      // {
      //   field: "orderId",
      //   title: "入库单主键",
      //   type: "string",
      //   width: 90,
      //   align: "left",
      // },
      {
        field: "bagNo",
        title: "内包号",
        type: "string",
        width: 150,
        width: 180,
        align: "left",
      },
      {
@@ -325,12 +334,6 @@
        type: "string",
        width: 200,
        align: "left",
      }, {
        field: "remark",
        title: "备注",
        type: "string",
        width: 200,
        align: "left",
      },
      {
        field: "creater",
@@ -352,6 +355,7 @@
        type: "string",
        width: 100,
        align: "left",
        hidden: true,
      },
      {
        field: "modifyDate",
@@ -359,6 +363,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        hidden: true,
      },
      {
        field: "remark",