From faecccbe46a1f85b5d9b18fce12e02764faba78e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 12:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/static/js/locNormal/locNormal.js | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/locNormal/locNormal.js b/src/main/webapp/static/js/locNormal/locNormal.js
index fd64c13..c331026 100644
--- a/src/main/webapp/static/js/locNormal/locNormal.js
+++ b/src/main/webapp/static/js/locNormal/locNormal.js
@@ -32,6 +32,29 @@
},
});
+// 搴撳尯涓嬫媺
+// 鑾峰彇浠撳簱涓嬫媺
+$.ajax({
+ url: baseUrl + "/locArea/queryAll/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var html = "";
+ if (res.data && res.data.length > 0) {
+ html += res.data.map(function (item) {
+ return "<Option value=" + item.uuid + ">" + item.name + "</Option>";
+ });
+ }
+ $('#putSiteSelect').append(html);
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+})
+
layui.use(['table', 'laydate', 'form', 'upload'], function () {
var table = layui.table;
var $ = layui.jquery;
@@ -119,7 +142,7 @@
var records = res.data.records;
records.map(function (item) {
locArea.map(function (d) {
- if (d.id == item.warehouse) {
+ if (d.uuid == item.warehouse) {
item.warehouse = d.name;
}
})
@@ -174,6 +197,7 @@
table.on('edit(locNormal)', function (obj) {
var count = obj.value;
var matnr = obj.data.matnr;
+ var id = obj.data.id;
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
@@ -198,6 +222,7 @@
const param = {
matnr: matnr,
anfme: count,
+ id: id,
}
$.ajax({
url: baseUrl + "/locNormal/update/auth",
@@ -227,30 +252,48 @@
var data = obj.data;
var param = {
matnr: data.matnr,
+ id: data.id,
}
switch (obj.event) {
case 'outLocNormal':
- // 鍑哄簱
- $.ajax({
- url: baseUrl + "/locNormal/outLoc/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(param),
- method: 'POST',
- success: function (res) {
- tableReload(false);
- },
+ layer.confirm('纭畾瑕佸嚭搴揫'+data.matnr+']鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鍙互鏃犻檺涓寜閽�
+ }, function(index, layero){
+ //纭畾鍥炶皟-鍑哄簱
+ $.ajax({
+ url: baseUrl + "/locNormal/outLoc/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(param),
+ method: 'POST',
+ success: function (res) {
+ tableReload(false);
+ layer.closeAll();
+ layer.msg("鍑哄簱鎴愬姛");
+ },
+ });
+ }, function(index){
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
});
break;
case 'removeLocNormal':
// 绉婚櫎
- $.ajax({
- url: baseUrl + "/locNormal/removeLoc/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(param),
- method: 'POST',
- success: function (res) {
- tableReload(false);
- },
+ layer.confirm('纭畾瑕佺Щ闄'+data.matnr+']鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鍙互鏃犻檺涓寜閽�
+ }, function(index, layero){
+ //纭畾鍥炶皟-绉婚櫎
+ $.ajax({
+ url: baseUrl + "/locNormal/removeLoc/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(param),
+ method: 'POST',
+ success: function (res) {
+ tableReload(false);
+ layer.closeAll();
+ layer.msg("绉婚櫎鎴愬姛");
+ },
+ });
+ }, function(index){
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
});
break;
}
--
Gitblit v1.9.1