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

yanjinhui

6 天以前 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17

 н¨Îļþ¼Ð/WMS/src/views/basic/locationInfo.vue

@@ -37,19 +37,30 @@
      locationType: "",
      locationStatus: "",
      enableStatus: "",
      remark: ""
      remark: "",
      warehouseCode:"",
    });
    const editFormOptions = ref([
      [
        {
          field: "warehouseId",
        // {
        //   field: "warehouseId",
        //   title: "库房编号",
        //   type: "select",
        //   required: true,
        //   span: 12,
        //   dataKey:  "warehouseNuber", 
        //   data: []
        // },
         {
          field: "warehouseCode",
          title: "库房编号",
          type: "select",
          required: true,
          span: 12,
          data: [],
          bind: { key: "warehouses", data: [] }
          dataKey:  "warehouseNuber", 
          data: []
        },
        
        {
          field: "locationCode",
          title: "货位编号",
@@ -84,12 +95,7 @@
          type: "int",
          span: 8
        },
        {
          field: "layer",
          title: "货位层",
          type: "int",
          span: 8
        }
      
      ],
      [
        {
@@ -98,13 +104,19 @@
          type: "int",
          span: 12
        },
        {
          field: "locationType",
          title: "货位类型",
          type: "select",
          span: 12,
          data: [],
          bind: { key: "locationTypeEnum", data: [] }
        // {
        //   field: "locationType",
        //   title: "货位类型",
        //   type: "select",
        //   span: 12,
        //   data: [],
        //   dataKey:  "locationTypeEnum",
        // }
          {
          field: "layer",
          title: "货位层",
          type: "int",
          span: 8
        }
      ],
      [
@@ -114,28 +126,28 @@
          type: "select",
          span: 12,
          data: [],
          bind: { key: "locationStatusEnum", data: [] }
           dataKey:  "locationStatusEnum",
        },
        {
          field: "enableStatus",
          title: "禁用状态",
          type: "select",
          span: 12,
          dataKey:"EnableStatusEnum",
          data: [],
          bind: { key: "status", data: [] }
        }
      ],
      [
        {
          field: "remark",
          title: "备注",
          type: "string",
          span: 24
        }
      ]
      // [
      //   {
      //     field: "remark",
      //     title: "备注",
      //     type: "string",
      //     span: 24
      //   }
      // ]
    ]);
    const searchFormFields = ref({
      warehouseId: "",
      // warehouseId: "",
      locationCode: "",
      locationName: "",
      roadwayNo: "",
@@ -145,20 +157,23 @@
      row: "",
      column: "",
      layer: "",
      warehouseCode: ""
    });
    const searchFormOptions = ref([
      [
        { title: "库房编号", field: "warehouseId", type: "select", data: [], bind: { key: "warehouses", data: [] } },
        // { title: "库房编号", field: "warehouseId", type: "select", dataKey:  "warehouseNuber",  data: [] } ,
         { title: "库房编号", field: "warehousecode", type: "select", dataKey:  "warehouseNuber",  data: [] } ,
        { title: "货位编号", field: "locationCode", type: "like" },
        { title: "货位名称", field: "locationName", type: "like" },
      ],
      [
        { title: "巷道编号", field: "roadwayNo", type: "like" },
        { title: "货位类型", field: "locationType", type: "select", data: [], bind: { key: "locationTypeEnum", data: [] } },
        { title: "货位状态", field: "locationStatus", type: "select", data: [], bind: { key: "locationStatusEnum", data: [] } },
        // { title: "货位类型", field: "locationType", type: "select",  dataKey:  "locationTypeEnum", data: []  },       
        { title: "货位状态", field: "locationStatus", type: "select",  dataKey:  "locationStatusEnum",data: []},
         { title: "禁用状态", field: "enableStatus", type: "select", data: [], dataKey:"status" },
      ],
      [
        { title: "禁用状态", field: "enableStatus", type: "select", data: [], bind: { key: "status", data: [] } },

        { title: "行", field: "row", type: "int" },
        { title: "列", field: "column", type: "int" },
        { title: "层", field: "layer", type: "int" }
@@ -175,14 +190,23 @@
        require: true,
        align: "left",
      },
      // {
      //   field: "warehouseId",
      //   title: "库房编号",
      //   type: "select",
      //   width: 120,
      //   align: "left",
      //   data: [],
      //   bind: { key: "warehouses", data: [] }
      // },
      {
        field: "warehouseId",
        field: "warehouseCode",
        title: "库房编号",
        type: "select",
        width: 120,
        align: "left",
        data: [],
        bind: { key: "warehouses", data: [] }
        bind: { key: "warehouseNuber", data: [] }
      },
      {
        field: "locationCode",
@@ -233,15 +257,15 @@
        width: 100,
        align: "left",
      },
      {
        field: "locationType",
        title: "货位类型",
        type: "select",
        width: 120,
        align: "left",
        data: [],
        bind: { key: "locationTypeEnum", data: [] }
      },
      // {
      //   field: "locationType",
      //   title: "货位类型",
      //   type: "select",
      //   width: 120,
      //   align: "left",
      //   data: [],
      //   bind: { key: "locationTypeEnum", data: [] }
      // },
      {
        field: "locationStatus",
        title: "货位状态",
@@ -260,13 +284,13 @@
        data: [],
        bind: { key: "status", data: [] },
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 150,
        align: "left",
      },
      // {
      //   field: "remark",
      //   title: "备注",
      //   type: "string",
      //   width: 150,
      //   align: "left",
      // },
      {
        field: "creater",
        title: "创建人",