From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新
---
项目代码/WCS/WCSClient/src/views/PackInfo/packaxis.vue | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/views/PackInfo/packaxis.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/views/PackInfo/packaxis.vue"
index 87b4e92..371c0e0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/views/PackInfo/packaxis.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/views/PackInfo/packaxis.vue"
@@ -1,6 +1,21 @@
<template>
<view-grid
+<<<<<<< HEAD
+ ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend"
+ >
+ </view-grid>
+</template>
+ <script>
+=======
ref="grid"
:columns="columns"
:detail="detail"
@@ -14,6 +29,7 @@
</view-grid>
</template>
<script>
+>>>>>>> main
import extend from "@/extension/PackInfo/packaxis.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -26,6 +42,41 @@
url: "/Packaxis/",
sortName: "CreateDate",
});
+<<<<<<< HEAD
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({
+
+ });
+ 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", type: "select",dataKey: "Stacker",data: [],},
+ { title: "鍒涘缓浜�", field: "creater", type: "like" },
+=======
const editFormFields = ref({
deviceCode:"",
stationCode:"",
@@ -231,6 +282,7 @@
field: "axisZCount",
type: "like",
},
+>>>>>>> main
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -248,10 +300,16 @@
{
field: "deviceCode",
title: "璁惧缂栧彿",
+<<<<<<< HEAD
+ type: "int",
+ width: 90,
+ align: "left",
+=======
type: "string",
width: 90,
align: "left",
bind: {key:"deviceCodes",data: []}
+>>>>>>> main
},
{
field: "stationCode",
@@ -259,15 +317,24 @@
type: "string",
width: 200,
align: "left",
+<<<<<<< HEAD
+=======
bind: {key:"stationCodes",data: []}
+>>>>>>> main
},
{
field: "packType",
title: "鍨涘瀷",
+<<<<<<< HEAD
+ type: "string",
+ width: 150,
+ align: "left",
+=======
type: "int",
width: 150,
align: "left",
bind:{key:"packTypes",data:[]}
+>>>>>>> main
},
{
field: "packNum",
@@ -314,7 +381,11 @@
{
field: "axisYSpacing",
title: "Y鍧愭爣鐮佸灈闂磋窛",
+<<<<<<< HEAD
+ type: "string",
+=======
type: "int",
+>>>>>>> main
width: 120,
align: "left",
},
@@ -335,7 +406,11 @@
{
field: "axisZSpacing",
title: "Z鍧愭爣鐮佸灈闂磋窛",
+<<<<<<< HEAD
+ type: "string",
+=======
type: "int",
+>>>>>>> main
width: 120,
align: "left",
},
@@ -388,3 +463,7 @@
},
});
</script>
+<<<<<<< HEAD
+
+=======
+>>>>>>> main
--
Gitblit v1.9.3