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.jsx | 193 +++++++++++++----------------------------------
1 files changed, 54 insertions(+), 139 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.jsx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx"
index 09f277c..cf8232d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx"
@@ -49,122 +49,63 @@
// }
// });
this.boxButtons.push({
- name: '鍏朵粬鍑哄簱', //鎸夐挳鍚嶇О
- icon: 'el-icon-document', //鎸夐挳鍥炬爣:缁勪欢绀轰緥->鍥炬爣
- //primary銆乻uccess銆亀arning銆乪rror銆乮nfo銆乼ext銆乨anger
- type: 'primary',
- plain: true,
- onClick: function () {
- this.$confirm('鏄惁鍏朵粬鍑哄簱', '璀﹀憡', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- center: true
- }).then(() => {
- this.http
- .post(
- `/api/Task/OtherOutBoundTaskAsync`,
- this.$refs.detail.rowData,
- '姝ｅ湪鐢熸垚鍑哄簱浠诲姟'
- )
- .then((res) => {
- if (res.status) {
- this.$Message.success(res.message)
- this.boxModel = false
- this.refresh()
- } else {
- this.$Message.error(res.message) //閿欒鎻愮ず
- }
- })
- })
- }
- })
- this.boxButtons.push({
- name: '璋冩嫧鍑哄簱', //鎸夐挳鍚嶇О
- icon: 'el-icon-document', //鎸夐挳鍥炬爣:缁勪欢绀轰緥->鍥炬爣
- //primary銆乻uccess銆亀arning銆乪rror銆乮nfo銆乼ext銆乨anger
+ name: '淇濆瓨', //鎸夐挳鍚嶇О
type: 'danger',
+ icon: 'el-icon-check',
+ disabled: false,
plain: true,
onClick: function () {
- this.$confirm('鏄惁璋冩嫧鍑哄簱', '璀﹀憡', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- center: true
- }).then(() => {
- this.http
- .post(
- `/api/Task/HandAllocateOutBoundTaskAsync`,
- this.$refs.detail.rowData,
- '姝ｅ湪鐢熸垚鍑哄簱浠诲姟'
- )
- .then((res) => {
- if (res.status) {
- this.$Message.success(res.message)
- this.boxModel = false
- this.refresh()
- } else {
- this.$Message.error(res.message) //閿欒鎻愮ず
- }
- })
- })
+ if (this.editFormFields.remark == '鍏朵粬鍑哄簱') {
+ this.$confirm('鏄惁鍏朵粬鍑哄簱', '璀﹀憡', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ center: true,
+ customClass: 'large-text-confirm'
+ }).then(() => {
+ this.http
+ .post(
+ `/api/Task/OtherOutBoundTaskAsync`,
+ this.$refs.detail.rowData,
+ '姝ｅ湪鐢熸垚鍑哄簱浠诲姟'
+ )
+ .then((res) => {
+ if (res.status) {
+ this.$Message.success(res.message)
+ this.boxModel = false
+ this.refresh()
+ } else {
+ this.$Message.error(res.message) //閿欒鎻愮ず
+ }
+ })
+ })
+ } else {
+ this.$confirm('鏄惁璋冩嫧鍑哄簱', '璀﹀憡', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ center: true,
+ customClass: 'large-text-confirm'
+ }).then(() => {
+ this.http
+ .post(
+ `/api/Task/HandAllocateOutBoundTaskAsync`,
+ this.$refs.detail.rowData,
+ '姝ｅ湪鐢熸垚鍑哄簱浠诲姟'
+ )
+ .then((res) => {
+ if (res.status) {
+ this.$Message.success(res.message)
+ this.boxModel = false
+ this.refresh()
+ } else {
+ this.$Message.error(res.message) //閿欒鎻愮ず
+ }
+ })
+ })
+ }
}
})
- // this.detailOptions.buttons.unshift({
- // name: '璋冩嫧鍑哄簱',
- // icon: '',
- // type: 'primary',
- // onClick: function (e) {
- // let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
- // if (row <= 0) {
- // //濡傛灉娌℃湁閫変腑琛�
- // this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
- // return
- // }
- // let taskNum = row[0].taskNum
- // this.http.post(`/api/Task/CompleteTaskAsync?taskNum=${taskNum}`, {}, "姝ｅ湪瀹屾垚浠诲姟").then((res) => {
- // //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
- // if (res.status) {
- // this.$Message.success(res.message)
- // } else {
- // this.$Message.error(res.message) //閿欒鎻愮ず
- // }
- // })
- // }
- // });
- // this.columns.push({
- // field: '鎿嶄綔',
- // title: '鎿嶄綔',
- // width: 90,
- // fixed: 'right',
- // align: 'center',
- // type:'jsx',
- // formatter: (row) => {
- // //return '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鐩樼偣鍑哄簱</i>'
- // return [{
- // name:"btn1",
- // type:"primary"
- // },{
- // name:"btn1",
- // type:"success"
- // }]
- // },
- // click: (row,formatter) => {
- // console.log(formatter);
- // this.http
- // .post(`/api/Task/OutBoundTaskAsync?palletCode=${row.palletCode}`, {}, '姝ｅ湪鐢熸垚浠诲姟')
- // .then((res) => {
- // //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
- // if (res.status) {
- // this.$Message.success(row.palletCode + '鍑哄簱鎴愬姛')
- // this.refresh()
- // } else {
- // this.$Message.error(res.message) //閿欒鎻愮ず
- // this.refresh()
- // }
- // })
- // }
- // })
this.columns.push({
title: '鎿嶄綔',
field: '鎿嶄綔',
@@ -175,7 +116,7 @@
<div>
<el-button
onClick={($e) => {
- ;(row.remark = '鍏朵粬鍑哄簱'), this.linkData(row)
+ ;(row.remark = '鍏朵粬鍑哄簱'), this.linkDataNew(row, '鍏朵粬鍑哄簱')
}}
type="primary"
>
@@ -184,7 +125,7 @@
<el-button
onClick={($e) => {
- ;(row.remark = '璋冩嫧鍑哄簱'), this.linkData(row)
+ ;(row.remark = '璋冩嫧鍑哄簱'), this.linkDataNew(row, '璋冩嫧鍑哄簱')
}}
type="success"
>
@@ -203,32 +144,6 @@
)
}
})
-
- // this.columns.push({
- // title: "鎿嶄綔",
- // field: "鎿嶄綔",
- // width: 150,
- // align: "left", // 'center',
- // render: (h, { row, column, index }) => {
- // return (
- // <div>
- // <el-button
- // onClick={($e) => {
- // // this.$refs.table.load();
- // // console.log(this.$refs.table);
- // this.$refs.gridHeader.open(row);
- // }}
- // type="primary"
- // plain
- // style="height:26px; padding: 10px !important;"
- // >
- // 鎵撳嵃
- // </el-button>
- // </div>
- // );
- // },
- // });
-
//绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
this.boxOptions.labelWidth = 150
this.buttons.forEach((btn) => {
--
Gitblit v1.9.3