Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

647556386

2 天以前 b680585c3a6d43f0c72a83a115ea537ce8c91a07

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/stock/stockView.vue

@@ -37,14 +37,21 @@
    const searchFormOptions = ref([
      [
        { title: "托盘编号", field: "palletCode",type: "like" },
        // { title: "货位编号", field: "locationCode",type: "like" },
        { title: "货位编号", field: "locationCode",type: "like" },
        { title: "货位状态", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
        { title: "库存状态", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
      ],
      [
        { title: "物料编号", field: "materielCode",type: "like"},
        { title: "批次号", field: "batchNo",type: "like"},
        { title: "所属仓库", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
        { title: "所属仓库", field: "locationType",type: "select",dataKey: "locationType",data: [],},
        { title: "所含条码", field: "barcode",type: "like"},
      ],
      [
        { title: "供应商编号", field: "supplyCode",type: "like"},
        { title: "所含单据编号", field: "orderNo",type: "like"},
        { title: "库存创建时间", field: "createDate",type: "datetime"},
        
      ],
    ]);
    const columns = ref([
@@ -59,6 +66,14 @@
        align: "left",
      },
      {
        field: "locationType",
        title: "所属仓库",
        type: "string",
        width: 150,
        align: "left",
        bind: { key: "locationType", data: [] },
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
@@ -70,23 +85,17 @@
        field: "locationCode",
        title: "货位编号",
        type: "string",
        width: 200,
        width: 150,
        align: "left",
      },
      {
        field: "locationName",
        title: "货位名称",
        type: "string",
        width: 270,
        width: 120,
        align: "left",
      },
      {
        field: "warehouseId",
        title: "所属仓库",
        type: "string",
        width: 80,
        align: "left",
      },
      
      {
        field: "roadwayNo",
        title: "巷道编号",
@@ -96,15 +105,22 @@
        hidden:true
      },
      {
        field: "materielCode",
        title: "所含物料编号",
        field: "orderStatistics",
        title: "所含物料明细",
        type: "string",
        width: 120,
        width: 630,
        align: "left",
      },
      {
        field: "sumStock",
        title: "总库存",
        type: "string",
        width: 140,
        align: "left",
      },
      {
        field: "stockOrderNo",
        title: "所含单据",
        type: "string",
        width: 140,
        align: "left",
@@ -125,6 +141,45 @@
        align: "left",
      },
      {
        field: "enalbeStatus",
        title: "货位禁用状态",
        type: "string",
        width: 140,
        align: "left",
        bind: { key: "enableStatusEnum", data: [] },
      },
      {
        field: "locationStatus",
        title: "货位状态",
        type: "string",
        width: 140,
        align: "left",
        bind: { key: "locationStatusEnum", data: [] },
      },
      {
        field: "locationType",
        title: "货位区域",
        type: "string",
        width: 140,
        align: "left",
        bind:{key: "locationTypeEnum", data: []}
      },
      {
        field: "stockStatus",
        title: "库存状态",
        type: "string",
        width: 140,
        align: "left",
        bind:{key: "stockStatusEmun", data: []}
      },
      {
        field: "warehouseId",
        title: "所属仓库",
        type: "string",
        width: 80,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",