From 8c8532db8fc7fa76b7fe4c254a36d67c6af24ace Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 11 六月 2025 14:46:33 +0800
Subject: [PATCH] 添加物料编码字段并更新查询逻辑
---
Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx | 127 +++++++++++++++++++++++++++++++++++-------
1 files changed, 105 insertions(+), 22 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx
index c74546e..a301399 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx
@@ -8,12 +8,12 @@
//姝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,14 +26,10 @@
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
//妗嗘灦鍒濆鍖栭厤缃墠锛�
- //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
- this.buttons.unshift({
- //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
- name: '鐩存帴鍑哄簱', //鎸夐挳鍚嶇О
- icon: 'el-icon-document', //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
- type: 'primary', //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
- onClick: function () {
- this.$Message.success('鐐瑰嚮浜嗘寜閽�')
+ 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) {
//濡傛灉娌℃湁閫変腑琛�
@@ -42,16 +38,66 @@
}
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('鍒涘缓浠诲姟鎴愬姛')
- } else {
- this.$Message.error(res.message) //閿欒鎻愮ず
- }
- })
+ 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鏁扮粍
+ // name: '鐩存帴鍑哄簱', //鎸夐挳鍚嶇О
+ // icon: 'el-icon-document', //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
+ // type: 'primary', //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
+ // 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('鍒涘缓浠诲姟鎴愬姛')
+ // } else {
+ // this.$Message.error(res.message) //閿欒鎻愮ず
+ // }
+ // })
+ // }
+ // })
//绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
this.boxOptions.labelWidth = 150
@@ -78,11 +124,47 @@
// );
// },
// });
+
+ this.columns.forEach((column) => {
+ //淇敼棰滆壊
+ if (column.field == 'roadwayNo') {
+ column.formatter = (row) => {
+ // return '<span style="color: #2d8cf0;">' + row?.locationInfo?.roadwayNo + '</span>'
+ return row?.locationInfo?.roadwayNo
+ }
+ }
+ if (column.field == 'materielCode') {
+ column.formatter = (row) => {
+ // return '<span style="color: #2d8cf0;">' + row?.locationInfo?.roadwayNo + '</span>'
+ return row?.stockInfoDetails[0]?.materielCode
+ }
+ }
+ //鏍煎紡鍖栨棩鏈�
+ // 妫�鏌ュ綋鍓嶅垪鐨勫瓧娈垫槸鍚︿负 'locationStatus'
+ if (column.field == 'locationStatus') {
+ // 浣跨敤瀵硅薄瀛楅潰閲忔潵鏄犲皠 'locationStatus' 鐨勫�煎拰瀵瑰簲鐨勬枃鏈�
+ const statusMap = {
+ '-1': '鍏ㄩ儴',
+ '0': '绌洪棽',
+ '1': '閿佸畾',
+ '2': '鏈夎揣',
+ '3': '鏈夎揣绂佺敤',
+ '4': '鏃犺揣绂佺敤'
+ };
+ // 瀹氫箟涓�涓牸寮忓寲鍑芥暟锛屾牴鎹� 'locationStatus' 鐨勫�艰繑鍥炵浉搴旂殑鏂囨湰
+ column.formatter = (row) => {
+ // 浣跨敤 statusMap 瀵硅薄鏉ヨ幏鍙栧搴旂殑鏂囨湰锛屽鏋滄病鏈夊尮閰嶅垯杩斿洖 '鏈煡鐘舵��'
+ return statusMap[row?.locationInfo?.locationStatus] || '鏈煡鐘舵��';
+ }
+ }
+ })
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //this.detailOptions.columns.forEach(column=>{ });
+ this.detailOptions.columns.forEach(column=>{
+ console.log(column)
+ });
},
searchBefore(param) {
//鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
@@ -90,7 +172,7 @@
return true
},
searchAfter(result) {
- //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+ console.log(result)
return true
},
addBefore(formData) {
@@ -103,9 +185,10 @@
},
rowClick({ row, column, event }) {
//鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
- this.$refs.table.$refs.table.toggleRowSelection(row) //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+ // this.$refs.table.$refs.table.toggleRowSelection(row) //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
},
modelOpenAfter(row) {
+
//鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
//(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
//(2)缁欏脊鍑烘璁剧疆榛樿鍊�
--
Gitblit v1.9.3