From a6a33f6916afbf1fc629baecb772939cda2ee981 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期四, 13 三月 2025 17:58:12 +0800
Subject: [PATCH] 代码提交
---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue | 147 ++++++++++++++++++++++++++++--------------------
1 files changed, 86 insertions(+), 61 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
index e448d8c..5317763 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
@@ -38,15 +38,34 @@
});
const editFormOptions = ref([
[
- {title: "缂撳瓨鐐圭紪鍙�",required: true,field: "pointCode",type: "string",},
- {title: "鍖哄煙涓婚敭",required: true,field: "areaId",type: "select",dataKey: "areainfo", data: [] ,},
- {title: "缂撳瓨鐐圭姸鎬�",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
- {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
- ],[
- { title: "琛�", field: "row", type: "string" },
- { title: "鍒�", field: "column", type: "string" },
- { title: "娣卞害", field: "depth", type: "string" },
- { title: "缂撳瓨鐐圭被鍨�", field: "pointType", type: "string"},
+ {
+ title: "缂撳瓨鐐圭紪鍙�",
+ required: true,
+ field: "pointCode",
+ type: "string",
+ },
+ // {title: "鍖哄煙涓婚敭",required: true,field: "areaId",type: "select",dataKey: "areainfo", data: [] ,},
+ {
+ title: "缂撳瓨鐐圭姸鎬�",
+ field: "pointStatus",
+ type: "select",
+ dataKey: "locationStatusEnum",
+ data: [],
+ },
+ {
+ title: "鏄惁绂佺敤",
+ field: "enableStatus",
+ type: "select",
+ dataKey: "enableStatusEnum",
+ data: [],
+ },
+ {
+ title: "鐗╂枡绫诲瀷",
+ field: "materialtype",
+ type: "select",
+ dataKey: "materielInfo",
+ data: [],
+ },
],
]);
const searchFormFields = ref({
@@ -58,18 +77,34 @@
row: "",
column: "",
depth: "",
+ Materialtype: "",
});
const searchFormOptions = ref([
[
- {title: "缂撳瓨鐐圭紪鍙�",field: "pointCode",type: "string",},
- {title: "鍖哄煙涓婚敭",field: "areaId",type: "select",dataKey: "areainfo",data: [],},
- {title: "缂撳瓨鐐圭姸鎬�",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
- {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
- ],[
- { title: "琛�", field: "row", type: "string" },
- { title: "鍒�", field: "column", type: "string" },
- { title: "娣卞害", field: "depth", type: "string" },
- { title: "缂撳瓨鐐圭被鍨�", field: "pointType", type: "string"},
+ { title: "缂撳瓨鐐圭紪鍙�", field: "pointCode", type: "like" },
+ { title: "鐗╂枡绫诲瀷", field: "materialtype", type: "like" },
+ {
+ title: "鐗╂枡绫诲瀷",
+ field: "materialtype",
+ type: "select",
+ dataKey: "materielInfo",
+ data: [],
+ },
+ // {title: "鍖哄煙涓婚敭",field: "areaId",type: "select",dataKey: "areainfo",data: [],},
+ {
+ title: "缂撳瓨鐐圭姸鎬�",
+ field: "pointStatus",
+ type: "select",
+ dataKey: "locationStatusEnum",
+ data: [],
+ },
+ {
+ title: "鏄惁绂佺敤",
+ field: "enableStatus",
+ type: "select",
+ dataKey: "enableStatusEnum",
+ data: [],
+ },
],
]);
const columns = ref([
@@ -83,14 +118,14 @@
require: true,
align: "left",
},
- {
- field: "areaId",
- title: "鍖哄煙涓婚敭",
- type: "int",
- width: 120,
- align: "left",
- bind:{ key: "areainfo", data: [] },
- },
+ // {
+ // field: "areaId",
+ // title: "鍖哄煙涓婚敭",
+ // type: "int",
+ // width: 120,
+ // align: "left",
+ // bind:{ key: "areainfo", data: [] },
+ // },
{
field: "pointCode",
title: "缂撳瓨鐐圭紪鍙�",
@@ -107,6 +142,23 @@
bind: { key: "locationStatusEnum", data: [] },
},
{
+ field: "materialtype",
+ title: "鐗╂枡绫诲瀷",
+ type: "string",
+ width: 90,
+ align: "left",
+ // bind: { key: "locationStatusEnum", data: [] },
+ },
+ {
+ field: "pointName",
+ title: "缂撳瓨鏋跺尯鍩�",
+ type: "string",
+ width: 90,
+ align: "left",
+ // bind: { key: "locationStatusEnum", data: [] },
+ },
+
+ {
field: "enableStatus",
title: "鏄惁绂佺敤",
type: "decimal",
@@ -114,41 +166,14 @@
align: "left",
bind: { key: "enableStatusEnum", data: [] },
},
- {
- field: "row",
- title: "琛�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "column",
- title: "鍒�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "depth",
- title: "娣卞害",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "pointType",
- title: "缂撳瓨鐐圭被鍨�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "Remark",
- title: "澶囨敞",
- type: "string",
- width: 90,
- align: "left",
- },
+
+ // {
+ // field: "pointType",
+ // title: "缂撳瓨鐐圭被鍨�",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ //},
{
field: "creater",
title: "鍒涘缓浜�",
--
Gitblit v1.9.3