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 | 252 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 213 insertions(+), 39 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..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,19 +1,19 @@
<template>
<view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
+ 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/PackInfo/packaxis.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -26,39 +26,211 @@
url: "/Packaxis/",
sortName: "CreateDate",
});
- const editFormFields = ref({});
- const editFormOptions = ref([]);
+ 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: "taskNum", type: "int" },
- { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
+ [{
+ title:"璁惧缂栧彿",
+ field:"deviceCode",
+ type:"select",
+ dataKey: "deviceCodes",
+ data: []
+ },
{
- title: "浠诲姟绫诲瀷",
- field: "taskType",
- type: "selectList",
- dataKey: "taskType",
- data: [],
+ title: "宸ヤ綅缂栧彿",
+ field: "stationCode",
+ type: "select",
+ dataKey: "stationCodes",
+ data:[]
},
{
- title: "浠诲姟鐘舵��",
- field: "taskState",
- type: "selectList",
- dataKey: "taskState",
- 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: "璧峰鍦板潃", 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" },
+ {
+ title: "Z鍧愭爣",
+ field: "axisZ",
+ type: "like",
+
+ },
+ {
+ title: "Z鍧愭爣闂磋窛",
+ field: "axisZSpacing",
+ type: "like",
+ },
+ {
+ title: "Z鍧愭爣鐮佸灈鏁�",
+ field: "axisZCount",
+ type: "like",
+ },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -76,9 +248,10 @@
{
field: "deviceCode",
title: "璁惧缂栧彿",
- type: "int",
+ type: "string",
width: 90,
align: "left",
+ bind: {key:"deviceCodes",data: []}
},
{
field: "stationCode",
@@ -86,13 +259,15 @@
type: "string",
width: 200,
align: "left",
+ bind: {key:"stationCodes",data: []}
},
{
field: "packType",
title: "鍨涘瀷",
- type: "string",
+ type: "int",
width: 150,
align: "left",
+ bind:{key:"packTypes",data:[]}
},
{
field: "packNum",
@@ -139,7 +314,7 @@
{
field: "axisYSpacing",
title: "Y鍧愭爣鐮佸灈闂磋窛",
- type: "string",
+ type: "int",
width: 120,
align: "left",
},
@@ -160,7 +335,7 @@
{
field: "axisZSpacing",
title: "Z鍧愭爣鐮佸灈闂磋窛",
- type: "string",
+ type: "int",
width: 120,
align: "left",
},
@@ -213,4 +388,3 @@
},
});
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3