From 9cb98d2a7ce6e56e76940d941e82b4dc25502a54 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 23 九月 2022 20:23:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 49 ++++
/dev/null | 263 -----------------------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssue.html | 140 ++++++++++++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_OrderBackInfo.html | 19 -
WebTM/WebTM.csproj | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangePlanDate.html | 149 +++++++++++++
6 files changed, 339 insertions(+), 283 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8756e73..8e9be20 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -163,7 +163,6 @@
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMS.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkPayType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkType.html" />
@@ -1007,6 +1006,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangePlanDate.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssue.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssueBillList.html" />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
index e627d98..4171473 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
@@ -23,11 +23,8 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
</div>
</div>
@@ -141,10 +138,11 @@
var isEndCheck = document.getElementById("HStopflag").checked;
data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
- data.field.HItemID = hID == "" ? 0 : hID;
-
+ if (hID == "") {
+ hID = 0;
+ }
+ data.field.HItemID = hID;
data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-
var oMain = JSON.stringify(data.field)
var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
if (HType == "Modify") {
@@ -165,16 +163,13 @@
});
}
else {
-
f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
error: function (err) {
-
f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+
}
});
}
@@ -195,16 +190,12 @@
});
}
else {
-
f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
error: function (err) {
-
f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
}
});
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html.html"
deleted file mode 100644
index 84fa92c..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html.html"
+++ /dev/null
@@ -1,263 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8" />
- <title>鏂板/缂栬緫璁㈠崟鍙嶉鐘舵��</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style type="text/css">
- .layui-form-label {
- width: 85px;
- }
- </style>
-</head>
-<body>
-
- <div id="layout1" class="layui-fluid">
- <div class="layui-row layui-col-space15">
- <div class="layui-col-md12">
- <div class="layui-card">
- <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
- <div class="layui-card-header">
- <div class="layui-btn-group">
-
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
- </div>
-
- </div>
- <div class="layui-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵�佷唬鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
- <input id="HItemID" name="HItemID" type="hidden" />
- <input id="HParentID" name="HParentID" type="hidden" />
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵�佸悕绉�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HName" lay-verify="HName" id="HName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍔╄鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </form>
- </div>
- </div>
- </div>
- </div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
- <script>
- //鑾峰彇鍙傛暟
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
-
- var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
- var HType = params[params[1]]; //鍗曟嵁鐘舵��
- var TagParentId = params[params[2]]; //鐖剁骇ID
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , laydate = layui.laydate
- , element = layui.element;
-
- //甯歌鐢ㄦ硶
-
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
-
- //#region 澶撮儴宸ュ叿鏍忎簨浠�
-
- //娓呴櫎
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
- //淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
- var ModRightNameAdd = 'Gy_RepairType_Edit';
- var user = sessionStorage["HUserName"];
- var arr = new Array();
- var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
- data.field.HItemID = hID == "" ? 0 : hID;
-
- data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-
- var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
- if (HType == "Modify") {
-
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderBackInfo/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- });
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderBackInfo/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": oMain },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- });
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- });
- //閫�鍑烘寜閽�
- form.on('submit(Exit)', function () {
- Pub_Close(1);
- })
- //#endregion
-
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
-
- if (HType == "Modify") {
- $.ajax({
- url: GetWEBURL() + "/Gy_OrderBackInfo/xg",
- //url: "http://localhost:12761/Gy_Department/xg",
- type: "GET",
- data: {
- "HInterID": hID
- },
- success: function (d) {
- console.log(d);
- ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HYX").val(d.data[0].HYX);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
- $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
- }
-
- });
- }
-
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
- }
- //}
- }
- });
- });
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssue.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssue.html"
index f8158ee..99b84f0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssue.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssue.html"
@@ -55,6 +55,42 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs12 layui-inline">
+ <label class="layui-form-label">闄勫睘璁惧1</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceName1" id="HSourceName1" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HSourceSub1ID" id="HSourceSub1ID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource1" id="btnSearchHSource1" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12 layui-inline">
+ <label class="layui-form-label">闄勫睘璁惧2</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceName2" id="HSourceName2" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HSourceSub2ID" id="HSourceSub2ID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource2" id="btnSearchHSource2" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12 layui-inline">
+ <label class="layui-form-label">闄勫睘璁惧3</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceName3" id="HSourceName3" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HSourceSub3ID" id="HSourceSub3ID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource3" id="btnSearchHSource3" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -135,6 +171,105 @@
}
})
});
+ form.on('submit(btnSearchHSource1)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName1").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceSub1ID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
+ form.on('submit(btnSearchHSource2)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName2").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceSub2ID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
+ form.on('submit(btnSearchHSource3)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName3").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceSub3ID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
form.on('submit(btnSearchHGroup)', function () {//鐝粍
layer.open({
type: 2
@@ -173,6 +308,9 @@
form.on('submit(btnSave)', function (data) {//鎻愪氦
var HGroupID = $("#HGroupID").val();
var HSourceID = $("#HSourceID").val();
+ var HSourceSub1ID = $("#HSourceSub1ID").val();
+ var HSourceSub2ID = $("#HSourceSub2ID").val();
+ var HSourceSub3ID = $("#HSourceSub3ID").val();
if (HGroupID == 0 || HSourceID == 0) {
layer.msg("璇烽�夋嫨鐝粍鍜岀敓浜ц祫婧�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -182,7 +320,7 @@
type: "GET",
url: GetWEBURL() + "/LEMS/MES_Sc_ProcessExchangeIssue",
async: true,
- data: { "HGroupID": HGroupID, "HSourceID": HSourceID, "HEntryId": $("#HItemID").val() },
+ data: { "HGroupID": HGroupID, "HSourceID": HSourceID, "HSourceSub1ID": HSourceSub1ID, "HSourceSub2ID": HSourceSub2ID, "HSourceSub3ID": HSourceSub3ID, "HEntryId": $("#HItemID").val() },
dataType: "json",
success: function (data) {
if (data.count == 1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
index 9f76dc1..3147a89 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
@@ -93,6 +93,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Issue"><i class="layui-icon layui-icon-file-b"></i>涓嬭揪</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelIssue"><i class="layui-icon layui-icon-file-b"></i>鍙嶄笅杈�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_PlanDate"><i class="layui-icon layui-icon-file-b"></i>鎸囨淳鏃ユ湡</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-file-b"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -160,6 +161,9 @@
break;
//鍙嶄笅杈�
case 'set_CancelIssue': set_CancelIssue();
+ break;
+ //鎸囨淳鏃ユ湡
+ case 'set_PlanDate': set_PlanDate();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
@@ -304,7 +308,6 @@
, { field: 'HEntryID', title: 'HEntryID', width: 90, hide: true }
, { field: '涓嬭揪鐘舵��', title: '涓嬭揪鐘舵��' }
, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
- , { field: '绫诲瀷', title: '绫诲瀷' }
, {
field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
}
@@ -320,6 +323,12 @@
, { field: 'HProcID', title: 'HProcID', hide: true }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , {
+ field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 120, sort: true, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"
+ }
+ , {
+ field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.璁″垝瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>"
+ }
, { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
, { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
@@ -339,8 +348,7 @@
, { field: '璁惧妯″叿', title: '璁惧妯″叿' }
, { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
, { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+
, { field: '鎽樿', title: '鎽樿' }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
@@ -636,7 +644,7 @@
type: 2
//, area: ['30%', '40%']
, area: ['100%', '100%']
- , title: '宸ュ簭鍒楄〃-涓嬭揪'
+ , title: '宸ュ簭娴佽浆鍗�-涓嬭揪'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssue.html?linterid=' + linterid
, end: function () {
@@ -686,6 +694,39 @@
}
});
}
+
+
+ //#region 鎸囨淳鏃ユ湡
+ function set_PlanDate() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 0) {
+ layer.msg('璇烽�夋嫨闇�瑕佹搷浣滅殑鏁版嵁锛�');
+ return;
+ }
+ var linterid = "";
+ for (var i = 0; i < data.length; i++) {
+ linterid += data[i].hmainid + "-" + data[i].HEntryID + ",";
+ }
+ linterid = linterid.substring(0, linterid.length - 1);
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ //, area: ['30%', '40%']
+ , area: ['40%', '60%']
+ , title: '宸ュ簭娴佽浆鍗�-鎸囨淳鏃ユ湡'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangePlanDate.html?linterid=' + linterid
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ }
+ //#endregion
//#endregion
//鍒犻櫎
function set_DeleteBill() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangePlanDate.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangePlanDate.html"
new file mode 100644
index 0000000..cc88069
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangePlanDate.html"
@@ -0,0 +1,149 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ュ簭娴佽浆鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">纭</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <div class="layui-row">
+ <div class="layui-col-xs12 layui-inline">
+ <label class="layui-form-label" style="width:120px">璁″垝寮�宸ユ棩鏈�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12 layui-inline">
+ <label class="layui-form-label"style="width:120px">璁″垝瀹屽伐鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPlanEndDate" id="HPlanEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ </script>
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </form>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鏄惁濮斿)-->
+ <script type="text/html" id="isEntrust">
+ <select name="isEntrust" lay-filter="isEntrust" id="isEntrust{{d.LAY_TABLE_INDEX+1}}">
+ <option value="false">鍚�</option>
+ <option value="true">鏄�</option>
+ </select>
+ </script>
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ var linterid = params[params[0]];//婧愬崟id
+ $("#HItemID").val(linterid);
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ set_InitFrom()
+ $("#HPlanBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鍗�
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ var HPlanBeginDate = $("#HPlanBeginDate").val();
+ var HPlanEndDate = $("#HPlanEndDate").val();
+ if (HPlanBeginDate == "" || HPlanEndDate == "") {
+ layer.msg("璇烽�夋嫨鏃ユ湡", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LEMS/MES_Sc_ProcessExchangePlanDate",
+ async: true,
+ data: { "HPlanBeginDate": HPlanBeginDate, "HPlanEndDate": HPlanEndDate,"HEntryId": $("#HItemID").val() },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+ //浠ヤ笂涓簂ayui妯″潡
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HPlanBeginDate',
+ });
+ laydate.render({
+ elem: '#HPlanEndDate'
+ });
+ }
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1