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

yanjinhui

6 天以前 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17

 н¨Îļþ¼Ð/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue

@@ -42,53 +42,29 @@
      createDate: "",
    });
    const searchFormOptions = ref([
      [
        { title: "任务号", field: "taskNum", type: "int" },
        { title: "托盘编号", field: "palletCode", type: "like" },
 [
        // { title: "任务号", field: "taskNum", type: "int" },
        { title: "单据编号", field: "orderNo", type: "like" },
        // { title: "托盘编号", field: "palletCode", type: "like" },
        { title: "批次号", field: "batchNo", type: "like" },
           { 
          title: "单据类型", 
          field: "taskType",
          type: "select", 
           data: [],
          dataKey:"TaskTypeEnum"
        },
      ],
      [
        { title: "物料编号", field: "materielCode", type: "like" },
        { title: "物料名称", field: "materielName", type: "like" },
        { 
          title: "操作类型", 
          field: "operateType", 
          type: "select", 
          data: [
            { key: "新增", value: "新增" },
            { key: "修改", value: "修改" },
            { key: "删除", value: "删除" }
          ] 
        },
      ],
      [
        { 
          title: "任务类型", 
          field: "taskType",
          type: "select", 
          data: [],
          dataKey:"TaskTypeEnum",
        },
        { 
          title: "任务状态", 
          field: "taskStatus",
          type: "select", 
          data: []
        },
        { 
          title: "库房编号", 
          field: "warehouseCode",
          type: "select", 
          data: [],
          dataKey: "warehouseNuber",
        },
      ],
      [
        { title: "货位编号", field: "locationCode", type: "like" },
        { title: "创建人", field: "creater", type: "like" },
      ],
      [
        { title: "创建时间", field: "createDate", type: "datetime" },
      {
        field: "materielSpec",
        title: "物料规格",
        type: "string",
        width: 120,
        align: "left",
      },
      ],
    ]);
    const columns = ref([
@@ -128,6 +104,7 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        hidden: true,
        width: 120,
        align: "left",
      },
@@ -136,6 +113,7 @@
        title: "托盘编号",
        type: "string",
        width: 120,
        hidden: true,
        align: "left",
      },
      {
@@ -168,7 +146,7 @@
      },
      {
        field: "taskType",
        title: "任务类型",
        title: "单据类型",
        type: "select",
        width: 100,
        align: "left",
@@ -181,6 +159,7 @@
        type: "select",
        width: 100,
        align: "left",
        bind: { key: "taskStatusEnum", data: [] },
        data: [],
      },
      {
@@ -223,6 +202,7 @@
        field: "dispatchertime",
        title: "任务下发时间",
        type: "datetime",
        hidden: true,
        width: 160,
        align: "left",
      },
@@ -231,6 +211,7 @@
        title: "创建人",
        type: "string",
        width: 90,
        hidden: true,
        align: "left",
      },
      {
@@ -238,6 +219,7 @@
        title: "创建时间",
        type: "datetime",
        width: 160,
        hidden: true,
        align: "left",
      },
      {