From 8dc2427e1c5e5e349bce2d72759034c406eb0848 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 13 三月 2026 01:15:27 +0800
Subject: [PATCH] 合并
---
项目代码/WCS/WCSClient/src/views/PackInfo/packaxis.vue | 81 ----------------------------------------
1 files changed, 1 insertions(+), 80 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 371c0e0..23011a2 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,21 +1,6 @@
<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"
@@ -29,7 +14,6 @@
</view-grid>
</template>
<script>
->>>>>>> main
import extend from "@/extension/PackInfo/packaxis.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -42,41 +26,6 @@
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:"",
@@ -89,7 +38,7 @@
axisYSpacing:"",
axisZ:"",
axisZCount:"",
- axisZSpacing:"",
+ axisZSpacing:""
});
const editFormOptions = ref([
[{
@@ -282,7 +231,6 @@
field: "axisZCount",
type: "like",
},
->>>>>>> main
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -300,16 +248,10 @@
{
field: "deviceCode",
title: "璁惧缂栧彿",
-<<<<<<< HEAD
- type: "int",
- width: 90,
- align: "left",
-=======
type: "string",
width: 90,
align: "left",
bind: {key:"deviceCodes",data: []}
->>>>>>> main
},
{
field: "stationCode",
@@ -317,24 +259,15 @@
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",
@@ -381,11 +314,7 @@
{
field: "axisYSpacing",
title: "Y鍧愭爣鐮佸灈闂磋窛",
-<<<<<<< HEAD
- type: "string",
-=======
type: "int",
->>>>>>> main
width: 120,
align: "left",
},
@@ -406,11 +335,7 @@
{
field: "axisZSpacing",
title: "Z鍧愭爣鐮佸灈闂磋窛",
-<<<<<<< HEAD
- type: "string",
-=======
type: "int",
->>>>>>> main
width: 120,
align: "left",
},
@@ -463,7 +388,3 @@
},
});
</script>
-<<<<<<< HEAD
-
-=======
->>>>>>> main
--
Gitblit v1.9.3