Merge branch 'dev'

wanshenmean

3 天以前 71be45c250688b0e76a59f93cd80e85ba37e3de7

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

@@ -42,6 +42,9 @@
      robotSourceAddressPalletCode: "",
      robotTargetAddressPalletCode: "",
      robotGrade: 2,
      robotExceptionMessage: "",
      robotDispatchertime: "",
      robotRemark: "",
    });

    // 编辑表单配置
@@ -154,7 +157,7 @@
        field: "robotRoadway",
        title: "巷道",
        type: "string",
        width: 100,
        width: 120,
        align: "left",
      },
      {
@@ -186,6 +189,7 @@
        type: "string",
        width: 120,
        align: "left",
        hidden: true,
      },
      {
        field: "robotTargetAddress",
@@ -193,37 +197,35 @@
        type: "string",
        width: 120,
        align: "left",
        hidden: true,
      },
      {
        field: "robotSourceAddressLineCode",
        title: "来源线代码",
        title: "来源线体地址",
        type: "string",
        width: 130,
        align: "left",
      },
      {
        field: "robotTargetAddressLineCode",
        title: "目标线代码",
        title: "目标线体地址",
        type: "string",
        width: 130,
        align: "left",
        hidden: true,
      },
      {
        field: "robotSourceAddressPalletCode",
        title: "来源托盘代码",
        title: "来源托盘",
        type: "string",
        width: 130,
        align: "left",
        hidden: true,
      },
      {
        field: "robotTargetAddressPalletCode",
        title: "目标托盘代码",
        title: "目标托盘",
        type: "string",
        width: 130,
        align: "left",
        hidden: true,
      },
      {
        field: "robotExceptionMessage",
@@ -256,6 +258,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        hidden: true,
      },
      {
        field: "robotremark",
@@ -271,6 +274,7 @@
        type: "string",
        width: 100,
        align: "left",
        hidden: true,
      },
      {
        field: "createDate",
@@ -279,6 +283,7 @@
        width: 160,
        align: "left",
        sortable: true,
        hidden: true,
      },
      {
        field: "modifier",
@@ -286,6 +291,7 @@
        type: "string",
        width: 100,
        align: "left",
        hidden: true,
      },
      {
        field: "modifyDate",
@@ -293,6 +299,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        hidden: true,
      },
    ]);