From aa321710e9a249fc09e3e9735a0d6820dcf392e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 六月 2020 10:27:33 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkMast/wrkMast.js | 18 +++++++++
src/main/webapp/static/js/common.js | 64 +++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/WorkController.java | 8 ++++
3 files changed, 89 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index c687eb7..39ddbcb 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -64,4 +64,12 @@
return R.ok("鍑哄簱鎴愬姛");
}
+ @RequestMapping("/hand/control/wrkMast")
+ @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
+ public R handControlWrkMast(@RequestParam String workNo,
+ @RequestParam Integer type){
+
+ return R.ok();
+ }
+
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 49ef8fa..3e2e453 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -87,5 +87,67 @@
}
});
}
-
}
+
+
+// http璇锋眰
+!function (n) {
+ "use strict";
+
+ var http = {
+ toAjax: function (params) {
+ $.ajax(params);
+ },
+ get: function (url, data, callback) {
+ http.toAjax({
+ method: 'GET',
+ url: url,
+ data: data,
+ dataType: 'json',
+ header: {'Content-Type': 'application/json'},
+ timeout: 10000,
+ cache: false,
+ success: function (result) {
+ callback(result);
+ },
+ error: function (res, type) {
+
+ }
+ })
+ },
+ // 榛樿琛ㄥ崟
+ post: function (url, param, callback, type) {
+ var headerType;
+ if (type === 'json') {
+ headerType = {'Content-Type': 'application/json'}
+ } else {
+ headerType = {'Content-Type': 'application/x-www-form-urlencoded'}
+ }
+ headerType['token'] = localStorage.getItem('token');
+ http.toAjax({
+ method: 'POST',
+ url: url,
+ data: param,
+ dataType: 'json',
+ headers: headerType,
+ timeout: 10000,
+ cache: false,
+ success: function (res) {
+ if (res.code === 200){
+ callback(res);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg);
+ }
+ },
+ error: function (res, type) {
+
+ }
+ })
+ },
+ };
+ "function" == typeof define && define.amd ? define(function () {
+ return http
+ }) : "object" == typeof module && module.exports ? module.exports = http : n.http = http
+}(this);
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index e27f546..b9bd159 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -299,6 +299,24 @@
}
});
break;
+ // 瀹屾垚
+ case 'complete':
+ layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+ layer.msg(res.msg);
+ })
+ layer.closeAll();
+ });
+ break;
+ // 鍙栨秷
+ case 'cancel':
+ layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo}, function(){
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ layer.msg(res.msg);
+ })
+ layer.closeAll();
+ });
+ break;
// 璇︽儏
case 'detail':
layer.open({
--
Gitblit v1.9.1