From c3ae169e32bd4c86be845c8c12167ee5d214b138 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 26 十二月 2023 14:43:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/zymesSrmLayUi
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/基础资料/Gy_UnitList.html | 104 ++
WebSRM/WebSRM.csproj | 5
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx | 15
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 14
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 271 ++++-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 49
WebSRM/App_Data/MssqlReportData.cs | 5
WebSRM/layuiAdmin.std-v1.2.1/src/views/基础资料/Gy_MaterialList.html | 113 ++
WebSRM/layuiAdmin.std-v1.2.1/src/views/基础资料/Gy_Currency.html | 669 +++++++++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_QuotePriceBillList.html | 4
WebSRM/layuiAdmin.std-v1.2.1/src/views/基础资料/Gy_Supplier.html | 651 +++++++++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Sup_QuotePriceBillEdit.html | 876 ++++++++++++++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_AskPriceBillList.html | 67 +
13 files changed, 2,764 insertions(+), 79 deletions(-)
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index 1019e7a..0c6d544 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -16,9 +16,9 @@
//public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
//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.1.253;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ public const string SqlConnStr = "Data Source=192.168.1.253;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//瀹夌憺
- public const string SqlConnStr = "Data Source=192.168.80.91;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ //public const string SqlConnStr = "Data Source=192.168.80.91;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//
//澶忓疂
//public const string SqlConnStr = "Data Source=192.168.1.239;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
@@ -155,6 +155,7 @@
{
public static void GenOneRecordset(System.Web.UI.Page DataPage, string QuerySQL)
{
+ LogService.Write(QuerySQL);
SqlReportData.DoGenDetailData(DataPage, QuerySQL, ReportDataBase.DefaultDataType, false);
}
diff --git a/WebSRM/WebSRM.csproj b/WebSRM/WebSRM.csproj
index 8316047..7f6d7d3 100644
--- a/WebSRM/WebSRM.csproj
+++ b/WebSRM/WebSRM.csproj
@@ -882,6 +882,7 @@
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBill.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBillList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\Sup_QuotePriceBillEdit.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_PoBarCodeBillList.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_BarCodeBillList.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_POInStockBill.aspx" />
@@ -921,6 +922,10 @@
<Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\Web_BarCodeBillList.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_POInStockBill.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_Web_BarCodeBillList.aspx" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\鍩虹璧勬枡\Gy_Currency.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\鍩虹璧勬枡\Gy_MaterialList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\鍩虹璧勬枡\Gy_Supplier.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\鍩虹璧勬枡\Gy_UnitList.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide.html" />
<Content Include="layuiAdmin.std-v1.2.1\璇存槑.txt" />
<Content Include="login.html" />
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_AskPriceBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_AskPriceBillList.html
index 7d2bde9..c0f2eba 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_AskPriceBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_AskPriceBillList.html
@@ -100,9 +100,10 @@
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <div class="layui-btn-container">
+ <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>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_QuotePrice"><i class="layui-icon layui-icon-logout"></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>
@@ -155,12 +156,16 @@
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
- break;
+ break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
- break;
+ break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
+ break;
+ //涓嬫帹鎶ヤ环
+ case 'get_QuotePrice': get_QuotePrice();
+ break;
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
@@ -189,10 +194,10 @@
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
//鏌ヨ
- get_Display("");
+ get_Display("");
//鍒濆鍖栬〃鏍�
//DisPlay_HideColumn();
- }
+ }
// 鏌ヨ
function get_Display(sWhere) {
@@ -372,6 +377,38 @@
}
}
+ //鎶ヤ环
+ function get_QuotePrice() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length > 0) {
+ var linterid = "";//涓籭d
+ var HEntryID = "";//瀛恑d
+ var HIEs = "";//涓籭d+瀛恑d
+ for (let i = 0; i < checkStatus.data.length;i++) {
+ linterid += data[i].hmainid + ',';
+ HEntryID += data[i].hentryid + ',';
+ HIEs += data[i].hmainid.toString() + data[i].hentryid.toString() + ',';
+ }
+ linterid = linterid.substring(0, linterid.length - 1);
+ HEntryID = HEntryID.substring(0, HEntryID.length - 1);
+ HIEs = HIEs.substring(0, HIEs.length - 1);
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '渚涘簲鍟嗘姤浠峰崟缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Sup_QuotePriceBillEdit.html?OperationType=1&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HIEs=' + HIEs
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
// 鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -408,13 +445,13 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
- }
+ }
// 鍒锋柊
function get_Refresh() {
set_ClearQuery();
get_Display(sWhere);
- }
+ }
function Format(datetime, fmt) {
if (parseInt(datetime) == datetime) {
@@ -426,13 +463,13 @@
}
datetime = new Date(datetime);
var o = {
- "M+": datetime.getMonth() + 1, //鏈堜唤
- "d+": datetime.getDate(), //鏃�
- "h+": datetime.getHours(), //灏忔椂
- "m+": datetime.getMinutes(), //鍒�
- "s+": datetime.getSeconds(), //绉�
- "q+": Math.floor((datetime.getMonth() + 3) / 3), //瀛ｅ害
- "S": datetime.getMilliseconds() //姣
+ "M+": datetime.getMonth() + 1, //鏈堜唤
+ "d+": datetime.getDate(), //鏃�
+ "h+": datetime.getHours(), //灏忔椂
+ "m+": datetime.getMinutes(), //鍒�
+ "s+": datetime.getSeconds(), //绉�
+ "q+": Math.floor((datetime.getMonth() + 3) / 3), //瀛ｅ害
+ "S": datetime.getMilliseconds() //姣
};
if (/(y+)/.test(fmt))
fmt = fmt.replace(RegExp.$1, (datetime.getFullYear() + "").substr(4 - RegExp.$1.length));
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index 8fdf7ce..ac5c64f 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -648,12 +648,12 @@
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 100, edit: 'text' }
+ , { field: 'HBatchNo', title: '鐢熶骇鏃ユ湡D/C', width: 100, edit: 'text' }
//, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
//, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
- , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true}//
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true}//, event: "chooseHKFDQDate"
//, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
@@ -947,21 +947,21 @@
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+ $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
});
}
else if (obj.event == 'inputHMinQty') {
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+ $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
});
}
else if (obj.event == 'inputHWXQty') {
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+ $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
});
}
});
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index e2027d3..b9bb524 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -25,7 +25,7 @@
<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="Aduit">瀹℃牳</button>
+ <button type="button" id="aduit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -54,13 +54,26 @@
</div>
</div>
<div class="layui-col-xs3">
+ <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
+ <input id="HSupID" name="HSupID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 棰勮鍒拌揣鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
+ </div>
+ </div>
+ <div class="layui-col-xs3" style="display:none">
<label class="layui-form-label">涓� 绠★細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HManagerName" id="HManagerName" readonly="readonly" autocomplete="off" disabled>
<input id="HManagerID" name="HManagerID" type="hidden" />
</div>
</div>
- <div class="layui-col-xs3">
+ <div class="layui-col-xs3" style="display:none">
<label class="layui-form-label">涓� 鍔� 鍛橈細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HEmpName" id="HEmpName" readonly="readonly" autocomplete="off">
@@ -72,19 +85,13 @@
</div>
<div class="layui-form-item">
<div class="layui-row">
- <div class="layui-col-xs3">
+ <div class="layui-col-xs3" style="display:none">
<label class="layui-form-label">鍗曟嵁鐘舵�侊細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HStatus" id="HStatus" readonly="readonly" autocomplete="off">
</div>
</div>
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
- <input id="HSupID" name="HSupID" type="hidden" />
- </div>
- </div>
+
<div class="layui-col-xs3">
<label class="layui-form-label"> 閮� 闂細</label>
<div class="layui-input-inline">
@@ -93,20 +100,10 @@
</div>
</div>
<div class="layui-col-xs3">
- <label class="layui-form-label"> 棰勮鍒拌揣鏃ユ湡锛�</label>
+ <label class="layui-form-label"> 閲囪喘缁勭粐锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
- </div>
- </div>
-
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 閫佽揣鍗曞彿锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+ <input class="layui-input" name="HPURCHASEORGName" lay-verify="HPURCHASEORGName" id="HPURCHASEORGName" readonly="readonly" autocomplete="off">
+ <input id="HPURCHASEORGID" name="HPURCHASEORGID" type="hidden" />
</div>
</div>
<div class="layui-col-xs3">
@@ -115,10 +112,46 @@
<input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
</div>
</div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鐗╂祦鍏徃锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExpressSupplier" id="HExpressSupplier" autocomplete="off">
+ </div>
+ </div>
</div>
-
</div>
-
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3" style="display:none">
+ <label class="layui-form-label"> 閫佽揣鍗曞彿锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鏀惰揣浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HReceiveGoodsMan" id="HReceiveGoodsMan" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鏀惰揣鍦板潃锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鑱旂郴鏂瑰紡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HReceiveGoodsLink" id="HReceiveGoodsLink" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
@@ -175,6 +208,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></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>
</form>
@@ -233,11 +267,13 @@
$("#HSupID").val(d.data[0].HSupID);
$("#HSupName").val(d.data[0].HSupName);
$("#HDeptID").val(d.data[0].HDeptID);
- $("#HDeptName").val(d.data[0].HDeptName);
+ $("#HDeptName").val(d.data[0].HDepName);
$("#HEmpID").val(d.data[0].HEmpID);
$("#HEmpName").val(d.data[0].HEmpName);
$("#HManagerID").val(d.data[0].HManagerID);
$("#HManagerName").val(d.data[0].HManagerName);
+ $("#HPURCHASEORGID").val(d.data[0].FPURCHASEORGID);
+ $("#HPURCHASEORGName").val(d.data[0].HOrgName);
}
});
@@ -259,7 +295,9 @@
});
RoadHBillSub();
layer.load(3)
- table.render({
+
+ var HModName = "SRM_POInStockBill_Edit";
+ var option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cols: [[
@@ -267,21 +305,21 @@
, { field: 'sorderid', title: '搴忓彿', width: 80, hide: true, fixed: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, fixed: true, edit: 'text', hide: true }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
- , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120 }
- , { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120, hide: true }
+ , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }//鍘熷懡鍚嶄负鐗╂枡浠ｇ爜
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
- , { field: 'FPrintCount', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120 }
+ , { field: 'FPrintCount', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120, hide: true }
, { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text', event: "inputHQty" }
- , { field: 'HRQty', title: '鍙彂璐ф暟閲�', width: 100 }
+ , { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100 }
, { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 120, edit: 'text', }
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }
+ , { field: 'HBatchNo', title: '鐢熶骇鏃ユ湡D/C', width: 120, edit: 'text' }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }
, { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
@@ -296,10 +334,12 @@
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 100, hide: true }
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: 'HExpressNumberSub', title: '鐗╂祦鍗曞彿', width: 200, edit: true }//鐟炵惇
- , { field: 'HExpressSupplierSub', title: '鐗╂祦鍏徃', width: 200, edit: true }//鐟炵惇
- , { field: 'HPlanArrivalDate', title: '鍒拌揣鏃ユ湡', width: 200, data_field: 'HPlanArrivalDate', event: "PlanArrivalDate" }//鐟炵惇
- , { field: 'HBoxNumber', title: '绠卞彿', width: 200, edit: true }//鐟炵惇
+ , { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 200, edit: 'text' }
+ , { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 200, edit: 'text' }
+ , { field: 'HExpressNumberSub', title: '鐗╂祦鍗曞彿', width: 200, edit: true, hide: true }//鐟炵惇,鍑礉
+ , { field: 'HExpressSupplierSub', title: '鐗╂祦鍏徃', width: 200, edit: true, hide: true }//鐟炵惇锛屽嚡璐�
+ , { field: 'HPlanArrivalDate', title: '鍒拌揣鏃ユ湡', width: 200, data_field: 'HPlanArrivalDate', event: "PlanArrivalDate", hide: true }//鐟炵惇
+ , { field: 'HBoxNumber', title: '绠卞彿', width: 200, edit: true, hide: true }//鐟炵惇
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
]]
@@ -310,7 +350,8 @@
, done: function () {
layer.closeAll("loading");
}
- });
+ };
+ table.render(option);
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -440,6 +481,10 @@
});
}
break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
};
});
//鐩戝惉琛屽伐鍏蜂簨浠�
@@ -491,7 +536,7 @@
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+ $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
});
}
@@ -507,7 +552,7 @@
HQty = parseFloat(obj.data.HQty);
}
if (parseFloat(obj.value) > obj.data.HRQty) {
- layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝閫佽揣鏁伴噺涓嶈兘瓒呰繃鍙彂璐ф暟閲忥紒", { icon: 5 });
+ layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝閫佽揣鏁伴噺涓嶈兘瓒呰繃鍓╀綑鍙彂璐ф暟閲忥紒", { icon: 5 });
}
else {
var bresult = true;
@@ -527,7 +572,7 @@
});
}
else {
- layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝鍚堣閫佽揣鏁伴噺涓嶈兘瓒呰繃鍙彂璐ф暟閲忥紒", { icon: 5 });
+ layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝鍚堣閫佽揣鏁伴噺涓嶈兘瓒呰繃鍓╀綑鍙彂璐ф暟閲忥紒", { icon: 5 });
}
}
}
@@ -542,6 +587,9 @@
data: { sMsg: linterid, sMsg2: lentryid, sMsg3: lSourceBillType },
success: function (result) {
if (result.count == 10000) {
+ for (let i = 0; i < result.data.length; i++) {
+ result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0,6);
+ }
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
table.reload('mainTable', {
data: ajaxReturnData
@@ -555,7 +603,7 @@
layer.closeAll("loading");
layer.msg(result.Message, { icon: 2, time: 4000 });
}
-
+
},
error: function (result) {
console.log(result);
@@ -568,7 +616,7 @@
//debugger;
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr;
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
@@ -606,6 +654,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $('#aduit-btn').addClass("layui-btn-disabled").attr("disabled", true);
layer.msg(data.Message, { icon: 1 });
}
else {
@@ -700,14 +749,14 @@
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,娌℃湁杩涜鏉＄爜鎵撳嵃锛屼笉鑳界敓鎴愰�佽揣鍗�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
- ////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉＄爜鏁伴噺 鏃堕檺鍒�
+ ////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍓╀綑鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉＄爜鏁伴噺 鏃堕檺鍒�
//if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].FPrintCount)) {
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
//閫佽揣鏁伴噺
if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HRQty)) {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧彲鍙戣揣鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧墿浣欏彲鍙戣揣鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
//////閫佽揣鏁伴噺
@@ -715,7 +764,7 @@
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囨墦鍗版潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
- ////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉＄爜鏁伴噺 鏃堕檺鍒�
+ ////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍓╀綑鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉＄爜鏁伴噺 鏃堕檺鍒�
//if (parseFloat(sSubStr[i].HQty) + parseFloat(sSubStr[i].HSQty) - parseFloat(sSubStr[i].HRQty) > parseFloat(sSubStr[i].FPrintCount)) {
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
@@ -724,6 +773,11 @@
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
+ if (sSubStr[i].HBatchNo == "") {
+ //鍑礉
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡D/C涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
@@ -731,6 +785,127 @@
}
return Result;
}
+
+ ////闅愯棌鍒楄缃�
+ //function get_HideColumn() {
+ // var colName = "";
+ // var contentUrl = "";
+ // for (var i = 1; i < option.cols[0].length - 1; i++) {
+ // colName += option.cols[0][i]["title"] + ",";
+ // }
+ // var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ // var urlLen = urlStr.split('/');
+ // for (var i = 0; i < urlLen.length - 4; i++) {
+ // contentUrl += "../";
+ // }
+ // colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ // contentUrl += 'views/鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ // layer.open({
+ // type: 2
+ // , skin: "layui-layer-rim" //鍔犱笂杈规
+ // , title: "闅愯棌鍒楄缃�" //鏍囬
+ // , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ // , shift: 2 //寮瑰嚭鍔ㄧ敾
+ // , area: ["50%", "90%"] //绐椾綋澶у皬
+ // , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ // , content: [contentUrl, "yes"]
+ // , btn: ["纭畾", "鍙栨秷"]
+ // , btn1: function (index, laero) {
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // DisPlay_HideColumn();
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // layer.close(index);//鍏抽棴寮圭獥
+ // }
+ // })
+ //}
+
+ ////鏄剧ず鍒楁暟鎹�
+ //function DisPlay_HideColumn() {
+ // $.ajax({
+ // url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ // type: "GET",
+ // data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ // async: false,
+ // success: function (data1) {
+ // if (data1.data.length != 0) {
+ // var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ // var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ // 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 (dataCols[3] > 0) {
+ // option.cols[0][i + 1]["width"] = dataCols[3];
+ // }
+ // //璁剧疆鍐呭瀛椾綋澶у皬
+ // 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 (data1.data[0].HColumnWidth != 0) {
+ // // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ // //} else {
+ // // option.cols[0][i + 1]["width"] = "";
+ // //}
+ // //鏄剧ず鍒�
+ // if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], 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);
+ // layer.closeAll("loading");
+ // } else {
+ // table.render(option);
+ // layer.closeAll("loading");
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // layer.closeAll("loading");
+ // }
+ // })
+ //}
+
});
</script>
</body>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index fdfdae4..579dda3 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -373,7 +373,11 @@
//闅愯棌id
//璁剧疆鍒楀
if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
+ if (option.cols[0][i + 1]["field"] == '鍥炲浜ゆ湡') {
+ option.cols[0][i + 1]["width"] = 120;
+ } else {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
@@ -387,7 +391,7 @@
//} else {
// option.cols[0][i + 1]["width"] = "";
//}
-
+
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
@@ -464,9 +468,11 @@
default:
if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�' || data[i].name == '鍓╀綑鏀舵枡鏁伴噺' || data[i].name == '鏈埌璐ф暟閲�' || data[i].name == '绱鏀舵枡鏁伴噺' || data[i].name == '鍓╀綑鍏ュ簱鏁伴噺' || data[i].name == '鍏ュ簱鏁伴噺') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ } else if (data[i].name == '鍥炲浜ゆ湡') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
+ }
}
}
}
@@ -584,6 +590,42 @@
_cur_page = 1;
get_Display(sqlWhere);
}
+
+ //鐩戝惉鍗曞厓鏍间簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'HSupSendGoodsDateRemark') {
+ layer.prompt({
+ formType: 2
+ , area: ['400px', '50px'] //鑷畾涔夋枃鏈煙瀹介珮
+ , title: '淇敼璁㈠崟鍙蜂负 銆� ' + data.鍗曟嵁鍙� + ' 銆� 锛岀墿鏂欎唬鐮佷负 銆� ' + data.鐗╂枡浠ｇ爜 + ' 銆� 鐨勫洖澶嶄氦鏈�'
+ , value: data.鍥炲浜ゆ湡
+ }, function (value, index) {
+ layer.close(index);
+ //鏇存柊鍥炲浜ゆ湡
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Cg_Poorder/UpdateSupSendGoodsDateRemark",
+ async: false,
+ data: { "HInterID": data.hmainid, "HEntryID": data.hsubid, "HSupSendGoodsDateRemark": value},
+ success: function (result) {
+ if (result.code == 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 鍥炲浜ゆ湡: value
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ },
+ error: function (result) {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ });
+ });
+ }
+ });
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -908,6 +950,7 @@
break;
};
});
+
});
</script>
</body>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_QuotePriceBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_QuotePriceBillList.html
index fc4bc50..4f8bf47 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_QuotePriceBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_QuotePriceBillList.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>渚涘簲鍟嗚浠峰崟鍒楄〃</title>
+ <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/layui/layui.js"></script>
@@ -365,7 +365,7 @@
, area: ['100%', '100%']
, title: '渚涘簲鍟嗚浠峰崟缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎶ヤ环鍗�/Sup_QuotePriceBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
+ , content: './Sup_QuotePriceBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Sup_QuotePriceBillEdit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Sup_QuotePriceBillEdit.html
new file mode 100644
index 0000000..ebd2877
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Sup_QuotePriceBillEdit.html
@@ -0,0 +1,876 @@
+锘�<!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/layui/layui.js"></script>
+ <script src="../../../../Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/general.js"></script>
+ <style>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </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="btnSave" 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">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HSupID" id="HSupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HDate" id="HDate">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎶ヤ环浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HQuoteEmp" id="HQuoteEmp" style="">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎶ヤ环閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HQuoteDept" id="HQuoteDept" style="">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">甯佸埆</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCurName" id="HCurName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HCurID" id="HCurID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCur" id="btnSearchCur" 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-xs4 layui-inline">
+ <label class="layui-form-label">浠樻鏉′欢</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPayConditionID" id="HPayConditionID" style="background-color:#efefef4d;" value="0" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熸晥鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶辨晥鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" style="width:500px;">
+ </div>
+ </div>
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">鎽樿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="width:500px;">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline" style="display:none">
+ <label class="layui-form-label">婧愬崟淇℃伅</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <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" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </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" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </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" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </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" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <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>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<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
+ , laydate = layui.laydate
+ , element = layui.element;
+ var option;
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ $('#btnSearchSup').addClass("layui-btn-disabled").attr("disabled", true);//渚涘簲鍟嗘寜閽鐢�
+ //$("#HSupName").val(sessionStorage["HUserName"]); //鑷姩鑾峰彇渚涘簲鍟嗕俊鎭�
+ var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = -1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HEntryID = params[params[2]];//婧愬崟瀛恑d
+ var HIEs = params[params[3]]; //婧愬崟id + 婧愬崟瀛恑d
+ }
+ //渚涘簲鍟嗘姤浠峰崟鏂板
+ if (OperationType == 1) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1121' },
+ success: function (d) {
+ //$("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ }
+ });
+ FetchSupInfo();
+ RoadHBillSub();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ } else if (OperationType == 3) {
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ RoadBillMain(linterid);
+ }
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "",
+ "HUnitName": "", "HQty": 0, "HPrice": 0, "HMoney": 0, "HTaxPrice": 0, "HTaxRate": 0, "HTaxMoney": 0,
+ "HlineTotal": 0, "HlineTotalBB": 0, "HDate": new Date(), "HBagType": "", "HCarryType": "", "HAddress": "", "HRemark": "",
+ "HSourceInterID": 0, "HSourceEntryID": 0,"HSourceBillNo": ""
+ };
+
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ break;
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ layer.close(index);
+ }
+ });
+ }
+
+ var data = obj.data;
+ if (obj.event == 'HDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+
+ if (obj.event == 'inputHQty' || obj.event == 'inputHPrice' || obj.event == 'inputHMoney' || obj.event == 'inputHTaxPrice' || obj.event == 'inputHTaxRate' || obj.event == 'inputHTaxMoney' || obj.event == 'inputHlineTotal' || obj.event == 'inputHlineTotalBB') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+ });
+ }
+
+ //#region [ 琛ㄤ綋F7浜嬩欢 ]
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HMaterID') {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜у搧鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HMaterName: checkStatus.data[0].HName
+ , HMaterID: checkStatus.data[0].HItemID
+ , HMaterNumber: checkStatus.data[0].HNumber
+ , HMaterModel: checkStatus.data[0].HModel
+ , HUnitID: checkStatus.data[0].HUnitID
+ , HUnitNumber: checkStatus.data[0].HUnitNumber
+ , HUnitName: checkStatus.data[0].HUnitName
+ });
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HUnitID') {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁￠噺鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HUnitID: checkStatus.data[0].HItemID
+ , HUnitNumber: checkStatus.data[0].HNumber
+ , HUnitName: checkStatus.data[0].HName
+ });
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ //#endregion
+
+ });
+
+ table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ var HQty = 0; //鏁伴噺
+ var HPrice = 0; //鍗曚环
+ var HMoney = 0; //閲戦
+ var HTaxRate = 0; //绋庣巼
+ var HTaxMoney = 0; //绋庨
+ var HTaxPrice = 0; //鍚◣鍗曚环
+ var HlineTotal = 0; //浠风◣鍚堣
+ var HlineTotalBB = 0; //鏈綅甯佷环绋庡悎璁�
+
+ if (obj.data.HQty != undefined) {
+ HQty = parseFloat(obj.data.HQty);
+ }
+ if (obj.data.HPrice != undefined) {
+ HPrice = parseFloat(obj.data.HPrice);
+ }
+ if (obj.data.HMoney != undefined) {
+ HMoney = parseFloat(obj.data.HMoney);
+ }
+
+ switch (field) {
+ case "HQty":
+ console.log(obj.data.HMoney);
+ obj.update({
+ HMoney: Math.ceil(parseFloat(obj.value) * parseFloat(obj.data.HPrice)),
+ });
+ console.log(obj.data.HMoney);
+ obj.update({
+ HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+ });
+ break;
+ case "HPrice":
+ obj.update({
+ HMoney: Math.ceil(parseFloat(obj.value) * parseFloat(obj.data.HQty)),
+ });
+ obj.update({
+ HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+ });
+ break;
+ case "HTaxRate":
+ obj.update({
+ HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+ });
+ break;
+ }
+ });
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ var sSubStr = table.cache['mainTable'];
+ if (AllowLoadData(sSubStr)) {
+ set_AddNew(data);
+ }
+ });
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function (data) {
+ if (OperationType != "") {
+ Pub_Close(1);
+ }
+ });
+
+ //鎵撳嵃
+ form.on('submit(btn_print)', function (data) {
+ get_print(data);
+ });
+
+ //#region [琛ㄥご鏀惧ぇ闀淽
+ //閫夋嫨渚涘簲鍟嗗脊绐�
+ form.on('submit(btnSearchSup)', function () {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '渚涘簲鍟嗗垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍩虹璧勬枡/Gy_Supplier.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").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(btnSearchCur)', function () {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '甯佸埆鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍩虹璧勬枡/Gy_Currency.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
+ $("#HCurID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ $("#HDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鏃ユ湡
+ $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鐢熸晥鏃ユ湡
+ $("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//澶辨晥鏃ユ湡
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HMaterID', title: '鐗╂枡ID', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterID", width: 165 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 220 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 165 }
+ , { field: 'HUnitID', title: '鍗曚綅ID', hide: true }
+ , { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜', edit: 'text', event: "HUnitID", width: 165 }
+ , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', width: 165 }
+ , { field: 'HQty', title: '鏁伴噺', event:'inputHQty', width: 90 }
+ , { field: 'HPrice', title: '鍗曚环', edit: 'text', event: 'inputHPrice', width:90 }
+ , { field: 'HMoney', title: '閲戦', event: 'inputHMoney', width:90 }
+ , { field: 'HTaxPrice', title: '鍚◣鍗曚环', edit: 'text', event: 'inputHTaxPrice', width:90 }
+ , { field: 'HTaxRate', title: '绋庣巼%', edit: 'text', event: 'inputHTaxRate', width:90 }
+ , { field: 'HTaxMoney', title: '绋庨', edit: 'text', event: 'inputHTaxMoney', width:90 }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', edit: 'text', event: 'inputHlineTotal', width:90 }
+ , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', edit: 'text', event: 'inputHlineTotalBB', width:125 }
+ , { field: 'HDate', title: '棰勮浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd')}}</div>", event: 'HDate' }
+ , { field: 'HBagType', title: '鍖呰鏂瑰紡', edit: 'text', width: 120 }
+ , { field: 'HCarryType', title: '杩愯緭鏂瑰紡', edit: 'text', width: 120 }
+ , { field: 'HAddress', title: '浜よ揣鍦扮偣', edit: 'text', width: 120 }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟ID', edit: 'text' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛怚D', edit: 'text' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 65 }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [columns]
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ });
+ }
+ , done: function (res, curr, count) {
+
+ }
+ };
+ option.data = [{
+ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "",
+ "HUnitName": "", "HQty": 0, "HPrice": 0, "HMoney": 0, "HTaxPrice": 0, "HTaxRate": 0, "HTaxMoney": 0,
+ "HlineTotal": 0, "HlineTotalBB": 0, "HDate": new Date(), "HBagType": "", "HCarryType": "", "HAddress": "", "HRemark": "",
+ "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": ""
+ }];
+ table.render(option);
+
+ }
+
+ //鍔犺浇鏁版嵁
+ function RoadHBillSub() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "GetAskPriceInfo",
+ async: true,
+ data: { HInterID: linterid, HEntryID: HEntryID, HIEs: HIEs},
+ success: function (result) {
+ var data = result.data;
+ if (result.count == 1) {
+ $("#HCurID").val(data[0]["HCurID"]);
+ $("#HCurName").val(data[0]["甯佸埆"]);
+
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HMaterID": data[i].HMaterID, "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterModel": data[i].瑙勬牸鍨嬪彿,
+ "HUnitID": data[i].HUnitID, "HUnitNumber": data[i].鍗曚綅浠ｇ爜, "HUnitName": data[i].鍗曚綅, "HQty": data[i].闇�姹傛暟閲�, "HPrice": 0, "HMoney": 0, "HTaxPrice": 0, "HTaxRate": 0, "HTaxMoney": 0,
+ "HlineTotal": 0, "HlineTotalBB": 0, "HDate": new Date(), "HBagType": "", "HCarryType": "", "HAddress": "", "HRemark": "",
+ "HSourceInterID": data[i].hmainid, "HSourceEntryID": data[i].hentryid, "HSourceBillNo": data[i].鍗曟嵁鍙�
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ } else {
+ layer.closeAll("loading");
+ layer.msg(result.Message, { icon: 2, time: 4000 });
+ }
+
+ },
+ error: function (result) {
+ console.log(result);
+ layer.closeAll("loading");
+ //layer.msg('鑾峰彇濮斿璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ }
+
+ //鑾峰彇渚涘簲鍟咺D
+ function FetchSupInfo() {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/list",
+ type: "GET",
+ data: { "sWhere": sWhere, "user": '', "Organization": sessionStorage["Organization"] },
+ success: function (result) {
+ if (result.data.length > 0) {
+ $("#HSupName").val(result.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").val(result.data[0].HItemID);
+ } else {
+ layer.msg("渚涘簲鍟嗕俊鎭湭缁存姢", { time: 5000 });
+ }
+ }
+ });
+ }
+
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
+ //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+ var sSubTable = [];
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i] != "") {
+ sSubStr[i].LAY_TABLE_INDEX = i;
+ sSubTable.push(sSubStr[i])
+ }
+ }
+
+ var Result = true;
+
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (sSubTable[i].HMaterID == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 5000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubTable[i].HUnitID == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅淇℃伅涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 5000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+
+ return Result
+ }
+
+ //淇濆瓨HMaker
+ function set_AddNew(data) {
+ var num_1 = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num_1.push(table.cache["mainTable"][i])
+ }
+ }
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num_1);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sup_QuotePriceBill/SaveQuotePriceBill",
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //缂栬緫 椤甸潰璧嬪��
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ var sWhere = " and hmainid=" + linterid;
+ $.ajax({
+ url: GetWEBURL() + "/Sup_QuotePriceBill/Sup_QuotePriceBillList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data;
+ //涓昏〃
+ $("#HBillNo").val(data[0]["鍗曟嵁鍙�"]);
+ $("#HInterID").val(data[0]["hmainid"]);
+ $("#HSupName").val(data[0]["渚涘簲鍟嗗悕绉�"]);
+ $("#HSupID").val(data[0]["HSupID"]);
+ $("#HQuoteEmp").val(data[0]["鎶ヤ环浜�"]);
+ $("#HQuoteDept").val(data[0]["鎶ヤ环閮ㄩ棬"]);
+ $("#HCurName").val(data[0]["甯佸埆"]);
+ $("#HCurID").val(data[0]["HCurID"]);
+ $("#HPayConditionID").val(data[0]["HPayConditionID"]);
+ $("#HBeginDate").val(Format(new Date(data[0]["鐢熸晥鏃ユ湡"]), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(data[0]["澶辨晥鏃ユ湡"]), "yyyy-MM-dd"));
+ $("#HExplanation").val(data[0]["鎽樿"]);
+ $("#HRemark").val(data[0]["琛ㄥご澶囨敞"]);
+
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HMaterID": data[i]["HMaterID"], "HMaterNumber": data[i]["鐗╂枡浠ｇ爜"], "HMaterName": data[i]["鐗╂枡鍚嶇О"], "HMaterModel": data[i]["瑙勬牸鍨嬪彿"], "HUnitID": data[i]["HUnitID"], "HUnitNumber": data[i]["鍗曚綅浠ｇ爜"],
+ "HUnitName": data[i]["鍗曚綅"], "HQty": data[i]["鏁伴噺"], "HPrice": data[i]["鍗曚环"], "HMoney": data[i]["閲戦"], "HTaxPrice": data[i]["鍚◣鍗曚环"], "HTaxRate": data[i]["绋庣巼"], "HTaxMoney": data[i]["绋庨"], "HlineTotal": data[i]["浠风◣鍚堣"], "HlineTotalBB": data[i]["鏈綅甯佷环绋庡悎璁�"], "HDate": data[i]["棰勮浜よ揣鏃ユ湡"], "HBagType": data[i]["鍖呰鏂瑰紡"], "HCarryType": data[i]["杩愯緭鏂瑰紡"], "HAddress": data[i]["浜よ揣鍦扮偣"], "HRemark": data[i]["琛ㄤ綋澶囨敞"]
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+ } else {
+ layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+
+ //鎵撳嵃
+ function get_print(data) {
+
+ }
+
+ 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;
+ }
+
+ //#endregion
+ })
+</script>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
index 5ee52b8..baeb1c4 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
@@ -6,7 +6,18 @@
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
-
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ")");
+ }
+ </script>
</head>
<body>
<form id="form1" runat="server">
@@ -14,4 +25,4 @@
</div>
</form>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
new file mode 100644
index 0000000..75e40b0
--- /dev/null
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
@@ -0,0 +1,669 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+ <script src="../../../../Scripts/webConfig.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <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">璐у竵浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璐у竵鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+
+ <div class="layui-row layui-form-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ var sWhere = "";
+ var option = [];
+ var Organization = sessionStorage["Organization"]
+ var HModName = "Gy_Currency";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+ //$.ajax({
+ // url: GetWEBURL() + '/Gy_Currency/LoadTree',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (result) {
+ // var data = result.data;
+ // //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ // var treeData = LoadTree(data);
+ // tree.render({
+ // elem: '#treeCurrency',
+ // data: treeData,
+ // id: 'treeId',
+ // disabled: 'disabled',
+ // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
+ // showLine: false
+ // });
+ // }
+ //});
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ //, cols: [[
+ // { type: 'checkbox', fixed: 'left' }
+ // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ // , { field: '璐у竵浠ｇ爜', title: '璐у竵浠ｇ爜' }
+ // , { field: '璐у竵鍚嶇О', title: '璐у竵鍚嶇О' }
+ // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+ // , { field: '灏忔暟浣�', title: '灏忔暟浣�' }
+ // , { field: '姹囩巼', title: '姹囩巼' }
+ // , { field: '澶囨敞', title: '澶囨敞' }
+ // , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+ //]]
+ };
+ }
+
+ var index = layer.load(0, { shade: false });
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Currency/list1',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //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 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ case 'btn-getCheckData':
+ var data = checkStatus.data;
+ layer.alert(JSON.stringify(data));
+ break;
+ case 'btn-Edit':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫璐у竵璁剧疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+
+ break;
+ case 'btn-Delete':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetGy_Currency',
+ type: "GET",
+ data: { "HItemID": ItemID },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HNumber) {
+ sWhere += " and 璐у竵浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 璐у竵鍚嶇О like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ });
+ //#endregion
+
+ //#region 鍒犻櫎
+ form.on('submit(btndelete)', function (obj) {
+ var ModRightNameDelete = 'Gy_Department_Delete'
+
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+ btn: ['Yes', 'No'] //鎸夐挳
+ , yes: function (index, layero) {
+ var checkStatus = table.checkStatus('mainTable');
+ var layEvent = checkStatus.event;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Currency/Delete_Json',
+ type: "GET",
+ //async: true,
+ data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#btnSearch").click();
+ layer.msg(result.Message, { icon: 1 });
+
+ }
+ else {
+ layer.msg(result.Message, { icon: 5 });
+ }
+ }
+ })
+ layer.close(index); //鍏抽棴寮瑰眰
+ }
+ });
+ });
+ //#endregion
+
+ //#region 绂佺敤
+ form.on('submit(btnJY)', function (obj) {
+ //var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ ////console.log(checkStatus.data[0].HBillStatus);
+ //if (data.length == 0) {
+ // layer.msg("鍏堥�夋嫨瑕佸垹闄よ鍗曟嵁鍚楋紵");
+ // return;
+ //}
+ //if (checkStatus.data[0].HBillStatus == '宸插鏍�') {
+ // layer.msg("璇ュ崟鎹凡瀹℃牳鏃犳硶鍒犻櫎锛岃鍏堝弽瀹℃牳锛�");
+ // return;
+ //}
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ layer.confirm('鎮ㄧ‘瀹氳绂佺敤鍚楋紵', {
+ btn: ['Yes', 'No'] //鎸夐挳
+ , yes: function (index, layero) {
+ var checkStatus = table.checkStatus('mainTable');
+ var layEvent = checkStatus.event;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Currency/JY_Json',
+ type: "GET",
+ //async: true,
+ data: { "HItemID": checkStatus.data[0].HItemID },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#btnSearch").click();
+ layer.msg(result.Message, { icon: 1 });
+
+ }
+ else {
+ layer.msg(result.Message, { icon: 5 });
+ }
+ }
+ })
+
+
+
+ layer.close(index); //鍏抽棴寮瑰眰
+ }
+ });
+ });
+ //#endregion
+
+ //#region 鍙嶇鐢�
+ form.on('submit(btnFJY)', function (obj) {
+ //var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ ////console.log(checkStatus.data[0].HBillStatus);
+ //if (data.length == 0) {
+ // layer.msg("鍏堥�夋嫨瑕佸垹闄よ鍗曟嵁鍚楋紵");
+ // return;
+ //}
+ //if (checkStatus.data[0].HBillStatus == '宸插鏍�') {
+ // layer.msg("璇ュ崟鎹凡瀹℃牳鏃犳硶鍒犻櫎锛岃鍏堝弽瀹℃牳锛�");
+ // return;
+ //}
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ layer.confirm('鎮ㄧ‘瀹氳鍙嶇鐢ㄥ悧锛�', {
+ btn: ['Yes', 'No'] //鎸夐挳
+ , yes: function (index, layero) {
+ var checkStatus = table.checkStatus('mainTable');
+ var layEvent = checkStatus.event;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Currency/FJY_Json',
+ type: "GET",
+ //async: true,
+ data: { "HItemID": checkStatus.data[0].HItemID },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#btnSearch").click();
+ layer.msg(result.Message, { icon: 1 });
+
+ }
+ else {
+ layer.msg(result.Message, { icon: 5 });
+ }
+ }
+ })
+ layer.close(index); //鍏抽棴寮瑰眰
+ }
+ });
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#region 淇敼鎸夐挳
+ form.on('submit(btnModify)', function (data) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬鍩虹璧勬枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['Gy_Department_Edit.html?HInterID=' + data[0].HItemID + '&HType=Modify', 'yes']
+ , resize: false
+ })
+ });
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ 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 (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ 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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], 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 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ layer.close(index);
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
new file mode 100644
index 0000000..027a066
--- /dev/null
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
@@ -0,0 +1,113 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+ <script src="../../../../Scripts/webConfig.js"></script>
+ <script>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer
+ , $ = layui.$;
+
+ form.on('submit(HQuery)', function () {//閫夋嫨鐗╂枡
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {//閫夋嫨鐗╂枡
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHMaterNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', title: '鐗╂枡ID', hide: true }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜' }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О', sort: true }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', hide: true }
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜' }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О' }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"];
+ } else {
+ Value = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " and ( HNumber like '%" + Where + "%' or HName like '%" + Where + "%' ) "
+ }
+ var index = layer.load();
+ $.ajax({
+ type: "get",
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+ url: GetWEBURL() + "/Web/GetMaterialList_Json",
+ async: true,
+ data: { "sWhere": Value },
+ //data: { "Value": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ layer.close(index);
+ },
+ error: function (result) {
+ layer.close(index);
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
new file mode 100644
index 0000000..19aa74c
--- /dev/null
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -0,0 +1,651 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+
+ <form class="layui-form" action="" lay-filter="component-form-group">
+
+ <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">渚涘簲鍟嗕唬鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟嗗悕绉�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"> </table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>淇敼</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+ <script src="../../../../Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var Organization = sessionStorage["Organization"]
+ var HModName = "Gy_Supplier";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板
+ case 'btnAdd': set_AddNew();
+ break;
+ //缂栬緫
+ case 'btnModify': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'btndelete': set_DeleteBill();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#region 閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+ //#endregion
+ //#endregion
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栭〉闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ //, cols: [[
+ // { type: 'radio', fixed: 'left' }
+ // , { field: '閫夋嫨', title: '閫夋嫨', sort: true, hide: true }
+ // , { field: 'HItemID', title: 'HItemID', hide: true }
+ // , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+ // , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
+ // , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
+ // , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
+ // , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+ // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+ //]]
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Supplier/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //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 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熺瓫閫�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HNumber) {
+ sWhere += " and 渚涘簲鍟嗕唬鐮� like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ // 閲嶇疆鎸夐挳
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HNumber2 = $('#HNumber2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Supplier/Gy_SupplierViewApi',
+ type: "GET",
+ data: { "Number": HNumber2, "Type": 'GYS' },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ // 鍒犻櫎鎸夐挳
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ModRightNameDelete = "Gy_Supplier_Delete";
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Supplier/Delete_Json',
+ type: "GET",
+ //async: true,
+ data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ // 淇敼鎸夐挳
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '渚涘簲鍟嗗熀纭�璧勬枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID + '&HSouceBillType=']
+ , resize: false
+ })
+ }
+ //鏂板鎸夐挳
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板渚涘簲鍟�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=1&linterid=&HSouceBillType=',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Supplier/AuditGy_Supplier", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Supplier/StopGy_Supplier", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ 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 (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ 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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], 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 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitList.html" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitList.html"
new file mode 100644
index 0000000..c29c6a0
--- /dev/null
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitList.html"
@@ -0,0 +1,104 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+ <script src="../../../../Scripts/webConfig.js"></script>
+ <script>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer
+ , $ = layui.$;
+
+ form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {//閫夋嫨鍗曚綅
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHUnitNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: '鍗曚綅ID', hide: true }
+ , { field: 'HNumber', width: 150, title: '璁￠噺鍗曚綅浠ｇ爜' }
+ , { field: 'HName', width: 150, title: '璁￠噺鍗曚綅', sort: true }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+ url: GetWEBURL() + "/Web/GetUnitList_Json",
+ async: true,
+ data: { "Unit": Value },
+ //data: { "Value": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
--
Gitblit v1.9.1