From f7f1f176f931f5ad54056df7b8e8a9f028eea100 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:50:38 +0800
Subject: [PATCH] 合并
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue
index acfdbbc..1317c2e 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue
@@ -22,44 +22,46 @@
cnName: '搴撳瓨淇℃伅',
name: 'stock/Dt_BillGroupStock',
url: "/StockInfo/",
- sortName: "PalletCode"
+ sortName: "createDate"
});
const editFormFields = ref({
"palletCode": "",
- "materialNo": "",
- "state": "",
- "groupType": ""
+ "productionLine": "",
+ "outboundTime": "",
+ // "groupType": ""
});
const editFormOptions = ref([
[
{ "title": "鎵樼洏鏉＄爜", "field": "palletCode", type: "text" },
- { "title": "鐗╂枡缂栧彿", "field": "materialNo", type: "text" },
- { "title": "搴撳瓨鐘舵��", "field": "state", type: "select", dataKey: "StockState", data: [] },
- { "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "text" },
+ { "title": "搴斿嚭搴撴椂闂�", "field": "outboundTime", type: "datetime"},
+ // { "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
]
]);
const searchFormFields = ref({});
const searchFormOptions = ref([
[
{ "title": "鎵樼洏鏉＄爜", "field": "palletCode", type: "text" },
- { "title": "鐗╂枡缂栧彿", "field": "materialNo", type: "text" },
- { "title": "搴撳瓨鐘舵��", "field": "state", type: "select", dataKey: "StockState", data: [] },
- { "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "text" },
+ { "title": "搴撳尯", "field": "areaCode", type: "select", dataKey: "AreaType", data: [] },
+ { "title": "搴撳瓨绫诲瀷", "field": "isFull", type: "select", dataKey: "isFull", data: [] },
+ ],[
+ { "title": "搴撲綅鍙�", "field": "locationCode", type: "text" },
]
]);
const columns = ref(
[{ field: 'id', title: '搴撳瓨ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
- { field: 'locationCode', title: '搴撲綅', type: 'string', width: 110, align: 'left' },
- { field: 'palletCode', title: '鎵樼洏鏉＄爜', type: 'string', width: 110, align: 'left', sort: true },
- { field: 'isFull', title: '鏄惁瀹炵洏', type: 'bool', width: 110, align: 'left' },
- { field: 'linedProcessFeedbackTime', title: '宸ヨ壓寮�濮嬫椂闂�', type: 'string', width: 110, align: 'left', sort: true },
+ { field: 'locationCode', title: '搴撲綅', type: 'string', width: 110, align: 'left', },
+ { field: 'palletCode', title: '鎵樼洏鏉＄爜', type: 'string', width: 110, align: 'left', },
+ { field: 'isFull', title: '搴撳瓨绫诲瀷', type: 'bool', width: 110, align: 'left', bind: { key: "isFull", data: [] }, },
+ { field: 'linedProcessFeedbackTime', title: '宸ヨ壓寮�濮嬫椂闂�', type: 'string', width: 110, align: 'left',},
{ field: 'specialParameterDuration', title: '宸ヨ壓鏃堕暱', type: 'string', width: 110, align: 'left', sort: true },
- { field: 'outboundTime', title: '搴斿嚭搴撴椂闂�', type: 'string', width: 110, align: 'left', sort: true },
- { field: 'productionLine', title: '鐢熶骇浜х嚎', type: 'string', width: 110, align: 'left', sort: true },
- { field: 'areaCode', title: '搴撳尯', type: 'string', width: 110, align: 'left', sort: true },
- { field: 'remark', title: '鐢佃姱鏁伴噺', type: 'string', width: 120, align: 'left' },
+ { field: 'outboundTime', title: '搴斿嚭搴撴椂闂�', type: 'string', width: 110, align: 'left', },
+ { field: 'productionLine', title: '鐢熶骇浜х嚎', type: 'string', width: 110, align: 'left', },
+ { field: 'areaCode', title: '搴撳尯', type: 'string', width: 110, align: 'left', bind: { key: "AreaType", data: [] } },
+ { field: 'remark', title: '鐢佃姱鏁伴噺', type: 'string', width: 120, align: 'left', },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left', hidden: true },
- { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', },
{ field: 'modifier', title: '鏈�鍚庝慨鏀逛汉', type: 'string', sort: true, width: 100, hidden: true, align: 'left' },
// { field: 'modifyDate', title: '鏈�鍚庝慨鏀规椂闂�', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
]
--
Gitblit v1.9.3