From c445cc6b68ee932bbcb3b3389b4298aaf8b291e0 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 16 三月 2022 15:16:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/static/js/receiveDetl/receiveDetl.js | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/receiveDetl/receiveDetl.js b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
index e46be7d..8bae838 100644
--- a/src/main/webapp/static/js/receiveDetl/receiveDetl.js
+++ b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
@@ -26,10 +26,11 @@
,{field: 'id', align: 'center',title: 'ID', hide:true}
,{field: 'hostId', align: 'center',title: '', hide:true}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜', width: 100}
- ,{field: 'anfme', align: 'center',title: '闇�鍏ュ簱鏁伴噺', width: 100}
- ,{field: 'inQty', align: 'center',title: '宸插叆搴撴暟閲�', width: 100}
+ ,{field: 'anfme', align: 'center',title: '搴斿叆搴撻噺', width: 100}
+ ,{field: 'inQty', align: 'center',title: '宸插叆搴撻噺', width: 100}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'state$', align: 'center',title: '璁㈠崟鐘舵��'}
,{field: 'name', align: 'center',title: '鍚嶇О', hide:true}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide:true}
,{field: 'model', align: 'center',title: '鍨嬪彿', hide:true}
@@ -54,6 +55,7 @@
pageSize: 'limit'
},
parseData: function (res) {
+ console.log(res)
return {
'code': res.code,
'msg': res.msg,
@@ -193,6 +195,7 @@
}
});
function startIn(data) {
+
admin.open({
type:1
,area: '600px'
@@ -206,14 +209,24 @@
form.val('inDetail',data);
form.on('submit(inLoc)',function (data) {
+
var loc = insXmSel.getValue('valueStr');
- alert(loc);
- console.log(data);
$.ajax({
url: baseUrl+"/receiveDetl/addIn"
,headers: {'token':localStorage.getItem('token')}
- ,data: data
+ // ,data: data.field
+ ,data: JSON.stringify(data.field)
+ ,contentType:'application/json;charset=UTF-8'
,method: 'POST'
+ ,success: function (res) {
+ layer.closeAll();
+ if(res.code === 200){
+ layer.msg(res.msg);
+ }
+ if (res.code === 500){
+ layer.msg(res.msg);
+ }
+ }
})
return false;
});
--
Gitblit v1.9.1