From ebe78eae552a990d5e5568ac607e402482408b92 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 29 十月 2022 17:09:17 +0800
Subject: [PATCH] 1
---
WebTM/App_Data/MssqlReportData.cs | 5
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html | 40 +-
WebTM/views/index.html | 64 ---
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain_ZXBZ.html | 611 +++++++++++++++++++++++++++++++++++++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 34 ++
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodPT.html | 5
WebTM/WebTM.csproj | 1
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 36 ++
8 files changed, 719 insertions(+), 77 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 4f85e41..a9d6caa 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -19,11 +19,10 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
- //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳
- //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
+ public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
- public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
+ //public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
//public string sServer;
//public string sDataBase;
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7361c54..10bad0d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -906,6 +906,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍖呰鍗昞Sc_PackUnionBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍖呰鍗昞Sc_PackUnionBillEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍙枡骞冲彴\JIT_ComplementGoodBillMain.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍙枡骞冲彴\JIT_ComplementGoodBillMain_ZXBZ.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍙枡骞冲彴\JIT_ComplementGoodPT.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍙枡骞冲彴\JIT_HlpBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瀹屽伐鍗昞Sc_Add_MESEndWorkBillList - 澶嶅埗.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e823a63..1ef973b 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -497,7 +497,8 @@
<dd>
<a>鍙枡绠＄悊</a>
<dl class="layui-nav-child append" id="append">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain.html">鐢熶骇鍙枡骞冲彴(鐢熶骇璁㈠崟)</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain.html">鐢熶骇鍙枡骞冲彴(鎸夎鍗曞彨鏂�)</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain_ZXBZ.html">鐢熶骇鍙枡骞冲彴(鏈�灏忓寘瑁呭彨鏂�)</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/Jl_CallGoodsBillMain.html">鍙枡鍗曞垪琛�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsList.html">鎷ｆ枡閰嶉�佸崟鍒楄〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">閫�鏂欑敵璇峰崟鍒楄〃</a></dd>
@@ -847,83 +848,38 @@
</a>
</dd>
<dd>
- <a href="http://localhost:64484/KB_ProductionEquipmentOutputAnalysis.html" target="_blank">
+ <a href="http://183.129.128.86:9090/newKanban/KB_ProductionEquipmentOutputAnalysis.html" target="_blank">
<i class="layui-icon layui-icon-layer"></i>鐢熶骇璁惧浜ч噺鍒嗘瀽鐪嬫澘
</a>
</dd>
<dd>
- <a href="http://localhost:64484/KB_EquipmentUtilizationRate.html" target="_blank">
+ <a href="http://183.129.128.86:9090/newKanban/KB_EquipmentUtilizationRate.html" target="_blank">
<i class="layui-icon layui-icon-layer"></i>璁惧绋煎姩鐜囩湅鏉�
</a>
</dd>
<dd>
- <a href="http://localhost:64484/KB_EquipmentStatus.html" target="_blank">
+ <a href="http://183.129.128.86:9090/newKanban/KB_EquipmentStatus.html" target="_blank">
<i class="layui-icon layui-icon-layer"></i>璁惧鐘舵�佺湅鏉�
</a>
</dd>
<dd>
- <a href="" target="_blank">
+ <a href="http://122.227.199.62:5058/HDKanBanUi/SalesDelivery.html" target="_blank">
<i class="layui-icon layui-icon-layer"></i>閿�鍞彂璐х湅鏉�
</a>
</dd>
<dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>鐢熶骇鐘舵�佺湅鏉�
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>缂烘枡棰勮鐪嬫澘
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>閲囪喘閫炬湡鐪嬫澘
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>璁㈠崟璺熻釜鐪嬫澘
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
+ <a href="http://122.227.199.62:5058/HDKanBanUi/HDHouse.html" target="_blank">
<i class="layui-icon layui-icon-layer"></i>浠撳簱鐘舵�佺湅鏉�
</a>
</dd>
<dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>浠撳簱鍙戞枡鐪嬫澘
+ <a href="http://47.96.97.237/kanbanUi/HDLackMats.html" target="_blank">
+ <i class="layui-icon layui-icon-layer"></i>缂烘枡棰勮鐪嬫澘
</a>
</dd>
<dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>浜х嚎鐪嬫澘
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
+ <a href="http://122.227.199.62:5058/HDKanBanUi/HDCALL.html" target="_blank">
<i class="layui-icon layui-icon-layer"></i>鍙枡鐪嬫澘
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>鍝佽川鐪嬫澘
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>閿�鍞垎甯冪湅鏉�
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>璁惧鐘舵�佺湅鏉�
- </a>
- </dd>
- <dd>
- <a href="" target="_blank">
- <i class="layui-icon layui-icon-layer"></i>鍣ㄥ叿鐘舵�佺湅鏉�
</a>
</dd>
</dl>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
index 80fd5a0..83c94b5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
@@ -46,6 +46,9 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1">
閲嶇疆
</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDel" id="btnDel">
+ 鍒犻櫎
+ </button>
</div>
</div>
</div>
@@ -401,6 +404,39 @@
});
});
+ //鍒犻櫎鎸夐挳
+ form.on('submit(btnDel)', function (data) {
+ var HItemID = $("#HItemID").val();//鐩樼偣
+ if (HItemID) {
+ layer.confirm('鏄惁鍒犻櫎鍏朵粬鏃犵敤鐨勫簱瀛橈紵', {
+ icon: 3,
+ title: "鎻愮ず",
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index) {
+ $.ajax({
+ url: GetWEBURL() + 'Gy_StockCheckItemBill/StockItemSubDel',
+ type: "GET",
+ anysc: false,
+ data: { "sID": HItemID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message, { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ })
+ }
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨鐩樼偣鏂规");
+ return;
+ }
+ });
+
//鐩樼偣鏂规寮圭獥
form.on('submit(HSourceInterList)', function () {
//椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 6d993c1..5dc5e45 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -112,9 +112,10 @@
<div class="layui-input-block">
<select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
<!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
+ <option value="鍏ㄩ儴" selected="selected">鍏ㄩ儴</option>
<option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
<option value="鏈笅鎺�">鏈笅鎺�</option>
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+
</select>
</div>
</div>
@@ -189,6 +190,13 @@
var sWhere = "";
var sWhere = "";
var HModName = "Sc_ICMOBillList";
+ var HDeptID = 0;
+
+ var params = getUrlVars();
+ var HDeptID = params[params[0]];
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+
//鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
@@ -210,6 +218,9 @@
}
$("#HDeptName").append(HDeptName);
+ if (!isNaN(HDeptID)) {
+ $("#HDeptName").val(HDeptID);
+ }
form.render('select');
}
layer.closeAll("loading");
@@ -511,6 +522,14 @@
break;
}
sWhere += " and " + ColName + " " + com;
+ }
+
+ //浼犻�掔殑鍙傛暟涓嶄负NAN
+ if (!isNaN(HDeptID) && HDeptName==0) {
+ HDeptName = HDeptID;
+ }
+ if (!isNaN(HDeptID)) {
+ HStatus = "寮�宸�";
}
if (HSF) {//鍒ゆ柇鎵撳嵃鐘舵��
@@ -877,6 +896,19 @@
$("#ColName").append(Organization);
form.render('select');
}
+
+
+ //鑾峰彇鍙傛暟
+ 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;
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
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 4359420..4745cc3 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"
@@ -28,7 +28,7 @@
<div style="padding: 10px; ">
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bzjjl" id="Bzjjl">鏍囧噯浠跺彨鏂�</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ptjl" id="Ptjl">閰嶅鍙枡</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">鏈�灏忓寘瑁呭彨鏂�</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">鏈�灏忓寘瑁呭彨鏂�</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">寮曞嚭Excel</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">涓嬫煡</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
@@ -49,9 +49,12 @@
</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="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
+ <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" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" style="width: 60%;display: inline-block;" >
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill" 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">
@@ -129,12 +132,9 @@
</div>
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <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" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <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="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
</div>
</div>
</div>
@@ -191,7 +191,7 @@
var HICMOBillNo = $("#HICMOBillNo").val();
if (HICMOBillNo == "") {
$("#Ptjl").hide();
- $("#Zxbzjl").hide();
+ //$("#Zxbzjl").hide();
$("#Jl").hide();
$("#Scjld").hide();
$("#Yltl").hide();
@@ -200,7 +200,7 @@
$("#Sctld").hide();
} else {
$("#Ptjl").show();
- $("#Zxbzjl").show();
+ //$("#Zxbzjl").show();
$("#Jl").show();
$("#Scjld").show();
$("#Yltl").show();
@@ -294,13 +294,14 @@
function set_ClearBill()
{
NotGeneratedMaterial();
- set_InitGrid();
- get_Display(sWhere);
Organ();
- DisPlay_HideColumn();
//璇诲彇杩囨护鏉′欢
get_ReadConfigFile();
+ set_InitGrid();
+ get_Display(sWhere);
+ DisPlay_HideColumn();
}
+
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
@@ -308,6 +309,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false,
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
@@ -322,7 +324,9 @@
if (dataG != null) {
var data2 = JSON.parse(dataG);
$("#Organization").val(data2["Organization"]);
- }
+ } else {
+ $("#Organization").val(sessionStorage["OrganizationID"]);
+ }
form.render('select');
}
@@ -392,6 +396,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -994,6 +999,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ComplementGoodBill/NotGeneratedMaterialList',
type: "GET",
+ async: false,
data: { "sWhere": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -1021,7 +1027,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇璁㈠崟鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html', 'yes']
+ , content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?HDeptID='+ $("#DepartmentID").val(), 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
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_ZXBZ.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_ZXBZ.html"
new file mode 100644
index 0000000..906f7af
--- /dev/null
+++ "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_ZXBZ.html"
@@ -0,0 +1,611 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏈�灏忓寘瑁呭彨鏂�</title>
+ <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>
+ .layui-row .layui-btn layui-btn-normal {
+ margin: 0px 10px;
+ }
+ /* .layui-inline {
+ margin: 0px 80px;
+ }*/
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Jl" id="Jl">鍙枡</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">鐢熸垚鎷ｆ枡鍗�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">涓嶈壇鍝侀��鏂欑敵璇峰崟</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">浣欓噺閫�鏂欑敵璇峰崟</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">鎶ュ簾閫�鏂欑敵璇峰崟</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">鐢熸垚閫�鏂欏崟</button>-->
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" style="margin-left: 0px;" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ </div>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="DepartmentID" name="DepartmentID" id="DepartmentID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="DepartmentName" name="DepartmentName" id="DepartmentName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDepartment" id="btnDepartment" 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">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="Organization" id="Organization" lay-verify="Organization">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" 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-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <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="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
+ </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="MaterialModel" id="MaterialModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "JIT_ComplementGoodBillMain_ZXBZ";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫夋嫨鐗╂枡
+ form.on('submit(btnMaterial)', function () {
+ btnMaterial();
+ })
+
+ //杩囨护鏌ヨ
+ form.on('submit(Cx)', function () {
+ get_FastQuery();
+ })
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ })
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //闅愯棌鍒楄缃�
+ form.on('submit(HideColumn)', function () {
+ get_HideColumn();
+ })
+
+ //閫夋嫨鐢熶骇杞﹂棿
+ form.on('submit(btnDepartment)', function () {
+ btnDepartment();
+ })
+
+ //鏂板鍙枡鍗�
+ form.on('submit(Jl)', function () {
+ set_AddNew_Jl();
+ })
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill()
+ {
+ set_InitGrid();
+ Organ();
+ //璇诲彇杩囨护鏉′欢
+ get_ReadConfigFile();
+ get_Display(sWhere);
+ DisPlay_HideColumn();
+
+ }
+
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#Organization").append(Organization);
+
+ //鑾峰彇瀛樺偍鏁版嵁
+ var dataG = localStorage.getItem("dataJLBZ");
+ if (dataG != null) {
+ var data2 = JSON.parse(dataG);
+ $("#Organization").val(data2["Organization"]);
+ } else {
+ $("#Organization").val(sessionStorage["OrganizationID"]);
+ }
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //琛ㄦ牸鏁版嵁
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-150'
+ , cellMinWidth: 90
+ , limit: 500
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '搴忓彿', title: '搴忓彿' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿'}
+ , { 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: 120 }
+ , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 120 }
+ , { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 120 }
+ , { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 120 }
+ , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 120, edit: 'text' }
+ , { field: '鍙彂鏁伴噺', title: '鍙彂鏁伴噺', width: 120 }
+ , { field: '鍙彂鍖呮暟', title: '鍙彂鍖呮暟', width: 120 }
+ , { field: '鐢ㄦ枡娓呭崟鎬婚噺', title: '鐢ㄦ枡娓呭崟鎬婚噺', width: 120 }
+ , { field: '杞﹂棿浠撳簱搴撳瓨', title: '杞﹂棿浠撳簱搴撳瓨', width: 120 }
+ , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 120, edit: 'text' }
+ , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text' }
+ , { field: '杞﹂棿浠撳簱', title: '杞﹂棿浠撳簱', width: 160 }
+ , { field: '鏈�灏忓彂鏂欐暟閲�', title: '鏈�灏忓彂鏂欐暟閲�', width: 160 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 160 }
+ , { field: '宸ユ', title: '宸ユ', width: 160 }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 160 }
+ , { field: 'HOutOrgID', title: 'HOutOrgID', width: 160, hide: true }
+ , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 160 }
+ ]]
+ };
+ }
+
+ //鏌ヨ鍔犺浇鏁版嵁
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ComplementGoodBill_ZXBZ/JIT_ComplementGoodBill_ZXBZ_List',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ //瀛樺偍杩囨护鏉′欢
+ get_WriteConfigFile();
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鐗╂枡
+ function btnMaterial() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#MaterialID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+ $("#MaterialName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+ $("#MaterialModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+ $("#MaterialNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠ｇ爜
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var MaterialNumber = $("#MaterialNumber").val(); //鐗╂枡浠ｇ爜
+ var MaterialName = $("#MaterialName").val(); //鐗╂枡鍚嶇О
+ var MaterialModel = $("#MaterialModel").val(); //鐗╂枡瑙勬牸鍨嬪彿
+ var HORGID = $("#Organization").val(); //缁勭粐
+ var HDeptID = $("#DepartmentID").val(); //鐢熶骇杞﹂棿
+ var user = sessionStorage["Czybm"]; //鍒跺崟浜�
+
+ if (HDeptID == 0) {
+ return layer.msg("璇烽�夋嫨鐢熶骇杞﹂棿!");
+ }
+ sWhere = "'" + MaterialNumber + "','" + MaterialName + "','" + MaterialModel + "','" + HORGID + "'," + HDeptID+",'" + user +"'"
+ get_Display(sWhere);
+ sWhere = "";
+ }
+
+ //琛屽唴蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == "OutWarehouse") {
+ var MaterNum = obj.data["鐗╂枡浠ｇ爜"];
+ var HOrgID = sessionStorage["OrganizationID"];
+ //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "浠撳簱鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList_JIT.html?MaterNum=" + MaterNum + "&HOrgID=" + HOrgID, "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].浠撳簱鍚嶇О
+ , "璋冨嚭浠撳簱ID": checkStatus.data[0].浠撳簱ID
+ , "璋冨嚭浠撳簱搴撳瓨鏁伴噺": checkStatus.data[0].璋冨嚭浠撳簱搴撳瓨鏁伴噺
+ , "璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺": checkStatus.data[0].璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺
+ , "HOutOrgID": checkStatus.data[0].搴撳瓨缁勭粐
+ , "璋冨嚭缁勭粐": checkStatus.data[0].缁勭粐鍚嶇О
+
+ })
+ 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);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ }
+ })
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#MaterialNumber").val("");
+ $("#MaterialName").val("");
+ $("#MaterialModel").val("");
+ sWhere = "";
+ }
+
+ //鐢熶骇杞﹂棿
+ function btnDepartment() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/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 === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#DepartmentID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#DepartmentName").val(checkStatus.data[0].HName);//閮ㄩ棬鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鏂板鍙枡鍗�
+ function set_AddNew_Jl() {
+ 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_ZXBZ/InsertCallGoodsBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ //鍒锋柊椤甸潰
+ get_FastQuery();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ }
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["璋冨嚭浠撳簱ID", "HOutOrgID","璋冨叆浠撳簱id"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["field"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("dataJLBZ");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+ $("#DepartmentID").val(data2["DepartmentID"]);
+ $("#DepartmentName").val(data2["DepartmentName"]);
+ $("#MaterialNumber").val(data2["MaterialNumber"]);
+ $("#MaterialName").val(data2["MaterialName"]);
+ $("#MaterialModel").val(data2["MaterialModel"]);
+ }
+ }
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.removeItem("dataJLBZ");
+ var data = {
+ DepartmentID: $("#DepartmentID").val()
+ , DepartmentName: $("#DepartmentName").val()
+ , Organization: $("#Organization").val()
+ , MaterialNumber: $("#MaterialNumber").val()
+ , MaterialName: $("#MaterialName").val()
+ , MaterialModel: $("#MaterialModel").val()
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("dataJLBZ", JSON.stringify(data));
+ }
+
+ //#endregion
+
+ });
+
+
+</script>
\ No newline at end of file
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_ComplementGoodPT.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_ComplementGoodPT.html"
index 2aa9b1a..4c59f98 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_ComplementGoodPT.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_ComplementGoodPT.html"
@@ -231,7 +231,7 @@
, { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 120, hide: true }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 120, edit: 'text', event: 'InWarehouse' }
, { field: '璋冨叆浠撳簱id', title: '璋冨叆浠撳簱id', width: 120, hide: true }
- , { field: '閰嶅鏁伴噺', title: '閰嶅鏁伴噺', width: 120 }
+ , { field: '閰嶅鏁伴噺', title: '閰嶅鏁伴噺', width: 120, edit: 'text' }
, { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 120 }
, { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 120 }
, { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160}
@@ -575,8 +575,9 @@
function set_ptjl() {
for (var item in table.cache["mainTable"]) {
if (table.cache["mainTable"][item]["閰嶅鏁伴噺"] > table.cache["mainTable"][item]["璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺"] || table.cache["mainTable"][item]["閰嶅鏁伴噺"] == 0) {
- return layer.msg("绗�" + (parseInt(item) + 1) + "琛岀殑閰嶅鏁伴噺澶т簬璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺!");
+ return layer.msg("绗�" + (parseInt(item) + 1) + "琛岀殑閰嶅鏁伴噺澶т簬璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺!鎴栬�呴厤濂楁暟閲忎负0!");
}
+
}
var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
--
Gitblit v1.9.1