From e7ba6232e39e30283a4e7f775eb997fc9da8e52e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 11 十月 2023 10:26:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/webapp/static/js/agvWrkMast/wrkMast.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/agvWrkMast/wrkMast.js b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
index 4fe5e9b..85ad9a2 100644
--- a/src/main/webapp/static/js/agvWrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
@@ -30,7 +30,7 @@
,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
//,{field: 'steNo', align: 'center',title: '灏忚溅', width: 70}
- ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: false}
+ ,{field: 'barcode', align: 'center',title: '鏂欑鐮�', hide: false}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷f枡', templet:function(row){
@@ -193,9 +193,9 @@
if (data.length === 0){
layer.msg('璇烽�夋嫨鏁版嵁');
} else {
- layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ layer.confirm('纭畾鍚姩'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
$.ajax({
- url: baseUrl+"/agv/wrkMast/delete/auth",
+ url: baseUrl+"/agv/wrkMast/startWrk/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
--
Gitblit v1.9.1