Merge branch 'dev' into xiaoyang

wanshenmean

16 小时以前 5c6e99cb3b30e0b4127caa3b626c2b51ea038b61

 Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/agvTask_hty.vue

copy from Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_agv.vue
copy to Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/agvTask_hty.vue
Îļþ´Ó Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_agv.vue ¸´ÖÆ
@@ -1,4 +1,3 @@


<template>

  <view-grid

    ref="grid"

@@ -13,55 +12,75 @@
  >

  </view-grid>

</template>

    <script>

import extend from "@/extension/taskinfo/agvTask.jsx";

<script>

import extend from "@/extension/taskinfo/agvTask_hty.jsx";

import { ref, defineComponent } from "vue";



export default defineComponent({

  setup() {

    const table = ref({

      key: "taskId",

      footer: "Foots",

      cnName: "任务信息",

      name: "task",

      url: "/Task/",

      sortName: "CreateDate",

      cnName: "任务历史",

      name: "taskHty",

      url: "/Task_Hty/",

      sortName: "insertTime",

    });



    const editFormFields = ref({});

    const editFormOptions = ref([]);



    const searchFormFields = ref({

      taskNum: "",

      palletCode: "",

      roadway: "",

      taskStatus: "",

      taskType: "",

      sourceAddress: "",

      targetAddress: "",

      currentAddress: "",

      nextAddress: "",

      creater: "",

      createDate: "",

      operateType: "",

      insertTime: "",

    });



    const searchFormOptions = ref([

      [

        { title: "任务号", field: "taskNum", type: "int" },

        { title: "托盘编号", field: "palletCode", type: "like" },

        { title: "创建人", field: "creater", type: "like" },

      ],

      [

        { title: "任务类型",field: "taskType",type: "selectList",dataKey: "taskTypeEnum",data: [],},

        { title: "任务状态",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},

        { title: "巷道号", field: "roadway", type: "like" },

        { title: "托盘编码", field: "palletCode", type: "like" },

        {

          title: "任务类型",

          field: "taskType",

          type: "selectList",

          dataKey: "taskType",

          data: [],

        },

        {

          title: "任务状态",

          field: "taskStatus",

          type: "selectList",

          dataKey: "taskState",

          data: [],

        },

      ],

      [

        { title: "起始地址", field: "sourceAddress", type: "like" },

        { title: "目标地址", field: "targetAddress", type: "like" },

        { title: "创建时间", field: "createDate", type: "datetime" },

        { title: "当前位置", field: "currentAddress", type: "like" },

        { title: "下一位置", field: "nextAddress", type: "like" },

      ],

      [

        { title: "巷道号", field: "roadway", type: "like" },

        { title: "创建人", field: "creater", type: "like" },

        { title: "操作类型", field: "operateType", type: "like" },

        { title: "移入历史时间", field: "insertTime", type: "datetime" },

      ],

    ]);



    const columns = ref([

      {

        field: "taskId",

        title: "taskId",

        title: "TaskId",

        type: "int",

        width: 90,

        hidden: true,

@@ -73,43 +92,43 @@
        field: "taskNum",

        title: "任务号",

        type: "int",

        width: 120,

        width: 100,

        align: "left",

      },

      {

        field: "palletCode",

        title: "托盘编号",

        title: "托盘编码",

        type: "string",

        width: 160,

        width: 150,

        align: "left",

      },

      {

        field: "roadway",

        title: "巷道号",

        type: "string",

        width: 120,

        width: 90,

        align: "left",

      },

      {

        field: "taskType",

        title: "任务类型",

        type: "int",

        width: 120,

        width: 90,

        align: "left",

        bind: { key: "taskTypeEnum", data: [] },

        bind: { key: "taskType", data: [] },

      },

      {

        field: "taskStatus",

        title: "任务状态",

        type: "int",

        width: 150,

        width: 120,

        align: "left",

        bind: { key: "taskStatusEnum", data: [] },

        bind: { key: "taskState", data: [] },

      },

      {

        field: "sourceAddress",

        title: "起始地址",

        type: "int",

        type: "string",

        width: 120,

        align: "left",

      },

@@ -135,48 +154,39 @@
        align: "left",

      },

      {

        field: "exceptionMessage",

        title: "异常信息",

        type: "string",

        field: "grade",

        title: "优先级",

        type: "int",

        width: 90,

        align: "left",

      },

      // {

      //   field: "grade",

      //   title: "优先级",

      //   type: "int",

      //   width: 80,

      //   align: "left",

      // },

      {

        field: "depth",

        title: "深度",

        field: "sourceId",

        title: "原表主键",

        type: "int",

        width: 80,

        width: 100,

        align: "left",

        bind: { key: "locationDepth", data: [] },

      },

      {

        field: "dispatchertime",

        title: "任务下发时间",

        type: "datetime",

        width: 160,

        align: "left",

        // hidden:true,

      },

      {

        field: "wMSId",

        title: "WMS任务主键",

        type: "int",

        field: "operateType",

        title: "操作类型",

        type: "string",

        width: 120,

        align: "left",

        hidden: true,

      },

      {

        field: "insertTime",

        title: "移入历史时间",

        type: "datetime",

        width: 170,

        align: "left",

        sort: true,

      },

      {

        field: "creater",

        title: "创建人",

        type: "string",

        width: 90,

        width: 100,

        align: "left",

      },

      {

@@ -204,17 +214,19 @@
        field: "remark",

        title: "备注",

        type: "string",

        width: 100,

        width: 120,

        align: "left",

        hidden: true,

      },

    ]);



    const detail = ref({

      cnName: "#detailCnName",

      cnName: "",

      table: "",

      columns: [],

      sortName: "",

      key: "",

    });



    return {

      table,

      extend,

@@ -228,4 +240,3 @@
  },

});

</script>