From 6078c3e72dd7acbf910a0f8bd8b8d17e7edf0302 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 05 七月 2021 16:19:37 +0800
Subject: [PATCH] 1.pda添加物料（非原材料）新增判断生产单号为空的情况
---
src/main/webapp/static/js/locNormal/locNormal.js | 111 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/static/js/locNormal/locNormal.js b/src/main/webapp/static/js/locNormal/locNormal.js
index fd64c13..9a18ffb 100644
--- a/src/main/webapp/static/js/locNormal/locNormal.js
+++ b/src/main/webapp/static/js/locNormal/locNormal.js
@@ -9,7 +9,7 @@
)
cols.push.apply(cols, locNormalCols);
cols.push(
- {field: 'warehouse', align: 'center', title: '搴撳尯'}
+ {field: 'warehouse$', align: 'center', title: '搴撳尯'}
, {field: 'state', align: 'center', title: '鍑哄叆搴撶姸鎬�', templet: '#locNormalState'}
, {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
, {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true}
@@ -21,7 +21,7 @@
// 鑾峰彇浠撳簱涓嬫媺
$.ajax({
- url: baseUrl+"/locArea/queryAll/auth",
+ url: baseUrl + "/locArea/queryAll/auth",
headers: {'token': localStorage.getItem('token')},
// data: top.reObject(data),
method: 'POST',
@@ -31,6 +31,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;
@@ -119,8 +142,8 @@
var records = res.data.records;
records.map(function (item) {
locArea.map(function (d) {
- if (d.id == item.warehouse) {
- item.warehouse = d.name;
+ 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,14 +222,27 @@
const param = {
matnr: matnr,
anfme: count,
+ id: id,
+ warehouse: obj.data.warehouse,
+ supplier: obj.data.supplier,
+ mnemonic: obj.data.mnemonic,
}
- $.ajax({
- url: baseUrl + "/locNormal/update/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(param),
- method: 'POST',
- success: function (res) {
- },
+ layer.confirm("纭畾淇敼" + obj.data.maktx + "鐨勬暟閲忓悧", {
+ btn: ['纭畾', '鍙栨秷']
+ }, function () {
+ // 鎸夐挳1鐨勪簨浠�
+ $.ajax({
+ url: baseUrl + "/locNormal/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(param),
+ method: 'POST',
+ success: function (res) {
+ layer.msg("淇敼鎴愬姛");
+ },
+ });
+ }, function () {
+ // 鎸夐挳2鐨勪簨浠�
+ tableIns.reload();
});
});
@@ -227,30 +264,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