From bfcd7f5b405e431a5c07fe3fa77d74c892d4e66b Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期四, 19 三月 2026 15:52:42 +0800
Subject: [PATCH] fix: 修复出入库冲突拦截，系统位置与实际位置的映射和修复
---
项目代码/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 109 ++++++++++++++++++++----------------------------------
1 files changed, 41 insertions(+), 68 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
index c7ccdd7..29b59d7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
@@ -1,23 +1,22 @@
-
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
- <script>
+<script>
import extend from "@/extension/taskinfo/task_hty.js";
-import { ref, defineComponent } from "vue";
+import { ref, defineComponent, computed } from "vue";
export default defineComponent({
setup() {
+ const getPalletTypeLabel = (warehouseId, palletType) => {
+ if (warehouseId === 2) {
+ return "鎴愬搧";
+ } else {
+ return palletType === 1 ? "甯冩枡" : "鏉惧竷鏂�";
+ }
+ };
+
const table = ref({
key: "taskId",
footer: "Foots",
@@ -26,9 +25,12 @@
url: "/Task_Hty/",
sortName: "taskId",
});
+
const editFormFields = ref({});
const editFormOptions = ref([]);
+
const searchFormFields = ref({
+ sourceId: "",
taskNum: "",
palletCode: "",
roadway: "",
@@ -38,26 +40,34 @@
targetAddress: "",
currentAddress: "",
nextAddress: "",
+ createDate: "",
+ warehouseId: "",
creater: "",
createDate: "",
});
+
const searchFormOptions = ref([
- [
- { title: "浠诲姟鍙�", field: "taskNum", type: "int" },
+ [
+ { title: "浠诲姟鍙�", field: "sourceId", type: "int" },
+ { title: "MES鍙�", field: "taskNum", type: "like" },
{ title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
],
[
- { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
- { title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
+ { 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" },
+ { title: "浠撳簱", field: "warehouseId", type: "selectList", dataKey: "warehouseEnum", data: [], },
],
+ [
+ { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ]
]);
+
const columns = ref([
{
field: "taskId",
@@ -93,8 +103,14 @@
title: "鎵樼洏绫诲瀷",
type: "string",
width: 80,
- align: "left",
- bind: { key: "taskhtypalltype", data: [] },
+ align: "center",
+ formatter: (row) => {
+ if (row.warehouseId === 2) {
+ return "鎴愬搧";
+ } else {
+ return row.palletType == 1 ? "甯冩枡" : "鏉惧竷鏂�";
+ }
+ }
},
{
field: "warehouseId",
@@ -156,49 +172,20 @@
align: "left",
},
{
- field: "numberSsuances",
- title: "寮傚父娆℃暟",
- type: "string",
- width: 100,
- align: "left",
- },
- {
field: "remark",
title: "澶囨敞",
type: "string",
width: 100,
align: "left",
},
- // {
- // field: "grade",
- // title: "浼樺厛绾�",
- // type: "int",
- // width: 80,
- // align: "left",
- // },
{
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
width: 160,
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: "鍒涘缓鏃堕棿",
@@ -206,28 +193,15 @@
width: 160,
align: "left",
},
- // {
- // field: "modifier",
- // title: "淇敼浜�",
- // type: "string",
- // width: 100,
- // align: "left",
- // },
- // {
- // field: "modifyDate",
- // title: "淇敼鏃堕棿",
- // type: "datetime",
- // width: 160,
- // align: "left",
- // },
-
]);
+
const detail = ref({
cnName: "#detailCnName",
table: "",
columns: [],
sortName: "",
});
+
return {
table,
extend,
@@ -240,5 +214,4 @@
};
},
});
-</script>
-
\ No newline at end of file
+</script>
\ No newline at end of file
--
Gitblit v1.9.3