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

helongyang

18 小时以前 dc06f58d8ed537555fd529551180f43a0586ec3f

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue

@@ -57,6 +57,10 @@
        { title: "目标地址", field: "targetAddress", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
      [
        { title: "所属仓库", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
        { title: "物料编号", field: "materielCode",type: "like",}
      ],
    ]);
    const columns = ref([
      {
@@ -73,28 +77,36 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        width: 80,
        width: 120,
        align: "left",
      },
      {
        field: "warehouseId",
        title: "所属仓库",
        type: "string",
        width: 100,
        align: "left",
        bind: { key: "warehouses", data: [] },
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 150,
        width: 160,
        align: "left",
      },
      {
        field: "roadway",
        title: "巷道号",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
      },
      {
        field: "taskType",
        title: "任务类型",
        type: "int",
        width: 90,
        width: 120,
        align: "left",
        bind: { key: "taskType", data: [] },
      },
@@ -110,14 +122,21 @@
        field: "sourceAddress",
        title: "起始地址",
        type: "int",
        width: 120,
        width: 220,
        align: "left",
      },
      {
        field: "targetAddress",
        title: "目标地址",
        type: "string",
        width: 120,
        width: 220,
        align: "left",
      },
      {
        field: "orderNo",
        title: "单据编号",
        type: "string",
        width: 150,
        align: "left",
      },
      // {
@@ -182,7 +201,7 @@
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 150,
        width: 160,
        align: "left",
      },
      {
@@ -200,13 +219,6 @@
        align: "left",
      },
      {
        field: "operateType",
        title: "备注",
        type: "string",
        width: 100,
        align: "left",
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
@@ -214,6 +226,20 @@
        align: "left",
        hidden: true,
      },
      {
        field: "materielCode",
        title: "物料编号",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "quantity",
        title: "物料数量",
        type: "float",
        width: 100,
        align: "left",
      },
    ]);
    const detail = ref({
      cnName: "#detailCnName",