From d57815781381a23be2255f1f93b480950c6c39a8 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 14 十一月 2025 17:20:24 +0800
Subject: [PATCH] 新增任务看板滚动功能及优化文档布局在 Home.vue中新增任务看板滚动显示功能，优化数据总览和图表样式新增 iconfont 字体文件及相关样式，提升页面视觉效果。在 TaskService.cs和 AGVSignal.cs中新增对RelocationGroup 的任务状态处理逻辑。新增EnumHelper.cs 中的枚举描述获取方法，支持动态描述解析优化按钮逻辑，统一“其他出库”和“调拨出库”的处理方式更新文档布局文件，调整引用路径、索引和视图状态。 在StockInfoService.cs中新增任务数据查询逻辑，支持任务状态描述返回。
---
项目代码/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock_Hty.jsx | 108 +++++++++++-------------------------------------------
1 files changed, 22 insertions(+), 86 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock_Hty.jsx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock_Hty.jsx"
index a301399..fad76f6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock_Hty.jsx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock_Hty.jsx"
@@ -8,12 +8,11 @@
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
// import gridHeader from "./demo_Product/Dt_BillGroupStockDetail.vue";
-import gridBody from "./extend/SupplementationData.vue"
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
gridHeader: '',
- gridBody: gridBody,
+ gridBody: '',
gridFooter: '',
//鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
modelHeader: '',
@@ -26,52 +25,6 @@
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
//妗嗘灦鍒濆鍖栭厤缃墠锛�
- let OutBoundBtn = this.buttons.find((x) => x.value == 'OutBound')
- if (OutBoundBtn) {
- OutBoundBtn.onClick = function () {
- // this.$Message.success('鐐瑰嚮浜嗘寜閽�')
- let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
- if (row <= 0) {
- //濡傛灉娌℃湁閫変腑琛�
- this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
- return
- }
- let locationCode = row[0].locationCode
- let palletCode = row[0].palletCode
- this.http
- .get(
- `/api/Task/CreateAndSendOutboundTask?locationCode=${locationCode}&palletCode=${palletCode}`,
- {},
- '姝ｅ湪鍒涘缓浠诲姟'
- )
- .then((res) => {
- //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
- if (res.status) {
- this.$Message.success('鍒涘缓浠诲姟鎴愬姛')
- console.log(res)
- this.refresh() //鍒锋柊琛ㄦ牸
- } else {
- this.$Message.error(res.message) //閿欒鎻愮ず
- }
- })
- }
- }
-
-
- var btnSupplementationData = this.buttons.find(x => x.value == "SupplementationData");
- if (btnSupplementationData != null) {
- btnSupplementationData.onClick = () => {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) {
- return this.$error("璇烽�夋嫨鏁版嵁!");
- } else if (rows.length > 1) {
- return this.$error("鍙兘閫夋嫨鍗曟潯鏁版嵁");
- }
- this.$refs.gridBody.open(rows[0].palletCode);
- this.refresh();
- }
-
- }
//绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
// this.buttons.unshift({
// //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
@@ -102,61 +55,45 @@
//绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
this.boxOptions.labelWidth = 150
- // this.columns.push({
- // title: "鎿嶄綔",
- // field: "鎿嶄綔",
- // width: 150,
- // align: "left", // 'center',
- // render: (h, { row, column, index }) => {
- // return (
- // <div>
- // <el-button
- // onClick={($e) => {
- // this.$refs.gridHeader.openModel1(row);
- // }}
- // type="primary"
- // plain
- // style="height:26px; padding: 10px !important;"
- // >
- // 鏌ョ湅搴撳瓨鏄庣粏
- // </el-button>
- // </div>
- // );
- // },
- // });
-
this.columns.forEach((column) => {
- //淇敼棰滆壊
- if (column.field == 'roadwayNo') {
+
+ if (column.field == 'floor') {
+
+ const floorMap = {
+ '1F': '涓�妤�',
+ '2F': '浜屾ゼ',
+ };
column.formatter = (row) => {
- // return '<span style="color: #2d8cf0;">' + row?.locationInfo?.roadwayNo + '</span>'
- return row?.locationInfo?.roadwayNo
+ return floorMap[row?.locationInfo?.floor] || ''
}
}
- if (column.field == 'materielCode') {
+ if (column.field == 'areaId') {
+
+ const floorMap = {
+ '1': '涓�妤煎爢鍨涙満鍖哄煙',
+ '2': '涓�妤糀GV鍑哄簱缂撳瓨鍖�',
+ '3': '涓�妤糀GV绔嬪簱缂撳瓨鍖�',
+ '4': '涓�妤糀GV鍏ュ簱缂撳瓨鍖�',
+ '5': '浜屾ゼB4-G4缂撳瓨鍖�',
+ '6': '浜屾ゼB5-G5缂撳瓨鍖�',
+ };
column.formatter = (row) => {
- // return '<span style="color: #2d8cf0;">' + row?.locationInfo?.roadwayNo + '</span>'
- return row?.stockInfoDetails[0]?.materielCode
+ return floorMap[row?.locationInfo?.areaId] || ''
}
}
- //鏍煎紡鍖栨棩鏈�
- // 妫�鏌ュ綋鍓嶅垪鐨勫瓧娈垫槸鍚︿负 'locationStatus'
if (column.field == 'locationStatus') {
- // 浣跨敤瀵硅薄瀛楅潰閲忔潵鏄犲皠 'locationStatus' 鐨勫�煎拰瀵瑰簲鐨勬枃鏈�
const statusMap = {
- '-1': '鍏ㄩ儴',
'0': '绌洪棽',
'1': '閿佸畾',
'2': '鏈夎揣',
'3': '鏈夎揣绂佺敤',
'4': '鏃犺揣绂佺敤'
};
- // 瀹氫箟涓�涓牸寮忓寲鍑芥暟锛屾牴鎹� 'locationStatus' 鐨勫�艰繑鍥炵浉搴旂殑鏂囨湰
column.formatter = (row) => {
- // 浣跨敤 statusMap 瀵硅薄鏉ヨ幏鍙栧搴旂殑鏂囨湰锛屽鏋滄病鏈夊尮閰嶅垯杩斿洖 '鏈煡鐘舵��'
- return statusMap[row?.locationInfo?.locationStatus] || '鏈煡鐘舵��';
+ return statusMap[row?.locationInfo?.locationStatus] || '';
}
}
+
})
},
onInited() {
@@ -188,7 +125,6 @@
// this.$refs.table.$refs.table.toggleRowSelection(row) //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
},
modelOpenAfter(row) {
-
//鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
//(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
//(2)缁欏脊鍑烘璁剧疆榛樿鍊�
--
Gitblit v1.9.3