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 | 255 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 254 insertions(+), 1 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 8b3c681..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,7 @@
<template>
<view-grid
+<<<<<<< HEAD
ref="grid"
:columns="columns"
:detail="detail"
@@ -14,6 +15,21 @@
</view-grid>
</template>
<script>
+=======
+ ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend"
+ >
+ </view-grid>
+</template>
+<script>
+>>>>>>> main
import extend from "@/extension/PackInfo/packaxis.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -26,6 +42,7 @@
url: "/Packaxis/",
sortName: "CreateDate",
});
+<<<<<<< HEAD
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({
@@ -59,6 +76,213 @@
[
{ title: "宸烽亾鍙�", field: "roadway", type: "like", type: "select",dataKey: "Stacker",data: [],},
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
+=======
+ const editFormFields = ref({
+ deviceCode:"",
+ stationCode:"",
+ packType:"",
+ axisX:"",
+ axisXCount:"",
+ axisXSpacing:"",
+ axisY:"",
+ axisYCount:"",
+ axisYSpacing:"",
+ axisZ:"",
+ axisZCount:"",
+ axisZSpacing:"",
+ });
+ const editFormOptions = ref([
+ [{
+ title:"璁惧缂栧彿",
+ field:"deviceCode",
+ type:"select",
+ dataKey: "deviceCodes",
+ data:[],
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇烽�夋嫨璁惧缂栧彿"
+ },
+ {
+ title:"宸ヤ綅缂栧彿",
+ field:"stationCode",
+ type:"select",
+ dataKey: "stationCodes",
+ data: [],
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇烽�夋嫨宸ヤ綅缂栧彿"
+ },
+ {
+ title: "鍨涘瀷",
+ field: "packType",
+ type: "select",
+ dataKey: "packTypes",
+ data: [],
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇烽�夋嫨鍨涘瀷"
+ },
+ ],
+ [
+ {
+ title: "X鍧愭爣",
+ field: "axisX",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣"
+ },
+ {
+ title: "X鍧愭爣闂磋窛",
+ field: "axisXSpacing",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣闂磋窛"
+ },
+ {
+ title: "X鍧愭爣鐮佸灈鏁�",
+ field: "axisXCount",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣鐮佸灈涓暟"
+ }
+ ]
+ ,
+ [
+ {
+ title: "Y鍧愭爣",
+ field: "axisY",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣"
+ },
+ {
+ title: "Y鍧愭爣闂磋窛",
+ field: "axisYSpacing",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣闂磋窛"
+ },
+ {
+ title: "Y鍧愭爣鐮佸灈鏁�",
+ field: "axisYCount",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣鐮佸灈涓暟"
+ }
+ ],
+ [
+ {
+ title: "Z鍧愭爣",
+ field: "axisZ",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣"
+ },
+ {
+ title: "Z鍧愭爣闂磋窛",
+ field: "axisZSpacing",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣闂磋窛"
+ },
+ {
+ title: "Z鍧愭爣鐮佸灈鏁�",
+ field: "axisZCount",
+ type: "string",
+ required: true, // 蹇呭～鏍囪
+ placeholder: "璇疯緭鍏鍧愭爣鐮佸灈涓暟"
+ }
+ ],
+ ]);
+ const searchFormFields = ref({
+ deviceCode:"",
+ stationCode:"",
+ packType:"",
+ packNum:"",
+ axisX:"",
+ axisXCount:"",
+ axisXSpacing:"",
+ axisY:"",
+ axisYCount:"",
+ axisYSpacing:"",
+ axisZ:"",
+ axisZCount:"",
+ axisZSpacing:"",
+ createDate:""
+ });
+ const searchFormOptions = ref([
+ [{
+ title:"璁惧缂栧彿",
+ field:"deviceCode",
+ type:"select",
+ dataKey: "deviceCodes",
+ data: []
+ },
+ {
+ title: "宸ヤ綅缂栧彿",
+ field: "stationCode",
+ type: "select",
+ dataKey: "stationCodes",
+ data:[]
+ },
+ {
+ title: "鍨涘瀷",
+ field: "packType",
+ type: "select",
+ dataKey: "packTypes",
+ data: []
+ }
+ ],
+ [
+ {
+ title: "X鍧愭爣",
+ field: "axisX",
+ type: "like",
+ },
+ {
+ title: "X鍧愭爣闂磋窛",
+ field: "axisXSpacing",
+ type: "like",
+ },
+ {
+ title: "X鍧愭爣鐮佸灈鏁�",
+ field: "axisXCount",
+ type: "like",
+ }
+ ]
+ ,
+ [
+ {
+ title: "Y鍧愭爣",
+ field: "axisY",
+ type: "like",
+ },
+ {
+ title: "Y鍧愭爣闂磋窛",
+ field: "axisYSpacing",
+ type: "like",
+ },
+ {
+ title: "Y鍧愭爣鐮佸灈鏁�",
+ field: "axisYCount",
+ type: "like",
+ }
+ ],
+ [
+ {
+ title: "Z鍧愭爣",
+ field: "axisZ",
+ type: "like",
+
+ },
+ {
+ title: "Z鍧愭爣闂磋窛",
+ field: "axisZSpacing",
+ type: "like",
+ },
+ {
+ title: "Z鍧愭爣鐮佸灈鏁�",
+ field: "axisZCount",
+ type: "like",
+ },
+>>>>>>> main
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -76,9 +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",
@@ -86,13 +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",
@@ -139,7 +381,11 @@
{
field: "axisYSpacing",
title: "Y鍧愭爣鐮佸灈闂磋窛",
+<<<<<<< HEAD
type: "string",
+=======
+ type: "int",
+>>>>>>> main
width: 120,
align: "left",
},
@@ -160,7 +406,11 @@
{
field: "axisZSpacing",
title: "Z鍧愭爣鐮佸灈闂磋窛",
+<<<<<<< HEAD
type: "string",
+=======
+ type: "int",
+>>>>>>> main
width: 120,
align: "left",
},
@@ -213,4 +463,7 @@
},
});
</script>
-
\ No newline at end of file
+<<<<<<< HEAD
+
+=======
+>>>>>>> main
--
Gitblit v1.9.3