From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js b/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
index f6328e0..f035c9e 100644
--- a/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
+++ b/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
@@ -25,28 +25,21 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'wmsWrkNo', align: 'center',title: 'WMS浠诲姟鍙�',width: 110}
- ,{field: 'wmsStatus$', align: 'center',title: 'WMS浠诲姟鐘舵��',width: 130}
+ {title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 110}
+ ,{field: 'taskNo', align: 'center',title: 'WMS浠诲姟鍙�',width: 110}
+ ,{field: 'status$', align: 'center',title: '浠诲姟鐘舵��',width: 130}
,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
,{field: 'createTime$', align: 'center',title: '浠诲姟鏃堕棿',width: 170}
,{field: 'durationTime', align: 'center',title: '鎸佺画鏃堕暱',width: 150}
,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
- ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
- ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'locSts', align: 'center',title: '搴撲綅鐘舵��'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- // ,{field: 'picking', align: 'center',title: '鎷ｆ枡'}
- // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'startPoint', align: 'center',title: '璧风偣'}
+ ,{field: 'targetPoint', align: 'center',title: '缁堢偣'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 110}
+ // ,{field: 'assignTime$', align: 'center',title: '娲惧彂鏃堕棿',width: 170}
+ // ,{field: 'executeTime$', align: 'center',title: '鎵ц鏃堕棿',width: 170}
+ // ,{field: 'completeTime$', align: 'center',title: '瀹岀粨鏃堕棿',width: 170}
+ // ,{field: 'cancelTime$', align: 'center',title: '鍙栨秷鏃堕棿',width: 170}
]],
request: {
pageName: 'curr',
@@ -207,12 +200,12 @@
var data = obj.data;
switch (obj.event) {
case 'distribute'://娲惧彂
- layer.confirm('纭娲惧彂璇ョ瑪浠诲姟锛�', {title: 'WMS浠诲姟鍙凤細' + data.wmsWrkNo, shadeClose: true}, function () {
+ layer.confirm('纭娲惧彂璇ョ瑪浠诲姟锛�', {title: 'WMS浠诲姟鍙凤細' + data.taskNo, shadeClose: true}, function () {
$.ajax({
url: baseUrl + "/wmsWrk/distribute/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- wmsWrkNo: data.wmsWrkNo
+ taskNo: data.taskNo
},
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1