From acf83c45ef4f342380d1ef1f146a1d575de7c9eb Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期一, 16 三月 2026 15:10:21 +0800
Subject: [PATCH] fix: 修复前端页面
---
项目代码/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue | 67 ++++++++++++---------------------
1 files changed, 24 insertions(+), 43 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
index e0109d2..16fdd2b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
@@ -1,19 +1,10 @@
-
<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.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -38,12 +29,12 @@
nextAddress: "",
creater: "",
createDate: "",
- palletType:"",
- WarehouseId:"",
+ palletType: "",
+ WarehouseId: "",
});
const editFormOptions = ref([
[
- { title: "浠诲姟鐘舵��",field: "taskStatus",type: "select",dataKey: "taskStatusEnum",data: [],},
+ { title: "浠诲姟鐘舵��", field: "taskStatus", type: "select", dataKey: "taskStatusEnum", data: [], },
],
[
{ title: "璧峰鍦板潃", field: "sourceAddress", type: "string" },
@@ -55,6 +46,7 @@
]
]);
const searchFormFields = ref({
+ taskId: "",
taskNum: "",
palletCode: "",
roadway: "",
@@ -64,24 +56,23 @@
targetAddress: "",
currentAddress: "",
nextAddress: "",
- creater: "",
createDate: "",
});
const searchFormOptions = ref([
[
- { title: "浠诲姟鍙�", field: "taskNum", type: "int" },
+ { title: "浠诲姟鍙�", field: "taskId", 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: [], },
],
]);
const columns = ref([
@@ -111,8 +102,14 @@
title: "鎵樼洏绫诲瀷",
type: "string",
width: 80,
- align: "left",
- bind: { key: "taskpalltype", data: [] },
+ align: "center",
+ formatter: (row) => {
+ if (row.warehouseId === 2) {
+ return "鎴愬搧";
+ } else {
+ return row.palletType == 1 ? "甯冩枡" : "鏉惧竷鏂�";
+ }
+ }
},
{
field: "roadway",
@@ -120,7 +117,7 @@
type: "string",
width: 70,
align: "left",
- },{
+ }, {
field: "warehouseId",
title: "浠撳簱缂栧彿",
type: "int",
@@ -173,13 +170,6 @@
align: "left",
},
{
- field: "numberSsuances",
- title: "寮傚父娆℃暟",
- type: "string",
- width: 100,
- align: "left",
- },
- {
field: "remark",
title: "澶囨敞",
type: "string",
@@ -198,14 +188,6 @@
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
width: 160,
- align: "left",
- hidden:true,
- },
- {
- field: "wMSId",
- title: "WMS浠诲姟涓婚敭",
- type: "int",
- width: 120,
align: "left",
hidden: true,
},
@@ -237,7 +219,7 @@
width: 160,
align: "left",
},
-
+
]);
const detail = ref({
cnName: "#detailCnName",
@@ -257,5 +239,4 @@
};
},
});
-</script>
-
\ No newline at end of file
+</script>
\ No newline at end of file
--
Gitblit v1.9.3