From 5c6e99cb3b30e0b4127caa3b626c2b51ea038b61 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期日, 26 四月 2026 17:49:27 +0800
Subject: [PATCH] Merge branch 'dev' into xiaoyang
---
Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/agvTask_hty.vue | 127 +++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 58 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_agv.vue b/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/agvTask_hty.vue
similarity index 72%
copy from Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_agv.vue
copy to Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/agvTask_hty.vue
index 8beaf41..5db3dc6 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_agv.vue
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/agvTask_hty.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>
-
\ No newline at end of file
--
Gitblit v1.9.3