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/WMS/WIDESEA_WMSClient/src/views/taskinfo/agvTask_hty.vue | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_agv.vue b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/agvTask_hty.vue
similarity index 87%
copy from Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_agv.vue
copy to Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/agvTask_hty.vue
index 8beaf41..ee750d9 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_agv.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/agvTask_hty.vue
@@ -14,17 +14,17 @@
</view-grid>
</template>
<script>
-import extend from "@/extension/taskinfo/agvTask.jsx";
+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: "task_hty",
+ url: "/Task_Hty/",
+ sortName: "taskId",
});
const editFormFields = ref({});
const editFormOptions = ref([]);
@@ -42,13 +42,13 @@
createDate: "",
});
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: "taskType",type: "selectList",dataKey: "taskType",data: [],},
{ title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
{ title: "宸烽亾鍙�", field: "roadway", type: "like" },
],
@@ -89,6 +89,12 @@
type: "string",
width: 120,
align: "left",
+ },{
+ field: "operateType",
+ title: "鎿嶄綔绫诲瀷",
+ type: "string",
+ width: 120,
+ align: "left"
},
{
field: "taskType",
@@ -120,26 +126,27 @@
width: 120,
align: "left",
},
- {
- field: "currentAddress",
- title: "褰撳墠浣嶇疆",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "nextAddress",
- title: "涓嬩竴浣嶇疆",
- type: "string",
- width: 120,
- align: "left",
- },
+ // {
+ // field: "currentAddress",
+ // title: "褰撳墠浣嶇疆",
+ // type: "string",
+ // width: 120,
+ // align: "left",
+ // },
+ // {
+ // field: "nextAddress",
+ // title: "涓嬩竴浣嶇疆",
+ // type: "string",
+ // width: 120,
+ // align: "left",
+ // },
{
field: "exceptionMessage",
title: "寮傚父淇℃伅",
type: "string",
width: 90,
align: "left",
+ hidden: true,
},
// {
// field: "grade",
@@ -160,9 +167,8 @@
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
- width: 160,
+ width: 150,
align: "left",
- // hidden:true,
},
{
field: "wMSId",
--
Gitblit v1.9.3