From a6d44d7c9aae8a241bb56baac6824ea4d765cd80 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 07 十一月 2023 11:00:00 +0800
Subject: [PATCH] 生产资源 凯贝优化 供应商 ,客户禁用 默认不选 工厂日历优化 可选择 凯贝 日计划平台增加 批量选产线 斯莫尔单品过站
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 2
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 10
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 283 +++++++++++++++++--------
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html | 125 +++++++----
WebTM/views/基础资料/生产基础资料/Gy_BadType.html | 2
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 73 ++++++
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 67 ++++++
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 4
WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html | 33 ++
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html | 2
10 files changed, 439 insertions(+), 162 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
index 7055c00..ef892be 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
@@ -215,7 +215,7 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Gy_BadReason/list',
+ url: GetWEBURL() + '/Gy_BadReason/Gy_BadTypeList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 98d8297..6a3c2a7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -134,6 +134,14 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ var Htype = "";
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ Htype = "";// 绫诲瀷
+ } else {
+ Htype = params[params[0]];//绫诲瀷
+ }
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -239,8 +247,11 @@
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖� 閰嶇疆
+ get_ReadConfigFile();
//鏌ヨ
get_FastQuery(1);
+
}
//#endregion
@@ -347,6 +358,9 @@
}
table.render(option);
+ //瀛樺偍鏉′欢
+ get_WriteConfigFile();
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -367,6 +381,43 @@
});
}
//#endregion
+
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.removeItem("Gy_SouceList");
+ var data = {
+ HNumber: $("#HNumber").val()
+ , HName: $("#HName").val()
+ , HOrgID: $("#HOrgID").val()
+ , ColName: $("#ColName").val()
+ , Comparator: $("#Comparator").val()
+ , ColContent: $("#ColContent").val()
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("Gy_SouceList", JSON.stringify(data));
+ }
+
+
+
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("Gy_SouceList");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+
+ $("#HNumber").val(data2["HNumber"]);
+ $("#HName").val(data2["HName"]);
+ $("#HOrgID").val(data2["HOrgID"]);
+ $("#ColName").val(data2["ColName"]);
+ $("#Comparator").val(data2["Comparator"]);
+ $("#ColContent").val(data2["ColContent"]);
+ form.render('select');
+ }
+ }
+
//#region 缂栬緫
function set_ShowBill() {
@@ -524,6 +575,10 @@
HOrgID = $("#HOrgID").val();//缁勭粐
}
+ if (Htype != "") {
+ Htype = decodeURI(Htype);
+ sWhere += " and 绫诲瀷 = '" + Htype + "'";
+ }
if (HNumber) {
sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + HNumber + "%'";
@@ -765,6 +820,18 @@
}
//#endregion
+
+ function get_UrlVars() {
+ 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;
+ }
+
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 82b85a9..f5ca7c3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -230,7 +230,7 @@
<div class="layui-row" style="margin-bottom:5px">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
</div>
</div>
</div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 35966e4..8aeed26 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -81,7 +81,7 @@
<div class="layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
</div>
</div>
<div class="layui-inline">
@@ -719,7 +719,7 @@
data: {},
success: function (d) {
$("#HInterID").val(d.data[0].hitemid);
- $("input[name='HStopflag']").prop("checked", 'true');//true:閫変腑 false:涓嶉�変腑
+ //$("input[name='HStopflag']").prop("checked", 'false');//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
}
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 4d07117..b129f69 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -192,6 +192,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>涓嬬Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>浼樺厛绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>鍑嗗鎺掑簭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>閫変骇绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -408,6 +409,11 @@
case 'set_ReadyAsc':
set_ReadyAsc();
break;
+ //閫変骇绾�
+ case 'set_Souce':
+ set_Souce(data);
+ break;
+
}
});
@@ -593,13 +599,11 @@
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
- columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
- columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true, sort: true });
+ columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, sort: true });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true });
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true });
- columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true, sort: true });
columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true });//0
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true });//0
columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true });//0
@@ -609,8 +613,7 @@
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150});
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺'});
- columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150});
-
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
columns.push({
@@ -752,6 +755,7 @@
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
+ columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150, sort: true });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150, sort: true });
columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true });
@@ -764,7 +768,7 @@
columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
columns.push({ field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 150, hide: true });
columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
- columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+
columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
@@ -2159,6 +2163,61 @@
}
}
+ //閫変骇绾�
+ function set_Souce(data) {
+
+ //data1.data[j]["婧愬崟涓诲唴鐮�"] == dataPush[i]["婧愬崟涓诲唴鐮�"] && data1.data[j]["婧愬崟瀛愬唴鐮�"] == dataPush[i]["婧愬崟瀛愬唴鐮�"]
+ if (data != 0) {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=鐢熶骇绾�", "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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+
+ var num = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (num >= data.length) {
+ break;
+ }
+ if (option.data[i]["婧愬崟涓诲唴鐮�"] == data[num]["婧愬崟涓诲唴鐮�"] && option.data[i]["婧愬崟瀛愬唴鐮�"] == data[num]["婧愬崟瀛愬唴鐮�"]) {
+ option.data[i]["HSourceID"] = OptionData.HItemID;
+ option.data[i]["鐢熶骇璧勬簮"] = OptionData.鐢熶骇璧勬簮鍚嶇О;
+ num += 1;
+ }
+ }
+ table.render(option);
+
+ //obj.update({
+ // "HSourceID": OptionData.HItemID
+ // , "鐢熶骇璧勬簮": OptionData.鐢熶骇璧勬簮鍚嶇О
+ //})
+ }
+ })
+
+
+ }
+ else {
+ return layer.msg("璇烽�夋嫨鏁版嵁!")
+ }
+ }
+
//淇濆瓨
function set_AddNew() {
@@ -2255,7 +2314,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=鐢熶骇绾�", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
index b83c8c2..6af9766 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
@@ -34,10 +34,22 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-block" style="width:100px">
<select name="HDate" lay-verify="required" id="HDate">
- <!--鍔ㄦ�佽幏鍙栨棩鏈�-->
+ <!--鍔ㄦ�佽幏鍙栨棩鏈�-->
</select>
</div>
</div>
@@ -195,6 +207,17 @@
//蹇�熻繃婊�
form.on('submit(btnSearch)', function (data) {
var Year = new Date($("#HDate").val()).getFullYear();
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var sWhere = "";
+ if (HNumber != "") {
+ sWhere += " and HNumber like'%" + HNumber + "%' ";
+ }
+
+ if (HName != "") {
+ sWhere += " and HName like'%" + HName + "%' ";
+ }
+
//鍒濆鍖栬〃鏍�
set_InitGrid(Year, 1, "");
set_InitGrid(Year, 2, "");
@@ -208,7 +231,7 @@
set_InitGrid(Year, 10, "");
set_InitGrid(Year, 11, "");
set_InitGrid(Year, 12, "");
- get_Display_Tree();
+ get_Display_Tree(sWhere);
get_Display("");
});
@@ -232,7 +255,7 @@
set_InitGrid(Year, 10, "");
set_InitGrid(Year, 11, "");
set_InitGrid(Year, 12, "");
- get_Display_Tree();
+ get_Display_Tree("");
get_Display("");
}
@@ -431,13 +454,13 @@
}
// 鏍戠姸鍥炬煡璇�
- function get_Display_Tree() {
+ function get_Display_Tree(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/MaterOutEntryReport/Gy_SourceList',
type: "GET",
async: false,
- data: { "HOrgid": sessionStorage["OrganizationID"] },
+ data: { "HOrgid": sessionStorage["OrganizationID"], "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
layer.close(ajaxLoad);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
index 4d2b7c3..f86cdcd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
@@ -52,6 +52,7 @@
<label class="layui-form-label" style="width: 85px;">褰撳墠宸ュ簭</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HProcID" name="HProcID" id="HProcID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -519,6 +520,7 @@
$("#HDeptID").val(data1.data[0]["HDeptID"]);
$("#HDeptName").val(data1.data[0]["杞﹂棿"]);
$("#HProName").val(data1.data[0]["宸ュ簭"]);
+ $("#HProcID").val(data1.data[0]["HProcID"]);
$("#HSourceID").val(data1.data[0]["HSourceID"]);
$("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
$("#HEmpID").val(data1.data[0]["HEmpID"]);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
index 75b3a4c..35aebad 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
@@ -699,8 +699,8 @@
if (HMaterSN == "") {
return layer.msg("璇峰厛鎵潯鐮�!");
}
- //var HInterID = $("#HInterID").val();
- //var HBillNo = $("#HBillNo").val();
+ var HInterID = $("#HInterID").val();
+ var HBillNo = $("#HBillNo").val();
//var HEmpName = $("#HEmpName").val();
//var HProdMac = $("#HProdMac").val();
//var HSourceInterID = $("#HSourceInterID").val();
@@ -712,8 +712,8 @@
var dataParams = {
'OperationType': 1
, 'HMaterSN': HMaterSN
- //, 'HInterID': HInterID
- //, 'HBillNo': HBillNo
+ , 'HInterID': HInterID
+ , 'HBillNo': HBillNo
//, 'HEmpName': HEmpName
//, 'HProdMac': HProdMac
//, 'HSourceInterID': HSourceInterID
@@ -724,7 +724,7 @@
//, 'subMaterList_Temp': $("#subMaterList_Temp").val()
}
var datajson = JSON.stringify(dataParams);
- url = encodeURI('../../杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_ProcessItemBGA_PJGH.html?OperationType=1&HMaterSN=' + HMaterSN);
+ url = encodeURI('../../杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_ProcessItemBGA_PJGH.html?OperationType=1&datajson=' + datajson);
layer.open({
type: 2
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
index aacd98f..e5d82a6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA_PJGH.html"
@@ -106,7 +106,7 @@
</div>
</div>
</div>
-
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -158,43 +158,23 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
- var HMaterSN = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var datajson = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒ゆ柇鏄惁鏂板
- if (HMaterSN != null || HMaterSN != "") {
+ if (OperationType == 1) {
+ datajson = decodeURI(datajson);
+ datajson = $.parseJSON(datajson);
OperationType = 1;
- $("#HMaterSN").val(HMaterSN);
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3791' },
- success: function (d) {
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HBillNo_bak").val(d.data[0].HBillNo);
- }
- });
+ $("#HMaterSN").val(datajson.HMaterSN);
+ $("#HInterID").val(datajson.HInterID);
+ $("#HBillNo").val(datajson.HBillNo);
+ $("#HBillNo_bak").val(datajson.HBillNo);
//鍒濆鍖栫晫闈�
set_ClearBill();
- } else if (OperationType == 2) {
- //绂佺敤缁勭粐閫夐」
- //$("#HOrgID").attr("disabled", true);
- RoadBillMain(HMaterSN);
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- async: false,
- data: { "HBillType": '3717' },
- success: function (d) {
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HBillNo_bak").val(d.data[0].HBillNo);
- }
- });
}
@@ -223,16 +203,6 @@
//閫夋嫨璐ㄦ鍛�
form.on('submit(btnHEmp)', function () {
btnHEmp();
- });
-
- //閫夋嫨鐢熶骇璧勬簮
- form.on('submit(btnHSource)', function () {
- btnHSource();
- });
-
- //閫夋嫨鐢熶骇鐝粍鎸夐挳
- form.on('submit(btnHGroup)', function () {
- btnHGroup();
});
//鏂板
@@ -271,7 +241,10 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鏌ヨ缁戝畾鐢ㄦ埛
get_Display();
+ //鏌ヨ鏉＄爜缁戝畾鐨勮繑淇褰�
+ get_RepairRecord();
}
//鏌ヨ
@@ -282,16 +255,13 @@
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- $("#HSourceID").val(data1.data[0]["HSourceID"]);
- $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
$("#HEmpID").val(data1.data[0]["HEmpID"]);
$("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]);
- $("#HGroupID").val(data1.data[0]["HGroupID"]);
- $("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -375,7 +345,7 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '璐ㄦ鍛樺垪琛�'//鏍囬
+ , title: '缁翠慨鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
@@ -394,9 +364,72 @@
})
}
-
+ //鏌ヨ鏉＄爜缁戝畾鐨勮繑淇褰�
+ function get_RepairRecord() {
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/Sc_SourceLineRepairBillSub_MaterList",
+ async: false,
+ data: { "sWhere": " and HSourceBillNo='" + $("#HMaterSN").val() + "'", "user": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(index);
-
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , totalRow: true
+ , data: data1.data
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { type: 'numbers', title: '搴忓彿' }
+ , { field: 'HInterID', title: 'HInterID', hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', hide: true }
+ , { field: 'HBillNo_bak', title: 'HBillNo_bak', hide: true }
+ , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+ , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+ , { field: 'HICMOBillType', title: 'HICMOBillType', hide: true }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟' }
+ , { field: 'HDate', title: '鏃ユ湡' }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: 'HMaterNumber', title: '閰嶄欢鐗╂枡缂栫爜' }
+ , { field: 'HMaterName', title: '閰嶄欢鐗╂枡鍚嶇О' }
+ , { field: 'HUnitID', title: 'HUnitID', hide: true }
+ , { field: 'HQty', title: '閰嶄欢鏁伴噺', hide: true }
+ , { field: 'HSupID', title: 'HSupID', hide: true }
+ , { field: 'HBatchNo', title: '鏇存崲鍖归厤鎵规', hide: true }
+ , { field: 'HBarCode', title: '閰嶄欢SN鐮�' }
+ , { field: 'HMaterSN', title: '浜у搧SN鐮�' }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ table.render(option);
+
+ }
+ else {
+ layer.close(index);
+ layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCodeSN").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+
//鑾峰彇鍙傛暟
function getUrlVars() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index 7511ac1..fee1b61 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -139,9 +139,13 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鎿嶄綔鍛�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HMateMAC" name="HMateMAC" id="HMateMAC" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎿嶄綔鍛�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName2" name="HEmpName2" id="HEmpName2" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HEmpID2" name="HEmpID2" id="HEmpID2" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp2" id="btnHEmp2" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -161,7 +165,6 @@
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 39%; float: left; height: 100px; background-color: white;">
<div class="layui-tab-content" style="padding-top: 10px; padding-left: 40%;">
- <!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-row">
@@ -187,7 +190,6 @@
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 10%; float: left; height: 100px; background-color: white;">
<div class="layui-tab-content" style="padding-top: 10px;">
- <!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div style="padding: 10px;">
@@ -201,7 +203,21 @@
<ul class="layui-tab-title">
<li class="layui-this">鍏抽敭浠舵竻鍗�</li>
</ul>
- <div class="layui-tab-content">
+ <div class="layui-tab-content" style="background-color: white;">
+ <div class="layui-row" style="margin-bottom: 5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">娴佽浆鍗�:</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBardCodeProcExchBillNo" lay-verify="HBardCodeProcExchBillNo" id="HBardCodeProcExchBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閰嶄欢鐮�:</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBardCodeMater" lay-verify="HBardCodeMater" id="HBardCodeMater">
+ </div>
+ </div>
+ </div>
<div class="layui-tab-item layui-show">
<!--鍏抽敭浠舵竻鍗�-->
<table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
@@ -273,48 +289,11 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
- var params = getUrlVars();
- var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
- var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ set_ClearBill();
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
-
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //$("#HIDDEN").hide();
- OperationType = 1;
-
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3791' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HBillNo_bak").val(d.data[0].HBillNo);
- }
- });
- //鍒濆鍖栫晫闈�
- set_ClearBill();
- } else if (OperationType == 2) {
- //绂佺敤缁勭粐閫夐」
- //$("#HOrgID").attr("disabled", true);
- RoadBillMain(linterid);
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- async: false,
- data: { "HBillType": '3717' },
- success: function (d) {
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HBillNo_bak").val(d.data[0].HBillNo);
- }
- });
- }
@@ -334,15 +313,29 @@
}
});
- //閫夋嫨涓嶈壇鍘熷洜
- form.on('submit(btnHBadReason)', function () {
- btnHBadReason();
+ //娴佽浆鍗″洖杞︽柟娉�
+ $('#HBardCodeProcExchBillNo').on('keydown', function (event) {
+ var HBarCode = $('#HBardCodeProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("娴佽浆鍗′笉鑳戒负绌猴紒")
+ return;
+ }
+ get_BomList(HBarCode);
+ }
});
+
//閫夋嫨璐ㄦ鍛�
form.on('submit(btnHEmp)', function () {
btnHEmp();
});
+
+ //閫夋嫨鎿嶄綔鍛�
+ form.on('submit(btnHEmp2)', function () {
+ btnHEmp2();
+ });
+
//閫夋嫨鐢熶骇璧勬簮
form.on('submit(btnHSource)', function () {
@@ -354,25 +347,16 @@
btnHGroup();
});
- //鏂板
- form.on('submit(set_AddNew)', function () {
- layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- location.replace('Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=0');
- });
+ //閫夋嫨鐢熶骇杞﹂棿鎸夐挳
+ form.on('submit(btnHDept)', function () {
+ btnHDept();
});
- //淇濆瓨鎻愪氦
- form.on('submit(btnSave_BL)', function (data) {//鎻愪氦
- if (AllowLoadData(data)) {
- set_AddNew(data,"涓嶈壇");
- }
+ //閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnHProc)', function () {
+ btnHProc();
});
- form.on('submit(btnSave_BF)', function (data) {//鎻愪氦
- if (AllowLoadData(data)) {
- set_AddNew(data,"鎶ュ簾");
- }
- });
//閫�鍑�
form.on('submit(btnEdit)', function (data) {
@@ -391,6 +375,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
get_Display();
+ get_CriticalPartsList();//鍏抽敭浠舵竻鍗�
}
//鏌ヨ
@@ -407,11 +392,14 @@
$("#HDeptID").val(data1.data[0]["HDeptID"]);
$("#HDeptName").val(data1.data[0]["杞﹂棿"]);
- $("#HProName").val(data1.data[0]["宸ュ簭"]);
+ $("#HProcName").val(data1.data[0]["宸ュ簭"]);
+ $("#HProcID").val(data1.data[0]["HProcID"]);
$("#HSourceID").val(data1.data[0]["HSourceID"]);
$("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
$("#HEmpID").val(data1.data[0]["HEmpID"]);
$("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]);
+ $("#HEmpID2").val(data1.data[0]["HEmpID"]);
+ $("#HEmpName2").val(data1.data[0]["璐ㄦ鍛�"]);
$("#HGroupID").val(data1.data[0]["HGroupID"]);
$("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
layer.close(ajaxLoad);
@@ -427,6 +415,33 @@
}
});
+ }
+
+
+ //鍏抽敭浠舵竻鍗�
+ function get_CriticalPartsList() {
+ var option = {
+ elem: '#mainTable2'
+ //, toolbar: '#toolbarDemo'
+ , async: true
+ , page: false
+ //, totalRow: true
+ , cellMinWidth: 120
+ , data: []
+ , height: 185
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
+ , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
+ , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺' }
+ , { field: '褰撳墠鎵规', title: '褰撳墠鎵规' }
+ , { field: 'HBillNo_bak', title: 'HBillNo_bak', hide: true }
+ , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+ ]]
+ }
+ table.render(option);
+
}
//鏉＄爜鍥炶溅鏌ヨ
@@ -466,32 +481,43 @@
});
}
- //涓嶈壇鍘熷洜閫夋嫨椤甸潰
- function btnHBadReason() {
- layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '涓嶈壇鍘熷洜鍒楄〃'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.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('璇烽�夋嫨鏁版嵁');
- }
- //鑾峰彇鏁版嵁
- $("#HBadReasonID").val(checkStatus.data[0].HItemID);
- $("#HBadReasonName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);
+ //娴佽浆鍗℃煡璇㈠叧閿欢娓呭崟
+ function get_BomList(HBarCode) {
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
+ async: true,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(index);
+ $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
+ $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
+ $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
+ $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
+ $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
+ $("#HMaterID").val(data1.data[0]["HMaterID"]);
+ $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
+ $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
+ $("#HBarCode").val(data1.data[0]["鏉＄爜"]);
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ else {
+ layer.close(index);
+ layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCodeSN").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- })
+ });
}
- //璐ㄦ鍛橀�夋嫨椤甸潰
+ //璐ㄦ鍛橀�夋嫨椤甸潰
function btnHEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -510,6 +536,32 @@
//鑾峰彇鏁版嵁
$("#HEmpID").val(checkStatus.data[0].HItemID);
$("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+
+ //鎿嶄綔鍛橀�夋嫨椤甸潰
+ function btnHEmp2() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璐ㄦ鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HEmpID2").val(checkStatus.data[0].HItemID);
+ $("#HEmpName2").val(checkStatus.data[0].鑱屽憳鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -568,18 +620,59 @@
})
}
- //鑾峰彇鍙傛暟
- 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;
+ //鐢熶骇杞﹂棿閫夋嫨椤甸潰
+ function btnHDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);//
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
}
+ //宸ュ簭閫夋嫨椤甸潰
+ function btnHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+
//淇濆瓨HMaker
function set_AddNew(data, HResult) {
--
Gitblit v1.9.1