From 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 00:41:18 +0800
Subject: [PATCH] 优化出入库逻辑

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue |  458 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 227 insertions(+), 231 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
index a92aae1..58e0814 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
@@ -1,235 +1,231 @@
 
 <template>
-    <view-grid
-      ref="grid"
-      :columns="columns"
-      :detail="detail"
-      :editFormFields="editFormFields"
-      :editFormOptions="editFormOptions"
-      :searchFormFields="searchFormFields"
-      :searchFormOptions="searchFormOptions"
-      :table="table"
-      :extend="extend"
-    >
-    </view-grid>
-  </template>
+  <view-grid
+    ref="grid"
+    :columns="columns"
+    :detail="detail"
+    :editFormFields="editFormFields"
+    :editFormOptions="editFormOptions"
+    :searchFormFields="searchFormFields"
+    :searchFormOptions="searchFormOptions"
+    :table="table"
+    :extend="extend"
+  >
+  </view-grid>
+</template>
     <script>
-  import extend from "@/extension/taskinfo/task.js";
-  import { ref, defineComponent } from "vue";
-  export default defineComponent({
-    setup() {
-      const table = ref({
-        key: "taskId",
-        footer: "Foots",
-        cnName: "浠诲姟淇℃伅",
-        name: "task",
-        url: "/Task/",
-        sortName: "CreateDate",
-      });
-      const editFormFields = ref({});
-      const editFormOptions = ref([]);
-      const searchFormFields = ref({
-        taskNum: "",
-        palletCode: "",
-        roadway: "",
-        sourceAddress: "",
-        targetAddress: "",
-        currentAddress: "",
-        nextAddress: "",
-        creater: "",
-        createDate: "",
-      });
-      const searchFormOptions = ref([
-        [
-          { title: "浠诲姟鍙�", field: "taskNum", type: "int" },
-          { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
-          {
-            title: "浠诲姟绫诲瀷",
-            field: "taskType",
-            type: "selectList",
-            dataKey: "taskType",
-            data: [],
-          },
-          {
-            title: "浠诲姟鐘舵��",
-            field: "taskState",
-            type: "selectList",
-            dataKey: "taskState",
-            data: [],
-          },
-        ],
-        [
-          { title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
-          { title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
-          { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
-          { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
-        ],
-        [
-          { title: "宸烽亾鍙�", field: "roadway", type: "like" },
-          { title: "鍒涘缓浜�", field: "creater", type: "like" },
-          { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
-        ],
-      ]);
-      const columns = ref([
-        {
-          field: "taskId",
-          title: "taskId",
-          type: "int",
-          width: 90,
-          hidden: true,
-          readonly: true,
-          require: true,
-          align: "left",
-        },
-        {
-          field: "taskNum",
-          title: "浠诲姟鍙�",
-          type: "int",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "palletCode",
-          title: "鎵樼洏缂栧彿",
-          type: "string",
-          width: 200,
-          align: "left",
-        },
-        {
-          field: "roadway",
-          title: "宸烽亾鍙�",
-          type: "string",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "taskType",
-          title: "浠诲姟绫诲瀷",
-          type: "int",
-          width: 90,
-          align: "left",
-          bind: { key: "taskType", data: [] },
-        },
-        {
-          field: "taskState",
-          title: "浠诲姟鐘舵��",
-          type: "int",
-          width: 150,
-          align: "left",
-          bind: { key: "taskState", data: [] },
-        },
-        {
-          field: "sourceAddress",
-          title: "璧峰鍦板潃",
-          type: "int",
-          width: 120,
-          align: "left",
-        },
-        {
-          field: "targetAddress",
-          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",
-          title: "浼樺厛绾�",
-          type: "int",
-          width: 80,
-          align: "left",
-        },
-        {
-          field: "dispatchertime",
-          title: "浠诲姟涓嬪彂鏃堕棿",
-          type: "datetime",
-          width: 150,
-          align: "left",
-        },
-        {
-          field: "wMSId",
-          title: "WMS浠诲姟涓婚敭",
-          type: "int",
-          width: 120,
-          align: "left",
-          hidden: true,
-        },
-        {
-          field: "creater",
-          title: "鍒涘缓浜�",
-          type: "string",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "createDate",
-          title: "鍒涘缓鏃堕棿",
-          type: "datetime",
-          width: 150,
-          align: "left",
-        },
-        {
-          field: "modifier",
-          title: "淇敼浜�",
-          type: "string",
-          width: 100,
-          align: "left",
-        },
-        {
-          field: "modifyDate",
-          title: "淇敼鏃堕棿",
-          type: "datetime",
-          width: 160,
-          align: "left",
-        },
-        {
-          field: "remark",
-          title: "澶囨敞",
-          type: "string",
-          width: 100,
-          align: "left",
-          hidden: true,
-        },
-      ]);
-      const detail = ref({
-        cnName: "#detailCnName",
-        table: "",
-        columns: [],
-        sortName: "",
-      });
-      return {
-        table,
-        extend,
-        editFormFields,
-        editFormOptions,
-        searchFormFields,
-        searchFormOptions,
-        columns,
-        detail,
-      };
-    },
-  });
-  </script>
+import extend from "@/extension/taskinfo/task.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+  setup() {
+    const table = ref({
+      key: "taskId",
+      footer: "Foots",
+      cnName: "浠诲姟淇℃伅",
+      name: "task",
+      url: "/Task/",
+      sortName: "CreateDate",
+    });
+    const editFormFields = ref({});
+    const editFormOptions = ref([]);
+    const searchFormFields = ref({
+      taskNum: "",
+      palletCode: "",
+      roadway: "",
+      taskStatus: "",
+      taskType: "",
+      sourceAddress: "",
+      targetAddress: "",
+      currentAddress: "",
+      nextAddress: "",
+      creater: "",
+      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: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
+        { title: "宸烽亾鍙�", field: "roadway", type: "like" },
+      ],
+      [
+        { title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
+        { title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
+        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+      ],
+    ]);
+    const columns = ref([
+      {
+        field: "taskId",
+        title: "taskId",
+        type: "int",
+        width: 90,
+        hidden: true,
+        readonly: true,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "taskNum",
+        title: "浠诲姟鍙�",
+        type: "int",
+        width: 80,
+        align: "left",
+      },
+      {
+        field: "palletCode",
+        title: "鎵樼洏缂栧彿",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "roadway",
+        title: "宸烽亾鍙�",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "taskType",
+        title: "浠诲姟绫诲瀷",
+        type: "int",
+        width: 80,
+        align: "left",
+        bind: { key: "taskTypeEnum", data: [] },
+      },
+      {
+        field: "taskStatus",
+        title: "浠诲姟鐘舵��",
+        type: "int",
+        width: 80,
+        align: "left",
+        bind: { key: "taskStatusEnum", data: [] },
+      },
+      {
+        field: "sourceAddress",
+        title: "璧峰鍦板潃",
+        type: "int",
+        width: 150,
+        align: "left",
+      },
+      {
+        field: "targetAddress",
+        title: "鐩爣鍦板潃",
+        type: "string",
+        width: 150,
+        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",
+        title: "浼樺厛绾�",
+        type: "int",
+        width: 80,
+        align: "left",
+      },
+      {
+        field: "depth",
+        title: "娣卞害",
+        type: "int",
+        width: 80,
+        align: "left",
+      },
+      {
+        field: "dispatchertime",
+        title: "浠诲姟涓嬪彂鏃堕棿",
+        type: "datetime",
+        width: 150,
+        align: "left",
+        hidden:true,
+      },
+      {
+        field: "wMSId",
+        title: "WMS浠诲姟涓婚敭",
+        type: "int",
+        width: 120,
+        align: "left",
+        hidden: true,
+      },
+      {
+        field: "creater",
+        title: "鍒涘缓浜�",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "createDate",
+        title: "鍒涘缓鏃堕棿",
+        type: "datetime",
+        width: 150,
+        align: "left",
+      },
+      {
+        field: "modifier",
+        title: "淇敼浜�",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "modifyDate",
+        title: "淇敼鏃堕棿",
+        type: "datetime",
+        width: 150,
+        align: "left",
+      },
+      {
+        field: "remark",
+        title: "澶囨敞",
+        type: "string",
+        width: 100,
+        align: "left",
+        hidden: true,
+      },
+    ]);
+    const detail = ref({
+      cnName: "#detailCnName",
+      table: "",
+      columns: [],
+      sortName: "",
+    });
+    return {
+      table,
+      extend,
+      editFormFields,
+      editFormOptions,
+      searchFormFields,
+      searchFormOptions,
+      columns,
+      detail,
+    };
+  },
+});
+</script>
     
\ No newline at end of file

--
Gitblit v1.9.3