From 25c71bc8a6015bf4885374e75576f3dc75d1424e Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期四, 04 十二月 2025 14:39:13 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MingHeZhiNeng/DuiDuoJiLiKu
---
项目代码/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx | 139 +++++++++++++++++++++++++++++++--------------
1 files changed, 95 insertions(+), 44 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 f175400..22a36f2 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"
@@ -48,55 +48,106 @@
// })
// }
// });
+ var DoubleTrayBtn = this.buttons.find(x => x.value == "DoubleTray");
+ if (DoubleTrayBtn != null) {
+ DoubleTrayBtn.onClick = () => {
+ let rows = this.$refs.table.getSelected();
+ if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+ if (rows.length > 1) return this.$error("璇烽�夋嫨鏁版嵁!");
+ this.http.post(`/api/Task/OutBoundTaskAsync?palletCode=${rows[0].palletCode}&remark=${""}&doubleTray=${1}`, {}, '鏁版嵁澶勭悊涓�...')
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success('鎴愬姛.');
+ this.refresh();
+ } else {
+ return this.$error(x.message);
+ }
+ });
+ }
+ }
+
this.boxButtons.push({
- name: '鍏朵粬鍑哄簱', //鎸夐挳鍚嶇О
- //icon: 'el-icon-document', //鎸夐挳鍥炬爣:缁勪欢绀轰緥->鍥炬爣
- //primary銆乻uccess銆亀arning銆乪rror銆乮nfo銆乼ext銆乨anger
- type: 'primary',
- plain: true,
+ name: '纭畾鍑哄簱', //鎸夐挳鍚嶇О
+ type: 'danger',
+ icon: 'el-icon-check',
+ disabled: false,
+ plain: false,
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) //閿欒鎻愮ず
- }
- })
- })
+ 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.boxButtons.push({
- name: '璋冩嫧鍑哄簱', //鎸夐挳鍚嶇О
- //icon: 'el-icon-document', //鎸夐挳鍥炬爣:缁勪欢绀轰緥->鍥炬爣
- //primary銆乻uccess銆亀arning銆乪rror銆乮nfo銆乼ext銆乨anger
- type: 'danger',
+ name: '鎵撳嵃浜岀淮鐮�', //鎸夐挳鍚嶇О
+ type: 'primary',
+ icon: 'el-icon-check',
+ disabled: false,
plain: true,
onClick: function () {
- this.$confirm('鏄惁璋冩嫧鍑哄簱', '璀﹀憡', {
+ let rows = this.$refs.detail.getSelected()
+ if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+ let orderNos = rows.map(x => {
+ return x.orderNo
+ })
+ this.$confirm('鏄惁鎵撳嵃鍗曟嵁', '璀﹀憡', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
- center: true
+ center: true,
+ customClass: 'large-text-confirm'
}).then(() => {
this.http
.post(
- `/api/Task/HandAllocateOutBoundTaskAsync`,
- this.$refs.detail.rowData,
- '姝ｅ湪鐢熸垚鍑哄簱浠诲姟'
+ `/api/StockInfo/PrintOrder`,
+ orderNos,
+ '姝ｅ湪鎵撳嵃'
)
.then((res) => {
if (res.status) {
@@ -120,7 +171,7 @@
<div>
<el-button
onClick={($e) => {
- ;(row.remark = '鍏朵粬鍑哄簱'), this.linkData(row)
+ ; (row.remark = '鍏朵粬鍑哄簱'), this.linkDataNew(row, '鍏朵粬鍑哄簱')
}}
type="primary"
>
@@ -129,7 +180,7 @@
<el-button
onClick={($e) => {
- ;(row.remark = '璋冩嫧鍑哄簱'), this.linkData(row)
+ ; (row.remark = '璋冩嫧鍑哄簱'), this.linkDataNew(row, '璋冩嫧鍑哄簱')
}}
type="success"
>
@@ -150,11 +201,11 @@
})
//绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
this.boxOptions.labelWidth = 150
- this.buttons.forEach((btn) => {
- if (btn.name == '缂栬緫') {
- btn.hidden = true
- }
- })
+ // this.buttons.forEach((btn) => {
+ // if (btn.name == '缂栬緫') {
+ // btn.hidden = true
+ // }
+ // })
this.boxButtons.forEach((btn) => {
if (btn.name == '淇� 瀛�') {
btn.hidden = true
@@ -200,7 +251,7 @@
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- this.detailOptions.columns.forEach((column) => {})
+ this.detailOptions.columns.forEach((column) => { })
},
searchBefore(param) {
//鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
--
Gitblit v1.9.3