From 693584e6c84f6292a29ba242aa9e47be200e451e Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 21 四月 2026 15:25:12 +0800
Subject: [PATCH] feat: 更新仓库枚举值和过滤条件，添加不等操作符支持 refactor: 重构任务和库存相关界面的查询逻辑 fix: 修复库存状态过滤条件错误问题 style: 统一代码格式和命名规范
---
Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx | 193 +++++++++++++++++++++++++++---------------------
1 files changed, 109 insertions(+), 84 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx
index be40abf..28cee0f 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.jsx
@@ -1,47 +1,48 @@
-
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-import gridBodyExtension from './extend/gridBodyExtension.vue'
+import gridBodyExtension from "./extend/gridBodyExtension.vue";
let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: gridBodyExtension,
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: '',
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- //娣诲姞"鎵嬪姩鍒涘缓浠诲姟"鎸夐挳
- this.buttons.push({
- name: '鎵嬪姩鍒涘缓浠诲姟',
- icon: 'el-icon-plus',
- type: 'primary',
- value: 'ManualCreateTask',
- onClick: () => {
- this.$refs.gridBody.open();
- }
- });
- //娣诲姞"鎵嬪姩涓嬪彂"鎸夐挳
- this.buttons.push({
- name: '鎵嬪姩涓嬪彂',
- icon: 'el-icon-s-promotion',
- type: 'primary',
- value: 'DispatchTasksToWCS',
- onClick: () => {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇峰厛閫夋嫨浠诲姟");
- this.$refs.gridBody.openDispatch(rows);
- }
- });
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: "",
+ gridBody: gridBodyExtension,
+ gridFooter: "",
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: "",
+ modelBody: "",
+ modelFooter: "",
+ },
+ tableAction: "", //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ //娣诲姞"鎵嬪姩鍒涘缓浠诲姟"鎸夐挳
+ this.buttons.push({
+ name: "鎵嬪姩鍒涘缓浠诲姟",
+ icon: "el-icon-plus",
+ type: "primary",
+ value: "ManualCreateTask",
+ onClick: () => {
+ this.$refs.gridBody.open();
+ },
+ });
+ //娣诲姞"鎵嬪姩涓嬪彂"鎸夐挳
+ this.buttons.push({
+ name: "鎵嬪姩涓嬪彂",
+ icon: "el-icon-s-promotion",
+ type: "primary",
+ value: "DispatchTasksToWCS",
+ onClick: () => {
+ let rows = this.$refs.table.getSelected();
+ if (rows.length == 0) return this.$error("璇峰厛閫夋嫨浠诲姟");
+ this.$refs.gridBody.openDispatch(rows);
+ },
+ });
- let TaskHandCancelBtn = this.buttons.find(x => x.value == 'TaskHandCancel');
+ let TaskHandCancelBtn = this.buttons.find(
+ (x) => x.value == "TaskHandCancel",
+ );
if (TaskHandCancelBtn) {
TaskHandCancelBtn.onClick = function () {
let rows = this.$refs.table.getSelected();
@@ -49,18 +50,20 @@
if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
var param = rows[0].taskNum;
this.http
- .post("api/Task/TaskCancel?taskNum="+param, "鏁版嵁澶勭悊涓�...")
+ .post("api/Task/TaskCancel?taskNum=" + param, "鏁版嵁澶勭悊涓�...")
.then((x) => {
if (x.status) {
- this.$Message.success('浠诲姟鍙栨秷鎴愬姛.');
+ this.$Message.success("浠诲姟鍙栨秷鎴愬姛.");
this.refresh();
} else {
return this.$error(x.message);
}
});
- }
+ };
}
- let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'TaskHandCompleted');
+ let TaskHandCompletedBtn = this.buttons.find(
+ (x) => x.value == "TaskHandCompleted",
+ );
if (TaskHandCompletedBtn) {
TaskHandCompletedBtn.onClick = function () {
let rows = this.$refs.table.getSelected();
@@ -68,52 +71,74 @@
if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
var param = rows[0].taskNum;
this.http
- .post("api/Task/TaskCompleted?taskNum="+param, "鏁版嵁澶勭悊涓�...")
+ .post("api/Task/TaskCompleted?taskNum=" + param, "鏁版嵁澶勭悊涓�...")
.then((x) => {
if (x.status) {
- this.$Message.success('浠诲姟鎵嬪姩瀹屾垚');
+ this.$Message.success("浠诲姟鎵嬪姩瀹屾垚");
this.refresh();
} else {
return this.$error(x.message);
}
});
- }
+ };
}
- },
- onInited() {
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //this.detailOptions.columns.forEach(column=>{ });
- },
- searchBefore(param) {
- //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
- //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
- return true;
- },
- searchAfter(result) {
- //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
- return true;
- },
- addBefore(formData) {
- //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
- return true;
- },
- updateBefore(formData) {
- //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
- return true;
- },
- rowClick({ row, column, event }) {
- //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
- this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
- },
- modelOpenAfter(row) {
- //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
- //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
- //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
- //(3)this.editFormFields.瀛楁='xxx';
- //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
- //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ },
+ onInited() {
+ //妗嗘灦鍒濆鍖栭厤缃悗
+ //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+ //this.detailOptions.columns.forEach(column=>{ });
+ },
+ searchBefore(param) {
+ //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+ //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+
+ // 绗竴涓繃婊ゆ潯浠�
+ const roadwayFilter1 = {
+ name: "roadway",
+ value: "ZJSC1",
+ displayType: "notequal",
+ };
+
+ // 绗簩涓繃婊ゆ潯浠�
+ const roadwayFilter2 = {
+ name: "roadway",
+ value: "FJSC1",
+ displayType: "notequal",
+ };
+
+ if (!param.wheres) {
+ param.wheres = [];
}
- }
- };
- export default extension;
+
+ // 灏嗕袱涓繃婊ゆ潯浠舵坊鍔犲埌鏌ヨ鍙傛暟涓�
+ param.wheres.push(roadwayFilter1);
+ param.wheres.push(roadwayFilter2);
+ return true;
+ },
+ searchAfter(result) {
+ //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+ return true;
+ },
+ addBefore(formData) {
+ //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+ return true;
+ },
+ updateBefore(formData) {
+ //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+ return true;
+ },
+ rowClick({ row, column, event }) {
+ //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+ this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+ },
+ modelOpenAfter(row) {
+ //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+ //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+ //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+ //(3)this.editFormFields.瀛楁='xxx';
+ //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+ //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ },
+ },
+};
+export default extension;
--
Gitblit v1.9.3