From 72626a69d978f0dd37be173d724f5beb2ebc7a1f Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期四, 11 八月 2022 20:52:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html | 2 +-
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill.html | 2 +-
WebTM/views/user/login.html | 1 -
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html | 48 ++++++++++++++++++++++++++++++++++++++++--------
WebTM/views/IpadIndex.html | 2 +-
WebTM/views/index.html | 2 +-
6 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index d459605..1496ad2 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -580,7 +580,7 @@
return false;
}
if (WorkStaus(HSourceID1, workcode, HSourceInterID, "姹囨姤")) {
- layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!", { icon: 5 });
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻姹囨姤鏉′欢!", { icon: 5 });
return false;
}
layer.open({
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 3d23fc3..11b0f74 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -376,7 +376,7 @@
<a>鐢熶骇璁″垝骞冲彴</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>
+ <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
<dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
</dl>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index cf6d621..79e9672 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -169,7 +169,6 @@
$("#Organization").val(data2["OrgID"]);
form.render('select');
}
- console.log(JSON.parse(data));
}
//瀛樺偍閰嶇疆鏂囦欢
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
index 15507fc..4c811a0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
@@ -440,7 +440,7 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "Sc_MESStopStepWorkBill/DeltetMESStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MESStopStepWorkBill/DeltetMESStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
index bd93413..13a37cb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
@@ -351,7 +351,7 @@
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "Sc_ComplementGoods/JIT_SendGoodsBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_ComplementGoods/JIT_SendGoodsBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainStr },
dataType: "json",
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
index 1bcdfd1..8282c62 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
@@ -311,13 +311,15 @@
, { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text'}
, { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160}
, { field: '宸查厤閫佹暟閲�', title: '宸查厤閫佹暟閲�', width: 160 }
- , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'Warehouse' }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'OutWarehouse' }
, { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 160, hide: true }
+ , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 160, edit: 'text', event: 'InWarehouse' }
+ , { field: '璋冨叆浠撳簱id', title: '璋冨叆浠撳簱id', width: 160, hide: true }
, { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 160 }
, { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 160 }
, { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 160 }
, { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 160 }
- , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 160}
+ , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 160}
, { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 160 }
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 160 }
@@ -485,7 +487,7 @@
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event == "Warehouse") {
+ if (obj.event == "OutWarehouse") {
//鎵撳紑缁翠慨椤圭洰灏忕獥浣�
layer.open({
type: 2
@@ -510,7 +512,36 @@
"璋冨嚭浠撳簱": checkStatus.data[0].HName
, "璋冨嚭浠撳簱id": checkStatus.data[0].HItemID
})
- console.log(checkStatus.data[0].HItemID)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ if (obj.event == "InWarehouse") {
+ //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "浠撳簱鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璋冨叆浠撳簱": checkStatus.data[0].HName
+ , "璋冨叆浠撳簱id": checkStatus.data[0].HItemID
+ })
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -521,17 +552,18 @@
//鏂板鍙枡鍗�
function set_AddNew_Jl() {
-
- if (table.cache['mainTable'].length == 0) {
+ var data = table.cache['mainTable'];
+ if (data.length == 0) {
return layer.msg("鏃犳暟鎹�,鏃犳硶鍙枡!");
}
else {
+
var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "Sc_ComplementGoodBill/InsertCallGoodsBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_ComplementGoodBill/InsertCallGoodsBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainStr },
dataType: "json",
@@ -676,7 +708,7 @@
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_JL_ICStockTuiBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_ComplementGoodBill/Insert_JL_ICStockTuiBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainStr },
dataType: "json",
--
Gitblit v1.9.1