From c9d3708f7f175d7c00d93780fbb1869ecdb77f39 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 29 十二月 2025 09:16:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/Baseset/HBarPlanPrint.html | 3
WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillEdit.html | 8
WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html | 15
WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html | 100 +
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillList.html | 100 +
WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillList.html | 527 -----
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html | 4
WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html | 102 +
WebTM/Vlog/webapi20251219.txt | 17
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 21
WebTM/WebTM.csproj.user | 34
WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html | 6
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html | 101 +
WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html | 103 +
WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html | 103 +
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.designer.cs | 26
WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx | 29
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html | 101 +
WebTM/views/领料发货/领料出库/Kf_StockOutRequestBillList.html | 101 +
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 103 +
WebTM/views/物流管理/运输定位/车辆轨迹表/Cg_CarTrajectoryBillList.html | 1432 ++++++++++++++++
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html | 100 +
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 10
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillListLink.html | 1223 +++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 25
WebTM/views/物流管理/运输定位/车辆轨迹表/Cg_CarTrajectoryBillEdit.html | 714 ++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.cs | 17
WebTM/WebTM.csproj | 13
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 103 +
30 files changed, 4,747 insertions(+), 496 deletions(-)
diff --git a/WebTM/Vlog/webapi20251219.txt b/WebTM/Vlog/webapi20251219.txt
new file mode 100644
index 0000000..88a999d
--- /dev/null
+++ b/WebTM/Vlog/webapi20251219.txt
@@ -0,0 +1,17 @@
+2025/12/19 16:35:55 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(126499) order by hmainid desc
+
+2025/12/19 16:35:56 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/19 16:35:56 ReportDataSet:1
+
+2025/12/19 16:36:27 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(126499) order by hmainid desc
+
+2025/12/19 16:36:27 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/19 16:36:27 ReportDataSet:1
+
+2025/12/19 16:51:08 鎵撳嵃sql:select * from h_v_IF_BarCodeBillList where hmainid in(126499) order by hmainid desc
+
+2025/12/19 16:51:08 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/19 16:51:08 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ccc5081..e79fbbe 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -472,6 +472,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
@@ -698,8 +699,13 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_QCVerificationBillMain.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Add_Edit_Gy_QCVerificationBill.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBillListLink.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBill_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
+ <Content Include="views\鐗╂祦绠＄悊\杩愯緭瀹氫綅\杞﹁締杞ㄨ抗琛╘Cg_CarTrajectoryBillList.html" />
+ <Content Include="views\鐗╂祦绠＄悊\杩愯緭瀹氫綅\杞﹁締杞ㄨ抗琛╘Cg_CarTrajectoryBillEdit.html">
+ <BrowseToURL>~/views/鐗╂祦绠＄悊/杩愯緭瀹氫綅/杞﹁締杞ㄨ抗琛�/Cg_CarTrajectoryBillEdit.html</BrowseToURL>
+ </Content>
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm_Sec.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS_Sec.html" />
@@ -2694,6 +2700,13 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.cs">
+ <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.designer.cs">
+ <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 17a8236..8a2285a 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,5 +2,39 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <UseIISExpress>true</UseIISExpress>
+ <Use64BitIISExpress />
+ <IISExpressSSLPort />
+ <IISExpressAnonymousAuthentication />
+ <IISExpressWindowsAuthentication />
+ <IISExpressUseClassicPipelineMode />
+ <UseGlobalApplicationHostFile />
+ <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
+ <AspNetDebugging>True</AspNetDebugging>
+ <SilverlightDebugging>False</SilverlightDebugging>
+ <NativeDebugging>False</NativeDebugging>
+ <SQLDebugging>False</SQLDebugging>
+ <ExternalProgram>
+ </ExternalProgram>
+ <StartExternalURL>
+ </StartExternalURL>
+ <StartCmdLineArguments>
+ </StartCmdLineArguments>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <EnableENC>True</EnableENC>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d77cc5e..880ca0d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,22 +8,27 @@
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
<<<<<<< HEAD
-
- var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
-
-/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
-
=======
- var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
+ /* var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆*/
+>>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
->>>>>>> a12e0abce941275b1d4295790546c673e556cd89
+ var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
+// var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+<<<<<<< HEAD
+ // var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+=======
+
+ /*var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+>>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
+ /* var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆*/
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
- // var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/views/Baseset/HBarPlanPrint.html b/WebTM/views/Baseset/HBarPlanPrint.html
index b829d70..33719f5 100644
--- a/WebTM/views/Baseset/HBarPlanPrint.html
+++ b/WebTM/views/Baseset/HBarPlanPrint.html
@@ -70,6 +70,9 @@
case "HDepartMent"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Department_Edit.aspx?linterid=" + value, true, "");
break;
+ case "HGy_BarCodeBill_xiaowei"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_xiaoweizutuo.aspx?linterid=" + value, true, "");
+ break;
//case "HPOOrderBill"://閲囪喘璁㈠崟鍗曟墦鍗�
// CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
// break;
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
index eb3a918..dd4b3aa 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -476,6 +476,7 @@
return;
}
hform.HMaterID = materialInfo.HMaterID;
+ hform.HMaterNumber = materialInfo.HMaterNumber;
hform.HMaterName = materialInfo.HMaterName;
hform.HMaterModel = materialInfo.HMaterModel;
$.ajax({
@@ -498,7 +499,7 @@
listData.push({
鏉＄爜缂栧彿: sBarCode,
鏁伴噺: 1,
- 鐗╂枡浠ｇ爜: hform.HMaterID,
+ 鐗╂枡浠ｇ爜: hform.HMaterNumber,
鐗╂枡鍚嶇О: hform.HMaterName,
鏉＄爜涓暟: 1,
HInterID: hform.HInterID
@@ -537,7 +538,8 @@
if (res.count == 1) {
resolve({
HMaterID: data[0].HMaterID,
- HMaterName: data[0].HMaterName,
+ HMaterNumber: data[0].HMaterNumber,
+ HMaterName: data[0].HMaterName_m,
HMaterModel: data[0].HMaterModel
});
} else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
index 427126c..95640e0 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
@@ -49,7 +49,8 @@
<!-- 杞Щ妯″紡閫夋嫨鎸夐挳 -->
<div class="transfer-mode-buttons">
- <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">灏忚溅-浠撳簱缁戝畾</button>
+ <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">灏忚溅-浠撳簱(鍏ュ簱)缁戝畾</button>
+ <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer2">灏忚溅-浠撳簱(鍑哄簱)缁戝畾</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarTransfer">灏忚溅杞Щ</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnWarehouseTransfer">浠撳簱杞Щ</button>
</div>
@@ -184,7 +185,7 @@
<input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
</div>
</div>
- </div>
+ </div>cmdBind
</div>
<!--涓婃灦淇℃伅-->
<div class="layui-tab-item">
@@ -254,7 +255,7 @@
var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var HInterID_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
var HBillNo_Temp = params[params[2]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
-
+ var bindsignal = 0;
//#endregion
// 鍒濆鍖栬浆绉绘ā寮�
@@ -276,6 +277,12 @@
$('#btnCarWarehouseTransfer').on('click', function() {
setTransferMode('car_warehouse');
+ $(this).addClass('layui-btn-active').siblings().removeClass('layui-btn-active');
+ setOrigin();
+ });
+ $('#btnCarWarehouseTransfer2').on('click', function () {
+ setTransferMode('car_warehouse');
+ bindsignal = 1;
$(this).addClass('layui-btn-active').siblings().removeClass('layui-btn-active');
setOrigin();
});
@@ -1125,7 +1132,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/BindCarAndWH",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID },
+ data: { "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID, "bindsignal": bindsignal },
success: function (result) {
if (result.count == 1) {
playSound_OK();
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
index e423f49..f1ac0ce 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
@@ -241,6 +241,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" 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-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-audit" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
@@ -389,6 +390,9 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
@@ -706,6 +710,103 @@
});
}
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
//鏉＄爜鏄庣粏
function get_BarCodeDetail() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
index ac23e03..ceae6c4 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
@@ -249,6 +249,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" 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-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
@@ -331,6 +332,9 @@
break;
//缂栬緫
case 'btn-Edit': set_ShowBill();
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
@@ -662,6 +666,103 @@
});
}
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_MoveStockRequestBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
//鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
index 64f2cfa..d78a453 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
@@ -240,6 +240,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" 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-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BarCodeDetail" id="BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
@@ -313,6 +314,9 @@
break;
//缂栬緫鎸夐挳
case 'btn-Edit': set_ShowBill();
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
@@ -631,6 +635,102 @@
});
}
+ // 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
//鏂板
function set_AddNew() {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
index 08ab6b6..132fa23 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
@@ -172,6 +172,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_WMSSub" id="btn_WMSSub"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -469,6 +470,9 @@
//缂栬緫鎸夐挳
case 'btn_Edit': btn_Edit();
break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
+ break;
//鍒犻櫎鎸夐挳
case 'btn_Delete': btn_Delete();
break;
@@ -493,6 +497,7 @@
//浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
case 'btn_Drop': set_DropBill(1);
break;
+
//鍙嶄綔搴熸寜閽�
case 'btn_DeDrop': set_DropBill(2);
break;
@@ -1083,6 +1088,104 @@
}
//#endregion
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
//#region 鑷畾涔夎繃婊や笅鎷夋
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx"
new file mode 100644
index 0000000..2270bca
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx"
@@ -0,0 +1,29 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_xiaoweizutuo.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_EquipFileMainBill" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
+ SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack 鏍堟澘鐮�,HBarCode 涓鐮�,b.hnumber 鐗╂枡浠ｇ爜,b.hname 鐗╂枡鍚嶇О from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid where HBarCode_Pack in (" + Request.Params["linterid"] + ") ", "select 1");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs"
new file mode 100644
index 0000000..b792947
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_xiaoweizutuo : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
new file mode 100644
index 0000000..b8aa324
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_EquipFileMainBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillEdit.html"
index 9d8f8b8..c7b6d11 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillEdit.html"
@@ -519,11 +519,7 @@
* 鏍规嵁宸ュ簭ID璁剧疆宸ュ簭鍚嶇О锛堣嚜鍔ㄥ～鍏呭埌杈撳叆妗嗭級
* @param {string} processId - 宸ュ簭ID
*/
- function setProcessNameById(processId) {
- if (!processId || processId === "0" || processId === "") {
- $("#HProcName").val('');
- return;
- }
+
getProcessNameById(processId, function (processName) {
if (processName) {
@@ -948,7 +944,7 @@
OperationType = 3;
}
} else {
- layer.msg("宸ュ簭鏈�夋嫨");
+ layer.msg(result.Message);
}
},
error: function (xhr, status, error) {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
index fad6f7e..91e654a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\351\230\266\346\242\257\345\267\245\344\273\267\347\263\273\346\225\260/Gy_SteppedPriceCoefficientBillList.html"
@@ -173,7 +173,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
@@ -199,6 +199,7 @@
</div>
</div>
<script>
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -221,15 +222,17 @@
console.log("GetWEBURL:", typeof GetWEBURL);
var HModName = "Gy_SteppedPriceCoefficientBillList";
- var HBillType = "GYSTPRICECOEFF";
+<<<<<<< HEAD
+ var HBillType = "";
+=======
+ var HBillType = "3341";
+>>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
var HMaker = sessionStorage["HUserName"];
var Organization = sessionStorage["Organization"];
// 鏌ヨ鏉′欢
var sWhere = "";
var option = {};
- var page = 1;
- var size = 50;
var set_HideButton_ID = "toolbarDemo_ButtonSet"; // 鎸夐挳瀹瑰櫒ID
//#region 銆愯繃婊ゆ柟妗堛��
@@ -344,8 +347,6 @@
//鍒锋柊
function btn_Refresh() {
$("#btnSearch").click();
- // 鍒锋柊鍚庨噸鏂拌缃垪鏍囬
- setTimeout(refreshTableWithChineseTitles, 500);
}
@@ -387,7 +388,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , page: false
+ , page: true
, cellMinWidth: 120
, totalRow: true
, limit: 50
@@ -413,128 +414,6 @@
console.log("琛ㄦ牸鍒濆鍖栧畬鎴�");
}
- // 瀛楁鍚嶅埌涓枃鏍囬鐨勬槧灏�
- function getColumnChineseTitle(fieldName) {
- var titleMap = {
- // 涓昏〃瀛楁
- "HInterID": "鍗曟嵁鍐呯爜",
- "HItemMainID": "涓昏〃鍐呯爜",
- "HBillNo": "鍗曟嵁鍙�",
- "HDate": "鍗曟嵁鏃ユ湡",
- "HYear": "骞翠唤",
- "HPeriod": "鏈堜唤",
- "HBillType": "鍗曟嵁绫诲瀷",
- "HBillSubType": "鍗曟嵁瀛愮被鍨�",
- "HBillStatus": "鍗曟嵁鐘舵��",
- "HRemark": "涓昏〃澶囨敞",
- "HChecker": "瀹℃牳浜�",
- "HCheckDate": "瀹℃牳鏃ユ湡",
- "HMaker": "鍒跺崟浜�",
- "HMakeDate": "鍒跺崟鏃ユ湡",
- "HUpDater": "淇敼浜�",
- "HUpDateDate": "淇敼鏃ユ湡",
- "HCloseMan": "鍏抽棴浜�",
- "HCloseDate": "鍏抽棴鏃ユ湡",
- "HCloseType": "鍏抽棴绫诲瀷",
- "HDropMan": "浣滃簾浜�",
- "HDropDate": "浣滃簾鏃ユ湡",
- "HReturnMan": "閫�鍥炰汉",
- "HReturnDate": "閫�鍥炴棩鏈�",
- "HReturnReason": "閫�鍥炲師鍥�",
- "HProcID": "宸ュ簭ID",
- "HEmpID": "璐熻矗浜篒D",
- "HDeptID": "閮ㄩ棬ID",
- "HStockOrgID": "缁勭粐ID",
-
- // 瀛愯〃瀛楁
- "HItemID": "瀛愯〃鍐呯爜",
- "RowNum": "搴忓彿",
- "HMinQty": "鏈�灏忔暟閲�",
- "HMaxQty": "鏈�澶ф暟閲�",
- "HCoefficient": "宸ヤ环绯绘暟",
- "HMaxPrice": "鏈�澶у伐浠�",
- "HRowCloseMan": "琛屽叧闂汉",
- "HRowCloseDate": "琛屽叧闂棩鏈�",
- "HRowCloseType": "琛屽叧闂被鍨�",
- "HRowRemark": "瀛愯〃澶囨敞",
- "HRelativeQty": "鍏宠仈鏁伴噺",
- "HRelativeMoney": "鍏宠仈閲戦",
- "HSubStockOrgID": "瀛愯〃缁勭粐ID",
- "HSourceHInterID": "婧愬崟ID",
- "HSourceItemID": "婧愬崟瀛怚D",
- "HSourceBillNo": "婧愬崟鍗曞彿",
- "HSourceBillType": "婧愬崟绫诲瀷",
- // 鏂板鐨勬眹鎬诲瓧娈�
- "TotalMinQty": "鎬绘渶灏忔暟閲�",
- "TotalMaxQty": "鎬绘渶澶ф暟閲�",
- "TotalCoefficient": "鎬荤郴鏁�",
- "SubCount": "瀛愯〃琛屾暟",
- "TotalMaxPrice": "鎬讳环鏍�"
-
-
- };
-
- return titleMap[fieldName] || fieldName;
- }
-
- // ========== 鏍稿績淇锛氱洿鎺ヤ娇鐢ㄩ澶勭悊鏁版嵁 ==========
- // 鍩轰簬鎺у埗鍙版樉绀虹殑鏁版嵁鏍煎紡杩涜绠�鍗曞鐞�
- // 瓒呯骇绠�鍗曠殑鏃ユ湡鏄剧ず鍑芥暟 - 涓撻棬澶勭悊鎮ㄧ殑鏁版嵁鏍煎紡
- // 閫氱敤鏃ユ湡鏍煎紡鍖栧嚱鏁� - 閫傞厤鎵�鏈夊悗绔繑鍥炴牸寮�
- function formatDateForDisplay(fieldName, dateValue) {
- if (!dateValue) return '';
-
- // 杞负瀛楃涓插苟娓呯悊棣栧熬绌烘牸
- var str = String(dateValue).trim();
-
- // 杩囨护缁濆鏃犳晥鐨勯粯璁ゆ棩鏈�
- var invalidDates = ['2001-10-01', '1900-01-01', '2000-01-01', '1970-01-01'];
- if (invalidDates.some(invalid => str.startsWith(invalid))) {
- return '';
- }
-
- // 鍦烘櫙1锛氬鐞嗙壒娈婃牸寮� 2025-12-11(15):48:28
- if (str.includes('(') && str.includes(')')) {
- try {
- // 鎻愬彇鏃ユ湡閮ㄥ垎 2025-12-11 鍜屾椂闂撮儴鍒� 15:48:28
- var datePart = str.split('(')[0].trim();
- var timePart = str.split('(')[1].replace(')', '').split(':').slice(0, 3).join(':');
- // 鍗曟嵁鏃ユ湡鍙樉绀烘棩鏈燂紝鍏朵粬鏃堕棿鏄剧ず瀹屾暣鏍煎紡
- return fieldName === 'HDate' ? datePart : `${datePart} ${timePart}`;
- } catch (e) {
- console.warn(`瑙ｆ瀽鐗规畩鏍煎紡鏃ユ湡澶辫触: ${str}`, e);
- }
- }
-
- // 鍦烘櫙2锛氬鐞� ISO 鏍煎紡 2025-12-16T14:33:50 鎴� 2025-12-16T14:33:50.35
- if (str.includes('T')) {
- try {
- var [datePart, timePart] = str.split('T');
- // 绉婚櫎鏃堕棿閮ㄥ垎鐨勬绉�
- var cleanTime = timePart.includes('.') ? timePart.split('.')[0] : timePart;
- // 鍙繚鐣欐椂鍒嗙
- cleanTime = cleanTime.split(':').slice(0, 3).join(':');
- return fieldName === 'HDate' ? datePart : `${datePart} ${cleanTime}`;
- } catch (e) {
- console.warn(`瑙ｆ瀽ISO鏍煎紡鏃ユ湡澶辫触: ${str}`, e);
- }
- }
-
- // 鍦烘櫙3锛氬鐞嗙函鏃ユ湡 2025-12-16 鎴� 瀹屾暣鏃堕棿 2025-12-16 14:33:50
- if (str.match(/^\d{4}-\d{2}-\d{2}/)) {
- // 鍖归厤 骞�-鏈�-鏃� 寮�澶寸殑鍚堟硶鏍煎紡
- if (fieldName === 'HDate' || str.length === 10) {
- return str.substring(0, 10); // 鍙樉绀烘棩鏈�
- } else {
- // 琛ュ叏鏃堕棿閮ㄥ垎锛堝鏋滃彧鏈夋棩鏈燂級
- return str.length > 10 ? str : `${str} 00:00:00`;
- }
- }
-
- // 鎵�鏈夎В鏋愬け璐ョ殑鎯呭喌锛岃繑鍥炲師濮嬪�硷紙閬垮厤绌烘樉绀猴級
- return str;
- }
-
//鍔犺浇缃戞牸锛堝姩鎬佸垪鍔犺浇鏂规硶锛�
@@ -551,320 +430,70 @@
"user": sessionStorage["HUserName"] || "guest"
},
success: function (data1) {
- console.log("=== API 杩斿洖鏁版嵁 ===");
-
- if (data1 && data1.list && data1.list.length > 0) {
- console.log("鍒楀畾涔夋暟閲�:", data1.list.length);
-
- // 姝ラ1锛氬垪鍘婚噸
- var uniqueColumns = [];
- var seenColumns = new Set();
- var columnData = [];
-
- for (var key in data1.list) {
- var colDef = data1.list[key];
- var colName = colDef.ColmCols;
-
- if (!seenColumns.has(colName)) {
- seenColumns.add(colName);
- uniqueColumns.push(colDef);
- columnData.push({
- "id": colName,
- "name": colName,
- "Type": colDef.ColmType,
- "chineseTitle": getColumnChineseTitle(colName)
- });
- }
- }
-
- console.log("鍘婚噸鍚庡垪鏁�:", columnData.length);
-
- // 姝ラ2锛氭瀯寤鸿〃鏍煎垪閰嶇疆 - 浣跨敤宸ュ巶鍑芥暟閬垮厤闂寘闂
+ if (data1.code == 1) {
+ var data = [];
var col = [];
-
- // 娣诲姞鍕鹃�夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
-
- // 鍒涘缓妯℃澘鍑芥暟鐢熸垚鍣�
- function createTempletFunction(fieldName, fieldType) {
- switch (fieldType) {
- case 'DateTime':
- return function (d) {
- var value = d[fieldName];
- if (!value) return '';
-
- var str = String(value).trim();
-
- // 杩囨护鏃犳晥鏃ユ湡
- var invalidDates = ['2001-10-01', '1900-01-01', '2000-01-01', '1970-01-01', '0001-01-01'];
- if (invalidDates.some(invalid => str.startsWith(invalid))) {
- return '';
- }
-
- // 鎻愬彇鏃ユ湡閮ㄥ垎
- if (str.includes('(')) {
- return str.split('(')[0].trim();
- } else if (str.includes('T')) {
- return str.split('T')[0];
- } else if (str.match(/^\d{4}-\d{2}-\d{2}/)) {
- return str.substring(0, 10);
- }
-
- return str;
- };
-
- case 'Decimal':
- case 'Double':
- case 'Float':
- return function (d) {
- var value = d[fieldName];
- if (value === null || value === undefined || value === '') {
- return '';
- }
- var num = parseFloat(value);
- return isNaN(num) ? '' : num.toFixed(2);
- };
-
- case 'Int32':
- case 'Int64':
- case 'Integer':
-
-
- // 鏁存暟绫诲瀷鐨勭壒娈婂鐞�
- if (fieldName === 'HBillStatus') {
- return function (d) {
- var status = d[fieldName] || '0';
- // 杞崲涓烘暟瀛楀啀鍒ゆ柇
- var statusNum = parseInt(status);
- switch (statusNum) {
- case 1: return '鏈';
- case 2: return '瀹℃牳閫氳繃';
- case 3: return '鍏抽棴';
- case 4: return '浣滃簾';
- case 5: return '瀹℃牳閫�鍥�';
- case 6: return '瀹℃牳涓�';
- case 7: return '宸查槄';
- case 8: return '宸插洖澶�';
- case 9: return '缁撴';
- case 10: return '楠岃瘉';
- case 11: return '涓嬭揪';
- case 12: return '寮�宸�';
- case 13: return '鐢宠瀹℃壒';
- case 15: return '鐢宠妫�楠�';
- case 16: return '鍒ゅ畾鍚堟牸';
- case 17: return '鍒ゅ畾涓嶅悎鏍�';
- case 0:
- default: return '鏈'; // 榛樿鏄剧ず涓烘湭瀹�
- }
- };
- }
- return null; // 鍏朵粬鏁存暟绫诲瀷涓嶉渶瑕佺壒娈婃ā鏉�
-
- default:
- // 鏂囨湰瀛楁鐨勭壒娈婂鐞�
- if (fieldName === 'HBillNo') {
- return function (d) {
- var billNo = d[fieldName] || '';
- return '<span style="color: blue; cursor: pointer;">' + billNo + '</span>';
- };
- }
- return null;
- }
+ var totalArray = [];
+ var titleData = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
-
- // 鍒涘缓浜嬩欢澶勭悊鏄犲皠
- function getEventForField(fieldName) {
- if (fieldName === 'HBillNo') {
- return '鍗曟嵁鍙�';
- }
- return null;
- }
-
- // 鑾峰彇瀹藉害璁剧疆
- function getWidthForField(fieldName, fieldType) {
- if (fieldName === 'HBillNo') return 500;
- if (fieldName === 'HBillStatus') return 100;
- if (fieldType === 'DateTime') return 160;
- if (fieldType === 'Decimal' || fieldType === 'Double' || fieldType === 'Float') return 120;
- if (fieldType === 'Int32' || fieldType === 'Int64' || fieldType === 'Integer') return 100;
- return 150;
- }
-
- // 鑾峰彇瀵归綈鏂瑰紡
- function getAlignForField(fieldType) {
- if (fieldType === 'Decimal' || fieldType === 'Double' || fieldType === 'Float' ||
- fieldType === 'Int32' || fieldType === 'Int64' || fieldType === 'Integer') {
- return 'right';
- }
- return 'center';
- }
-
- // 鏋勫缓鍒楅厤缃�
- // 鏋勫缓鍒楅厤缃�
- for (var i = 0; i < columnData.length; i++) {
- var colItem = columnData[i];
- var columnTitle = colItem.chineseTitle;
- var fieldName = colItem.id;
- var fieldType = colItem.Type;
- var columnTitle = getColumnChineseTitle(fieldName); // 杩欓噷閲嶅浜嗭紝鍒犻櫎杩欎竴琛�
-
- var columnConfig = {
- field: fieldName,
- title: columnTitle, // 纭繚浣跨敤涓枃鏍囬
- align: getAlignForField(fieldType),
- sort: true,
- width: getWidthForField(fieldName, fieldType)
- };
-
-
- // 璁剧疆妯℃澘鍑芥暟
- var templetFunc = createTempletFunction(fieldName, fieldType);
- if (templetFunc) {
- columnConfig.templet = templetFunc;
- }
-
- // 璁剧疆浜嬩欢
- var event = getEventForField(fieldName);
- if (event) {
- columnConfig.event = event;
- }
-
- col.push(columnConfig);
- }
-
- console.log("鏋勫缓鐨勫垪閰嶇疆鏁伴噺:", col.length);
- // 璋冭瘯锛氭樉绀哄墠鍑犱釜鍒楃殑閰嶇疆
- for (var j = 0; j < Math.min(5, col.length); j++) {
- console.log(`鍒�${j}: field=${col[j].field}, title=${col[j].title}, templet=${typeof col[j].templet}`);
- }
-
- // 姝ラ3锛氬鐞嗚〃鏍兼暟鎹�
- var tableData = data1.data || [];
- console.log("鍘熷鏁版嵁鏉℃暟:", tableData.length);
-
- // 璋冭瘯锛氭樉绀哄墠鍑犺鏁版嵁鐨勬墍鏈夊瓧娈�
- if (tableData.length > 0) {
- console.log("=== 绗竴琛屾暟鎹畬鏁寸粨鏋� ===");
- var firstRow = tableData[0];
- for (var key in firstRow) {
- console.log(`${key}: ${firstRow[key]} (绫诲瀷: ${typeof firstRow[key]})`);
- }
- }
-
- // 濡傛灉鏄富琛ㄥ垪琛紝鎸夊崟鎹彿鍘婚噸
- if (tableData.length > 0 && tableData[0].HBillNo) {
- var uniqueMap = {};
- var uniqueList = [];
-
- for (var k = 0; k < tableData.length; k++) {
- var row = tableData[k];
- var billNo = row.HBillNo;
-
- if (!uniqueMap[billNo]) {
- uniqueMap[billNo] = true;
- uniqueList.push(row);
- }
- }
-
- tableData = uniqueList;
- console.log("鍘婚噸鍚庢暟鎹潯鏁�:", tableData.length);
- }
-
- // 姝ラ4锛氶厤缃苟娓叉煋琛ㄦ牸
- option.cols = [col];
- option.data = tableData;
-
- console.log("option 閰嶇疆:", {
- colsLength: option.cols[0].length,
- dataLength: option.data.length
- });
-
- // 鍒楄缃�
- // 淇敼 get_Display 鍑芥暟涓殑鍒楄缃儴鍒�
- // 鍒楄缃�
- // 鍒楄缃�
- if (typeof DisPlay_HideColumn === 'function') {
- // 鍏堜繚瀛樺師濮嬪垪閰嶇疆锛堜腑鏂囨爣棰橈級
- var originalCols = [];
- for (var i = 0; i < col.length; i++) {
- originalCols.push({
- field: col[i].field,
- title: col[i].title,
- align: col[i].align,
- sort: col[i].sort,
- width: col[i].width,
- templet: col[i].templet,
- event: col[i].event
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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 if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
});
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
+ }
}
-
- // 鎵ц鍒楄缃�
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
-
- // 寮哄埗鎵ц涓枃鏍囬鎭㈠
- setTimeout(function () {
- if (option.cols && option.cols[0]) {
- var currentCols = option.cols[0];
- for (var i = 0; i < currentCols.length; i++) {
- var currentCol = currentCols[i];
- if (currentCol.field && currentCol.field !== 'LAY_CHECKED' && currentCol.field !== 'checkbox') {
- // 鏌ユ壘鍘熷閰嶇疆涓殑涓枃鏍囬
- for (var j = 0; j < originalCols.length; j++) {
- if (originalCols[j].field === currentCol.field) {
- currentCol.title = originalCols[j].title;
- break;
- }
- }
- }
- }
- }
-
- // 閲嶆柊娓叉煋琛ㄦ牸
- try {
- table.render(option);
- console.log("琛ㄦ牸宸查噸鏂版覆鏌擄紝鍒楁爣棰樺己鍒朵负涓枃");
- } catch (e) {
- console.error("琛ㄦ牸娓叉煋閿欒:", e);
- }
- }, 200);
}
- // 閲嶆柊鍒濆鍖栦笅鎷夋
- ColFilter();
+ option.cols = [col];
+ option.data = data1.data;
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+ ins = table.render(option);
- // 娓叉煋琛ㄦ牸
- // 娓叉煋琛ㄦ牸
- try {
- // 鍏堥攢姣佹棫鐨勮〃鏍�
- var mainTable = table.render(option);
- console.log("琛ㄦ牸娓叉煋鎴愬姛");
-
- // 娴嬭瘯锛氭鏌ヨ〃鏍兼暟鎹�
- var tableCache = table.cache.mainTable;
- if (tableCache && tableCache.length > 0) {
- console.log("琛ㄦ牸缂撳瓨绗竴琛屾暟鎹�:");
- var cacheRow = tableCache[0];
- console.log("HBillNo:", cacheRow.HBillNo);
- console.log("HDate:", cacheRow.HDate);
- console.log("TotalCoefficient:", cacheRow.TotalCoefficient);
- }
- } catch (e) {
- console.error("琛ㄦ牸娓叉煋閿欒:", e);
- layer.msg("琛ㄦ牸娓叉煋澶辫触: " + e.message, { icon: 5 });
- }
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(wait);
- if (tableData.length > 0) {
- layer.msg(`鍏� ${tableData.length} 鏉℃暟鎹甡, { icon: 1, time: 2000 });
- } else {
- layer.msg("鏆傛棤鏁版嵁", { icon: 3, time: 2000 });
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
}
+
} else {
- console.warn("鏁版嵁鏍煎紡涓嶆纭垨 list 涓虹┖");
layer.close(wait);
- layer.msg("鏁版嵁鍔犺浇澶辫触", { icon: 2 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
+
+
},
error: function (xhr, status, error) {
console.error("AJAX 璇锋眰閿欒:", error);
@@ -959,13 +588,13 @@
// 娣诲姞鏃ユ湡鏉′欢
if (HMakeDate_Begin) {
- sWhere += " and CONVERT(date, HMakeDate) >= '" + HMakeDate_Begin + "'";
+ sWhere += " and CONVERT(date, 鍗曟嵁鏃ユ湡) >= '" + HMakeDate_Begin + "'";
}
if (HMakeDate_End) {
- sWhere += " and CONVERT(date, HMakeDate) <= '" + HMakeDate_End + "'";
+ sWhere += " and CONVERT(date, 鍗曟嵁鏃ユ湡) <= '" + HMakeDate_End + "'";
}
if (HBillNo) {
- sWhere += " and HBillNo like '%" + HBillNo + "%'";
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
// 绉婚櫎寮�澶寸殑 "and "
@@ -1061,7 +690,6 @@
btn: ['纭畾'],
end: function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
}
});
}
@@ -1079,7 +707,6 @@
btn: ['纭畾'],
end: function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
}
});
}
@@ -1102,7 +729,6 @@
btn: ['纭畾'],
end: function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
}
});
}
@@ -1129,7 +755,6 @@
if (result.code === "1") {
layer.msg("鍒犻櫎鎴愬姛锛�", { time: 1000, icon: 1 }, function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
});
} else {
layer.msg(result.Message || "鍒犻櫎澶辫触", { icon: 2 });
@@ -1174,7 +799,6 @@
if (result.code === "1") {
layer.msg(result.Message || (num === 1 ? "瀹℃牳鎴愬姛" : "鍙嶅鏍告垚鍔�"), { time: 1000, icon: 1 }, function () {
$("#btnSearch").trigger('click');
- setTimeout(refreshTableWithChineseTitles, 200);
});
} else {
layer.msg(result.Message || "鎿嶄綔澶辫触", { icon: 2 });
@@ -1189,34 +813,7 @@
}
}
//#endregion
- function refreshTableWithChineseTitles() {
- console.log("=== 寮�濮嬭缃腑鏂囧垪鏍囬 ===");
-
- // 纭繚鍒楁爣棰樹负涓枃
- if (option.cols && option.cols[0]) {
- var cols = option.cols[0];
- console.log("褰撳墠鍒楁暟:", cols.length);
-
- for (var i = 0; i < cols.length; i++) {
- var col = cols[i];
- if (col.field && col.field !== 'LAY_CHECKED' && col.field !== 'checkbox') {
- var chineseTitle = getColumnChineseTitle(col.field);
- if (chineseTitle && chineseTitle !== col.field) { // 纭繚涓嶆槸瀛楁鍚嶆湰韬�
- col.title = chineseTitle;
- console.log(`璁剧疆鍒楁爣棰�: ${col.field} -> ${chineseTitle}`);
- }
- }
- }
- }
-
- // 閲嶆柊娓叉煋琛ㄦ牸
- try {
- table.render(option);
- console.log("琛ㄦ牸宸查噸鏂版覆鏌擄紝鍒楁爣棰樹负涓枃");
- } catch (e) {
- console.error("琛ㄦ牸娓叉煋閿欒:", e);
- }
- }
+
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable'),
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillListLink.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillListLink.html"
new file mode 100644
index 0000000..ec0776c
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillListLink.html"
@@ -0,0 +1,1223 @@
+锘�<!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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/MESLanguage.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+
+ .disabled-filter {
+ background-color: #f5f5f5 !important;
+ cursor: not-allowed !important;
+ }
+ </style>
+</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 id="BT_GD">鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_HBeginDate">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_HEndDate">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_HBarCode">鏉＄爜缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBarCode"
+ id="HBarCode">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 5px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_HSourceBillNo">婧愬崟鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HSourceBillNo" id="HSourceBillNo" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_HMaterName">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName"
+ id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_HMaterNumber">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes"
+ lay-verify="HUSEORGID" disabled>
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </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>
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_ColName">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" class="ForFilteringSchemes" id="ColName" lay-filter="ColName"
+ style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent"
+ id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_ColName1">杩囨护</label>
+ <div class="layui-input-block">
+ <select class="ForFilteringSchemes" name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" class="ForFilteringSchemes" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" 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 ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_ColName2">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" 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 ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+
+ <div id="page" style="position:relative;bottom:0;"></div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="" id="set_HideColumn" 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(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ 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
+ , soulTable = layui.soulTable
+
+ //鏌ヨ鏉′欢
+ var HTranSlate = "zh-CN";
+ var sWhere = "";
+ var option = [];
+ var ins;
+ var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID", "HItemID", "hmainid", "hsubid", "HInterID", "HUnitID", "HAuxPropID", "HSTOCKORGID"];
+ var page = 1;
+ var size = 50;
+
+ // 鍏ㄥ眬鍙橀噺锛氬瓨鍌║RL浼犲叆鐨勫弬鏁�
+ var urlParams = {
+ docNoParam: null,
+ orgIdParam: null,
+ cardNoParam: null, // 娣诲姞鍗″彿鍙傛暟
+ docNos: [],
+ baseWhere: ""
+ };
+
+ // 鑾峰彇URL鍙傛暟鍑芥暟
+ function getUrlParams() {
+ var params = {};
+ var queryString = window.location.search.substring(1);
+ var pairs = queryString.split('&');
+
+ for (var i = 0; i < pairs.length; i++) {
+ var pair = pairs[i].split('=');
+ if (pair.length === 2) {
+ params[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);
+ }
+ }
+ return params;
+ }
+
+ // 妫�鏌ユ槸鍚︽弧瓒虫煡璇㈡潯浠讹紙蹇呴』鏈夊崟鎹彿鍜岀粍缁嘔D锛�
+ function hasRequiredQueryParams() {
+ var params = getUrlParams();
+ urlParams.docNoParam = params['docNo'] || params['billNo'] || params['sourceBillNo'];
+ urlParams.orgIdParam = params['org'] || params['organ'] || params['orgId'] || params['organization'];
+ urlParams.cardNoParam = params['cardNo'] || params['card'] || params['icCard'] || params['iccard']; // 鑾峰彇鍗″彿鍙傛暟
+
+ return (urlParams.docNoParam && urlParams.docNoParam.trim() !== '') &&
+ (urlParams.orgIdParam && urlParams.orgIdParam.trim() !== '') &&
+ (urlParams.cardNoParam && urlParams.cardNoParam.trim() !== ''); // 瑕佹眰蹇呴』鏈夊崱鍙�
+ }
+
+ // 鏋勫缓鍩虹鏌ヨ鏉′欢锛堝熀浜嶶RL鍙傛暟锛�
+ function buildBaseWhere() {
+ if (!urlParams.docNoParam || !urlParams.orgIdParam) {
+ return "";
+ }
+
+ var baseWhere = "";
+
+ // 1. 澶勭悊缁勭粐ID
+ baseWhere += " and HSTOCKORGID = ''" + urlParams.orgIdParam.trim() + "''";
+
+ // 2. 澶勭悊鍗曟嵁鍙�
+ if (urlParams.docNoParam) {
+ var docNos = urlParams.docNoParam.split('@');
+ var docNoCondition = "";
+ urlParams.docNos = [];
+
+ for (var i = 0; i < docNos.length; i++) {
+ if (docNos[i].trim() !== '') {
+ urlParams.docNos.push(docNos[i].trim());
+ if (docNoCondition !== "") {
+ docNoCondition += " or ";
+ }
+ docNoCondition += "婧愬崟鍗曞彿 = ''" + docNos[i].trim() + "''";
+ }
+ }
+
+ if (docNoCondition !== "") {
+ baseWhere += " and (" + docNoCondition + ")";
+ }
+ }
+
+ urlParams.baseWhere = baseWhere;
+ return baseWhere;
+ }
+ // 鏄剧ず鍩烘湰鎸夐挳
+ $("#btn-reload").show();
+ $("#btn-view").show();
+ $("#btn-print").show();
+
+ // 绂佺敤/鍚敤杩囨护鎺т欢
+ function setFilterControlsState(enabled) {
+ if (enabled) {
+ // 鍚敤杩囨护鎺т欢锛堥櫎浜嗙粍缁囦笅鎷夋鍜屾簮鍗曞崟鍙疯緭鍏ユ锛�
+ $("#HBarCode").prop('disabled', false).removeClass('disabled-filter');
+ $("#HMaterName").prop('disabled', false).removeClass('disabled-filter');
+ $("#HMaterNumber").prop('disabled', false).removeClass('disabled-filter');
+ $("#HBeginDate").prop('disabled', false);
+ $("#HEndDate").prop('disabled', false);
+ $("#HInitTimeCycle").prop('disabled', false);
+ $("#ColName").prop('disabled', false);
+ $("#Comparator").prop('disabled', false);
+ $("#ColContent").prop('disabled', false);
+ $("#ColName1").prop('disabled', false);
+ $("#Comparator1").prop('disabled', false);
+ $("#ColContent1").prop('disabled', false);
+ $("#ColName2").prop('disabled', false);
+ $("#Comparator2").prop('disabled', false);
+ $("#ColContent2").prop('disabled', false);
+ $("#btnSearch").prop('disabled', false).removeClass('disabled-filter');
+ $("#btnReSearch").prop('disabled', false).removeClass('disabled-filter');
+
+ // 绂佺敤缁勭粐涓嬫媺妗嗗拰婧愬崟鍗曞彿杈撳叆妗�
+ $("#HUSEORGID").prop('disabled', true).addClass('disabled-filter');
+ $("#HSourceBillNo").prop('readonly', true).addClass('disabled-filter');
+ } else {
+ // 绂佺敤鎵�鏈夎繃婊ゆ帶浠�
+ $(".ForFilteringSchemes").prop('disabled', true).addClass('disabled-filter');
+ $("#btnSearch").prop('disabled', true).addClass('disabled-filter');
+ $("#btnReSearch").prop('disabled', true).addClass('disabled-filter');
+ }
+
+ form.render('select');
+ }
+
+ Organ1();
+ var HModName = "Gy_BarCodeBillList";
+ set_ClearBill();
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'btn-Delete':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 0 || checkStatus.data.length > 300) {
+ layer.msg(get_MessageError('[0000-1-014]璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁,涓旈�変腑琛屾暟涓嶈兘瓒呰繃300琛岋紒', sessionStorage["HTranSlate"]));
+ return;
+ }
+ var mainid = "";
+ var BarCode = "";
+ for (i = 0; i < data.length; i++) {
+ mainid += data[i].hmainid.toString() + ",";
+ BarCode += data[i].鏉＄爜缂栧彿.toString() + ",";
+ }
+
+ mainid = mainid.substring(0, mainid.length - 1)
+ BarCode = BarCode.substring(0, BarCode.length - 1)
+
+ var oData = JSON.stringify(mainid) + ";" + sessionStorage["HUserName"] + ";" + JSON.stringify(BarCode);
+
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm(get_MessageError("[0000-1-003]纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", sessionStorage["HTranSlate"]), { title: get_MessageError("[0000-2-009]鍒犻櫎纭", sessionStorage["HTranSlate"]) }, function (index) {
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "oData": oData },
+ 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(get_MessageError(result.code + result.Message, sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ })
+ break;
+ case 'btn-print':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var ModRightName = 'Gy_BarCodeBillList_Print';
+ $.ajax({
+ url: GetWEBURL() + 'Gy_BarCodeBillList/GetBarCodeBillPermission',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"]},
+ success: function (res) {
+ if (res.data == 1) {
+ if (checkStatus.data.length > 0) {
+ var rows = '';
+ for (var i = 0; i < data.length; i++) {
+ rows += data[i].HItemID.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨鏁版嵁鎵撳嵃锛�', sessionStorage["HTranSlate"]));
+ }
+ }
+ else {
+ layer.alert(get_MessageError("鏃犳墦鍗版潈闄�!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ }
+ });
+ break;
+ case 'btn-print-zx':
+ PrintZX();
+ break;
+ //鍒锋柊
+ case 'btn-reload':
+ $("#HBarCode").val("");
+ $("#HMaterName").val("");
+ $("#HSourceBillNo").val("");
+ $("#HMaterNumber").val("");
+ sWhere = "";
+ get_DisplayPage(sWhere);
+
+ break;
+ //浣滃簾鎸夐挳
+
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "鏉＄爜涓绘。";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+
+ };
+ });
+
+ //#region 閲嶇疆鎸夐挳 - 鍙噸缃瓫閫夋潯浠讹紝涓嶆敼鍙樺熀纭�鏌ヨ
+ form.on('submit(btnReSearch)', function (data) {
+ // 閲嶇疆绛涢�夋潯浠�
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBarCode").val("");
+ $("#HMaterName").val("");
+ $("#HMaterNumber").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render('select');
+
+ // 閲嶇疆鍚庨噸鏂版煡璇㈠熀纭�鏁版嵁
+ page = 1;
+ optionPage.curr = 1;
+ get_DisplayPage(urlParams.baseWhere);
+ });
+
+ //#region 鏌ヨ鎸夐挳 - 鍦ㄥ熀纭�鏌ヨ涓婃坊鍔犵瓫閫夋潯浠�
+ form.on('submit(btnSearch)', function (data) {
+ page = 1;
+ optionPage.curr = 1;
+ get_FastQuery();
+ });
+
+ // 淇敼 set_ClearBill 鍑芥暟
+ function set_ClearBill() {
+ set_InitGrid();
+ setSelect_HInitTimeCycle();
+
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ Organ1();
+ ColFilter();
+
+ // 寤惰繜鎵цURL鍙傛暟妫�鏌�
+ setTimeout(function () {
+ handleUrlParamsAndQuery();
+ }, 300);
+ }
+
+ function handleUrlParamsAndQuery() {
+ // 妫�鏌ユ槸鍚︽弧瓒虫煡璇㈡潯浠�
+ if (!hasRequiredQueryParams()) {
+ console.log('鏈彁渚涘繀闇�鐨勬煡璇㈠弬鏁帮紙鍗曟嵁鍙枫�佺粍缁嘔D鍜屽崱鍙凤級锛岄〉闈繚鎸佺┖鐧�');
+ layer.msg('璇烽�氳繃URL鎻愪緵鍗曟嵁鍙枫�佺粍缁嘔D鍜屽崱鍙疯繘琛屾煡璇�', { time: 3000, icon: 2 });
+ // 鍒濆鍖栫┖琛ㄦ牸
+ get_DisplayPageListStruct(" and 1 = 0");
+ // 绂佺敤鎵�鏈夎繃婊ゆ帶浠�
+ setFilterControlsState(false);
+ return;
+ }
+
+ // 婊¤冻鏉′欢锛岄鍏堜娇鐢ㄥ崱鍙风櫥褰曡幏鍙栫敤鎴蜂俊鎭�
+ if (urlParams.cardNoParam) {
+
+ // 璋冪敤loginByICCard鏂规硶锛岃繖閲岄渶瑕佷紶閫掔粍缁嘔D浣滀负鍙傛暟
+ var loginSuccess = loginByICCard(urlParams.cardNoParam, urlParams.orgIdParam);
+
+ if (!loginSuccess) {
+ layer.msg('鍗″彿鐧诲綍澶辫触锛岃妫�鏌ュ崱鍙锋垨鑱旂郴绠＄悊鍛�', { time: 3000, icon: 2 });
+ // 鍒濆鍖栫┖琛ㄦ牸
+ get_DisplayPageListStruct(" and 1 = 0");
+ // 绂佺敤鎵�鏈夎繃婊ゆ帶浠�
+ setFilterControlsState(false);
+ return;
+ }
+
+ }
+
+ // 鏋勫缓鍩虹鏌ヨ鏉′欢
+ var baseWhere = buildBaseWhere();
+ if (baseWhere !== "") {
+ console.log('鎵ц鍩虹鏌ヨ:', baseWhere);
+
+ // 璁剧疆UI鏄剧ず
+ $("#HUSEORGID").val(urlParams.orgIdParam.trim());
+ if (urlParams.docNos.length > 0) {
+ $("#HSourceBillNo").val(urlParams.docNos.join(', '));
+ }
+
+ // 鏄剧ず鏌ヨ鏉ユ簮
+ var sourceInfo = "鏌ヨ鏉ユ簮: 缁勭粐=" + urlParams.orgIdParam + ", 鍗曟嵁鏁�=" + urlParams.docNos.length + ", 鍗″彿=" + urlParams.cardNoParam;
+ $("#HFilterScheme_Now").text(sourceInfo);
+
+ // 鍚敤杩囨护鎺т欢锛堥櫎浜嗙粍缁囦笅鎷夋鍜屾簮鍗曞崟鍙疯緭鍏ユ锛�
+ setFilterControlsState(true);
+
+ // 鎵ц鏌ヨ
+ page = 1;
+ optionPage.curr = 1;
+ get_DisplayPage(baseWhere);
+ }
+ }
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-150'
+ , page: false
+ , limit: 50
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
+ , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', width: 160, sort: true }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 160, sort: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 250, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 250, sort: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200, sort: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200, sort: true }
+ , { field: '鐐夊彿', title: '鐐夊彿', width: 200, sort: true }
+ , { field: '閽㈠嵎鍙�', title: '閽㈠嵎鍙�', width: 200, sort: true }
+ , { field: '鏉＄爜鐘舵��', title: '鏉＄爜鐘舵��', width: 200, sort: true }
+ , { field: '鍘傚晢', title: '鍘傚晢', width: 200, sort: true }
+ , { field: '鎹嗗寘鍙�', title: '鎹嗗寘鍙�', width: 200, sort: true }
+ , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '淇濊川鏈熻嚦', title: '淇濊川鏈熻嚦', width: 200, templet: "<div>{{d.淇濊川鏈熻嚦 ==null ?'':layui.util.toDateString(d.淇濊川鏈熻嚦, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
+ , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 160, sort: true }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 160, sort: true }
+ , { field: '鎵瑰彿', title: '鎵瑰彿', width: 160, sort: true }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 200, sort: true, totalRow: true }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 200, sort: true }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200, sort: true }
+ , { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200, sort: true }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200, sort: true }
+ , { field: '杩涙枡鏃ユ湡', title: '杩涙枡鏃ユ湡', width: 200, sort: true }
+ , { field: '杩涙枡鏃ユ湡鍛�', title: '杩涙枡鏃ユ湡鍛�', width: 115, sort: true }
+ , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 115, sort: true }
+ , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200, sort: true }
+ , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
+ , { field: '杞﹂棿', title: '杞﹂棿', width: 115, sort: true }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 200, sort: true }
+ , { field: '鎷栧彿', title: '鎷栧彿', width: 200, sort: true }
+ , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 200, sort: true, totalRow: true }
+ , { field: '澶囨敞', title: '澶囨敞', width: 200, sort: true }
+ , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115, sort: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200, sort: true }
+ , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200, sort: true }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115, sort: true }
+ , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鍏ュ簱鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鍏ュ簱鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 200, templet: "<div>{{d.閿�鍞嚭搴撴棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞嚭搴撴棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ ]]
+ };
+ optionPage = {
+ elem: 'page',
+ count: 0,
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ if (!first) {
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
+ }
+
+ function loginByICCard(HBarCode, HOrgID) {
+ var login_result = false;
+ var index = layer.load();
+
+ // 鑾峰彇榛樿缁勭粐鍚嶇О
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data;
+ for (let element of data) {
+ if (element.ID == HOrgID) {
+ sessionStorage["Organization"] = element.Name;
+ }
+ }
+ }
+ },
+ error: function (err) {
+ login_result = false;
+ layer.close(index);
+ layer.msg("鑾峰彇缁勭粐淇℃伅澶辫触锛�" + err, { icon: 5 });
+ return login_result;
+ }
+ });
+
+ // 鑾峰彇鐧诲綍淇℃伅
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetUserByICCard",
+ type: "GET",
+ async: false,
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(index);
+ // 缂撳瓨鐢ㄦ埛淇℃伅
+ sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName; // 閲戣澏浜戣处鍙�
+ sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
+ sessionStorage["HMaker"] = result.data[0].Czymc;
+ sessionStorage["HUserName"] = result.data[0].Czymc;
+ sessionStorage["HBillerID"] = result.data[0].HK3UserID;
+ sessionStorage["SourceFlag"] = false;
+ sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
+ sessionStorage["HKeeper"] = result.data[0].HKeeper;
+ sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
+ sessionStorage["HSecManager"] = result.data[0].HSecManager;
+ sessionStorage["HSellManID"] = result.data[0].HSellManID;
+ sessionStorage["HSellMan"] = result.data[0].HSellMan;
+ sessionStorage["HDeptID"] = result.data[0].HDeptID;
+ sessionStorage["HDept"] = result.data[0].HDept;
+ sessionStorage["HWHID"] = result.data[0].HWhID;
+ sessionStorage["HWHName"] = result.data[0].HWHName;
+ sessionStorage["HSPID"] = result.data[0].HSPID;
+ sessionStorage["HSPName"] = result.data[0].HSPName;
+ sessionStorage["HSupID"] = result.data[0].HSupID;
+ sessionStorage["HSupName"] = result.data[0].HSupName;
+ sessionStorage["Czmm"] = result.data[0].Czmm;
+ sessionStorage["Czybm"] = result.data[0].Czybm;
+ sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
+ sessionStorage["HEmpName"] = result.data[0].HEmpName;
+ sessionStorage["HGroup"] = result.data[0].HGroup;
+ sessionStorage["HGroupID"] = result.data[0].HGroupID;
+ sessionStorage["HProc"] = result.data[0].HProc;
+ sessionStorage["HProcNo"] = result.data[0].HProcNo;
+ sessionStorage["HSource"] = result.data[0].HSource;
+ sessionStorage["HSourceID"] = result.data[0].HSourceID;
+ sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+ sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+ sessionStorage["HProcName"] = result.data[0].HProcName;
+ sessionStorage["HProcID"] = result.data[0].HProcID;
+ sessionStorage["HCheckEmpID"] = result.data[0].HCheckEmpID;
+ sessionStorage["HCheckEmpName"] = result.data[0].HCheckEmpName;
+ sessionStorage["login"] = "login";
+ sessionStorage["OrganizationID"] = HOrgID;
+ sessionStorage["HTranSlate"] = HTranSlate || "zh-CN";
+
+ login_result = true;
+
+ } else {
+ layer.close(index);
+ login_result = false;
+ layer.msg("鍗″彿鐧诲綍澶辫触锛�" + result.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ login_result = false;
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5 });
+ }
+ });
+
+ return login_result;
+ }
+ // 淇敼 get_FastQuery 鍑芥暟锛屽湪鍩虹鏌ヨ涓婃坊鍔犵瓫閫夋潯浠�
+ function get_FastQuery() {
+ // 濡傛灉娌℃湁鍩虹鏌ヨ鏉′欢锛屼笉鎵ц
+ if (!urlParams.baseWhere) {
+ layer.msg('璇峰厛閫氳繃URL鎻愪緵鍗曟嵁鍙峰拰缁勭粐ID', { time: 3000, icon: 2 });
+ return;
+ }
+
+
+
+ //#endregion
+ // 鑾峰彇绛涢�夋潯浠�
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+ var HBarCode = $("#HBarCode").val();
+ var HMaterName = $("#HMaterName").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var ColName = $("#ColName").val();
+ var Comparator = $("#Comparator").val();
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();
+ var Comparator1 = $("#Comparator1").val();
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();
+ var Comparator2 = $("#Comparator2").val();
+ var ColContent2 = $("#ColContent2").val();
+
+ // 浠庡熀纭�鏌ヨ鏉′欢寮�濮�
+ var sWhere = urlParams.baseWhere;
+
+ // 娣诲姞鏃ユ湡鑼冨洿绛涢��
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100), 鏃ユ湡, 23) >= ''" + HBeginDate + "''";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100), 鏃ユ湡, 23) <= ''" + HEndDate + "''";
+ }
+
+ // 娣诲姞鍏朵粬鏉′欢绛涢��
+ if (HBarCode) {
+ sWhere += " and 鏉＄爜缂栧彿 like ''%" + HBarCode + "%''";
+ }
+ if (HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like ''%" + HMaterName + "%''";
+ }
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like ''%" + HMaterNumber + "%''";
+ }
+
+ // 娣诲姞鑷畾涔夎繃婊ゅ櫒
+ if (ColName != 0 && Comparator != 0 && ColContent) {
+ var com = getComparatorSql(Comparator, ColContent);
+ sWhere += " and " + ColName + " " + com;
+ }
+
+ if (ColName1 != 0 && Comparator1 != 0 && ColContent1) {
+ var com1 = getComparatorSql(Comparator1, ColContent1);
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+
+ if (ColName2 != 0 && Comparator2 != 0 && ColContent2) {
+ var com2 = getComparatorSql(Comparator2, ColContent2);
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
+ console.log('瀹屾暣鏌ヨ鏉′欢:', sWhere);
+ get_DisplayPage(sWhere);
+ }
+
+ function getComparatorSql(comparator, content) {
+ switch (comparator) {
+ case "7": return "like ''%" + content + "%''";
+ case "8": return "like ''%" + content + "''";
+ case "9": return "like ''" + content + "%''";
+ case "10": return "not like ''%" + content + "%''";
+ default: return comparator + " ''" + content + "''";
+ }
+ }
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + 'Gy_BarCodeBillList/page',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;
+ if (data1.code == 1) {
+ optionPage.count = data1.count;
+ 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 ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true });
+ }
+ else {
+ switch (data[i].Type) {
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ layer.close(ajaxLoad);
+ } else {
+ option.data = [[]]
+ table.render(option);
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }, complete: function () {
+ DisPlay_HideColumn();
+ }
+ });
+ }
+ //#endregion
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ // 鍒濆鍖栫┖琛ㄦ牸缁撴瀯锛堜笉鏌ヨ鏁版嵁锛�
+ function get_DisplayPageListStruct(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + 'Gy_BarCodeBillList/page',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": 1, "size": 50 },
+ success: function (data1) {
+ option.limit = 50;
+ if (data1.code == 1) {
+ optionPage.count = 0;
+ 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 ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true });
+ }
+ else {
+ switch (data[i].Type) {
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = [];
+ ins = table.render(option);
+ laypage.render(optionPage);
+ layer.close(ajaxLoad);
+ } else {
+ option.data = [[]]
+ table.render(option);
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ }
+ });
+ }
+
+ function DisPlay_HideColumn() {
+
+
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: {
+ "HModName": HModName,
+ "user": sessionStorage["HUserName"]
+ },
+ success: function (data1) {
+ // 妫�鏌ヨ繑鍥炴暟鎹槸鍚︽湁鏁�
+ if (data1 && data1.data && data1.data.length > 0) {
+ var dataCol = [];
+ var newCols = [[]];
+
+ // 鏀惧叆绗竴涓猚heckbox鍒�
+ if (option.cols && option.cols[0] && option.cols[0][0]) {
+ newCols[0].push(option.cols[0][0]);
+ }
+
+ // 纭繚鏈塇GridString鏁版嵁
+ if (data1.data[0].HGridString) {
+ dataCol = data1.data[0].HGridString.split(',');
+ }
+
+ // 鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length > 0 && option.cols && option.cols[0] &&
+ dataCol.length == option.cols[0].length - 1) {
+
+ // 閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[j]) {
+ var dataCols = dataCol[j].split('|');
+ // 閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1] &&
+ option.cols[0][i + 1]["field"] == dataCols[5]) {
+
+ // 闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+
+ // 璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = parseInt(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 (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+
+ // 缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+
+ // 瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ 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;
+ }
+
+ // 璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ }
+
+ // 閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+
+ // 鍙栨秷鍐荤粨鍒�
+ 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;
+ }
+ if (option.cols[0][i + 1]) {
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ }
+
+ table.render(option);
+ } else {
+ // 娌℃湁鍒楄缃暟鎹紝姝ｅ父娓叉煋琛ㄦ牸
+ console.log('鏈壘鍒板垪璁剧疆鏁版嵁锛屼娇鐢ㄩ粯璁よ〃鏍艰缃�');
+ if (option && option.cols) {
+ table.render(option);
+ }
+ }
+
+ // 鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button");
+ var HBillType = "鏉＄爜涓绘。";
+
+ // 瀹夊叏鍦版樉绀烘寜閽�
+ try {
+ $("#btn-reload").show();
+ $("#btn-view").show();
+ $("#btn-print").show();
+
+ // 妫�鏌isplay_HideButton鍑芥暟鏄惁瀛樺湪
+ if (typeof Display_HideButton === 'function') {
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ } else {
+ console.warn('Display_HideButton鍑芥暟鏈畾涔�');
+ }
+ } catch (e) {
+ console.error('鏄剧ず鎸夐挳鏃跺嚭閿�:', e);
+ }
+ },
+ error: function (xhr, status, error) {
+ console.error('鑾峰彇鍒楄缃け璐�:', error);
+ console.log('璇锋眰URL:', GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList');
+ console.log('璇锋眰鍙傛暟:', { "HModName": HModName, "user": sessionStorage["HUserName"] });
+
+ // 鍗充娇鍑洪敊涔熷皾璇曟覆鏌撹〃鏍�
+ try {
+ if (option && option.cols) {
+ table.render(option);
+
+ // 鏄剧ず鍩烘湰鎸夐挳
+ $("#btn-reload").show();
+ $("#btn-view").show();
+ $("#btn-print").show();
+ }
+ } catch (e) {
+ console.error('娓叉煋琛ㄦ牸澶辫触:', e);
+ }
+
+
+ }
+ });
+ }
+
+
+ function Organ1() {
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data;
+ var options = '<option value="">璇烽�夋嫨缁勭粐</option>';
+ for (var i = 0; i < data.length; i++) {
+ options += '<option value="' + data[i].Name + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").html(options);
+ layui.form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ error: function () {
+ console.error("鑾峰彇缁勭粐淇℃伅澶辫触");
+ }
+ });
+ }
+
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+ $("#HInitTimeCycle").val("29");
+ }
+
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');
+ $(obj.tr.selector).attr({ "style": "background:" });
+ }
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+
+ 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].title + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index b006230..933407f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -21,6 +21,27 @@
.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
background: #aef0f7;
}
+ /* 纭繚body鍙粴鍔� */
+ html, body {
+ height: 100%;
+ overflow: auto;
+ }
+
+ /* 鎭㈠婊氬姩鏉� */
+ ::-webkit-scrollbar {
+ width: 8px;
+ height: 8px;
+ }
+
+ ::-webkit-scrollbar-thumb {
+ background: #ccc;
+ border-radius: 4px;
+ }
+
+ ::-webkit-scrollbar-track {
+ background: #f5f5f5;
+ }
+
</style>
</head>
<body>
diff --git "a/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/\350\275\246\350\276\206\350\275\250\350\277\271\350\241\250/Cg_CarTrajectoryBillEdit.html" "b/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/\350\275\246\350\276\206\350\275\250\350\277\271\350\241\250/Cg_CarTrajectoryBillEdit.html"
new file mode 100644
index 0000000..ad503cc
--- /dev/null
+++ "b/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/\350\275\246\350\276\206\350\275\250\350\277\271\350\241\250/Cg_CarTrajectoryBillEdit.html"
@@ -0,0 +1,714 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>杞﹁締杞ㄨ抗琛ㄧ紪杈�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../..//style/admin.css" media="all">
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/PageTitle.js"></script>
+ <style type="text/css">
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: black;
+ }
+
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+
+ .coordinate-input {
+ width: 150px;
+ }
+ </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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-CarTrajectoryBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>杞﹁締杞ㄨ抗琛�</b></h1>
+ <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-inline">
+ <label class="layui-form-label">鍗曟嵁缂栧彿<label style="color:red"> * </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-inline">
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩愬崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HContractTransportBillNo" id="HContractTransportBillNo" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞︾墝鍙�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCarNumber" id="HCarNumber" value="">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">杞ㄨ抗鑾峰彇鏃堕棿<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="datetime-local" class="layui-input" name="HGetTime" id="HGetTime" style="width: 200px;">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">缁忓害<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="number" step="0.000001" class="layui-input coordinate-input" name="HLongitude" id="HLongitude" value="0" placeholder="璇疯緭鍏ョ粡搴�">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绾害<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="number" step="0.000001" class="layui-input coordinate-input" name="HLatitude" id="HLatitude" value="0" placeholder="璇疯緭鍏ョ含搴�">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <textarea class="layui-textarea" name="HRemark" id="HRemark" autocomplete="off" style="width: 501px;" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�"></textarea>
+ </div>
+ </div>
+ </div>
+
+ <!--闅愯棌瀛楁-->
+ <div class="layui-row" style="display:none;">
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <input class="layui-input" name="HBillType" id="HBillType" value="1119" autocomplete="off">
+ <input class="layui-input" name="HBillSubType" id="HBillSubType" value="1119" autocomplete="off">
+ <input class="layui-input" name="HYear" id="HYear" value="" autocomplete="off">
+ <input class="layui-input" name="HPeriod" id="HPeriod" value="" autocomplete="off">
+
+ <input class="layui-input" name="HMainSourceBillType" id="HMainSourceBillType" value="" autocomplete="off">
+ <input class="layui-input" name="HMainSourceInterID" id="HMainSourceInterID" value="" autocomplete="off">
+ <input class="layui-input" name="HMainSourceEntryID" id="HMainSourceEntryID" value="" autocomplete="off">
+ <input class="layui-input" name="HMainSourceBillNo" id="HMainSourceBillNo" value="" autocomplete="off">
+ <input class="layui-input" name="HContractTransportBillMainID" id="HContractTransportBillMainID" value="" autocomplete="off">
+ <input class="layui-input" name="HBillStatus" id="HBillStatus" value="1" autocomplete="off">
+ </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="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="HChecker" id="HChecker" 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="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="HCheckDate" id="HCheckDate" 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="HCloseMan" id="HCloseMan" 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="HCloseDate" id="HCloseDate" 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 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="HBacker" id="HBacker" 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="HBackDate" id="HBackDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 100%;">
+ <label class="layui-form-label" style="width: 85px;">閫�鍥炲師鍥�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 80%;">
+ <textarea class="layui-textarea" name="HBackRemark" id="HBackRemark" style="background-color:#efefef4d;" readonly></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <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 HModName = "Cg_CarTrajectoryBill";
+ var HBillType = "1119";
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ //鍗曟嵁鐘舵�佹槧灏�
+
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "1119";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+ //#endregion
+
+ //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+ if (OperationType == null || OperationType == 1) { //鏂板
+ //鏂板椤甸潰鍒濆鍖�
+ Init_setAdd();
+ }
+ else if (OperationType == 3) { //缂栬緫
+ $("#HInterID").val(linterid);
+ //鍔犺浇琛ㄥご鏁版嵁
+ RoadBillMain(linterid);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栨棩鏈熸椂闂撮�夋嫨鍣�
+
+ //#endregion
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+ //#region 閫夋嫨杩愬崟鎸夐挳
+ form.on('submit(HContractTransportBillList)', function () {
+ get_checkContractTransportBill();
+ });
+ //#endregion
+ //#endregion
+
+ //#region 琛ㄥご鎸夐挳瑙﹀彂浜嬩欢
+ //#region 淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+ //#endregion
+
+ //#region 瀹℃牳鎸夐挳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(0);
+ });
+ //#endregion
+
+ //#region 閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
+ })
+ //#endregion
+ //#endregion
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 鏃堕棿杞崲
+ function formatDate(date) {
+ if (!date) return "";
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear(),
+ hours = '' + d.getHours(),
+ minutes = '' + d.getMinutes(),
+ seconds = '' + d.getSeconds();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+ if (hours.length < 2) hours = '0' + hours;
+ if (minutes.length < 2) minutes = '0' + minutes;
+ if (seconds.length < 2) seconds = '0' + seconds;
+
+ return [year, month, day].join('-') + 'T' + [hours, minutes, seconds].join(':');
+ }
+
+ function formatDateForDisplay(date) {
+ if (!date) return "";
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear(),
+ hours = '' + d.getHours(),
+ minutes = '' + d.getMinutes();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+ if (hours.length < 2) hours = '0' + hours;
+ if (minutes.length < 2) minutes = '0' + minutes;
+
+ return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes;
+ }
+ //#endregion
+
+
+ function get_MAXNum() {
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ type: "GET",
+ data: { "HBillType": '1119' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
+ }
+
+
+ //#region 鏂板椤甸潰鍒濆鍖�
+ function Init_setAdd() {
+ get_MAXNum();
+ //璁剧疆鎿嶄綔绫诲瀷涓� 鏂板
+ OperationType = 1;
+ $("#HBillStatus").val("1"); // 1=鏈鐘舵��
+
+ //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+ var now = new Date();
+ $("#HDate").val(Format(now, "yyyy-MM-dd"));
+ $("#HGetTime").val(formatDate(now));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(now, "yyyy-MM-dd"));
+ $("#HYear").val(now.getFullYear());
+ $("#HPeriod").val(now.getMonth() + 1);
+
+ }
+ //#endregion
+
+ //#region 缂栬緫椤甸潰鍒濆鍖�
+ function RoadBillMain(linterid) {
+ //鏌ヨ杞﹁締杞ㄨ抗鍗曟嵁鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cg_CarTrajectoryBill/EditCg_CarTrajectoryBill",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": linterid,
+ "HMaker": sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ if (result.code == "1") { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+
+
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDateForDateInput(data.鍗曟嵁鏃ユ湡)
+
+ , "HContractTransportBillNo": data.杩愬崟鍙�
+ , "HContractTransportBillMainID": data.杩愬崟涓诲唴鐮�
+ , "HCarNumber": data.杞︾墝鍙�
+ , "HGetTime": formatDate(data.杞ㄨ抗鏃堕棿)
+ , "HLongitude": data.缁忓害
+ , "HLatitude": data.绾害
+ , "HRemark": data.澶囨敞
+
+ , "HMainSourceBillType": data.婧愬崟绫诲瀷
+ , "HMainSourceInterID": data.婧愬崟涓诲唴鐮�
+ , "HMainSourceEntryID": data.婧愬崟瀛愬唴鐮�
+ , "HMainSourceBillNo": data.婧愬崟鍙�
+
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟浜� == "" ? "" : formatDateForDisplay(data.鍒跺崟鏃ユ湡)
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼浜� == "" ? "" : formatDateForDisplay(data.淇敼鏃ユ湡)
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳浜� == "" ? "" : formatDateForDisplay(data.瀹℃牳鏃ユ湡)
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴浜� == "" ? "" : formatDateForDisplay(data.鍏抽棴鏃ユ湡)
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾浜� == "" ? "" : formatDateForDisplay(data.浣滃簾鏃ユ湡)
+ , "HBacker": data.閫�鍥炰汉
+ , "HBackDate": data.閫�鍥炰汉 == "" ? "" : formatDateForDisplay(data.閫�鍥炴棩鏈�)
+ , "HBackRemark": data.閫�鍥炲師鍥�
+
+ , "HYear": data.HYear
+ , "HPeriod": data.HPeriod
+ });
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ function formatDateForDisplay(date) {
+ if (!date) return "";
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return year + '-' + month + '-' + day; // 鍙繑鍥炴棩鏈�
+ }
+ //#endregion
+
+ //#region 寮圭獥閫夋嫨鏂规硶
+ //#region 杩愬崟閫夋嫨椤甸潰
+ function get_checkContractTransportBill() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '杩愬崟鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Cg_ContractTransportBillList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HContractTransportBillNo").val(checkStatus.data[0].HBillNo);
+ $("#HContractTransportBillMainID").val(checkStatus.data[0].HInterID);
+ // 鑷姩濉厖杞︾墝鍙凤紙濡傛灉杩愬崟涓湁杞︾墝鍙蜂俊鎭級
+ if (checkStatus.data[0].HCarNumber) {
+ $("#HCarNumber").val(checkStatus.data[0].HCarNumber);
+ }
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+ //鏁版嵁鏍￠獙
+ if (!validateData(data)) {
+ return;
+ }
+
+ //璁板綍鎿嶄綔绫诲瀷
+ var refSav = "";
+ if (OperationType == 1 || OperationType == 2) {
+ refSav = "Add";
+ }
+ if (OperationType == 3) {
+ refSav = "Update";
+ //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+ data.field.HUpDater = sessionStorage["HUserName"];
+ /* data.field.HUpDateDate = Format(new Date(), "yyyy-MM-dd HH:mm:ss");*/
+ $("#HUpDater").val(sessionStorage["HUserName"]);
+/* $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd HH:mm:ss"));*/
+ }
+
+ //搴忓垪鍖栬〃澶翠俊鎭�
+ var sMainStr = JSON.stringify(data.field);
+ //鎷兼帴鍙傛暟锛堢敱浜庢病鏈夊瓙琛紝瀛愯〃浼犵┖鏁扮粍锛�
+ var sSubStr = "[]";
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cg_CarTrajectoryBill/SaveCg_CarTrajectoryBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (result) {
+ if (result.code == "0" && result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(result.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+
+ // 濡傛灉鏄柊澧烇紝鏇存柊鍗曟嵁ID
+ if (refSav == "Add" && result.HInterID) {
+ $("#HInterID").val(result.HInterID);
+ OperationType = 3; // 淇濆瓨鍚庤浆涓虹紪杈戠姸鎬�
+ }
+
+ layer.close(index);
+ }
+ else {
+ layer.alert(result.Message, { icon: 5 });
+ layer.close(index);
+ }
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err.responseText || err, { icon: 5 });
+ layer.close(index);
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁版嵁鏍￠獙
+ function validateData(data) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var numRef = /^-?\d+(\.\d+)?$/; //鏁板瓧姝ｅ垯琛ㄨ揪寮�
+ var coordRef = /^-?\d+(\.\d{1,6})?$/; //鍧愭爣姝ｅ垯琛ㄨ揪寮忥紙鏈�澶�6浣嶅皬鏁帮級
+
+ //#region 琛ㄥご鏁版嵁妫�楠�
+ if ($("#HBillNo").val() == "") {
+ layer.msg("鍗曟嵁缂栧彿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HCarNumber").val() == "") {
+ layer.msg("杞︾墝鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+
+ if ($("#HGetTime").val() == "") {
+ layer.msg("杞ㄨ抗鑾峰彇鏃堕棿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ // 缁忓害鏍￠獙
+ var longitude = $("#HLongitude").val();
+ if (longitude == "" || !coordRef.test(longitude)) {
+ layer.msg("璇疯緭鍏ユ湁鏁堢殑缁忓害鍊硷紙鏈�澶�6浣嶅皬鏁帮級!");
+ return false;
+ }
+ if (parseFloat(longitude) < -180 || parseFloat(longitude) > 180) {
+ layer.msg("缁忓害鑼冨洿搴斿湪-180鍒�180涔嬮棿!");
+ return false;
+ }
+
+ // 绾害鏍￠獙
+ var latitude = $("#HLatitude").val();
+ if (latitude == "" || !coordRef.test(latitude)) {
+ layer.msg("璇疯緭鍏ユ湁鏁堢殑绾害鍊硷紙鏈�澶�6浣嶅皬鏁帮級!");
+ return false;
+ }
+ if (parseFloat(latitude) < -90 || parseFloat(latitude) > 90) {
+ layer.msg("绾害鑼冨洿搴斿湪-90鍒�90涔嬮棿!");
+ return false;
+ }
+ //#endregion
+
+ return true;
+ }
+ //#endregion
+
+ //#region 瀹℃牳/鍙嶅鏍告暟鎹�
+ function set_CheckBill(num) {
+ var InterID = $("#HInterID").val();
+ if (InterID == "0") {
+ layer.msg("璇峰厛淇濆瓨鍗曟嵁!");
+ return;
+ }
+
+ //鍒ゆ柇鏄鏍歌繕鏄弽瀹℃牳
+ var isAudit = 1; // 1-瀹℃牳锛�2-鍙嶅鏍�
+
+ if (currentStatus == 2) {
+ isAudit = 2;
+ }
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_CarTrajectoryBill/AuditCg_CarTrajectoryBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": InterID,
+ "IsAudit": isAudit,
+ "HMaker": sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ if (result.code == "0" && result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 閲嶆柊鍔犺浇鏁版嵁
+ RoadBillMain(InterID);
+ });
+ } else {
+ layer.alert(result.Message || "鎿嶄綔澶辫触!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+ function formatDateForDateInput(date) {
+ if (!date) return "";
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+
+
+
+ //#endregion
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/\350\275\246\350\276\206\350\275\250\350\277\271\350\241\250/Cg_CarTrajectoryBillList.html" "b/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/\350\275\246\350\276\206\350\275\250\350\277\271\350\241\250/Cg_CarTrajectoryBillList.html"
new file mode 100644
index 0000000..1da42f0
--- /dev/null
+++ "b/WebTM/views/\347\211\251\346\265\201\347\256\241\347\220\206/\350\277\220\350\276\223\345\256\232\344\275\215/\350\275\246\350\276\206\350\275\250\350\277\271\350\241\250/Cg_CarTrajectoryBillList.html"
@@ -0,0 +1,1432 @@
+锘�<!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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../../layuiadmin/SetColumn.js"></script>
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞︾墝鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HCarNumber" id="HCarNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩愬崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HContractTransportBillNo" id="HContractTransportBillNo">
+ </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" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content" style="padding: 6px; 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" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <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="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <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="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAudit" id="btn_DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Close" id="btn_Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeClose" id="btn_DeClose"><i class="layui-icon layui-icon-circle"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Drop" id="btn_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeDrop" id="btn_DeDrop"><i class="layui-icon layui-icon-circle"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_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(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], 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
+ , soulTable = layui.soulTable
+ var HModName = "Cg_CarTrajectoryBillList";
+ var HBillType = "1119";
+ var HMaker = sessionStorage["HUserName"]
+ var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var option = [];
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
+ var columns = "";
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ //#endregion
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "杞﹁締杞ㄨ抗鍗曟嵁鍒楄〃";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 鍥炶溅鏌ヨ
+
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //杞︾墝鍙峰洖杞︽柟娉�
+ $('#HCarNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //杩愬崟鍙峰洖杞︽柟娉�
+ $('#HContractTransportBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent2').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , totalRow: true
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: 50
+
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 1000, 2000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭
+ , where: { //璇锋眰鍙傛暟
+ field: obj.field //鎺掑簭瀛楁
+ , order: obj.type //鎺掑簭鏂瑰紡
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, HMaker);
+ });
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ 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 (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ 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;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ 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";
+ }
+ }
+ }
+ }
+ ins = table.render(option);
+
+ } else {
+ ins = table.render(option);
+
+ }
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, HMaker);
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
+ //鏂板鎸夐挳
+ case 'btn_Add': btn_Add();
+ break;
+ //缂栬緫鎸夐挳
+ case 'btn_Edit': btn_Edit();
+ break;
+ //鎵撳嵃
+ case 'btn-print':
+ get_PrintReport();
+ break;
+ //鍒犻櫎鎸夐挳
+ case 'btn_Delete': btn_Delete();
+ break;
+ //鍒锋柊鎸夐挳
+ case 'btn_Refresh': btn_Refresh();
+ break;
+ //瀹℃牳鎸夐挳 锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+ case 'btn_Audit': set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn_DeAudit': set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn_Close': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn_DeClose': set_CloseBill(2);
+ break;
+ //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+ case 'btn_Drop': set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn_DeDrop': set_DropBill(2);
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //鎸夐挳璁剧疆
+ case 'btn_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, HBillType, HModName, HMaker);
+ break;
+ //淇濆瓨鏂规
+ case 'btn_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'btn_ReadScheme': set_ReadScheme();
+ break;
+ };
+ });
+ //#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = data.鍗曟嵁鍐呯爜.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../杞﹁締杞ㄨ抗琛�/Cg_CarTrajectoryBillEdit.html?OperationType=3&HInterID=' + HInterID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ var data;
+ //璁剧疆sWhere
+ var ajaxLoad = layer.load();
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HCarNumber = $("#HCarNumber").val();//杞︾墝鍙�
+ var HContractTransportBillNo = $("#HContractTransportBillNo").val();//杩愬崟鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").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 (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ if (HBeginDate) {
+ sWhere += " and 鍗曟嵁鏃ユ湡 >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and 鍗曟嵁鏃ユ湡 <= '" + HEndDate + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HCarNumber) {
+ sWhere += " and 杞︾墝鍙� like '%" + HCarNumber + "%'";
+ }
+ if (HContractTransportBillNo) {
+ sWhere += " and 杩愬崟鍙� like '%" + HContractTransportBillNo + "%'";
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/Cg_CarTrajectoryBill/GetCg_CarTrajectoryBillList',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sWhere": sWhere, "HMaker": HMaker },
+ success: function (data1) {
+ if (data1.code == "0") {
+ data = data1.data
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, data, "xls");
+ }
+ //#endregion
+
+ //#region 鏂板
+ function btn_Add() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 鏂板'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../杞﹁締杞ㄨ抗琛�/Cg_CarTrajectoryBillEdit.html?OperationType=1&HInterID=0'
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function btn_Edit() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鍗曟嵁鍐呯爜.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../杞﹁締杞ㄨ抗琛�/Cg_CarTrajectoryBillEdit.html?OperationType=3&HInterID=' + HInterID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鍗曟嵁鍐呯爜.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Cg_CarTrajectoryBill/DeleteCg_CarTrajectoryBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HMaker": HMaker },
+ success: function (result) {
+ if (result.code == "0") {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+ //鍒锋柊鐣岄潰
+ $("#btnSearch").trigger('click');
+ layer.close(wait);
+ });
+
+ } else {
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function btn_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鎵撳嵃鍔熻兘
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ else {
+ var hmainid = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ hmainid.push(data[i].鍗曟嵁鍐呯爜)
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=Cg_CarTrajectoryBillList', 'yes']
+ , resize: false
+ })
+ }
+ }
+ //#endregion
+
+ //#region 瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鍗曟嵁鍐呯爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_CarTrajectoryBill/AuditCg_CarTrajectoryBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID , "IsAudit": num, "HMaker": HMaker },
+ success: function (result) {
+ if (result.code == "0") {
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+ }
+ }
+ //#endregion
+
+ //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鍗曟嵁鍐呯爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_CarTrajectoryBill/CloseCg_CarTrajectoryBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID , "Type": num, "HMaker": HMaker },
+ success: function (result) {
+ if (result.code == "0") {
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+ }
+ }
+ }
+ //#endregion
+
+ //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鍗曟嵁鍐呯爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_CarTrajectoryBill/DropCg_CarTrajectoryBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID , "Type": num, "HMaker": HMaker },
+ success: function (result) {
+ if (result.code == "0") {
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽浣滃簾锛�');
+ }
+ }
+ }
+ //#endregion
+
+
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
+ });
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HCarNumber").val("");//杞︾墝鍙�
+ $("#HContractTransportBillNo").val("");//杩愬崟鍙�
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
+ });
+
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HCarNumber = $("#HCarNumber").val();//杞︾墝鍙�
+ var HContractTransportBillNo = $("#HContractTransportBillNo").val();//杩愬崟鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").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 (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ if (HBeginDate) {
+ sWhere += " and 鍗曟嵁鏃ユ湡 >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and 鍗曟嵁鏃ユ湡 <= '" + HEndDate + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HCarNumber) {
+ sWhere += " and 杞︾墝鍙� like '%" + HCarNumber + "%'";
+ }
+ if (HContractTransportBillNo) {
+ sWhere += " and 杩愬崟鍙� like '%" + HContractTransportBillNo + "%'";
+ }
+ get_DisplayPage(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //#endregion
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_CarTrajectoryBill/GetCg_CarTrajectoryBillList_Page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ 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 if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ 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 HH:mm:ss')}}</div>", width: 160 });
+ break;
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+
+ option.totalRow = true;
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ //option.data = [[]]
+ //table.render(option);
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ 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].title + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+ var data = data1.data;
+ //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+ HInterID_Choose = data[0].hmainid;
+ //杩囨护鏂规鍐呯爜
+ HInterID = data[0].hmainid
+ //杩囨护鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨�"鍙夊彿"鍏抽棴寮圭獥椤甸潰
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";//杩囨护鏉′欢
+ var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+ var HValue = "";//杩囨护鍊�
+ var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ //缂栬緫
+ var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
index 2f24f4c..ef2fe66 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
@@ -704,7 +704,7 @@
//#endregion
//#region 鍒嗛〉鏌ヨ
- function get_DisplayPage(sWhere) {
+ function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainListPage',
@@ -905,7 +905,7 @@
}
}
//RoadHBillNo(sqlWhere);
- get_DisplayPage(sqlWhere);
+ get_Display(sqlWhere);
}
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
index 60e4ffb..7f3d5a6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
@@ -38,7 +38,7 @@
<option value="" selected="selected">鍏ㄩ儴</option>
<option value="1253">涓婃灦</option>
<option value="1252">涓嬫灦</option>
- <option value="灏忚溅缁戝畾">灏忚溅缁戝畾</option>
+ <option value="灏忚溅鍏ュ簱缁戝畾">灏忚溅缁戝畾</option>
<option value="灏忚溅杞Щ">灏忚溅杞Щ</option>
<option value="浠撳簱杞Щ">浠撳簱杞Щ</option>
<option value="10004">灏忚溅閿佸畾</option>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index ae56746..d660f01 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -1392,11 +1392,11 @@
layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return; //return; 闃绘鍑芥暟缁х画鎵ц
}
- if ($("#HExRate").val() == 0) {
- //鎻愮ず璇疯緭鍏ユ眹鐜囷紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉� 锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮� 鏍囬涓衡�欐俯棣ㄦ彁绀衡��
- layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HExRate").val() == 0) {
+ // //鎻愮ず璇疯緭鍏ユ眹鐜囷紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉� 锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮� 鏍囬涓衡�欐俯棣ㄦ彁绀衡��
+ // layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
//澶勭悊閲囪喘鏂瑰紡鍜岀粨绠楁柟寮忓�奸槻姝㈠悗绔痠nt杞瑂ting鎶ラ敊
if ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
$("#HPSStyleID").val(0)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
index 37fe9f7..1a72627 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
@@ -211,6 +211,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -316,6 +317,9 @@
}
});
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//瀹℃牳
case 'btn-Audit': set_AuditBill();
@@ -758,6 +762,102 @@
}
}
+ // 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index cf3afc8..35919cf 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -206,6 +206,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" 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-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-WmsSub" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -355,6 +356,9 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
@@ -843,6 +847,104 @@
}
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
//鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
index c9b879e..7115fde 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
@@ -203,6 +203,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" 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-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-BarCodeDetail" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
@@ -279,6 +280,9 @@
break;
//缂栬緫鎸夐挳
case 'btn-Edit': set_ShowBill();
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
@@ -600,6 +604,102 @@
}
+ // 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index ac03c71..d08aa2e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -259,6 +259,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushSellOutChangeBills" id="btn-PushSellOutChangeBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞皟浠峰崟)</button>
@@ -394,6 +395,9 @@
//缂栬緫
case 'btn-Edit':
set_ShowBill();
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//涓嬫帹(鐗规壒鐢宠鍗�)
case 'btn-PushExceptiveCheckRequestBill':
@@ -975,6 +979,105 @@
}
//#endregion
+
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
index 989ecb5..fc19d69 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
@@ -222,6 +222,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" 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-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -298,6 +299,9 @@
break;
//鍒锋柊
case 'get_Refresh': set_Refresh();
+ break;
+ //鎵樻暟鍙樻洿
+ case "btn-tally": set_PalletChange();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -788,6 +792,103 @@
function set_Refresh() {
$("#btnSearch").click();
}
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_StockOutRequestBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
index 2186ab0..300c08d 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
@@ -219,6 +219,7 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -354,6 +355,9 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
@@ -936,6 +940,105 @@
}
//#endregion
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
+
//#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 257b0a2..799e3de 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -239,6 +239,7 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown_PayableBill" id="get_LookDown_PayableBill"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡(搴斾粯鍗�)</button>
@@ -767,7 +768,9 @@
}
break;
-
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
+ break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
break;
@@ -1043,6 +1046,104 @@
}
//#endregion
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟 ;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
//#region 鍒锋柊
function get_Refresh() {
//set_ClearQuery();
--
Gitblit v1.9.1