Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

yanjinhui

6 天以前 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrder.vue

@@ -75,7 +75,7 @@
          title: "库房号",
          field: "warehouse_no",
          type: "select",
          dataKey: "warehouse",
         dataKey: "warehouseNuber", 
          data: [],
          required: true,
        },
@@ -128,22 +128,22 @@
          dataKey: "order_type",
          data: [],
        },
        {
          title: "表头状态",
          field: "odrderStatus",
        // {
        //   title: "表头状态",
        //   field: "odrderStatus",
        //   type: "select",
        //   dataKey: "odrderStatus",
        //   data: [],
        // },
          {
          title: "库房号",
          field: "warehouse_no",
          type: "select",
          dataKey: "odrderStatus",
           dataKey: "warehouseNuber", 
          data: [],
        },
      ],
      [
        {
          title: "库房号",
          field: "warehouse_no",
          type: "select",
          dataKey: "warehouse",
          data: [],
        },
        {
          title: "入库记账时间",
          field: "account_tiem",
@@ -199,7 +199,7 @@
        type: "string",
        width: 100,
        align: "left",
        bind: { key: "warehouse", data: [] },
        bind: { key: "warehouseNuber", data: [] },
      },
      {
        field: "account_tiem",
@@ -216,13 +216,13 @@
        align: "left",
        bind: { key: "odrderStatus", data: [] },
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
      },
      // {
      //   field: "creater",
      //   title: "创建人",
      //   type: "string",
      //   width: 90,
      //   align: "left",
      // },
      {
        field: "createDate",
        title: "创建时间",
@@ -230,13 +230,13 @@
        width: 160,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
      },
      // {
      //   field: "modifier",
      //   title: "修改人",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      // },
      {
        field: "modifyDate",
        title: "修改时间",
@@ -274,9 +274,19 @@
          type: "string",
          width: 120,
          align: "left",
          // bind: { key: "reservoirArea", data: [] }
          // edit:{type:'select',dataKey:'reservoirArea',data:[]}
          edit:{type:""}
          bind: { key: "warehouseNuber", data: [] },
          // edit:{type:'select',dataKey:'warehouseNuber',data:[]},
          // edit:{type:""}
        },
           {
          field: "goods_no",
          title: "物料名称",
          type: "string",
          width: 150,
          align: "left",
          required: true,
          // edit:{type:""},
          bind: { key: "MaterielNames", data: [] },
        },
        {
          field: "goods_no",
@@ -286,7 +296,7 @@
          align: "left",
          bind: { key: "medicineGoods", data: [] },
          required: true,
          edit:{type:""}
          // edit:{type:""}

        },
        {
@@ -296,16 +306,16 @@
          width: 120,
          align: "left",
          required: true,
          edit:{type:"number"}
          // edit:{type:"number"}

        },
        {
          field: "order_Inqty",
          title: "入库完成数量",
          title: "完成数量",
          type: "decimal",
          width: 120,
          align: "left",
          edit:{type:"number"}
          // edit:{type:"number"}

        },
        {
@@ -315,7 +325,7 @@
          width: 120,
          align: "left",
          required: true,
          edit:{type:""}
          // edit:{type:""}

        },
        {
@@ -324,7 +334,7 @@
          type: "string",
          width: 120,
          align: "left",
          edit:{type:""}
          // edit:{type:""}

        },
        {
@@ -334,7 +344,7 @@
          width: 120,
          align: "left",
          // bind: { key: "orderDetailStatus", data: [] },
          edit:{type:""}
          // edit:{type:""}

        },
        {
@@ -344,7 +354,7 @@
          width: 120,
          align: "left",
          bind: { key: "syncStatus", data: [] },
          edit:{type:'select',dataKey:'syncStatus',data:[]}
          // edit:{type:'select',dataKey:'syncStatus',data:[]}
        },
        {
          field: "creater",