From 1d346a70b7f8022a1048086c3691cc654a91f48c Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 15:01:00 +0800
Subject: [PATCH] 优化前端
---
新建文件夹/WMS/src/views/Alarm/Container.vue | 4
新建文件夹/WMS/src/views/inbound/inboundOrder.vue | 52 +++---
新建文件夹/WMS/src/views/taskinfo/Dt_SupplyTask.vue | 31 ++--
新建文件夹/WMS/src/views/inbound/inboundOrder_Hty.vue | 44 +++---
新建文件夹/WMS/src/views/basic/materielInfo.vue | 103 ++++++-------
新建文件夹/WMS/src/extension/system/Sys_Log.js | 14 ++
新建文件夹/WMS/src/views/stock/Dt_Inventory_Batch.vue | 34 ++--
新建文件夹/WMS/src/views/outbound/outboundOrder_Hty.vue | 44 +++---
新建文件夹/WMS/src/views/Alarm/EquipmentAlarmInfor.vue | 6
新建文件夹/WMS/src/views/outbound/outboundOrder.vue | 44 +++---
10 files changed, 193 insertions(+), 183 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/system/Sys_Log.js" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/system/Sys_Log.js"
index 5b05c40..24954d1 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/system/Sys_Log.js"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/extension/system/Sys_Log.js"
@@ -17,6 +17,20 @@
onInit() {
console.log("sys_log")
this.setFiexdSearchForm(true);
+
+ // 璁剧疆榛樿鏃堕棿鑼冨洿涓轰粖澶�0鐐瑰埌娆℃棩0鐐�
+ // 鑾峰彇浠婂ぉ0鐐规椂闂�
+ // let todayStart = this.base.getDate(true); // 鑾峰彇褰撳墠鏃堕棿甯︽椂鍒嗙
+ // todayStart = todayStart.split(' ')[0] + ' 00:00:00'; // 璁剧疆涓轰粖澶�0鐐�
+
+ // // 鑾峰彇鏄庡ぉ0鐐规椂闂�
+ // let tomorrowStart = this.base.addDays(todayStart, -1); // 鍔�1澶�
+ // tomorrowStart = tomorrowStart.split(' ')[0] + ' 00:00:00'; // 璁剧疆涓烘槑澶�0鐐�
+
+ // // 濡傛灉鏄棩鏈熻寖鍥村瓧娈碉紙鏁扮粍褰㈠紡锛�
+ // this.searchFormFields.beginDate = [tomorrowStart,todayStart];
+
+
},
onInited() {
this.height = this.height - 170;
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/Container.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/Container.vue"
index a3267d4..03db34c 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/Container.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/Container.vue"
@@ -90,9 +90,9 @@
{field:'humidity',title:'婀垮害',type:'float',width:100,align:'left'},
{field:'alarm',title:'鏄惁鎶ヨ',type:'select',width:100,align:'left',bind:{key:'enable',data:[]}},
{field:'alarmInformation',title:'鎶ヨ淇℃伅',type:'string',width:200,align:'left'},
- {field:'creater',title:'鍒涘缓鑰�',type:'string',width:100,require:true,align:'left'},
+ // {field:'creater',title:'鍒涘缓鑰�',type:'string',width:100,require:true,align:'left'},
{field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:160,require:true,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ // {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
{field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:160,align:'left',sort:true}
]);
const detail = ref({
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/EquipmentAlarmInfor.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/EquipmentAlarmInfor.vue"
index c43578e..c4c29fd 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/EquipmentAlarmInfor.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/Alarm/EquipmentAlarmInfor.vue"
@@ -91,10 +91,10 @@
bind: { key: "deviceStatus", data: [] },
},
{field:'syncTime',title:'鍚屾鏃堕棿',type:'datetime',width:160,align:'left',sort:true},
- {field:'creater',title:'鍒涘缓鑰�',type:'string',width:100,require:true,align:'left'},
+ // {field:'creater',title:'鍒涘缓鑰�',type:'string',width:100,require:true,align:'left'},
{field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:160,require:true,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:160,align:'left',sort:true}
+ //{field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ // {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:160,align:'left',sort:true}
]);
const detail = ref({
cnName: "#detailCnName",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
index 6daa38a..0748ff0 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
@@ -134,15 +134,15 @@
}
]
},
- {
- title: "鐗╂枡鐘舵��",
- field: "materielState",
- type: "select",
- dataKey: "materielState",
- data: [],
- span: 8,
- required: true,
- }
+ // {
+ // title: "鐗╂枡鐘舵��",
+ // field: "materielState",
+ // type: "select",
+ // dataKey: "materielState",
+ // data: [],
+ // span: 8,
+ // required: true,
+ // }
],
// 绗簲琛岋細搴撳瓨淇℃伅
[
@@ -235,27 +235,20 @@
const searchFormOptions = ref([
[
- {
- title: "浠撳簱缂栧彿",
- field: "warehouseCode",
- type: "string"
- },
+ // {
+ // title: "浠撳簱缂栧彿",
+ // field: "warehouseCode",
+ // type: "string"
+ // },
{
title: "鐗╂枡缂栧彿",
field: "materielCode",
type: "like"
},
- ],
- [
- {
+ {
title: "鐗╂枡鍚嶇О",
field: "materielName",
type: "like"
- },
- {
- title: "鍝佸悕/閫氱敤鍚�",
- field: "item",
- type: "like",
},
{
title: "鑽墏",
@@ -278,22 +271,22 @@
dataKey: "materielType",
data: [],
},
- ],
- [
- {
+ {
title: "鐗╂枡灞炴�у垎绫�",
field: "materielSourceType",
type: "select",
dataKey: "materialCode",
data: [],
},
- {
- title: "鐗╂枡鐘舵��",
- field: "materielState",
- type: "select",
- dataKey: "materielState",
- data: [],
- },
+ ],
+ [
+ // {
+ // title: "鐗╂枡鐘舵��",
+ // field: "materielState",
+ // type: "select",
+ // dataKey: "materielState",
+ // data: [],
+ // },
],
// [
// {
@@ -434,15 +427,15 @@
width: 100,
align: "left",
},
- {
- field: "materielState",
- title: "鐗╂枡鐘舵��",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "materielState", data: [] },
- require: true,
- },
+ // {
+ // field: "materielState",
+ // title: "鐗╂枡鐘舵��",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // bind: { key: "materielState", data: [] },
+ // require: true,
+ // },
{
field: "goodStatusState",
title: "涓嬪彂鐘舵��",
@@ -459,13 +452,13 @@
width: 150,
align: "left",
},
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
+ // {
+ // field: "creater",
+ // title: "鍒涘缓浜�",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ // },
{
field: "createDate",
title: "鍒涘缓鏃堕棿",
@@ -473,13 +466,13 @@
width: 160,
align: "left",
},
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
+ // {
+ // field: "modifier",
+ // title: "淇敼浜�",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // },
{
field: "modifyDate",
title: "淇敼鏃堕棿",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
index d43aa0e..68a1a2d 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
@@ -75,7 +75,7 @@
title: "搴撴埧鍙�",
field: "warehouse_no",
type: "select",
- dataKey: "warehouse",
+ dataKey: "warehouseNuber",
data: [],
required: true,
},
@@ -128,22 +128,22 @@
dataKey: "order_type",
data: [],
},
- {
- title: "琛ㄥご鐘舵��",
- field: "odrderStatus",
+ // {
+ // title: "琛ㄥご鐘舵��",
+ // field: "odrderStatus",
+ // type: "select",
+ // dataKey: "odrderStatus",
+ // data: [],
+ // },
+ {
+ title: "搴撴埧鍙�",
+ field: "warehouse_no",
type: "select",
- dataKey: "odrderStatus",
+ dataKey: "warehouseNuber",
data: [],
},
],
[
- {
- title: "搴撴埧鍙�",
- field: "warehouse_no",
- type: "select",
- dataKey: "warehouse",
- data: [],
- },
{
title: "鍏ュ簱璁拌处鏃堕棿",
field: "account_tiem",
@@ -216,13 +216,13 @@
align: "left",
bind: { key: "odrderStatus", data: [] },
},
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
+ // {
+ // field: "creater",
+ // title: "鍒涘缓浜�",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ // },
{
field: "createDate",
title: "鍒涘缓鏃堕棿",
@@ -230,13 +230,13 @@
width: 160,
align: "left",
},
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
+ // {
+ // field: "modifier",
+ // title: "淇敼浜�",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // },
{
field: "modifyDate",
title: "淇敼鏃堕棿",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder_Hty.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder_Hty.vue"
index 972e2db..3f2d401 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder_Hty.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder_Hty.vue"
@@ -134,13 +134,13 @@
align: 'left',
bind: { key: "odrderStatus", data: [] }
},
- {
- field: 'creater',
- title: '鍒涘缓浜�',
- type: 'string',
- width: 90,
- align: 'left'
- },
+ // {
+ // field: 'creater',
+ // title: '鍒涘缓浜�',
+ // type: 'string',
+ // width: 90,
+ // align: 'left'
+ // },
{
field: 'createDate',
title: '鍒涘缓鏃堕棿',
@@ -149,21 +149,21 @@
align: 'left',
sort: true
},
- {
- field: 'modifier',
- title: '淇敼浜�',
- type: 'string',
- width: 100,
- align: 'left'
- },
- {
- field: 'modifyDate',
- title: '淇敼鏃堕棿',
- type: 'datetime',
- width: 160,
- align: 'left',
- sort: true
- }
+ // {
+ // field: 'modifier',
+ // title: '淇敼浜�',
+ // type: 'string',
+ // width: 100,
+ // align: 'left'
+ // },
+ // {
+ // field: 'modifyDate',
+ // title: '淇敼鏃堕棿',
+ // type: 'datetime',
+ // width: 160,
+ // align: 'left',
+ // sort: true
+ // }
]);
const detail = ref({
cnName: "鍘嗗彶鍏ュ簱鍗曟槑缁�",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
index 27556a3..056dc5b 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
@@ -110,7 +110,7 @@
[
{ title: "鍑哄簱鍗曞彿", field: "out_no", type: "like" },
{ title: "瀹㈡埛浠ｇ爜", field: "client_no", type: "like" },
- { title: "瀹㈡埛浠ｇ爜", field: "warehouse_no", type: "select", dataKey: "warehouseNuber", data: [] },
+ { title: "搴撴埧鍙�", field: "warehouse_no", type: "select", dataKey: "warehouseNuber", data: [] },
{
title: "鍑哄簱鍗曠被鍨�",
field: "out_type",
@@ -120,13 +120,13 @@
},
],
[
- {
- title: "鐘舵��",
- field: "outStatus",
- type: "select",
- dataKey: "outStatus",
- data: [],
- },
+ // {
+ // title: "鐘舵��",
+ // field: "outStatus",
+ // type: "select",
+ // dataKey: "outStatus",
+ // data: [],
+ // },
{ title: "瀹㈡埛鍚嶇О", field: "client_name", type: "like" },
{ title: "鍑哄簱璁拌处鏃堕棿", field: "account_time", type: "datetime" },
]
@@ -200,13 +200,13 @@
// bind: { key: "outStatus", data: [] }
// edit:{type:""}
},
- {
- field: 'creater',
- title: '鍒涘缓浜�',
- type: 'string',
- width: 90,
- align: 'left'
- },
+ // {
+ // field: 'creater',
+ // title: '鍒涘缓浜�',
+ // type: 'string',
+ // width: 90,
+ // align: 'left'
+ // },
{
field: 'createDate',
title: '鍒涘缓鏃堕棿',
@@ -215,13 +215,13 @@
align: 'left',
sort: true
},
- {
- field: 'modifier',
- title: '淇敼浜�',
- type: 'string',
- width: 100,
- align: 'left'
- },
+ // {
+ // field: 'modifier',
+ // title: '淇敼浜�',
+ // type: 'string',
+ // width: 100,
+ // align: 'left'
+ // },
{
field: 'modifyDate',
title: '淇敼鏃堕棿',
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder_Hty.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder_Hty.vue"
index 39477d7..5d53b4f 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder_Hty.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder_Hty.vue"
@@ -138,13 +138,13 @@
align: 'left',
bind: { key: "outStatus", data: [] }
},
- {
- field: 'creater',
- title: '鍒涘缓浜�',
- type: 'string',
- width: 90,
- align: 'left'
- },
+ // {
+ // field: 'creater',
+ // title: '鍒涘缓浜�',
+ // type: 'string',
+ // width: 90,
+ // align: 'left'
+ // },
{
field: 'createDate',
title: '鍒涘缓鏃堕棿',
@@ -153,21 +153,21 @@
align: 'left',
sort: true
},
- {
- field: 'modifier',
- title: '淇敼浜�',
- type: 'string',
- width: 100,
- align: 'left'
- },
- {
- field: 'modifyDate',
- title: '淇敼鏃堕棿',
- type: 'datetime',
- width: 160,
- align: 'left',
- sort: true
- }
+ // {
+ // field: 'modifier',
+ // title: '淇敼浜�',
+ // type: 'string',
+ // width: 100,
+ // align: 'left'
+ // },
+ // {
+ // field: 'modifyDate',
+ // title: '淇敼鏃堕棿',
+ // type: 'datetime',
+ // width: 160,
+ // align: 'left',
+ // sort: true
+ // }
]);
const detail = ref({
cnName: "鍘嗗彶鍑哄簱鍗曟槑缁�",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/Dt_Inventory_Batch.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/Dt_Inventory_Batch.vue"
index 977958c..cef7d24 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/Dt_Inventory_Batch.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/stock/Dt_Inventory_Batch.vue"
@@ -92,12 +92,12 @@
field: "erpStockQuantity",
type: "number",
},
- {
- title: "搴撳瓨宸紓",
- field: "status",
- type: "select",
- bind: { key: "stockDifference", data: [] }
- }
+ // {
+ // title: "搴撳瓨宸紓",
+ // field: "status",
+ // type: "select",
+ // bind: { key: "stockDifference", data: [] }
+ // }
],
[
// {
@@ -129,9 +129,9 @@
});
const searchFormOptions = ref([
[
- { title: "鐗╂枡缂栧彿", field: "materielCode" },
- { title: "鐗╂枡鍚嶇О", field: "materielName" },
- { title: "鎵规鍙�", field: "batchNo" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode" ,type: "like" },
+ { title: "鐗╂枡鍚嶇О", field: "materielName" ,type: "like"},
+ { title: "鎵规鍙�", field: "batchNo" ,type: "like"},
],
]);
const columns = ref([
@@ -207,14 +207,14 @@
width: 120,
align: "left",
},
- {
- field: "status",
- title: "搴撳瓨宸紓",
- type: "select",
- width: 100,
- align: "left",
- bind: { key: "stockDifference", data: [] },
- },
+ // {
+ // field: "status",
+ // title: "搴撳瓨宸紓",
+ // type: "select",
+ // width: 100,
+ // align: "left",
+ // bind: { key: "stockDifference", data: [] },
+ // },
// {
// field: "productionDate",
// title: "鐢熶骇鏃ユ湡",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask.vue"
index 224d91d..b9ab106 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask.vue"
@@ -217,12 +217,27 @@
align: "left",
},
{
+ field: "orderNo",
+ title: "鍗曟嵁缂栧彿",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
width: 120,
align: "left",
},
+ {
+ field: "materielCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+
{
field: "batchNo",
title: "鎵规鍙�",
@@ -230,13 +245,7 @@
width: 120,
align: "left",
},
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 120,
- align: "left",
- },
+
{
field: "materielName",
title: "鐗╂枡鍚嶇О",
@@ -299,13 +308,7 @@
width: 100,
align: "left",
},
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 120,
- align: "left",
- },
+
{
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
--
Gitblit v1.9.3