From fac6be89f3a02270b7b4a1bbe1f0dc05788c368e Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 13:19:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

---
 Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue
index 4f2b25b..ba60513 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue
@@ -14,7 +14,7 @@
   </view-grid>
 </template>
     <script>
-import extend from "@/extension/taskinfo/task_hty.js";
+import extend from "@/extension/taskinfo/task_hty.jsx";
 import { ref, defineComponent } from "vue";
 export default defineComponent({
   setup() {
@@ -89,6 +89,12 @@
         type: "string",
         width: 120,
         align: "left",
+      },{
+        field: "operateType",
+        title: "鎿嶄綔绫诲瀷",
+        type: "string",
+        width: 120,
+        align: "left"
       },
       {
         field: "taskType",
@@ -96,7 +102,7 @@
         type: "int",
         width: 120,
         align: "left",
-        bind: { key: "taskType", data: [] },
+        bind: { key: "taskTypeEnum", data: [] },
       },
       {
         field: "taskStatus",
@@ -110,14 +116,14 @@
         field: "sourceAddress",
         title: "璧峰鍦板潃",
         type: "int",
-        width: 220,
+        width: 120,
         align: "left",
       },
       {
         field: "targetAddress",
         title: "鐩爣鍦板潃",
         type: "string",
-        width: 220,
+        width: 120,
         align: "left",
       },
       // {
@@ -142,13 +148,13 @@
         align: "left",
         hidden: true,
       },
-      {
-        field: "grade",
-        title: "浼樺厛绾�",
-        type: "int",
-        width: 80,
-        align: "left",
-      },
+      // {
+      //   field: "grade",
+      //   title: "浼樺厛绾�",
+      //   type: "int",
+      //   width: 80,
+      //   align: "left",
+      // },
       {
         field: "depth",
         title: "娣卞害",

--
Gitblit v1.9.3