From 9db41bd74bbf657d724ce1e07ca3ed63ae78632e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 08 五月 2024 14:26:18 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 67
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 56
WebTM/views/项目管理/工作任务/PM_WorkTaskMoneyBill.html | 45
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 2
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 2
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 2
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 2
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 75
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 2
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 303 +
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html | 383 ++-
WebTM/views/基础资料/基础资料/Gy_DotCheckItemClassList.html | 652 +++++
WebTM/views/项目管理/工作任务/PM_WorkTaskMoneyBillList.html | 2
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 73
WebTM/views/基础资料/公用基础资料/xmlLBM_Xs_SeOrderBill.aspx | 2
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 4
WebTM/views/项目管理/基础建模/Gy_TaskClass.html | 13
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html | 46
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 215 +
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 2
WebTM/views/项目管理/工程项目/PM_ProjectBeginBillMain.html | 80
WebTM/views/基础资料/基础资料/Gy_DotCheckList.html | 7
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 49
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 19
WebTM/views/基础资料/基础资料/Gy_DotCheckItemMethodList.html | 666 +++++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html | 104
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html | 18
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 53
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 63
WebTM/WebTM.csproj | 6
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 46
WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillEdit.html | 89
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 34
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 85
WebTM/views/车间管理/工序流转卡/MES_ColorRecordBillList.html | 2
WebTM/views/基础资料/基础资料/Gy_DotCheckEdit.html | 61
WebTM/views/基础资料/基础资料/Gy_DotCheckItemClassEdit.html | 194 +
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 4
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html | 335 ++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 30
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillEdit.html | 246 +
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillList.html | 52
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 1
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html | 160
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html | 484 +++
WebTM/views/基础资料/生产基础资料/Gy_SOPBillEdit.html | 52
WebTM/views/质量管理/基础建模/Gy_ErrType.html | 8
WebTM/views/基础资料/基础资料/Gy_DotCheckItemMethodEdit.html | 194 +
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 48
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 63
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 41
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 100
WebTM/views/质量管理/基础建模/Add_Edit_Gy_ErrMsgBackType.html | 77
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 733 +++++
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 2
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 102
WebTM/WebTM.csproj.user | 11
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 178 +
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 26
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html | 88
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 2
WebTM/views/项目管理/工程项目/PM_ProjectMoneyBillMain.html | 70
WebTM/views/质量管理/基础建模/Add_Edit_Gy_ErrType.html | 35
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 74
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 2
WebTM/views/项目管理/工程项目/PM_ProjectEndBillMain.html | 65
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html | 52
WebTM/views/销售管理/应收退款单/YS_ReceiveBackBill.html | 41
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 3
70 files changed, 5,798 insertions(+), 1,109 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 8e64bfb..f4df6b3 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1583,6 +1583,9 @@
<File Include="views/PlateBinding.html">
<publishTime>04/28/2024 08:36:23</publishTime>
</File>
+ <File Include="views/PlateBinding.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
<File Include="views/PublicPage/AreaInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
</File>
@@ -1973,6 +1976,12 @@
<File Include="views/WMS鎵爜妯″潡/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_PDA.html">
<publishTime>04/28/2024 08:36:23</publishTime>
</File>
+ <File Include="views/WMS鎵爜妯″潡/鐢熶骇琛ユ枡/Kf_MateReplenishOutBillList_PDA.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/WMS鎵爜妯″潡/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_PDA.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA.html">
<publishTime>04/28/2024 08:42:16</publishTime>
</File>
@@ -2164,6 +2173,9 @@
</File>
<File Include="views/浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
<publishTime>04/28/2024 08:36:23</publishTime>
+ </File>
+ <File Include="views/浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
</File>
<File Include="views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html">
<publishTime>04/15/2024 13:00:47</publishTime>
@@ -5339,6 +5351,12 @@
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html">
<publishTime>04/28/2024 08:36:24</publishTime>
</File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CodingReport.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_QiaoYi.html">
<publishTime>04/15/2024 13:00:49</publishTime>
</File>
@@ -5951,6 +5969,18 @@
<File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Add_Edit_Gy_TaskClass.html">
<publishTime>04/28/2024 08:36:24</publishTime>
</File>
+ <File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Add_Edit_Gy_ProjectClass.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Add_Edit_Gy_TaskClass.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Gy_ProjectClass.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBill.html">
<publishTime>04/15/2024 13:00:49</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5d7bc76..d1e3ae1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -322,6 +322,10 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ColorClassList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
@@ -1754,6 +1758,8 @@
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkReportWeekBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBillList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index bd6a6b4..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -16,8 +16,9 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>views/user/login.html</StartPageUrl>
- <StartAction>SpecificPage</StartAction>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
@@ -31,7 +32,7 @@
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
- <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d7325c6..7078c95 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
/* var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�*/
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/Add_Edit_Kf_MoveStockBill.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/Add_Edit_Kf_MoveStockBill.html"
index b873acc..e8a956b 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/Add_Edit_Kf_MoveStockBill.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/Add_Edit_Kf_MoveStockBill.html"
@@ -72,7 +72,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -102,7 +102,7 @@
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -113,7 +113,7 @@
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨叆浠撳簱</label>
+ <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -123,7 +123,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -136,7 +136,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹鍛�</label>
+ <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -146,7 +146,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�</label>
+ <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -156,7 +156,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓氬姟鍛�</label>
+ <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -172,7 +172,7 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
- <option value="璋冩嫧鐢宠鍗�" selected="selected">璋冩嫧鐢宠鍗�</option>
+ <option value="1243" selected="selected">璋冩嫧鐢宠鍗�</option>
<option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
</select>
@@ -354,7 +354,7 @@
var allVal;
//鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
- window.OptionData = {};
+ window.OptionData = [];
//#endregion
@@ -431,8 +431,8 @@
//#endregion
var rowdata = [{
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HRemark": "",
- "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "", "HQty": "", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HRemark": "",
+ "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
"HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
@@ -446,8 +446,8 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HRemark": "",
- "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "", "HQty": "", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HRemark": "",
+ "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
"HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
@@ -793,18 +793,19 @@
, "HEmpID": data[0]["HEmpID"]
, "HEmpName": data[0]["涓氬姟鍛�"]
- , "HWHID": data[0]["HWHID"]
- , "HWHName": data[0]["璋冨叆浠撳簱"]
- , "HSCWHID": data[0]["HWHID"]
- , "HSCWHName": data[0]["璋冨嚭浠撳簱"]
, "HSecManagerID": data[0]["HSecManagerID"]
, "HSecManagerName": data[0]["楠屾敹鍛�"]
, "HKeeperID": data[0]["HKeeperID"]
, "HKeeperName": data[0]["淇濈鍛�"]
-
- , "HDeptID": data[0]["HDeptID"]
, "HManagerID": data[0]["HManagerID"]
, "HMangerName": data[0]["涓荤"]
+
+ , "HWHID": data[0]["HWHID"]
+ , "HWHName": data[0]["璋冨叆浠撳簱"]
+ , "HSCWHID": data[0]["HSCWHID"]
+ , "HSCWHName": data[0]["璋冨嚭浠撳簱"]
+
+
, "HExplanation": data[0]["HExplanation"]
, "HInvoiceBillNo": data[0]["鍙戠エ缂栧彿"]
, "HProjectID": data[0]["HProjectID"]
@@ -860,23 +861,31 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- if ($("#HDeptName").val() == 0) {
- layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
-
- if ($("#HWHName").val() == 0) {
- layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HSCWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨嚭浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HKeeperID").val() == 0) {
- layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
if ($("#HSecManagerID").val() == 0) {
- layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("璇烽�夋嫨楠屾敹浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠撶鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HKeeperID ").val() == 0) {
+ layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
var num = [];
@@ -1159,6 +1168,7 @@
})
}
//#endregion
+
//#endregion
//琛屽唴蹇嵎閿瓫閫�
@@ -1199,9 +1209,9 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length>0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
- "HMaterID": OptionData.HMaterID
+ "HMaterID": OptionData.HItemID
, "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
@@ -1210,7 +1220,6 @@
})
OptionData = [];
}
-
}
});
}
@@ -1242,15 +1251,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
"HPropertyID": OptionData.HItemID
, "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
})
OptionData = [];
}
-
- }
+ }
})
}
//璁￠噺鍗曚綅
@@ -1263,7 +1271,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1286,8 +1294,8 @@
, end: function () {
if (OptionData.length > 0) {
obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ "HUnitID": OptionData[0].HItemID
+ , "璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
})
OptionData = [];
}
@@ -1324,15 +1332,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
"HWHID": OptionData.HItemID
, "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
})
OptionData = [];
}
-
- }
+ }
})
}
@@ -1365,14 +1372,13 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
"HSCWHID": OptionData.HItemID
, "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
})
OptionData = [];
}
-
}
})
}
@@ -1399,21 +1405,20 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HSPID": checkStatus.data[0].HItemID,
+ "HSPID": checkStatus.data[0].HMainID,
"浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
- "HSPID": OptionData.HItemID
+ "HSPID": OptionData.HMainID
, "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
})
- OptionData = [];
+ optiondata = [];
}
-
- }
+ }
})
}
@@ -1495,13 +1500,7 @@
function getSupType() {
var type = $("#HSourceBillType").val();
switch (type) {
- case '1102':
- return { url: "../../閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html", name: "閲囪喘璁㈠崟" };
- break;
- case '1103':
- return { url: "../../閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html", name: "鏀舵枡閫氱煡鍗�" };
- break;
- case '璋冩嫧鐢宠鍗�':
+ case '1243':
return { url: "../../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html", name: "璋冩嫧鐢宠鍗�" };
break;
}
@@ -1510,7 +1509,7 @@
//琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
- if ($("#HSourceBillType").val() == "璋冩嫧鐢宠鍗�") {
+ if ($("#HSourceBillType").val() == "1243") {
var url = getSupType().url;
url = encodeURI(url);
@@ -1568,49 +1567,31 @@
for (var i = 0; i < checkStatus.data.length; i++) {
ProcessNumber.push(checkStatus.data[i]);
}
+ $("#HEmpID").val(checkStatus.data[0]["HEmpID"]);
+ $("#HEmpName").val(checkStatus.data[0]["涓氬姟鍛�"]);
+ $("#HSecManagerID").val(checkStatus.data[0]["HSecManagerID"]);
+ $("#HSecManagerName").val(checkStatus.data[0]["楠屾敹鍛�"]);
+ $("#HKeeperID").val(checkStatus.data[0]["HKeeperID"]);
+ $("#HKeeperName").val(checkStatus.data[0]["淇濈鍛�"]);
+ $("#HManagerID").val(checkStatus.data[0]["HMangerID"]);
+ $("#HMangerName").val(checkStatus.data[0]["涓荤"]);
+ $("#HWHID").val(checkStatus.data[0]["HWHID"]);
+ $("#HWHName").val(checkStatus.data[0]["璋冨叆浠撳簱"]);
+ $("#HSCWHID").val(checkStatus.data[0]["HSCWHID"]);
+ $("#HSCWHName").val(checkStatus.data[0]["璋冨嚭浠撳簱"]);
//鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
var NowNum = 0;
NowNum = option.data.length;
- if (getSupType().name == "閲囪喘璁㈠崟") {
- var j = 0;
- for (var i = 0; i < checkStatus.data.length; i++) {
- option.data.push({
- "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
- "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅,
- "HQty": checkStatus.data[j].鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
- "HMoney": checkStatus.data[j].閲戦,
- "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
- })
- j++;
- }
- table.render(option);
- layer.close(index);
- }
- else if (getSupType().name == "鏀舵枡閫氱煡鍗�") {
- var j = 0;
- for (var i = 0; i < ProcessNumber.length; i++) {
- option.data.push({
- "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
- " ": 0, "鐗╂枡杈呭姪灞炴��": "", "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": "", "HQty": checkStatus.data[j].鏁伴噺, "HRemark": "",
- "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
- "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
- "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
- "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
- })
- j++;
- }
- table.render(option);
- layer.close(index);//鍏抽棴寮圭獥
- }
- else if (getSupType().name == "璋冩嫧鐢宠鍗�") {
+ if ($("#HSourceBillType").val() == "1243") {
var j = 0;
for (var i = 0; i < ProcessNumber.length; i++) {
option.data.push({
"HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
"HPropertyID": checkStatus.data[j].HPropertyID, "杈呭姪灞炴��": checkStatus.data[j].杈呭姪灞炴��, "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": checkStatus.data[j].搴旀敹鏁伴噺, "HQty": checkStatus.data[j].瀹炴敹鏁伴噺, "HRemark": checkStatus.data[j].琛ㄤ綋澶囨敞,
"HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "璋冨叆浠撳簱": checkStatus.data[j].璋冨叆浠撳簱, "HSCWHID": checkStatus.data[j].HSCWHID, "璋冨嚭浠撳簱": checkStatus.data[j].璋冨嚭浠撳簱,
+ "HSPID":"0", "浠撲綅鍚嶇О":"",
"HPOOrderInterID": checkStatus.data[j].HPOOrderInterID, "HPOOrderEntryID": checkStatus.data[j].HPOOrderEntryID, "HPOOrderBillNo": checkStatus.data[j].閲囪喘璁㈠崟鍙�,
"HSeOrderInterID": checkStatus.data[j].HSeOrderInterID, "HSeOrderEntryID": checkStatus.data[j].HSeOrderEntryID, "HSeOrderBillNo": checkStatus.data[j].閿�鍞鍗曞彿,
"HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillSubType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
@@ -1625,6 +1606,7 @@
});
});
+
//鍒ゆ柇鎵�閫夌潃涓庤〃鏍兼槸鍚︽湁閲嶅鏁版嵁
function checkDuplicateData(data) {
const duplicates = [];
@@ -1792,7 +1774,7 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
+ function GetAuxiliaryUnitValue(data) {
OptionData = data
}
@@ -1807,7 +1789,7 @@
}
//鍙屽嚮杩斿洖浠撲綅
- function GetGyStockPlace(data) {
+ function GetGyStockPlace(data) {
OptionData = data
}
//鍙屽嚮杩斿洖璋冨叆浠撳簱
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 5e54b38..efd33a2 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"
@@ -368,6 +368,7 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 160, sort: true }
, { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true, sort: true }
, { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200, sort: true }
, { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 160, sort: true }
@@ -490,28 +491,33 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Kf_MoveStockBill/DelteteGetMoveStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ if (data[0].鐘舵�� =="鍒涘缓") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Kf_MoveStockBill/DelteteGetMoveStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,涓嶈兘鍒犻櫎锛�');
+ }
+
})
}
else {
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_MoveStockRequestBillEdit.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_MoveStockRequestBillEdit.html"
index c52074b..0dbd8a8 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_MoveStockRequestBillEdit.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_MoveStockRequestBillEdit.html"
@@ -69,7 +69,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -83,7 +83,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <label class="layui-form-label">寰�鏉ュ崟浣�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -93,7 +93,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓氬姟鍛�</label>
+ <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -103,7 +103,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -115,7 +115,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨叆浠撳簱</label>
+ <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -125,7 +125,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -135,7 +135,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹</label>
+ <label class="layui-form-label">楠屾敹<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -147,7 +147,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�</label>
+ <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -157,7 +157,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -339,6 +339,27 @@
$("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撶畻鏂瑰紡
}
});
+ //椤甸潰鍒濆鍖栧姞杞�
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+
+ //鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鐨勯儴闂� 鑾峰彇 涓荤
+ if ($("#HDeptID").val() != 0) {
+ $.ajax({
+ url: GetWEBURL() + "Gy_Department/list",
+ async: false,
+ type: "GET",
+ data: {
+ "sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
+ },
+ success: function (result) {
+ $("#HMangerID").val(result.data[0].HEmpID);
+ $("#HMangerName").val(result.data[0].璐熻矗浜�);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
} else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HInterID").val(linterid);
RoadBillMain(linterid);
@@ -364,7 +385,7 @@
"HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HSecUnitRate": "0",
"HSecUnitID": "0", "杈呭姪璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
"HOutPrice": "0", "HOutMoney": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "",
- "HBASEUNITID": "0", "鍩烘湰璁￠噺鍗曚綅": "", "HEXTAUXUNITID": "", "杈呭崟浣�": "", "HRemark": ""
+ "HBASEUNITID": "0", "鍩烘湰璁￠噺鍗曚綅": "", "HEXTAUXUNITID": "0", "杈呭崟浣�": "", "HRemark": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -548,62 +569,61 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "/Cg_POOrderBill/cx",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/cx",
type: "GET",
data: {
"HInterID": linterid
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
+ var data = result.data;
allVal = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HSSDate": formatDate(data.缁撶畻鏃ユ湡)
- //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HAddress": data.浜よ揣鍦扮偣
- , "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.涓氬姟鍛�
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HManagerName": data.涓荤
- , "HManagerID": data.HManagerID
- , "HPSStyleID": data.HPSStyleID
- , "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HSSID": data.HSSID
- , "HSSName": data.缁撶畻鏂瑰紡
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HInnerBillNo": data.杈呭姪瀛楁
- , "HRemark": data.琛ㄥご澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HChecker": data.瀹℃牳浜�
- , "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": formatDate(data[0].鏃ユ湡)
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HDeptID": data[0].HDeptID
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].寰�鏉ュ崟浣�
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].涓氬姟鍛�
+ , "HMangerName": data[0].涓荤
+ , "HMangerID": data[0].HMangerID
+ , "HSecManagerName": data[0].楠屾敹鍛�
+ , "HSecManagerID": data[0].HSecManagerID
+ , "HKeeperName": data[0].淇濈鍛�
+ , "HKeeperID": data[0].HKeeperID
+
+ , "HWHID": data[0].涓昏皟鍏ヤ粨搴揑D
+ , "HWHName": data[0].涓昏皟鍏ヤ粨搴�
+ , "HSCWHID": data[0].涓昏皟鍑轰粨搴揑D
+ , "HSCWHName": data[0].涓昏皟鍑轰粨搴�
+
+ , "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡
+ , "HUpDateDate": data[0].淇敼鏃ユ湡
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡
});
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
- , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQty": data.鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
- , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
- , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd")
+ "HMaterID": data[i].HMaterID, "鐗╂枡浠ｇ爜": data[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿,
+ "HUnitID": data[i].HUnitID, "璁￠噺鍗曚綅": data[i].璁￠噺鍗曚綅, "HSecUnitRate": data[i].鎹㈢畻鐜�,
+ "HSecUnitID": data[i].HSecUnitID, "杈呭姪璁￠噺鍗曚綅": data[i].杈呭姪璁￠噺鍗曚綅
+ , "HQtyMust": data[i].搴旀敹鏁伴噺, "HQty": data[i].瀹炴敹鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+ , "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HOutPrice": data[i].璋冨嚭鍗曚环, "HOutMoney": data[i].璋冨嚭閲戦
+ , "HWHID": data[i].HWHID, "璋冨叆浠撳簱": data[i].璋冨叆浠撳簱, "HSCWHID": data[i].HSCWHID, "璋冨嚭浠撳簱": data[i].璋冨嚭浠撳簱,
+ "HBASEUNITID": data[i].HBASEUNITID, "鍩烘湰璁￠噺鍗曚綅": data[i].鍩烘湰璁￠噺鍗曚綅,
+ "HEXTAUXUNITID": data[i].HEXTAUXUNITID, "杈呭崟浣�": data[i].杈呭崟浣�
}
)
}
@@ -626,6 +646,43 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+
+ if (OperationType == undefined) {
+ OperationType = 1;
+ }
+
+ if ($("#HWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSCWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨璋冨嚭浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSecManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨楠屾敹浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠撶鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HKeeperID ").val() == 0) {
+ layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HDeptID").val() == 0) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -704,7 +761,7 @@
}
, end: function () {
obj.update({
- "HMaterID" :OptionData.HMaterID
+ "HMaterID": OptionData.HItemID
,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
@@ -722,7 +779,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -739,11 +796,14 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HUnitID": OptionData[0].HItemID
+ , "璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
}
})
}
@@ -757,7 +817,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -774,11 +834,14 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSecUnitID": OptionData.HItemID
- , "杈呭姪璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HSecUnitID": OptionData[0].HItemID
+ , "杈呭姪璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
}
})
}
@@ -862,7 +925,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -879,11 +942,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HBASEUNITID": OptionData.HItemID
- , "鍩烘湰璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HBASEUNITID": OptionData[0].HItemID
+ , "鍩烘湰璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -897,7 +964,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -914,11 +981,14 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HEXTAUXUNITID": OptionData.HItemID
- , "杈呭崟浣�": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HEXTAUXUNITID": OptionData[0].HItemID
+ , "杈呭崟浣�": OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
@@ -1168,12 +1238,30 @@
{
$("#HWHName").val(obj[0].浠撳簱鍚嶇О);
$("#HWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HWHID"] == 0) {
+ option.data[i]["HWHID"] = obj[0].HItemID;
+ option.data[i]["璋冨叆浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
}
function GetHSCWHValue(obj) //杩斿洖璋冨嚭浠撳簱
{
$("#HSCWHName").val(obj[0].浠撳簱鍚嶇О);
- $("#HSCWHID").val(obj[0].HItemID);
+ $("#HSCWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HSCWHID"] == 0) {
+ option.data[i]["HSCWHID"] = obj[0].HItemID;
+ option.data[i]["璋冨嚭浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
}
function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
@@ -1199,7 +1287,7 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
+ function GetAuxiliaryUnitValue(data) {
OptionData = data
}
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 ee82b3f..50fb08f 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"
@@ -117,12 +117,16 @@
<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" 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>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Faudit" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></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>
+ <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-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeAudit" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Close" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeClose" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Drop" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeDrop" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></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>
<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>
@@ -178,10 +182,37 @@
case 'btn-Add': set_AddNew();
break;
//缂栬緫
- case 'set_ShowBill': set_ShowBill();
+ case 'btn-Edit': set_ShowBill();
break;
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳鎸夐挳
+ 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 'set_CloseBill': set_CloseBill();
@@ -222,6 +253,12 @@
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+ //#endregion
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -405,37 +442,239 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
- 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();
- });
+ if (data[0].鐘舵�� == "鍒涘缓") {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ暟鎹笉鏄垱寤虹姸鎬�,涓嶈兘鍒犻櫎锛�');
+ }
+
})
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HDeptID = $("#HDeptID").val();//閮ㄩ棬
+ var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+ var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var Warehouse = $("#Warehouse").val();//浠撳簱
+ var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HDeptID) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+ }
+ if (MaterialCode) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
+ }
+ if (MaterialName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+ }
+ if (SpecificationModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ }
+ if (HSourceBillNo) {
+ sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ }
+ if (Warehouse) {
+ sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
+ }
+ if (Hmaker) {
+ sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HDeptID").val();//閮ㄩ棬
+ $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ $("#MaterialName").val();//鐗╂枡鍚嶇О
+ $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ $("#Warehouse").val();//浠撳簱
+ $("#Hmaker").val();//鍒跺崟浜�
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1243 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/AuditKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/CloseKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_MoveStockRequestBill/DropKf_MoveStockRequestBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
@@ -553,94 +792,6 @@
})
}
-
- // 蹇�熻繃婊�
- function get_FastQuery() {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- var HDeptID = $("#HDeptID").val();//閮ㄩ棬
- var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
- var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
- var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
- var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
- var Warehouse = $("#Warehouse").val();//浠撳簱
- var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
- }
- if (HDeptID) {
- sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
- }
- if (MaterialCode) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
- }
- if (MaterialName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
- }
- if (SpecificationModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
- }
- if (HSourceBillNo) {
- sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
- }
- if (Warehouse) {
- sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
- }
- if (Hmaker) {
- sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
- }
- get_Display(sWhere);
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- }
- // 閲嶇疆杩囨护鏉′欢
- function set_ClearQuery() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HBillNo").val("");//鍗曟嵁鍙�
- $("#HDeptID").val();//閮ㄩ棬
- $("#MaterialCode").val();//鐗╂枡浠ｇ爜
- $("#MaterialName").val();//鐗╂枡鍚嶇О
- $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
- $("#HSourceBillNo").val();//婧愬崟鍗曞彿
- $("#Warehouse").val();//浠撳簱
- $("#Hmaker").val();//鍒跺崟浜�
- sWhere = "";
- get_Display(sWhere);
- }
- //閲嶆柊鍚屾鎸夐挳
- function set_ResCnz() {
- var HBillno2 = $('#HBillno2').val();
- $.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
- type: "GET",
- data: { "HBillNo": HBillno2, "HBillType": 1243 },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
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_StepFoldinBillEdit.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_StepFoldinBillEdit.html"
index 8b37334..b83c602 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_StepFoldinBillEdit.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_StepFoldinBillEdit.html"
@@ -96,7 +96,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
+ <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -106,7 +106,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撶鍛�</label>
+ <label class="layui-form-label">浠撶鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -118,7 +118,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
+ <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -128,7 +128,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨叆浠撳簱</label>
+ <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -138,7 +138,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -150,7 +150,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹</label>
+ <label class="layui-form-label">楠屾敹<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -160,7 +160,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�</label>
+ <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -170,7 +170,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -311,7 +311,7 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
//鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
- window.OptionData = {};
+ window.OptionData = [];
//#endregion
@@ -552,6 +552,109 @@
table.render(option);
}
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ switch (field) {
+ case "HQty": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = value * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ /* table.render(option);*/
+ break;
+ case "HPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = value * 1;
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1;
+ var HPrice = (HMoney / HQty).toFixed(2); //鍗曚环=閲戦/鏁伴噺
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ table.render(option);
+ default:
+ }
+ });
+ //#endregion
+
//#region 鍔犺浇琛ㄥご
function RoadBillMain(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -564,70 +667,70 @@
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
+ var data = result.data;
allVal = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": formatDate(data[0].鏃ユ湡)
/*, "HSSDate": formatDate(data.缁撶畻鏃ユ湡)*/
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HAddress": data.浜よ揣鍦扮偣
- , "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.浠撶鍛�
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HWHID": data.HWHID
- , "HWHName": data.璋冨叆浠撳簱
- , "HSCWHID": data.HSCWHID
- , "HSCWHName": data.璋冨嚭浠撳簱
- , "HManagerName": data.璐熻矗浜�
- , "HManagerID": data.HManagerID
- , "HSecManagerID": data.HSecManagerID
- , "HSecManagerName": data.楠屾敹
- , "HKeeperID": data.HKeeperID
- , "HKeeperName": data.淇濈鍛�
- , "HPSStyleID": data.HPSStyleID
- , "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HSourceBillType": data.婧愬崟绫诲瀷
- , "HSSID": data.HSSID
- , "HSSName": data.缁撶畻鏂瑰紡
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HInnerBillNo": data.杈呭姪瀛楁
- , "HRemark": data.琛ㄥご澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HAddress": data[0].浜よ揣鍦扮偣
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HDeptID": data[0].HDeptID
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].渚涘簲鍟�
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].浠撶鍛�
+ , "HCurID": data[0].HCurID
+ , "HCurName": data[0].甯佸埆
+ , "HExRate": data[0].姹囩巼
+ , "HWHID": data[0].HWHID
+ , "HWHName": data[0].璋冨叆浠撳簱
+ , "HSCWHID": data[0].HSCWHID
+ , "HSCWHName": data[0].璋冨嚭浠撳簱
+ , "HManagerName": data[0].璐熻矗浜�
+ , "HManagerID": data[0].HManagerID
+ , "HSecManagerID": data[0].HSecManagerID
+ , "HSecManagerName": data[0].楠屾敹
+ , "HKeeperID": data[0].HKeeperID
+ , "HKeeperName": data[0].淇濈鍛�
+ , "HPSStyleID": data[0].HPSStyleID
+ , "HPSStyleName": data[0].閲囪喘鏂瑰紡
+ , "HSourceBillType": data[0].婧愬崟绫诲瀷
+ , "HSSID": data[0].HSSID
+ , "HSSName": data[0].缁撶畻鏂瑰紡
+ , "HLinkMan": data[0].鑱旂郴浜�
+ , "HLinkPhone": data[0].鑱旂郴鐢佃瘽
+ , "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡
+ , "HUpDater": data[0].淇敼浜�
+ , "HUpDateDate": data[0].淇敼鏃ユ湡
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡
+ , "HDeleteMan": data[0].浣滃簾浜�
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡
});
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
- , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQtyMust": data.搴旀敹鏁伴噺, "HQty": data.瀹炴敹鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HOrderPrice": data.閲囪喘閲戦, "HWHID": data.HWHID, "璋冨叆浠撳簱": data.璋冨叆浠撳簱, "HSCWHID": data.HSCWHID, "璋冨嚭浠撳簱": data.璋冨嚭浠撳簱, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
- , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
- , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd"), "HBatchNo": data.鎵规,
- "HSourceBillNo": data.婧愬崟鍗曞彿, //婧愬崟鍙�
- "HSourceBillType": data.婧愬崟绫诲瀷, //婧愬崟绫诲瀷
- "HSourceInterID": data.婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
- "HSourceEntryID": data.婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
+ "HMaterID": data[i].HMaterID, "鐗╂枡浠ｇ爜": data[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿, "HUnitID": data[i].HUnitID
+ , "璁￠噺鍗曚綅": data[i].璁￠噺鍗曚綅, "HQtyMust": data[i].搴旀敹鏁伴噺, "HQty": data[i].瀹炴敹鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+ , "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HOrderPrice": data[i].閲囪喘閲戦, "HWHID": data[i].HWHID, "璋冨叆浠撳簱": data[i].璋冨叆浠撳簱, "HSCWHID": data[i].HSCWHID, "璋冨嚭浠撳簱": data[i].璋冨嚭浠撳簱, "HTaxRate": data[i].绋庣巼
+ , "HTaxMoney": data[i].閲戦 * data[i].绋庣巼, "HlineTotal": data[i].閲戦 + data[i].绋庨, "HlineTotalBB": (data[i].閲戦 + data[i].绋庨) * data[i].姹囩巼
+ , "HTaxPrice": data[i].鍚◣鍗曚环, "HDiscountRate": data[i].鎶樻墸鐜�, "HRelTaxPrice": data[i].瀹為檯鍚◣鍗曚环
+ , "HDate": Format(new Date(data[i].浜よ揣鏃ユ湡), "yyyy-MM-dd"), "HBatchNo": data[i].鎵规,
+ "HSourceBillNo": data[i].婧愬崟鍗曞彿, //婧愬崟鍙�
+ "HSourceBillType": data[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
+ "HSourceInterID": data[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
+ "HSourceEntryID": data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
}
)
}
@@ -651,7 +754,30 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
-
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠撶鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSecManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HKeeperID").val() == 0) {
+ layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HDeptID").val() == 0) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
if ($("#HWHID").val() == 0) {
layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -670,24 +796,24 @@
}
}
- checkDuplicateData(num);
- const duplicateRows = checkDuplicateData(num);
- if (duplicateRows.length > 0) {
- let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
+ //checkDuplicateData(num);
+ //const duplicateRows = checkDuplicateData(num);
+ //if (duplicateRows.length > 0) {
+ // let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
- for (let i = 0; i < duplicateRows.length; i++) {
- const { row1, row2 } = duplicateRows[i];
- message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
+ // for (let i = 0; i < duplicateRows.length; i++) {
+ // const { row1, row2 } = duplicateRows[i];
+ // message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
- if (i !== duplicateRows.length - 1) {
- message += '锛�';
- }
- }
+ // if (i !== duplicateRows.length - 1) {
+ // message += '锛�';
+ // }
+ // }
- message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
- layer.alert(message);
- return;
- }
+ // message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
+ // layer.alert(message);
+ // return;
+ //}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
@@ -759,9 +885,9 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length>0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
- "HMaterID": OptionData.HMaterID
+ "HMaterID": OptionData.HItemID
, "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
@@ -770,6 +896,7 @@
})
OptionData = [];
}
+
}
})
@@ -784,7 +911,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -804,8 +931,8 @@
, end: function () {
if (OptionData.length > 0) {
obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ "HUnitID": OptionData[0].HItemID
+ , "璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
})
OptionData = [];
}
@@ -880,13 +1007,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
"HWHID": OptionData.HItemID
, "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
})
OptionData = [];
}
+
}
})
@@ -919,13 +1047,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
"HSCWHID": OptionData.HItemID
, "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
})
OptionData = [];
}
+
}
})
@@ -1399,7 +1528,7 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
+ function GetAuxiliaryUnitValue(data) {
OptionData = data
}
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 987cf05..9d74974 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"
@@ -267,6 +267,7 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true, hide: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 195, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 110, sort: true }
, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
@@ -412,31 +413,36 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Fb_StepFoldInBill/DeltetFb_StepFoldInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
- 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();
- });
+ if (data[0].鐘舵��=="鍒涘缓") {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Fb_StepFoldInBill/DeltetFb_StepFoldInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ暟鎹笉鏄垱寤虹姸鎬�,鏃犳硶鍒犻櫎锛�');
+ }
+
})
}
else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
index eecbc50..ba5aff3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
@@ -23,13 +23,9 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
</div>
-
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -37,7 +33,7 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
@@ -46,23 +42,49 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
+ <label class="layui-form-label">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" lay-verify="HName" id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍔╄鐮�</label>
+ <label class="layui-form-label" style="">椤圭洰绫诲埆<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HQCCheckClassList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">妫�楠岄」鐩被鍒�</label>
+ <label class="layui-form-label">鍒嗘瀽鏂规硶<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod">
+ <option value="1" selected="selected">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
- <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HQCCheckClassList" style="width:40px;">
+ <input type="text" name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnUnit" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶芥牱鏂规</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSampleSchemeName" id="HSampleSchemeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnSampleScheme" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -74,16 +96,96 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <label class="layui-form-label">缂洪櫡绛夌骇</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HDefectLevel" lay-filter="HDefectLevel" id="HDefectLevel">
+ <option value="1">鑷村懡缂洪櫡</option>
+ <option value="2">閲嶇己闄�</option>
+ <option value="3" selected="selected">杞荤己闄�</option>
+ </select>
</div>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" >
+ <div class="layui-inline">
+ <label class="layui-form-label">璐ㄩ噺鏍囧噯</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQualityStdName" id="HQualityStdName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HQualityStdID" id="HQualityStdID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnQualityStd" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妫�楠屾柟娉�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HInspectMethodName" id="HInspectMethodName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HInspectMethodID" id="HInspectMethodID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnInspectMethod" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妫�楠屼华鍣�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HInspectInstruMentName" id="HInspectInstruMentName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HInspectInstruMentID" id="HInspectInstruMentID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnInspectInstruMent" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妫�楠屼緷鎹�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HInspectBasisName" id="HInspectBasisName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HInspectBasisID" id="HInspectBasisID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnInspectBasis" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁绯荤粺棰勮</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HISsystemSet" id="HISsystemSet" lay-skin="primary" title="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect" lay-skin="primary" title="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐮村潖鎬ф楠�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HDestructInspect" id="HDestructInspect" lay-skin="primary" title="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
</div>
</div>
</div>
@@ -100,8 +202,9 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
-//鑾峰彇鍙傛暟
+ //鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -117,7 +220,7 @@
var hID = params[params[0]];//缂栬緫鏌ョ湅
var HType = params[params[1]]; //鍗曟嵁鐘舵�併�佸眰绾�
var TagParentId = params[params[2]]; //鐖剁骇ID
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -143,9 +246,10 @@
- form.on('submit(Cancel)', function () {
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
//sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
+ //parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
@@ -153,11 +257,20 @@
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+
+ if (!AllowLoadData()) {
+ return;
+ }
+
var ModRightNameAdd = 'Gy_QCCheckItem_Edit';
var user = sessionStorage["HUserName"];
var arr = new Array();
var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ data.field.HStopflag = isEndCheck;//
+
+ data.field.HISsystemSet = document.getElementById("HISsystemSet").checked;
+ data.field.HKeyInspect = document.getElementById("HKeyInspect").checked;
+ data.field.HDestructInspect = document.getElementById("HDestructInspect").checked;
hID = hID == "" ? 0 : hID;
data.field.HItemID = hID == "" ? 0 : hID;
@@ -237,28 +350,69 @@
if (HType == "Modify") {
$.ajax({
- url: GetWEBURL() + "/Gy_CheckItem/xg",
+ url: GetWEBURL() + "/Gy_CheckItem/xg_View",
//url: "http://localhost:12761/Gy_Department/xg",
type: "GET",
data: {
"HInterID": hID
},
success: function (d) {
- console.log(d);
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
+ $("#HNumber").val(d.data[0].妫�楠岄」鐩唬鐮�);
+ $("#HName").val(d.data[0].妫�楠岄」鐩悕绉�);
+ $("#HHelpCode").val(d.data[0].鍔╄鐮�);
$("#HQCCheckClassID").val(d.data[0].HQCCheckClassID);
- $("#HQCCheckClassName").val(d.data[0].HQCCheckClassName);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HDefaultResult").val(d.data[0].HDefaultResult);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ $("#HQCCheckClassName").val(d.data[0].妫�楠岄」鐩被鍒悕绉�);
+ $("#HRemark").val(d.data[0].澶囨敞);
+ $("#HDefaultResult").val(d.data[0].榛樿缁撹);
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
+
+ $("#HUnitName").val(d.data[0].鍗曚綅鍚嶇О);
+ $("#HUnitID").val(d.data[0].HUnitID);
+ $("#HSampleSchemeName").val(d.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSampleSchemeID").val(d.data[0].HSampleSchemeID);
+ $("#HQualityStdName").val(d.data[0].璐ㄩ噺鏍囧噯鍚嶇О);
+ $("#HQualityStdID").val(d.data[0].HQualityStdID);
+ $("#HInspectMethodName").val(d.data[0].妫�楠屾柟娉曞悕绉�);
+ $("#HInspectMethodID").val(d.data[0].HInspectMethodID);
+ $("#HInspectInstruMentName").val(d.data[0].妫�楠屼华鍣ㄥ悕绉�);
+ $("#HInspectInstruMentID").val(d.data[0].HInspectInstruMentID);
+ $("#HInspectBasisName").val(d.data[0].妫�楠屼緷鎹悕绉�);
+ $("#HInspectBasisID").val(d.data[0].HInspectBasisID);
+
+ switch (d.data[0].鍒嗘瀽鏂规硶) {
+ case "瀹氭�у垎鏋�":
+ d.data[0].鍒嗘瀽鏂规硶 = "1";
+ break;
+ case "瀹氶噺鍒嗘瀽":
+ d.data[0].鍒嗘瀽鏂规硶 = "2";
+ break;
+ case "鍏朵粬鍒嗘瀽":
+ d.data[0].鍒嗘瀽鏂规硶 = "3";
+ break;
+ }
+
+ switch (d.data[0].缂洪櫡绛夌骇) {
+ case "鑷村懡缂洪櫡":
+ d.data[0].缂洪櫡绛夌骇 = "1";
+ break;
+ case "閲嶇己闄�":
+ d.data[0].缂洪櫡绛夌骇 = "2";
+ break;
+ case "杞荤己闄�":
+ d.data[0].缂洪櫡绛夌骇 = "3";
+ break;
+ }
+ $("#HAnalysisMethod").val(d.data[0].鍒嗘瀽鏂规硶);
+ $("#HDefectLevel").val(d.data[0].缂洪櫡绛夌骇);
+
+ $("input[name='HISsystemSet']").prop("checked", d.data[0].鏄惁绯荤粺棰勮 == "1" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ $("input[name='HKeyInspect']").prop("checked", d.data[0].閲嶇偣妫�鏌� == "1" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ $("input[name='HDestructInspect']").prop("checked", d.data[0].鐮村潖鎬ф楠� == "1" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == "1" ? true : false);//true:閫変腑 false:涓嶉�変腑
+
+ form.render("select");
+ form.render("checkbox");
}
});
@@ -286,7 +440,7 @@
title: '妫�楠岄」鐩被鍒垪琛�',
closeBtn: 1,
shift: 2,
- area: ['100%', '100%'],
+ area: ['80%', '80%'],
maxmin: true,
content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
@@ -314,6 +468,262 @@
}
});
});
+
+ //璁￠噺鍗曚綅寮圭獥
+ form.on('submit(HbtnUnit)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁￠噺鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HUnitID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鎶芥牱鏂规寮圭獥
+ form.on('submit(HbtnSampleScheme)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //璐ㄩ噺鏍囧噯寮圭獥
+ form.on('submit(HbtnQualityStd)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ㄩ噺鏍囧噯鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQualityStdName").val(checkStatus.data[0].璐ㄩ噺鏍囧噯鍚嶇О);
+ $("#HQualityStdID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //妫�楠屾柟娉曞脊绐�
+ form.on('submit(HbtnInspectMethod)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟娉曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HInspectMethodName").val(checkStatus.data[0].妫�楠屾柟娉曞悕绉�);
+ $("#HInspectMethodID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //妫�楠屼华鍣ㄥ脊绐�
+ form.on('submit(HbtnInspectInstruMent)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼华鍣ㄥ垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HInspectInstruMentName").val(checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�);
+ $("#HInspectInstruMentID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //妫�楠屼緷鎹脊绐�
+ form.on('submit(HbtnInspectBasis)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼緷鎹垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectBasis.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HInspectBasisName").val(checkStatus.data[0].妫�楠屼緷鎹悕绉�);
+ $("#HInspectBasisID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var HQCCheckClassID = $("#HQCCheckClassID").val();
+ var HAnalysisMethod = $("#HAnalysisMethod").val();
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+ return false;
+ }
+ if (HQCCheckClassID == null || HQCCheckClassID == undefined || HQCCheckClassID == "0") {
+
+ layer.msg("璇烽�夋嫨椤圭洰绫诲埆锛�", { icon: 5 });
+ return false;
+ }
+ if (HAnalysisMethod == null || HAnalysisMethod == undefined || HAnalysisMethod == "") {
+ layer.msg("璇烽�夋嫨鍒嗘瀽鏂规硶锛�", { icon: 5 });
+ return false;
+ }
+ return true;
+ }
});
function GetQCCheckClassValue(obj) { //妫�楠岄」鐩被鍒�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index ff9bbef..30fb65c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -228,6 +228,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">涓�娆″悎鏍�<br/>鐜囨爣鍑嗗��</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HOnceRightRate" id="HOnceRightRate" autocomplete="off" onfocus="this.select();" value="0" style="margin-top:10px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label"> 鐧藉澂瑕佹眰锛�</label>
<div class="layui-input-inline ">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
@@ -634,6 +640,9 @@
, upload = layui.upload
, colorpicker = layui.colorpicker
+ //鍏敤瀛楁
+ var ref = /^[0-9]+\.?[0-9]*$/;
+
//鍒濆鍖栫晫闈�
@@ -643,32 +652,37 @@
$("#HItemID").val(0);
get_ReadConfigFile();
- // 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
+ // 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
document.getElementById('testList').addEventListener('click', function () {
- // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
+ // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
document.getElementById('HNumber').click();
+ if ($("#HNumber").val() == "" || $("#HNumber").val() == null || $("#HNumber").val() == undefined) {
+ layer.msg('璇峰厛杈撳叆鐗╂枡浠ｇ爜绛変俊鎭悗鍦ㄤ笂浼犲浘鐗囷紒', { time: 3 * 1000, icon: 3 });
+ }
});
- // 鐩戝惉鏂囦欢杈撳叆妗嗙殑change浜嬩欢
+ // 鐩戝惉鏂囦欢杈撳叆妗嗙殑change浜嬩欢
document.getElementById('HNumber').addEventListener('change', function () {
var inputHNumber = document.getElementById('HNumber');
- var hNumberValue = inputHNumber.value.trim(); // 鑾峰彇鏂囨湰妗嗙殑鐗╂枡浠ｇ爜鍊煎苟鍘婚櫎鍓嶅悗绌烘牸
+ var hNumberValue = inputHNumber.value.trim(); // 鑾峰彇鏂囨湰妗嗙殑鐗╂枡浠ｇ爜鍊煎苟鍘婚櫎鍓嶅悗绌烘牸
if (hNumberValue == '') {
- // 鐗╂枡浠ｇ爜涓虹┖锛岀粰鍑烘彁绀哄苟娓呴櫎宸查�夋嫨鐨勬枃浠�
+ // 鐗╂枡浠ｇ爜涓虹┖锛岀粰鍑烘彁绀哄苟娓呴櫎宸查�夋嫨鐨勬枃浠�
layer.msg("鐗╂枡浠ｇ爜涓虹┖,鏃犳硶杩涜鍥剧墖涓婁紶");
this.value = '';
} else {
- // 鐗╂枡浠ｇ爜涓嶄负绌猴紝璋冪敤鏂囦欢涓婁紶鏂规硶骞朵紶鍏ユ枃浠跺垪琛ㄥ拰鐗╂枡浠ｇ爜
+ // 鐗╂枡浠ｇ爜涓嶄负绌猴紝璋冪敤鏂囦欢涓婁紶鏂规硶骞朵紶鍏ユ枃浠跺垪琛ㄥ拰鐗╂枡浠ｇ爜
PicUpload();
}
});
-
+
}
- else if (OperationType==2){
+ else if (OperationType == 2) {
//淇敼鏃朵富琛↖D
RoadBillMain(hID);
$("#HItemID").val(0);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
}
else if (OperationType == 3) {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
$("#HItemID").val(hID);
@@ -772,6 +786,16 @@
//閫夋嫨宸℃妫�楠屾柟妗堟寜閽�
form.on('submit(HQCSchemeID_Patrol-BT)', function () {
get_checkHQCSchemeID_Patrol();
+ });
+
+ //鐩戝惉涓�娆″悎鏍肩巼鏍囧噯鍊�
+ $("#HOnceRightRate").blur(function (data) {
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ var value = $("#HOnceRightRate").val();
+ if (!ref.test(value)) {
+ layer.msg("涓�娆″悎鏍肩巼鏍囧噯鍊硷紝璇疯緭鍏�0-9姝ｇ‘鏁板��", { time: 3000, });
+ $("#HOnceRightRate").val("0");
+ }
});
//閫夋嫨棰滆壊
@@ -905,6 +929,7 @@
, "HFootPrice": data.缁撶畻浠�
, "HTaxCost": data.鍚◣鎴愭湰浠�
, "HNoTaxCost": data.涓嶅惈绋庢垚鏈环
+ , "HOnceRightRate": data.涓�娆″悎鏍肩巼鏍囧噯鍊�
});
colorpicker.render({
@@ -1168,6 +1193,11 @@
}
}
+ if (!ref.test($("#HOnceRightRate").val())) {
+ layer.msg("涓�娆″悎鏍肩巼鏍囧噯鍊硷紝璇疯緭鍏�0-9姝ｇ‘鏁板瓧", { time: 3000, });
+ return;
+ }
+
//if ($("#HUnitGroupName").val() == 0) {
// layer.msg("璇烽�夋嫨璁￠噺鍗曚綅缁勶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
@@ -1222,7 +1252,7 @@
$("#HItemID").val(0);
$('#HNumber').val('');
$('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);
- });
+ });
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -1574,7 +1604,7 @@
function set_ClearBill() {
}
-
+
//#region 鏂囦欢涓婁紶
function PicUpload() {
@@ -1769,10 +1799,10 @@
area: ['80%', '80%'],
shadeClose: true,
scrollbar: false,
- title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
- content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
+ title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
+ content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
cancel: function () {
- //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
+ //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
}
});
}
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/Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
index 83438a1..7e90b71 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
@@ -37,16 +37,7 @@
<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 style="padding: 10px;">
- <!--<div class="layui-col-xs2">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
-
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- </div>
+ <div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
@@ -105,15 +96,12 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></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-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
</div>
</script>
</form>
@@ -212,6 +200,14 @@
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
break;
};
});
@@ -403,7 +399,7 @@
title: '鏂板妫�楠岄」鐩�',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['100%', '100%'],
maxmin: true,
content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + TagId + '&Level=' + Level+''],
end: function () {
@@ -524,7 +520,7 @@
if (TagId != "") {
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['100%', '100%']
, title: '缂栬緫妫�楠岄」鐩�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
@@ -550,7 +546,7 @@
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['100%', '100%']
, title: '缂栬緫妫�楠岄」鐩�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
@@ -595,6 +591,42 @@
})
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_CheckItem/AuditGy_CheckItem", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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/Gy_StockPlace_List.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
index a52fdef..8ef2069 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
@@ -167,15 +167,15 @@
//#endregion
- //#region 鍙屽嚮杩斿洖鏁版嵁
- table.on('rowDouble(mainTable)', function (obj) {
- var data = [];
- data.push(obj.data);
- parent.GetStockPlaceValue(data);
- var index = parent.layer.getFrameIndex(window.name);
- parent.layer.close(index);
- });
- //#endregion
+ ////#region 鍙屽嚮杩斿洖鏁版嵁
+ //table.on('rowDouble(mainTable)', function (obj) {
+ // var data = [];
+ // data.push(obj.data);
+ // parent.GetStockPlaceValue(data);
+ // var index = parent.layer.getFrameIndex(window.name);
+ // parent.layer.close(index);
+ //});
+ ////#endregion
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
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_Xs_SeOrderBill.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_Xs_SeOrderBill.aspx"
index d10a2b0..7dc31d8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Xs_SeOrderBill.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_Xs_SeOrderBill.aspx"
@@ -15,7 +15,7 @@
//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_IF_SeOrderBillList where hmainid=" + Request.Params["linterid"]);
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_SeOrderBillList where hmainid=" + Request.Params["linterid"] + " order by hsubid asc");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckEdit.html"
index e13c352..4edd8fd 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckEdit.html"
@@ -29,12 +29,9 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
</div>
-
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -64,6 +61,18 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐐规椤圭洰<br />鍒嗙被</label>
+ <div class="layui-input-inline" style="margin-top:10px;">
+ <input type="text" readonly name="HDotCheckItemClassName" id="HDotCheckItemClassName" class="layui-input" value="" style="float: left; width: 150px;">
+ <input type="hidden" name="HDotCheckItemClassID" id="HDotCheckItemClassID" class="layui-input" value="0" style="float:left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDotCheckItemClass" id="btnHDotCheckItemClass" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -125,12 +134,14 @@
success: function (d) {
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HLevel").val(d.data[0].HLevel);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+ $("#HNumber").val(d.data[0].鐐规椤圭洰浠ｇ爜);
+ $("#HName").val(d.data[0].鐐规椤圭洰鍚嶇О);
+ $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+ $("#HRemark").val(d.data[0].澶囨敞);
+ $("#HLevel").val(d.data[0].绛夌骇);
+ $("#HDotCheckItemClassID").val(d.data[0].HDotCheckItemClassID);
+ $("#HDotCheckItemClassName").val(d.data[0].鐐规椤圭洰鍒嗙被鍚嶇О);
+ $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
//table.reload(layTableId, {
@@ -142,7 +153,7 @@
}
//#region 宸ュ叿鎸夐挳
-
+
//閫�鍑烘寜閽�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
@@ -161,7 +172,7 @@
var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + user +';' + linterid ;
+ var sMainSub = oMain + ';' + user + ';' + linterid;
if (OperationType == 3) {
//淇敼
@@ -228,6 +239,34 @@
//#endregion
+ //鐐规椤圭洰鍒嗙被
+ form.on('submit(btnHDotCheckItemClass)', function () {//
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']//澶у皬
+ , title: '鐐规椤圭洰鍒嗙被鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDotCheckItemClassName").val(checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О);
+ $("#HDotCheckItemClassID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassEdit.html"
new file mode 100644
index 0000000..bce76e2
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassEdit.html"
@@ -0,0 +1,194 @@
+锘�<!DOCTYPE html>
+<html>
+<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/treeTable.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/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+ </div>
+
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ debugger;
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+ 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;
+ //#endregion
+ //甯歌鐢ㄦ硶
+
+
+ if (OperationType == 3) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_DotCheckItemClass/EditDotCheckItemClass",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (d) {
+ ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+ $("#HNumber").val(d.data[0].鐐规椤圭洰鍒嗙被浠ｇ爜);
+ $("#HName").val(d.data[0].鐐规椤圭洰鍒嗙被鍚嶇О);
+ $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+ $("#HRemark").val(d.data[0].澶囨敞);
+ $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+ }
+ });
+ }
+
+ //#region 宸ュ叿鎸夐挳
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ })
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+ var user = sessionStorage["HUserName"];
+ var isEndCheck = document.getElementById("HStopflag").checked;
+ data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+ data.field.HItemID = linterid == "" ? 0 : linterid;
+
+ var oMain = JSON.stringify(data.field)
+
+ var sMainSub = oMain + ';' + user + ';' + sessionStorage["OrganizationID"] + ';' + OperationType ;
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_DotCheckItemClass/SaveGy_DotCheckItemClassList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+
+ //#endregion
+
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html"
new file mode 100644
index 0000000..4da0044
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html"
@@ -0,0 +1,652 @@
+锘�<!DOCTYPE html>
+<html>
+<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/treeTable.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/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+ </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" style="width: 85px;">浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+
+ var TagId = "";
+ var TagParentId = "";
+ var Level = "1";
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Gy_DotCheckItemClassList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID"];
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒濆鍖栬〃鏍�
+ set_ClearBill();
+ //#endregion
+
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': set_ClearQuery();
+ break;
+ //娴忚
+ case 'btn-view':
+ get_ViewReport();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ 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 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ var index = parent.layer.getFrameIndex(window.name);
+ var data = obj.data;
+ //杩斿洖鏂规硶
+ parent.GetDotCheckListValue(data);
+ parent.layer.close(index);
+ })
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //浠ｇ爜鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍚嶇О鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍒濆鍖栬〃鏍�
+
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+
+ //#region鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_DotCheckItemClass/GetDotCheckItemClassList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙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' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HNumber) {
+ sWhere += " and 鐐规椤圭洰鍒嗙被浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 鐐规椤圭洰鍒嗙被鍚嶇О like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 宸ュ叿鏍忎簨浠�
+ //鏂板
+ function set_AddNew() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鐐规椤圭洰鍒嗙被',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: ['../鍩虹璧勬枡/Gy_DotCheckItemClassEdit.html?OperationType=1&linterid=&HSouceBillType='],
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+
+ }
+
+ //淇敼鎸夐挳
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐐规椤圭洰鍒嗙被'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_DotCheckItemClassEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ };
+
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , yes: function (index, layero) {
+ $.ajax({
+ url: GetWEBURL() + '/Gy_DotCheckItemClass/DeleteDotCheckItemClass',
+ type: "GET",
+ data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ //閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ };
+
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").click();
+ }
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_DotCheckItemClass/AuditGy_DotCheckItemClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodEdit.html"
new file mode 100644
index 0000000..14ee784
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodEdit.html"
@@ -0,0 +1,194 @@
+锘�<!DOCTYPE html>
+<html>
+<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/treeTable.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/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+ </div>
+
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ debugger;
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+ 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;
+ //#endregion
+ //甯歌鐢ㄦ硶
+
+
+ if (OperationType == 3) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_DotCheckItemMethod/EditDotCheckItemMethod",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (d) {
+ ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+ $("#HNumber").val(d.data[0].鐐规鏂规硶浠ｇ爜);
+ $("#HName").val(d.data[0].鐐规鏂规硶鍚嶇О);
+ $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+ $("#HRemark").val(d.data[0].澶囨敞);
+ $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+ }
+ });
+ }
+
+ //#region 宸ュ叿鎸夐挳
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ })
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+ var user = sessionStorage["HUserName"];
+ var isEndCheck = document.getElementById("HStopflag").checked;
+ data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+ data.field.HItemID = linterid == "" ? 0 : linterid;
+
+ var oMain = JSON.stringify(data.field)
+
+ var sMainSub = oMain + ';' + user + ';' + sessionStorage["OrganizationID"] + ';' + OperationType;
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_DotCheckItemMethod/SaveGy_DotCheckItemMethodList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+
+ //#endregion
+
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html"
new file mode 100644
index 0000000..b005af9
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html"
@@ -0,0 +1,666 @@
+锘�<!DOCTYPE html>
+<html>
+<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/treeTable.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/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+ </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" style="width: 85px;">浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+
+ var TagId = "";
+ var TagParentId = "";
+ var Level = "1";
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Gy_DotCheckItemMethodList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID"];
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒濆鍖栬〃鏍�
+ set_ClearBill();
+ //#endregion
+
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': set_ClearQuery();
+ break;
+ //娴忚
+ case 'btn-view':
+ get_ViewReport();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(2);
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ 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 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ var index = parent.layer.getFrameIndex(window.name);
+ var data = obj.data;
+ //杩斿洖鏂规硶
+ parent.GetDotCheckListValue(data);
+ parent.layer.close(index);
+ })
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //浠ｇ爜鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍚嶇О鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍒濆鍖栬〃鏍�
+
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+
+ //#region鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_DotCheckItemMethod/GetDotCheckItemMethodList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙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' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HNumber) {
+ sWhere += " and 鐐规鏂规硶浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 鐐规鏂规硶鍚嶇О like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 宸ュ叿鏍忎簨浠�
+ //鏂板
+ function set_AddNew() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鐐规鏂规硶',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: ['../鍩虹璧勬枡/Gy_DotCheckItemMethodEdit.html?OperationType=1&linterid=&HSouceBillType='],
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+
+ }
+
+ //淇敼鎸夐挳
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐐规鏂规硶'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_DotCheckItemMethodEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ };
+
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , yes: function (index, layero) {
+ $.ajax({
+ url: GetWEBURL() + '/Gy_DotCheckItemMethod/DeleteDotCheckItemMethod',
+ type: "GET",
+ data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ //閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ };
+
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").click();
+ }
+
+ //棰勮
+ function get_ViewReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDotCheck&OpenTmp=鐐规椤圭洰");
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_DotCheckItemMethod/AuditGy_DotCheckItemMethod", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
index 8e2bada..3e54945 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
@@ -273,6 +273,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
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' });
@@ -393,7 +398,7 @@
title: '鏂板鐐规椤圭洰',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['100%', '100%'],
maxmin: true,
content: ['../鍩虹璧勬枡/Gy_DotCheckEdit.html?OperationType=1&linterid=&HSouceBillType='],
end: function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
index 230a5b5..0bc4b20 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
@@ -232,6 +232,8 @@
var HModName = "Gy_SOPBillEdit";
var arr = [];
var HEntryID = 1;
+ var trindex = -1; //榛樿閫変腑琛屼笅鏍�
+ var checkobj = ""; //澶嶉�夋
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -273,16 +275,29 @@
//琛岀洃鍚簨浠�
table.on('row(mainTable)', function (obj) {
+ //绉婚櫎閫夋嫨鏂囦欢鎸夐挳
$("#ChoseFile").remove();
HEntryID = Number($(obj.tr).attr("data-index")) + Number(1);
//submitbtngroup 杩欎釜鏄笂浼犳寜閽殑鐖惰妭鐐� 鍔ㄦ�佹坊鍔犱笂浼犳寜閽� 瑙ｅ喅涓婁紶涓�娆′箣鍚巆hoose鏂规硶涓嶆墽琛岀殑bug
$("#submitbtngroup").append('<button type = "button" class="layui-btn layui-btn-primary" lay-submit lay-filter="ChoseFile" id="ChoseFile" style="color:#232389;background-color:#D4D2CF">閫夋嫨鏂囦欢</button>');
+
+ if (trindex != -1) {
+ $("tr[data-index = " + (trindex) + "] ").removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $("tr[data-index = " + (trindex) + "] ").attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ trindex = -1;
+ }
+ if (checkobj != "") {
+ checkobj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ checkobj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(checkobj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ checkobj = obj;
} else {
obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
@@ -291,8 +306,13 @@
layui.each(table.cache.mainTable, function (i, l) {
if (obj.tr.index() == l.LAY_TABLE_INDEX) {
l.LAY_CHECKED = flag;
+ } else {
+ l.LAY_CHECKED = false;
}
});
+
+ trindex = Number($(obj.tr).attr("data-index"));
+
PicUpload();
});
//#endregion
@@ -448,22 +468,22 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
- //if (HMaterNumber == "") {
- // layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (HUnitName == "") {
- // layer.msg("鍗曚綅娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (option.data[0].娴佹按鍙� == "" && option.data[0].宸ュ簭浠ｇ爜 == "" && option.data[0].宸ュ簭 == "" && option.data[0].宸ヤ綅 == "" && option.data[0].宸ヤ綅浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績 == "" && option.data[0].澶囨敞 == "") {
- // layer.msg("娌℃湁鏄庣粏琛�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (option.data[0].宸ヤ綔涓績 == "") {
- // layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
+ if (HMaterNumber == "") {
+ layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (HUnitName == "") {
+ layer.msg("鍗曚綅娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (option.data[0].娴佹按鍙� == "" && option.data[0].宸ュ簭浠ｇ爜 == "" && option.data[0].宸ュ簭 == "" && option.data[0].宸ヤ綅 == "" && option.data[0].宸ヤ綅浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績 == "" && option.data[0].澶囨敞 == "") {
+ layer.msg("娌℃湁鏄庣粏琛�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (option.data[0].宸ヤ綔涓績 == "") {
+ layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
$.ajax({
url: GetWEBURL() + '/Gy_SOPBill/Save',
type: "POST",
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
index 42c0452..fc5c194 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillEdit.html"
@@ -224,7 +224,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -368,6 +368,10 @@
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckItemNumber', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: 'HDotCheckItemNumber' }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰' }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -396,7 +400,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿
@@ -421,7 +425,7 @@
function set_EditFromGrid(linterid) {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItemNumber": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
}
//缂栬緫鑾峰彇琛ㄥご
@@ -469,9 +473,15 @@
type: "GET",
data: { "HInterID": linterid },
success: function (result) {
- console.log(result);
if (result.count == 1) {
- option.data = result.list[0];
+ var data = result.data;
+ var subarr = [];
+
+ for (var i = 0; i < data.length; i++) {
+ subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItemNumber": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+ }
+
+ option.data = subarr;
table.render(option);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -578,6 +588,8 @@
HDotCheckItemID: checkStatus.data[0].HItemID,
HDotCheckItemNumber: checkStatus.data[0].鐐规椤圭洰浠ｇ爜,
HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -629,6 +641,73 @@
}
});
}
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
obj.event = "";
return false;
}
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_MouldFile.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_MouldFile.html"
index e0fe612..81b9bc3 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_MouldFile.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_MouldFile.html"
@@ -1521,7 +1521,7 @@
$("#HWHID").val(obj[0].HItemID);
}
- function GetStockPlaceValue(obj) { //浠撲綅
+ function GetGyStockPlace(obj) { //浠撲綅
$("#HSPName").val(obj[0].浠撲綅鍚嶇О);
$("#HSPID").val(obj[0].HMainID);
}
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/Sc_Add_MouldDotCheckPlanBillList.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/Sc_Add_MouldDotCheckPlanBillList.html"
index bb2d9c0..f4131e8 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/Sc_Add_MouldDotCheckPlanBillList.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/Sc_Add_MouldDotCheckPlanBillList.html"
@@ -296,7 +296,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
switch (obj.event) {
//澧炲姞涓�琛�
case 'btn-AddLine': set_AddLine(NewRow);
@@ -398,6 +398,10 @@
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "HDotCheckCode" }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -431,21 +435,21 @@
success: function (result) {
if (result != null) {
if (result.count == 1) {
- var BYData = result.list[0];//鐐规
+ var DJData = result.list[0];//鐐规
var PJData = result.list[1];//閰嶄欢
var rowdate1 = layui.table.cache["mainTable"];
var rowdate2 = layui.table.cache["mainTable1"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
- if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
+ if (DJData.length != 0) //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
{
buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < BYData.length; i++) {
+ for (var i = 0; i < DJData.length; i++) {
var checkrow = {
- "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
- "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerCode": BYData[i].HManagerNumber,
- "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark
+ "HDotCheckItemID": DJData[i].鐐规椤圭洰ID, "HDotCheckItem": DJData[i].鐐规椤圭洰, "HDotCheckPart": DJData[i].鐐规閮ㄤ綅,
+ "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].璐熻矗浜篒D, "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": DJData[i].璐熻矗浜哄悕绉�, "HRemark": DJData[i].瀛愬娉�, "HDotCheckItemClassID": DJData[i].HDotCheckItemClassID, "HDotCheckItemClassName": DJData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": DJData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": DJData[i].鐐规鏂规硶鍚嶇О
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -466,7 +470,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -494,7 +498,7 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
}
//缂栬緫鍔犺浇琛ㄥご
@@ -544,9 +548,14 @@
type: "GET",
data: { "sqlWhere": "and HInterID=" + linterid },
success: function (result) {
- //console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.list[0];
+ var data = result.data;
+ var subarr = [];
+ for (var i = 0; i < data.length; i++) {
+ subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": "", "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浠ｇ爜, "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+ }
+
+ option.data = subarr;
table.render(option);
} else {
@@ -654,7 +663,9 @@
obj.update({
HDotCheckItemID: checkStatus.data[0].HItemID,
HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠ｇ爜,
- HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
+ HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -702,6 +713,73 @@
}
});
}
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
obj.event = "";
return false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 457afb3..9c6fd30 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -700,6 +700,9 @@
, { field: 'HWidth', title: '闂ㄥ箙', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
, { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true, sort: true, totalRow: true }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', totalRow: true, sort: true, totalRow: true }
+ , { field: '鐢熶骇鍏ュ簱鏁伴噺', title: '鐢熶骇鍏ュ簱鏁伴噺', totalRow: true, sort: true, totalRow: true }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺', totalRow: true, sort: true, totalRow: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
, { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true }
, { field: '鏄惁鍙栧簱瀛�', title: '鏄惁鍙栧簱瀛�', sort: true }
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index 8b3a19e..dd2cca3 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -302,7 +302,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width:110px;">瀵瑰簲CLOUD瀵嗙爜</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCloudUserPsd" id="HCloudUserPsd">
+ <input type="password" class="layui-input" name="HCloudUserPsd" id="HCloudUserPsd">
</div>
</div>
</div>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index 6b58107..a3748fe 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 36484ee..8025c14 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 95px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 9b8fe05..bdaab34 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 71cf943..2cafb20 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -13,7 +13,7 @@
<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/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 95px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index c3e7b18..0baafeb 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -225,7 +225,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
switch (obj.event) {
//澧炲姞涓�琛�
case 'btn-AddLine': set_AddLine(NewRow);
@@ -392,6 +392,10 @@
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode" }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -445,7 +449,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -472,7 +476,7 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
@@ -493,7 +497,7 @@
if (result.count == 1) {
var DJData = result.data;//鐐规
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
if (DJData.length != 0) //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
@@ -503,7 +507,7 @@
var checkrow = {
"HDotCheckItemID": DJData[i].鐐规椤圭洰ID, "HDotCheckCode": DJData[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": DJData[i].鐐规椤圭洰, "HDotCheckPart": DJData[i].鐐规閮ㄤ綅,
"HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].璐熻矗浜篒D, "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�,
- "HManagerName": DJData[i].璐熻矗浜�, "HRemark": DJData[i].瀛愬娉�
+ "HManagerName": DJData[i].璐熻矗浜�, "HRemark": DJData[i].瀛愬娉�, "HDotCheckItemClassID": DJData[i].HDotCheckItemClassID, "HDotCheckItemClassName": DJData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -566,11 +570,15 @@
url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
- success: function (result) {
- console.log(result);
- //console.log('gouba' + result);
+ success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+ var data = result.data;
+ var subarr = [];
+ for (var i = 0; i < data.length; i++) {
+ subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+ }
+
+ option.data = subarr;
table.render(option);
} else {
@@ -708,6 +716,8 @@
HDotCheckItemID: checkStatus.data[0].HItemID,
HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠ｇ爜,
+ HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
//HDotCheckPart: checkStatus.data[0].鐐规閮ㄤ綅
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -723,7 +733,7 @@
}
//灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
for (var i = 0; i < checkStatus.data.length; i++) {
- buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" });
+ buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" });
}
table.reload("mainTable", {
@@ -777,6 +787,74 @@
}
});
}
+
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
obj.event = "";
return false;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 6e7f173..e51039e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 42738a6..087fb75 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index 24b8aaa..36fb1bc 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -204,7 +204,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -269,7 +269,9 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HDotCheckItemID: checkStatus.data[0].HItemID,
- HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
+ HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
} else {
@@ -284,7 +286,7 @@
}
//灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
for (var i = 0; i < checkStatus.data.length; i++) {
- buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" });
+ buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0,"HDotCheckItemMethodName":""});
}
table.reload("mainTable", {
@@ -355,6 +357,74 @@
}
});
}
+
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
obj.event = "";
return false;
@@ -378,6 +448,10 @@
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem' }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -406,7 +480,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿
@@ -460,7 +534,7 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
}
@@ -508,7 +582,7 @@
var data = result.data;
var rowarr = [];
for (var i = 0; i < result.data.length; i++) {
- rowarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].瀛愬娉� });
+ rowarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].瀛愬娉�, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
}
option.data = rowarr;
table.render(option);
@@ -596,7 +670,7 @@
//璐ｄ换浜�
function GetHManagerValue(obj) {
OptionData = obj;
- }
+ }
</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/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
index 9955767..bd2db11 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
@@ -33,14 +33,14 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">浠ｇ爜锛�</label>
+ <label class="layui-form-label" style="width: 120px">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+ <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
@@ -144,35 +144,36 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
+ if (AllowLoadData()) {
+ var isEndCheck = document.getElementById("HStopflag").checked;
+ isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
- var isEndCheck = document.getElementById("HStopflag").checked;
- isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveGy_ErrMsgBackType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
- var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "SaveGy_ErrMsgBackType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainStr },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
}
- else {
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
+ });
+ }
});
//閫�鍑�
form.on('submit(Exit)', function (data) {//
@@ -231,12 +232,12 @@
$("#HNumber").val(data.寮傚父鍙嶉绫诲瀷浠ｇ爜);//浠ｇ爜
$("#HName").val(data.寮傚父鍙嶉绫诲瀷鍚嶇О);//鍚嶇О
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
- $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+ $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
$("#HRemark").val(data.澶囨敞);//澶囨敞
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-
+ form.render("select");
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -246,6 +247,22 @@
});
}
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ var HNumber = $("#HNumber").val() //浠ｇ爜
+ var HName = $("#HName").val() //鍚嶇О
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+ return false;
+ }
+ return true;
+ }
+
//
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html"
index dfa04f5..d35e0a0 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html"
@@ -10,7 +10,6 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -18,12 +17,9 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
</div>
-
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -32,14 +28,14 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">浠ｇ爜锛�</label>
+ <label class="layui-form-label" style="width: 120px">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+ <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
@@ -77,12 +73,6 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
- </div>
- </div>
- <div class="layui-form-item">
<div class="layui-col-xs11">
<label class="layui-form-label"> 澶囨敞锛�</label>
<div class="layui-input-block">
@@ -90,6 +80,12 @@
<input type="hidden" class="layui-input" name="HOrgID" id="HOrgID" autocomplete="off">
<input type="hidden" class="layui-input" name="HMakeEmp" id="HMakeEmp" autocomplete="off">
</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
</div>
</div>
</div>
@@ -227,7 +223,7 @@
}
})
});
-
+
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -279,7 +275,7 @@
$("#HUSEORGID").val(data.HUSEORGID);//缁勭粐
$("#HUseFlag").val(data.浣跨敤鏍囪);//浣跨敤鏍囪
$("#HBarCode").val(data.鏉″舰鐮�);//鏉″舰鐮�
- $("input[name='HStopflag']").attr("checked", (data.绂佺敤鏍囪==" "?false:true));//true:閫変腑 false:涓嶉�変腑
+ $("input[name='HStopflag']").attr("checked", (data.绂佺敤鏍囪 == " " ? false : true));//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
} else {
@@ -315,8 +311,15 @@
//鏁版嵁楠岃瘉
function AllowLoadData() {
- if ($("#HHelpCode").val() == '') {
- layer.msg("璇峰～鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ var HNumber = $("#HNumber").val() //浠ｇ爜
+ var HName = $("#HName").val() //鍚嶇О
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
return false;
}
return true;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html"
index 4240dc8..232d5b9 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html"
@@ -78,8 +78,8 @@
<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" 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="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display: none;" 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-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-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>瀵煎嚭</button>
@@ -456,8 +456,8 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_BadReason/AuditGy_ErrType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "/Gy_ErrType/AuditGy_ErrType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index bb1db9e..e0dd644 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -95,16 +95,36 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 45%;">
+ <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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%">
+ <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
<input type="radio" name="HLastResult" id="HLastResult" value="1" title="鍚堟牸" checked>
<input type="radio" name="HLastResult" id="HLastResult" value="0" title="涓嶅悎鏍�">
- </div>
- </div>
- <div class="layui-colorpicker-xs" style="margin-top:15px">
- <label class="layui-form-label"> 澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
</div>
</div>
</div>
@@ -1075,6 +1095,9 @@
, "HMainProcNumber": data.宸ュ簭浠ｇ爜
, "HMainProcName": data.宸ュ簭鍚嶇О
, "HRemark": data.琛ㄥご澶囨敞
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.鐝鍚嶇О
+ , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
});
@@ -1187,6 +1210,44 @@
})
});
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//閫夋嫨浜у搧寮圭獥
form.on('submit(HMateria-BT)', function () {//浜у搧
layer.open({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index a381201..72e7e77 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -74,7 +74,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 47px;">
+ <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 68px;">
</div>
</div>
<div class="layui-inline">
@@ -86,7 +86,7 @@
</button>
<input type="hidden" name="HSourceID" id="HSourceID" value="0">
</div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -173,12 +173,28 @@
<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
+ </div>
+ </div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width: 50%;">
+ <div class="layui-inline" style="width: 45%;">
<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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%">
+ <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
</div>
</div>
</div>
@@ -1385,6 +1401,9 @@
, "HEntryID": data.hsubid
, "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
, "HQCCheckItemID": data.HQCCheckItemID
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.鐝鍚嶇О
+ , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
});
data = result.data;
//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
@@ -1490,6 +1509,44 @@
});
});
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//琛ㄤ綋淇℃伅妫�楠岄」鐩脊绐�
form.on('submit(btnSearchCheckItemID)', function () {
//椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 760bfa6..03f2025 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -12,10 +12,20 @@
.layui-form-label {
width: 85px;
}
+
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
</style>
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -47,7 +57,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏂规鍚嶇О</label>
+ <label class="layui-form-label">鏂规鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HName" id="HName" class="layui-input">
</div>
@@ -103,9 +113,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">榛樿鏂规</label>
+ <label class="layui-form-label">鎶芥牱鏂规</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="" checked="">
+ <input type="text" name="HSampleSchemeName" id="HSampleSchemeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSampleSchemeList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -133,25 +147,33 @@
</div>
</div>
</div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿鏂规</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="" checked="">
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
</div>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- </div>
- </div>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
</div>
- </script>
+ </script>
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
</script>
-
+
</form>
</div>
</div>
@@ -161,6 +183,40 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
+
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(缂洪櫡绛夌骇)-->
+ <script type="text/html" id="HDefectLevel">
+ <select name="HDefectLevel" lay-filter="HDefectLevel" id="HDefectLevel{{d.LAY_TABLE_INDEX+1}}">
+ <option value="1">鑷村懡缂洪櫡</option>
+ <option value="2">閲嶇己闄�</option>
+ <option value="3">杞荤己闄�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鐘舵��)-->
+ <script type="text/html" id="HStatus">
+ <select name="HStatus" lay-filter="HStatus" id="HStatus{{d.LAY_TABLE_INDEX+1}}">
+ <option value="0">涓嶅悎鏍�</option>
+ <option value="1" selected>鍚堟牸</option>
+ </select>
+ </script>
+ <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+ <script type="text/html" id="HKeyInspect">
+ <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+ </script>
+
+ <!--澶嶉�夋锛堢牬鍧忔�ф楠岋級-->
+ <script type="text/html" id="HDestructInspect">
+ <input type="checkbox" value="{{d.HDestructInspect}}" lay-skin="primary" id="HDestructInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDestructInspect" {{ d.HDestructInspect == 1 ? 'checked' : '' }}>
+ </script>
+
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -193,14 +249,12 @@
, element = layui.element;
var option;
var sBillType = "3320";
- //var TabRow = { "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" };
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -221,7 +275,16 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" };
+ var NewRow = {
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
+ , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
+ , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -238,6 +301,7 @@
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
+ //#region 鍩虹璧勬枡鏀惧ぇ闀滄寜閽�
//琛ㄥご寮圭獥鐗╂枡淇℃伅
form.on('submit(HMaterList)', function () {
@@ -382,6 +446,43 @@
});
});
+ //琛ㄥご鎶芥牱鏂规淇℃伅
+ form.on('submit(HSampleSchemeList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//琛ㄥご鍗曚綅鍗曚綅
form.on('submit(HUnitList)', function () {//閫夋嫨鍗曚綅
//椤甸潰灞�-鑷畾涔�
@@ -419,12 +520,94 @@
}
});
});
+ //#endregion
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+ Saver(data);
+ });
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {//
+ if (typeof (params[params[0]]) == "undefined") {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+
+ //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+ form.on('select(HAnalysisMethod)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堢己闄风瓑绾э級
+ form.on('select(HDefectLevel)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HDefectLevel = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+ form.on('select(HStatus)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //鏄惁閲嶇偣妫�鏌�
+ form.on('checkbox(HKeyInspect)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //鏄惁鐮村潖鎬ф楠�
+ form.on('checkbox(HDestructInspect)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HDestructInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁榛樿鏂规
+ form.on('checkbox(HStandard)', function (data) {
+ $("#HStandard").val(data.elem.checked);
+ });
+ //#endregion
+
+ //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
//琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event === 'HQCCheckItemNumber') //淇濆吇椤圭洰淇℃伅
+ if (obj.event === 'HQCCheckItemNumber') //
{
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -473,7 +656,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
-
+
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -483,6 +666,204 @@
}
});
}
+ if (obj.event === 'HQualityStdName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ㄩ噺鏍囧噯鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HQualityStdID: checkStatus.data[0].HItemID,
+ HQualityStdName: checkStatus.data[0].璐ㄩ噺鏍囧噯鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectMethodName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟娉曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectMethodID: checkStatus.data[0].HItemID,
+ HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectInstruMentName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼华鍣ㄥ垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectInstruMentID: checkStatus.data[0].HItemID,
+ HInspectInstruMentName: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�,
+ HQCTool: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectBasisName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼緷鎹垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectBasis.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectBasisID: checkStatus.data[0].HItemID,
+ HInspectBasisName: checkStatus.data[0].妫�楠屼緷鎹悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HSampleSchemeName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HSampleSchemeID: checkStatus.data[0].hmainid,
+ HSampleSchemeName: checkStatus.data[0].鎶芥牱鏂规鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+
obj.event = "";
return false;
@@ -490,9 +871,83 @@
})
}
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HPrjNo', title: '娆″簭鍙�', edit: 'text', hide: true }
+ , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
+ , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩唬鐮�*', edit: 'text', event: 'HQCCheckItemNumber' }
+ , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HQCStdMax', title: '鏈�澶ф楠屾爣鍑�', edit: 'text' }
+ , { field: 'HQCUnit', title: '妫�楠屽崟浣�', edit: 'text' }
+
+ , { field: 'HQCTool', title: '妫�楠屽伐鍏凤紙浠櫒锛�', edit: 'text' }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod' }
+ , { field: 'HDefectLevel', title: '缂洪櫡绛夌骇', templet: '#HDefectLevel' }
+ , { field: 'HDestructInspect', title: '鐮村潖鎬ф楠�', templet: '#HDestructInspect', unresize: false }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+ , { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
+ , { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
+ , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectInstruMentID', title: '妫�楠屼华鍣↖D', edit: 'text', hide: true }
+ , { field: 'HInspectInstruMentName', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentName' }
+ , { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
+ , { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
+ , { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
+ , { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', event: 'HSampleSchemeName' }
+ , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }
+ , { field: 'HCompareSymbol', title: '姣旇緝绗�', edit: 'text' }
+ , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text' }
+ , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text' }
+ , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text' }
+ , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text' }
+ , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text' }
+ , { field: 'HTargetValKey', title: '鐩爣鍊糑ey', edit: 'text' }
+ , { field: 'HUpLimitKey', title: '涓婇檺鍊糑ey', edit: 'text' }
+ , { field: 'HDownLimitKey', title: '涓嬮檺鍊糑ey', edit: 'text' }
+ , { field: 'HUpOffSetKey', title: '涓婂亸宸甂ey', edit: 'text' }
+ , { field: 'HDownOffSetKey', title: '涓嬪亸宸甂ey', edit: 'text' }
+ , { field: 'HTargetValQ', title: '鐩爣鍊兼暟閲�', edit: 'text' }
+ , { field: 'HUpLimitQ', title: '涓婇檺鍊兼暟閲�', edit: 'text' }
+ , { field: 'HDownLimitQ', title: '涓嬮檺鍊兼暟閲�', edit: 'text' }
+ , { field: 'HUpOffSetQ', title: '涓婂亸宸暟閲�', edit: 'text' }
+ , { field: 'HDownOffSetQ', title: '涓嬪亸宸暟閲�', edit: 'text' }
+ , { field: 'HTargetValB', title: '鐩爣鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HUpLimitB', title: '涓婇檺鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HDownLimitB', title: '涓嬮檺鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HUpOffSetB', title: '涓婂亸宸熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HDownOffSetB', title: '涓嬪亸宸熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HTargetValTxt', title: '鐩爣鍊兼枃鏈�', edit: 'text' }
+ , { field: 'HUpLimitTxt', title: '涓婇檺鍊兼枃鏈�', edit: 'text' }
+ , { field: 'HDownLimitTxt', title: '涓嬮檺鍊兼枃鏈�', edit: 'text' }
+ , { field: 'HUpOffSetTxt', title: '涓婂亸宸枃鏈�', edit: 'text' }
+ , { field: 'HDownOffSetTxt', title: '涓嬪亸宸枃鏈�', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , limit: 100
+ , cols: [columns]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
//淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
+ function Saver(data) {
var isEndCheck = document.getElementById("HStandard").checked;
data.field.HStandard = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var sMainStr = JSON.stringify(data.field);
@@ -526,56 +981,22 @@
layer.alert("閿欒:" + err, { icon: 5 });
}
});
- });
-
- //閫�鍑�
- form.on('submit(Exit)', function (data) {//
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- });
-
-
- //#endregion
-
- //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- //琛ㄥご
- columns = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HPrjNo', title: '娆″簭鍙�', edit: 'text', hide: true }
- , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
- , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩唬鐮�', edit: 'text', event: 'HQCCheckItemNumber' }
- , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' }
- , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
- , { field: 'HQCStdMax', title: '鏈�澶ф楠屾爣鍑�', edit: 'text' }
- , { field: 'HQCUnit', title: '妫�楠屽崟浣�', edit: 'text' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
- ];
- option = {
- id: 'mainTable'
- , elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , page: false
- , cellMinWidth: 120
- , height: 500
- , limit:100
- , cols: [columns]
- , done: function (res, curr, count) {
-
- }
- };
-
}
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [];
+ option.data = [{
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
+ , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
+ , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ }];
table.render(option);
}
@@ -583,7 +1004,16 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" }];
+ option.data = [{
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
+ , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
+ , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ }];
table.render(option);
}
@@ -619,8 +1049,17 @@
success: function (result) {
console.log(result);
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Gy_QCCheckProjectList_NEW[0];
- $("input[name='HStandard']").prop("checked", data.HStandard);//true:閫変腑 false:涓嶉�変腑
+ var data = result.data.h_v_Gy_QCCheckProjectList_Edit[0];
+
+ //$("input[name='HStandard']").prop("checked", data.榛樿鏂规 == 0 ? false : true);//true:閫変腑 false:涓嶉�変腑
+
+ if (data.榛樿鏂规 == 1) {
+ $("input[name='HStandard']").prop("checked", true);
+ }
+ else {
+ $("input[name='HStandard']").prop("checked", false);
+ }
+
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
form.val("component-form-group", {
"HBillNo": data.鍗曟嵁鍙�
@@ -640,6 +1079,9 @@
, "HUnitID": data.HUnitID
, "HUnitNumber": data.鍗曚綅浠ｇ爜
, "HRemark": data.琛ㄥご澶囨敞
+ , "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
+ , "HSampleSchemeID": data.HSampleSchemeID
+ , "HStandard": data.榛樿鏂规 == 1 ? true : false
});
@@ -675,8 +1117,111 @@
data: { "HInterID": linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+
+ var rowarr = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ switch (data[i].鍒嗘瀽鏂规硶) {
+ case "瀹氭�у垎鏋�":
+ data[i].鍒嗘瀽鏂规硶 = "1";
+ break;
+ case "瀹氶噺鍒嗘瀽":
+ data[i].鍒嗘瀽鏂规硶 = "2";
+ break;
+ case "鍏朵粬鍒嗘瀽":
+ data[i].鍒嗘瀽鏂规硶 = "3";
+ break;
+ }
+ switch (data[i].缂洪櫡绛夌骇) {
+ case "鑷村懡缂洪櫡":
+ data[i].缂洪櫡绛夌骇 = "1";
+ break;
+ case "閲嶇己闄�":
+ data[i].缂洪櫡绛夌骇 = "2";
+ break;
+ case "杞荤己闄�":
+ data[i].缂洪櫡绛夌骇 = "3";
+ break;
+ }
+ switch (data[i].鐘舵��) {
+ case "鍚堟牸":
+ data[i].鐘舵�� = "1";
+ break;
+ case "涓嶅悎鏍�":
+ data[i].鐘舵�� = "0";
+ break;
+ }
+
+ rowarr.push({
+ "HPrjNo": (i + 1), "HQCCheckItemID": data[i].妫�楠岄」鐩甀D, "HQCCheckItemNumber": data[i].妫�楠岄」鐩唬鐮�,
+ "HQCCheckItemName": data[i].妫�楠岄」鐩�, "HQCStd": data[i].妫�楠屾爣鍑�, "HQCStdMax": data[i].鏈�澶ф楠屾爣鍑�,
+ "HQCUnit": data[i].妫�楠屽崟浣�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HQCTool": data[i].妫�楠屽伐鍏�,
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HDefectLevel": data[i].缂洪櫡绛夌骇, "HDestructInspect": data[i].鐮村潖鎬ф楠� == 0 ? false : true,
+ "HKeyInspect": data[i].閲嶇偣妫�鏌� == 0 ? false : true, "HQualityStdID": data[i].HQualityStdID, "HInspectMethodID": data[i].HInspectMethodID,
+ "HInspectInstruMentID": data[i].HInspectInstruMentID, "HInspectBasisID": data[i].HInspectBasisID,
+ "HSampleSchemeID": data[i].HSampleSchemeID_sub, "HStatus": data[i].鐘舵��, "HCompareSymbol": data[i].姣旇緝绗�,
+ "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�,
+ "HDownOffSet": data[i].涓嬪亸宸�, "HTargetValKey": data[i].鐩爣鍊糑ey, "HUpLimitKey": data[i].涓婇檺鍊糑ey,
+ "HDownLimitKey": data[i].涓嬮檺鍊糑ey, "HUpOffSetKey": data[i].涓婂亸宸甂ey, "HDownOffSetKey": data[i].涓嬪亸宸甂ey,
+ "HTargetValQ": data[i].鐩爣鍊兼暟閲�, "HUpLimitQ": data[i].涓婇檺鍊兼暟閲�, "HDownLimitQ": data[i].涓嬮檺鍊兼暟閲�,
+ "HUpOffSetQ": data[i].涓婂亸宸暟閲�, "HDownOffSetQ": data[i].涓嬪亸宸暟閲�, "HTargetValB": data[i].鐩爣鍊煎熀纭�璧勬枡,
+ "HUpLimitB": data[i].涓婇檺鍊煎熀纭�璧勬枡, "HDownLimitB": data[i].涓嬮檺鍊煎熀纭�璧勬枡, "HUpOffSetB": data[i].涓婂亸宸熀纭�璧勬枡,
+ "HDownOffSetB": data[i].涓嬪亸宸熀纭�璧勬枡, "HTargetValTxt": data[i].鐩爣鍊兼枃鏈�, "HUpLimitTxt": data[i].涓婇檺鍊兼枃鏈�,
+ "HDownLimitTxt": data[i].涓嬮檺鍊兼枃鏈�, "HUpOffSetTxt": data[i].涓婂亸宸枃鏈�, "HDownOffSetTxt": data[i].涓嬪亸宸枃鏈�,
+ "HQualityStdName": data[i].璐ㄩ噺鏍囧噯鍚嶇О, "HInspectMethodName": data[i].妫�楠屾柟娉曞悕绉�, "HInspectInstruMentName": data[i].妫�楠屼华鍣ㄥ悕绉�,
+ "HInspectBasisName": data[i].妫�楠屼緷鎹悕绉�, "HSampleSchemeName": data[i].瀛愭娊鏍锋柟妗堝悕绉�
+ });
+ }
+
+ option.data = rowarr;
table.render(option);
+
+ for (var i = 1; i <= data.length; i++) {
+ switch (data[(i - 1)].鍒嗘瀽鏂规硶) {
+ case "瀹氭�у垎鏋�":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "1";
+ break;
+ case "瀹氶噺鍒嗘瀽":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "2";
+ break;
+ case "鍏朵粬鍒嗘瀽":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "3";
+ break;
+ }
+ switch (data[(i - 1)].缂洪櫡绛夌骇) {
+ case "鑷村懡缂洪櫡":
+ data[(i - 1)].缂洪櫡绛夌骇 = "1";
+ break;
+ case "閲嶇己闄�":
+ data[(i - 1)].缂洪櫡绛夌骇 = "2";
+ break;
+ case "杞荤己闄�":
+ data[(i - 1)].缂洪櫡绛夌骇 = "3";
+ break;
+ }
+ switch (data[(i - 1)].鐘舵��) {
+ case "鍚堟牸":
+ data[(i - 1)].鐘舵�� = "1";
+ break;
+ case "涓嶅悎鏍�":
+ data[(i - 1)].鐘舵�� = "0";
+ break;
+ }
+
+ $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
+ $('#HDefectLevel' + i + '').find("option[value='" + (data[(i - 1)].缂洪櫡绛夌骇) + "']").attr("selected", true);
+ $('#HStatus' + i + '').find("option[value='" + (data[(i - 1)].鐘舵��) + "']").attr("selected", true);
+
+ if (data[(i - 1)].鐮村潖鎬ф楠�) {
+ $('#HDestructInspect' + (i)).attr("checked", true);
+ }
+ if (data[(i - 1)].閲嶇偣妫�鏌�) {
+ $('#HKeyInspect' + (i)).attr("checked", true);
+ }
+ }
+
+ form.render("select");
+ form.render("checkbox");
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -742,6 +1287,62 @@
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
+ var HName = $("#HName").val(); //鏂规鍚嶇О
+
+ if (HName == null || HName == undefined || HName == "") {
+ layer.msg("璇疯緭鍏ユ柟妗堝悕绉帮紒", { icon: 5 });
+ return false;
+ }
+
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ var sSubStr = table.cache['mainTable'];
+
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (!ref.test(sSubStr[i].HTargetValQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 鐩爣鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpLimitQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婇檺鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownLimitQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬮檺鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpOffSetQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婂亸宸暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownOffSetQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬪亸宸暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HTargetValB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 鐩爣鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpLimitB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婇檺鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownLimitB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬮檺鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpOffSetB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婂亸宸熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownOffSetB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬪亸宸熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr[i].HQCCheckItemID == 0 || sSubStr[i].HQCCheckItemID == null || sSubStr[i].HQCCheckItemID == undefined) {
+ layer.msg("绗�" + (i + 1) + "琛� 妫�楠岄」鐩负绌猴紝璇烽�夋嫨妫�楠岄」鐩�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
return Result;
}
//#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 2bba3eb..86e91ad 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -10,22 +10,18 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
-
</head>
<body>
-
<div class="layui-card layadmin-header">
<div class="layui-breadcrumb" lay-filter="breadcrumb">
<a lay-href="">涓婚〉</a>
</div>
</div>
-
<div class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
-
<div class="layui-card-body">
<!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
<form class="layui-form" action="">
@@ -36,7 +32,6 @@
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
-
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -64,11 +59,13 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add" ><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" ><i class="layui-icon layui-icon-return"></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-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_Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
</script>
</div>
@@ -140,18 +137,20 @@
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
- break;
- //瀹℃牳鎸夐挳
- case 'btn-Audit': set_CheckBill();
- break;
- //鍙嶅鏍告寜閽�
- case 'btn-DeAudit': set_AbandonCheck();
- break;
+ break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
//閫�鍑烘寜閽�
case 'btn_Exit': Pub_Close(1);
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
break;
};
});
@@ -375,15 +374,41 @@
}
}
- //瀹℃牳
- function set_CheckBill() {
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_QCCheckProject/AuditGy_QCCheckProject", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
}
-
- //鍙嶅鏍�
- function set_AbandonCheck() {
-
- }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
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_Add_Edit_FirstPieceCheckBill.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_Add_Edit_FirstPieceCheckBill.html"
index 4be6002..6deab56 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_Add_Edit_FirstPieceCheckBill.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_Add_Edit_FirstPieceCheckBill.html"
@@ -79,12 +79,12 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px; width: 110%;">
+ <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 68px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 100px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
- <div class="layui-input-block" style="margin-left: 92px;">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -114,6 +114,16 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
</div>
</div>
</div>
@@ -187,14 +197,20 @@
<div class="layui-row">
</div>
<div class="layui-row">
- <div class="layui-inline" style="width: 50%;">
+ <div class="layui-inline" style="width: 45%;">
<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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
+ <div class="layui-inline" style="width: 45%">
+ <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
+ </div>
+ </div>
</div>
- <div class="layui-row">
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
@@ -1157,7 +1173,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1174,7 +1190,7 @@
, HQCCheckItemID: checkStatus.data[0].HItemID
, HResult: HResult
});
- $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
+ $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
form.render('select');
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1497,6 +1513,9 @@
, "HEntryID": data.hsubid
, "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
, "HQCCheckItemID": data.HQCCheckItemID
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.鐝鍚嶇О
+ , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
});
data = result.data;
//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
@@ -1849,7 +1868,7 @@
//#endregion
//#region銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
- window.get_CheckItem = function() {
+ window.get_CheckItem = function () {
var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -2053,6 +2072,44 @@
}
$("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -3752,7 +3809,7 @@
$("#HQCSchemeID").val(obj[0].hmainid);
$("#HQCSchemeName").val(obj[0].妫�楠屾柟妗堝悕绉�);
get_CheckItem();
- }
+ }
</script>
</body>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 5d7d209..01308f5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -212,13 +212,13 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" value="0" name="HQty" id="HQty">
+ <input type="text" class="layui-input" value="0" name="HQty" id="HQty" onfocus="this.select();">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0">
+ <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" onfocus="this.select();">
</div>
</div>
</div>
@@ -275,34 +275,64 @@
<input type="hidden" value="0" name="HTemporaryAreaID" id="HTemporaryAreaID">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇鐝</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
+ </div>
+ </div>
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ユ椂</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璁惧娓呭崟</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">宸ユ椂</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁惧娓呭崟</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ュ簾鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="HWasterQty_Work" style="width:190px;" id="HWasterQty_Work" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏂欏簾鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="HWasterQty_Mater" style="width:190px;" id="HWasterQty_Mater" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩斿伐鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="HBackWorkQty" style="width:190px;" id="HBackWorkQty" onfocus="this.select();">
+ </div>
+ </div>
</div>
<div class="layui-row">
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓嶈壇鏁伴噺</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" value="0" name="" id="">
- </div>
- </div>-->
+ <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" value="0" name="" id="">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
- </div>
- </div>-->
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
+ </div>-->
</div>
</div>
</div>
@@ -613,7 +643,7 @@
var option;
var HModName = "Cj_StationOutBill";
var FirstEndHProcNo = 0; // 榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
-
+ var ref = /^[0-9]+\.?[0-9]*$/;
//杩涘叆椤甸潰鍏ュ簱鎸夐挳缃伆
//$('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true);
@@ -757,6 +787,64 @@
//RoadBillSub(linterid);
}
+ //#region 鐩戝惉 鎶ュ簾鏁伴噺锛屾枡搴熸暟閲忥紝宸ュ簾鏁伴噺
+ $("#HWasterQty_Work").blur(function (data) { //宸ュ簾鏁伴噺
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ if (!ref.test($("#HWasterQty_Work").val())) {
+ layer.msg("宸ュ簾鏁伴噺锛岃杈撳叆0-9姝ｇ‘鏁板��", { time: 3000, });
+ $("#HWasterQty_Work").val("0");
+ }
+ //绂佺敤鎶ュ簾鏁伴噺瀛楁
+ if ((Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val())) > 0) {
+ $("#HWasterQty").attr("disabled", "disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#efefef4d';
+ } else {
+ $("#HWasterQty").removeAttr("disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#FFFFFF';
+ }
+
+ $("#HWasterQty").val(Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val()));
+ });
+
+ $("#HWasterQty_Mater").blur(function (data) { //鏂欏簾鏁伴噺
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ if (!ref.test($("#HWasterQty_Mater").val())) {
+ layer.msg("鏂欏簾鏁伴噺锛岃杈撳叆0-9姝ｇ‘鏁板��", { time: 3000, });
+ $("#HWasterQty_Mater").val("0");
+ }
+ //绂佺敤鎶ュ簾鏁伴噺瀛楁
+ if ((Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val())) > 0) {
+ $("#HWasterQty").attr("disabled", "disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#efefef4d';
+ } else {
+ $("#HWasterQty").removeAttr("disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#FFFFFF';
+ }
+
+ $("#HWasterQty").val(Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val()));
+ });
+
+ $("#HWasterQty").blur(function (data) { //鎶ュ簾鏁伴噺
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ if (!ref.test($("#HWasterQty").val())) {
+ layer.msg("鎶ュ簾鏁伴噺锛岃杈撳叆0-9姝ｇ‘鏁板��", { time: 3000, });
+ $("#HWasterQty").val("0");
+ }
+ //绂佺敤宸ュ簾鏁伴噺锛屾枡搴熸暟閲忓瓧娈�
+ if ($("#HWasterQty").val() > 0) {
+ $("#HWasterQty_Work").attr("disabled", "disabled");
+ $("#HWasterQty_Mater").attr("disabled", "disabled");
+ document.getElementById('HWasterQty_Work').style.backgroundColor = '#efefef4d';
+ document.getElementById('HWasterQty_Mater').style.backgroundColor = '#efefef4d';
+ } else {
+ $("#HWasterQty_Work").removeAttr("disabled");
+ $("#HWasterQty_Mater").removeAttr("disabled");
+ document.getElementById('HWasterQty_Work').style.backgroundColor = '#FFFFFF';
+ document.getElementById('HWasterQty_Mater').style.backgroundColor = '#FFFFFF';
+ }
+ });
+ //#endregion
+
//鍔犺浇琛ㄥご
function RoadBillMain(linterid) {
@@ -803,7 +891,12 @@
"HUpDater": data.HUpDater,
"HUpDateDate": data.HUpDater == "" ? "" : Pub_Format(data.HUpDateDate, "yyyy-MM-dd hh:mm:ss"),
"HChecker": data.HChecker,
- "HCheckDate": data.HChecker == "" ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss")
+ "HCheckDate": data.HChecker == "" ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss"),
+ "HWasterQty_Work": data.宸ュ簾鏁伴噺,
+ "HWasterQty_Mater": data.鏂欏簾鏁伴噺,
+ "HBackWorkQty": data.杩斿伐鏁伴噺,
+ "HShiftsID": data.HShiftsID,
+ "HShiftsName": data.鐝鍚嶇О,
});
if (data.鏄惁瀹℃牳 == "true") {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
@@ -816,6 +909,16 @@
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
}
+
+ //绂佺敤鎶ュ簾鏁伴噺瀛楁
+ if ((Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val())) > 0) {
+ $("#HWasterQty").attr("disabled", "disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#efefef4d';
+ } else {
+ $("#HWasterQty").removeAttr("disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#FFFFFF';
+ }
+
PicUpload();
layer.close(index);
}
@@ -1529,6 +1632,31 @@
})
});
+ //鐢熶骇鐝
+ form.on('submit(BtnHShiftsName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇鐝鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
//閫夋嫨鐢熶骇璧勬簮寮圭獥
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html"
index 1d0df64..ca742e9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html"
@@ -250,7 +250,7 @@
//鍔犺浇缃戞牸
function get_Display(sWhere) {
- sWhere += " order by 鏃ユ湡 desc ";
+ sWhere += " order by 鍒跺崟鏃ユ湡 desc ";
//鍔ㄦ�佸垪-缂撳瓨鍒楄〃
$.ajax({
url: GetWEBURL() + "/ColorRecord/ColorRecordList",
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 5c6541a..de75887 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -100,56 +100,46 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閲囪喘閮ㄩ棬</label>
- <div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hdeptlist" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">涓氬姟鍛�</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">涓荤</label>
- <div class="layui-input-inline">
- <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- <div class="layui-inline">
+ <div class="layui-inline"style="width:625px">
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 505px" readonly>
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </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" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px; " readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ </button>
+ </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" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">甯佸埆</label>
+ <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -159,27 +149,37 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閲囪喘鏂瑰紡</label>
+ <label class="layui-form-label">閲囪喘鏂瑰紡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
<input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hsellslist" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HPSStyleList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</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" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">涓荤</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
+ <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">浠樻鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block">
@@ -498,9 +498,9 @@
}
//#endregion
- //if (AllowLoadData(data)) {
+ if (AllowLoadData(data)) {
set_SaveBill(data);
- //}
+ }
});
//#endregion
//#endregion
@@ -759,7 +759,7 @@
}
});
}
- ////#endregion
+ //#endregion
//#region 寮圭獥閫夋嫨鏂规硶
//#region 閫夋嫨閲囪喘閮ㄩ棬
@@ -770,7 +770,19 @@
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
})
}
//#endregion
@@ -783,7 +795,19 @@
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘涓荤鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HMangerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
})
}
//#endregion
@@ -796,7 +820,19 @@
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
})
}
//#endregion
@@ -822,7 +858,20 @@
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HPSStyleName").val(checkStatus.data[0].閲囪喘鏂瑰紡鍚嶇О);
+ $("#HPSStyleID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
})
}
//#endregion
@@ -835,7 +884,7 @@
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -843,7 +892,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSSName").val(checkStatus.data[0].HName);
+ $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1733,7 +1782,7 @@
}
, end: function () {
obj.update({
- "HMaterID" :OptionData.HMaterID
+ "HMaterID": OptionData.HItemID
,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
@@ -2303,6 +2352,42 @@
return res;
}
//#endregion
+
+ //#region 淇濆瓨鏂规硶鏍￠獙
+ function AllowLoadData(data) {
+ if ($("#HCurID").val() == 0) {
+ layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HExRate").val() == 0) {
+ layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HDeptID").val() == 0) {
+ layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HPSStyleID").val() == 0) {
+ layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSSID").val() == 0) {
+ layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ return true;
+ }
+
+ //endregion
+
//#endregion
@@ -2311,7 +2396,7 @@
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
}
@@ -2323,25 +2408,25 @@
function GetHManagerValue(obj) //杩斿洖涓荤
{
- $("#HMangerName").val(obj[0].HName);
+ $("#HMangerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HMangerID").val(obj[0].HItemID);
}
function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
- function GetHPSStyleValue(obj) //杩斿洖閲囪喘鏂瑰紡
+ function GetHPSStyleNameValue(obj) //杩斿洖閲囪喘鏂瑰紡
{
- $("#HSellSName").val(obj[0].HName);
- $("#HSellSID").val(obj[0].HItemID);
+ $("#HPSStyleName").val(obj[0].閲囪喘鏂瑰紡鍚嶇О);
+ $("#HPSStyleID").val(obj[0].HItemID);
}
function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
{
- $("#HSSName").val(obj[0].HName);
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(obj[0].HItemID);
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 65228fe..e5c77e0 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -947,9 +947,9 @@
}
//#endregion
- //if (AllowLoadData(data)) {
+ if (AllowLoadData(data)) {
set_SaveBill(data);
- //}
+ }
});
//#endregion
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 0013626..6492625 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"
@@ -366,7 +366,7 @@
var allVal;
//#endregion
- //璁板綍缁勭粐鐨勫��
+ //璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -385,14 +385,14 @@
var params = get_UrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
-
- //#region 鍒濆鍖栫粍缁�
+
+ //#region 鍒濆鍖栫粍缁�
Organ();
//#endregion
- //#region 鑾峰彇缁勭粐
+ //#region 鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
var Organization = '';
@@ -406,7 +406,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 4 || OperationType == null) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -422,6 +422,7 @@
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
+ OptionData = 1;
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HInterID").val("0");
$("#HBillNo").val("");
@@ -1056,10 +1057,6 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- //if (checkStatus.data.length != 1) {
- // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- //}
-
OptionData = checkStatus.data[0];
var rowIndex = $(obj.tr).attr("data-index") * 1;
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1532,7 +1529,7 @@
}
//鍙屽嚮杩斿洖鐗╂枡
- function GetGyMaterial(data) {
+ function GetGyMaterial(data) {
OptionData = data
}
//椤圭洰
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index ef0f308..7891a13 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -69,13 +69,13 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓氬姟鍛�</label>
+ <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -88,7 +88,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">瀹㈡埛</label>
+ <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -98,7 +98,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱</label>
+ <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -116,7 +116,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -126,7 +126,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">甯佸埆</label>
+ <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -136,7 +136,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姹囩巼</label>
+ <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0">
</div>
@@ -152,7 +152,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -304,7 +304,7 @@
<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>
+ <input model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -413,6 +413,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ get_DeptHManage();
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -701,7 +703,8 @@
, "璁￠噺鍗曚綅": checkStatus.data[i].璁￠噺鍗曚綅
,"HWHID": "0"
, "鍙戣揣浠撳簱": ""
- , "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+ , "HQty": checkStatus.data[i].鏁伴噺,
+ "HPrice": "0", "HMoney": "0", "HRemark": ""
, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
, "HSourceBillType": checkStatus.data[i].HBillType
@@ -709,9 +712,24 @@
, "HSourceEntryID": checkStatus.data[i].hsubid
})
}
- $("#HProjectID").val(checkStatus.data[0].HProjectID);
+ $("#HProjectID").val(checkStatus.data[0].HProjectID ? checkStatus.data[0].HProjectID : 0);
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰缂栫爜);
$("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+
+ $("#HCusID").val(checkStatus.data[0].HCusID);
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛);
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HCurID").val(checkStatus.data[0].HCurID);
+ $("#HCurName").val(checkStatus.data[0].甯佸埆);
+ $("#HExRate").val(checkStatus.data[0].姹囩巼);
+ $("#HWHID").val(checkStatus.data[0].涓讳粨搴搃d);
+ $("#HWHName").val(checkStatus.data[0].涓讳粨搴�);
+
table.render(option);
layer.close(index);//鍏抽棴寮圭獥
}
@@ -881,8 +899,12 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
$("#HInterID").val(d.data[0].HInterID);
+ $("#HMakeDate").val(shijian);
+ $("#HMaker").val(sessionStorage["HUserName"]);
}
});
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ get_DeptHManage();
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HInterID").val(linterid);
@@ -905,6 +927,36 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+
+ if ($("#HWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ if ($("#HManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨涓荤锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HCusID").val() == 0) {
+ layer.msg("璇烽�夋嫨瀹㈡埛锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HCurID ").val() == 0) {
+ layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HExRate").val() == 0) {
+ layer.msg("姹囩巼涓嶈兘涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HDeptID").val() == 0) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -945,6 +997,33 @@
});
}
//#endregion
+
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ function get_DeptHManage() {
+ //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+ $("#HEmpName").val(sessionStorage["HUserName"]);
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
+
+ //鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鐨勯儴闂� 鑾峰彇 涓荤
+ if ($("#HDeptID").val() != 0) {
+ $.ajax({
+ url: GetWEBURL() + "Gy_Department/list",
+ async: false,
+ type: "GET",
+ data: {
+ "sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
+ },
+ success: function (result) {
+ $("#HManagerID").val(result.data[0].HEmpID);
+ $("#HManagerName").val(result.data[0].璐熻矗浜�);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ }
//琛屽唴蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
@@ -1279,7 +1358,6 @@
})
}
//#endregion
-
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 935da93..d266f93 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -264,6 +264,8 @@
,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125, sort: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 125, sort: true }
+ , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
, { field: 'HCusID', title: 'HCusID', hide: true, sort: true }
, { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', width: 125, sort: true }
@@ -302,6 +304,7 @@
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125, sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', sort: true }
+ , { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', sort: true }
, { field: '鍗曚环', title: '鍗曚环', sort: true }
, { field: '閲戦', title: '閲戦', sort: true }
, { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
@@ -422,28 +425,33 @@
var HSourceEntryID = data[0].婧愬崟瀛愬唴鐮�;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"]},
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ if (data[0].鐘舵��=="鍒涘缓") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+ }
+
})
}
else {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 4c36e12..66e5a06 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -103,7 +103,7 @@
<div class="layui-inline">
<label class="layui-form-label">閿�鍞憳</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -1309,7 +1309,7 @@
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
- HOrgIDBar = 0;
+ HOrgIDBar = sessionStorage["OrganizationID"];
//瀛愯〃 璧嬪��
var rowdata = [];
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
index 5cac824..f951f22 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
@@ -506,31 +506,36 @@
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + '/Xs_ReceivableBill/delete',
- type: "GET",
- data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
+ if (data[0].鍗曟嵁鐘舵��=="鍒涘缓") {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Xs_ReceivableBill/delete',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
layer.close(wait);
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ暟鎹笉鏄垱寤虹姸鎬�,鏃犳硶鍒犻櫎锛�');
+ }
+
})
}
else {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
index bfc25f2..f1b7c19 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
@@ -575,8 +575,11 @@
var HSumMoney = newHSumMoney * 1; //閲戦
var HDiscountRate = $("#HDiscountRate").val() * 1; //鏁村崟鎶樻墸
var HRelSumMoney = HSumMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);
+
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
+ HGiftMoney = dealDoubleToFixed(HGiftMoney, 2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -605,6 +608,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HDiscountRate = newHDiscountRate * 1; //鏁村崟鎶樻墸
var HRelSumMoney = HSumMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -620,6 +624,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
+ HGiftMoney = dealDoubleToFixed(HGiftMoney, 2);
$("#HGiftMoney").val(HGiftMoney);
});
@@ -1414,6 +1419,42 @@
});
}
//#endregion
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index f0ce3f0..3309fae 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -565,8 +565,11 @@
var HSumMoney = newHSumMoney * 1; //閲戦
var HDiscountRate = $("#HDiscountRate").val() * 1; //鏁村崟鎶樻墸
var HRelSumMoney = HSumMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);
+
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
+ HGiftMoney = dealDoubleToFixed(HGiftMoney,2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -595,6 +598,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HDiscountRate = newHDiscountRate * 1; //鏁村崟鎶樻墸
var HRelSumMoney = HSumMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -610,6 +614,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
+ HGiftMoney = dealDoubleToFixed(HGiftMoney,2);
$("#HGiftMoney").val(HGiftMoney);
});
@@ -1537,6 +1542,42 @@
});
}
//#endregion
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index d82c1c8..7a6d65a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -145,6 +145,8 @@
</select>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">閿�鍞鍗曠被鍨�</label>
<div class="layui-input-inline">
@@ -154,8 +156,6 @@
</select>
</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">
@@ -166,7 +166,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">閿�鍞柟寮�</label>
<div class="layui-input-inline">
<input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -664,7 +664,7 @@
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
- "HWHID": "",
+ "HWHID": "0",
"浠撳簱":"",
"HQty": "0",
"HPrice": "0",
@@ -680,6 +680,8 @@
"HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
+ "HRemark_TL": "",
+ "HRemark_SJG": "",
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
@@ -1242,6 +1244,8 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
+ , { field: 'HRemark_TL', title: '鎶曟枡', width: 100, edit: 'text' }
+ , { field: 'HRemark_SJG', title: '娣卞姞宸�', width: 100, edit: 'text' }
, { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
, { field: '浠撳簱', title: '浠撳簱', width: 100, style: 'background-color:#efefef4d;' ,edit: 'text' ,event: "HWHID" }//f7
, { field: 'HisStockGoods', title: '鏄惁鍙栧簱瀛�', width: 120, templet: '#HisStockGoods' }
@@ -1297,7 +1301,7 @@
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
- "HWHID": "",
+ "HWHID": "0",
"浠撳簱":"",
"HQty": "0",
"HPrice": "0",
@@ -1313,6 +1317,8 @@
"HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
+ "HRemark_TL": "",
+ "HRemark_SJG": "",
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
@@ -1461,6 +1467,8 @@
"HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
"HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
+ "HRemark_TL": result.data[i]["鎶曟枡"],
+ "HRemark_SJG": result.data[i]["娣卞姞宸�"],
"HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
"HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
"HCusModel": result.data[i]["瀹㈡埛瑙勬牸鍨嬪彿"],
@@ -2175,7 +2183,7 @@
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
- "HWHID": "",
+ "HWHID": "0",
"浠撳簱": "",
"HQty": "0",
"HPrice": "0",
@@ -2191,6 +2199,8 @@
"HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
+ "HRemark_TL": "",
+ "HRemark_SJG": "",
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
@@ -2236,7 +2246,7 @@
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
- "HWHID": "",
+ "HWHID": "0",
"浠撳簱": "",
"HQty": "0",
"HPrice": "0",
@@ -2252,6 +2262,8 @@
"HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
+ "HRemark_TL": "",
+ "HRemark_SJG": "",
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index f82cbef..a3fea2a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -191,7 +191,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var HModName = "Xs_SeOrderBill";
+ var HModName = "Xs_SeOrderBillList";
var HBillType = "1401";
@@ -504,6 +504,10 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', sort: true, totalRow: true }
+ , { field: '鐢熶骇鍏ュ簱鏁伴噺', title: '鐢熶骇鍏ュ簱鏁伴噺', sort: true, totalRow: true }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺', sort: true, totalRow: true }
+ , { field: '鍓╀綑璁㈤噾', title: '鍓╀綑璁㈤噾', sort: true, totalRow: true }
+ , { field: '鍏宠仈鏁伴噺', title: '閿�鍞嚭搴撳叧鑱旀暟閲�', sort: true, totalRow: true }
, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
@@ -519,8 +523,8 @@
, { field: '閲戦', title: '閲戦', sort: true, totalRow: true }
, { field: '浠风◣鍚堣', title: '浠风◣鍚堣', sort: true, totalRow: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
- , { field: '鍓╀綑璁㈤噾', title: '鍓╀綑璁㈤噾', sort: true, totalRow: true }
- , { field: '鍏宠仈鏁伴噺', title: '閿�鍞嚭搴撳叧鑱旀暟閲�', sort: true, totalRow: true }
+ , { field: '鎶曟枡', title: '鎶曟枡', sort: true }
+ , { field: '娣卞姞宸�', title: '娣卞姞宸�', sort: true }
, { field: '鏈叧鑱旀暟閲�', title: '閿�鍞嚭搴撴湭鍏宠仈鏁伴噺', sort: true, totalRow: true }
, { field: '鐢熶骇鍏宠仈鏁伴噺', title: '鐢熶骇鍏宠仈鏁伴噺', sort: true, totalRow: true }
, { field: '鐢熶骇鏈叧鑱旀暟閲�', title: '鐢熶骇鏈叧鑱旀暟閲�', sort: true, totalRow: true }
@@ -545,16 +549,18 @@
//, { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125, sort: true }
//, { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170, sort: true }
//, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
- //, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
- //, { field: '甯佸埆', title: '甯佸埆', sort: true }
- //, { field: '姹囩巼', title: '姹囩巼', sort: true }
+ ////, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
+ //, { field: '甯佸埆', title: '甯佸埆', hide: true, sort: true }
+ //, { field: '姹囩巼', title: '姹囩巼', hide: true, sort: true }
//, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
- //, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
- //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
- //, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
+ ////, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
+ //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, hide: true,sort: true }
+ ////, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
//, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
- //, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
- //, { field: '涓荤', title: '涓荤', sort: true }
+ ////, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
+ //, { field: '涓荤', title: '涓荤', hide: true, sort: true }
+ //, { field: '涓讳粨搴搃d', title: '涓讳粨搴搃d', hide: true, sort: true }
+ //, { field: '涓讳粨搴�', title: '涓讳粨搴�', hide: true, sort: true }
//, { field: '鎽樿', title: '鎽樿', sort: true }
//, { field: '鎵瑰彿', title: '鎵瑰彿', sort: true }
//, { field: '绋庨', title: '绋庨', sort: true }
@@ -1265,7 +1271,7 @@
get_needClose_Bar = 1;
//涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
- sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=500 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' order by 鍗曟嵁鍙� desc";
+ sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=1000 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' order by 鍗曟嵁鍙� desc";
//鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
var ajaxLoad = layer.load();
@@ -1387,7 +1393,7 @@
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
if (get_needClose_Bar == 0) {
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
} else if (get_needClose_Bar == 1) {
$("#get_needClose").trigger('click');
}
@@ -1428,7 +1434,7 @@
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
if (get_needClose_Bar == 0) {
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
} else if (get_needClose_Bar == 1) {
$("#get_needClose").trigger('click');
}
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
index 3504903..a04f3e0 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
@@ -357,6 +357,19 @@
function get_Refresh() {
$("#btnSearch").trigger('click');
}
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetTaskClassValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+
+ //#endregion
+
+
//鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
index f374231..4dbb87c 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
@@ -206,6 +206,16 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟绫诲埆</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HTaskClassName" name="HTaskClassName" id="HTaskClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HTaskClassID" id="HTaskClassID" lay-verify="HTaskClassID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskClass" id="btnSearchHTaskClass" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -572,6 +582,13 @@
get_checkSearchHCopyEmp();
});
//#endregion
+
+ //#region 閫夋嫨娲惧崟浜烘寜閽�
+ form.on('submit(btnSearchHTaskClass)', function () {
+ get_checkSearchHTaskClass();
+ });
+ //#endregion
+
//#endregion
@@ -813,7 +830,7 @@
})
}
//#endregion
-
+
//#region 娲惧崟浜洪�夋嫨椤甸潰
function get_checkSearchHSendEmp() {
var HOrgID = $("#HOrgID").val();
@@ -947,6 +964,33 @@
}
});
+ }
+ //#endregion
+
+ //#region 浠诲姟绫诲埆閫夋嫨椤甸潰
+ function get_checkSearchHTaskClass() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍛樺伐琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HTaskClassID").val(checkStatus.data[0].HItemID);
+ $("#HTaskClassName").val(checkStatus.data[0].浠诲姟绫诲埆鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
}
//#endregion
@@ -1136,6 +1180,8 @@
, "HRemark": tableMain[0]["HRemark"]
, "HOrgID": tableMain[0]["HOrgID"]
, "HOrderLevID": tableMain[0]["HOrderLevID"]
+ , "HTaskClassID": tableMain[0]["HTaskClassID"]
+ , "HTaskClassName": tableMain[0]["HTaskClassName"]
, "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
, "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
@@ -1620,6 +1666,11 @@
function GetHReceiveValue(obj) {
$("#HReceiveEmp").val(obj[0].鑱屽憳鍚嶇О);//鎺ユ敹浜哄悕绉�
}
+ //浠诲姟绫诲埆
+ function GetTaskClassValue(obj) {
+ $("#HTaskClassID").val(obj[0].HItemID);
+ $("#HTaskClassName").val(obj[0].浠诲姟绫诲埆鍚嶇О);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBill.html"
index 53e14b7..8252cad 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBill.html"
@@ -117,7 +117,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -291,7 +291,7 @@
//#region
//鍏ㄥ眬鍙橀噺
- window.OptionData = {};
+ window.OptionData = [];
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
//鑾峰彇鍙傛暟
@@ -405,7 +405,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProMoneyID": "", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0",
+ "HProMoneyID": "0", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
};
switch (obj.event) {
@@ -771,16 +771,22 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HProMoneyID": checkStatus.data[0].HItemID
- , "HProMoneyName": checkStatus.data[0].椤圭洰璐圭敤鍚嶇О
+ "HProMoneyID": checkStatus.data[0].HItemID,
+ "HProMoneyName": checkStatus.data[0].椤圭洰璐圭敤鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , btn2: function (index, layero) { }
, end: function () {
- obj.update({
- "HProMoneyID": OptionData.HItemID
- , "HProMoneyName": OptionData.椤圭洰璐圭敤鍚嶇О
- })
+ if (OptionData.length == undefined && OptionData.length!=0) {
+ obj.update({
+ "HProMoneyID": OptionData.HItemID,
+ "HProMoneyName": OptionData.椤圭洰璐圭敤鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
@@ -942,7 +948,26 @@
layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
-
+ if ($("#HWorkTaskName").val() == "") {
+ layer.msg("浠诲姟鍚嶇О涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HWorkTaskNumber").val() == "") {
+ layer.msg("浠诲姟浠ｇ爜涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HProNumber").val() == "") {
+ layer.msg("椤圭洰浠ｇ爜涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HProName").val() == "") {
+ layer.msg("椤圭洰鍚嶇О涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HCusName").val() == "") {
+ layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+ return false;
+ }
return true;
}
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
index c724222..9226f50 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskMoneyBillList.html"
@@ -136,7 +136,7 @@
var HModName = "PM_WorkTaskBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID", "HBillStatus", "HProjectID", "HWorkTaskID", "HCusID", "HOrgID","HEntryID"];
+ var titleData = ["HInterID", "HBillStatus", "HProjectID", "HWorkTaskID", "HCusID", "HOrgID", "HEntryID","HProMoneyID"];
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBeginBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBeginBillMain.html"
index e63437f..0595dc2 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBeginBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBeginBillMain.html"
@@ -110,7 +110,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -134,7 +134,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍚堝悓鎬婚噾棰�</label>
+ <label class="layui-form-label" style="width: 85px;">鍚堝悓鎬婚噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HSumMoney" name="HSumMoney" id="HSumMoney">
</div>
@@ -149,13 +149,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁撶畻閲戦</label>
+ <label class="layui-form-label" style="width: 85px;">缁撶畻閲戦<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HMoney" name="HMoney" id="HMoney" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍚堝悓棰勪及浜哄ぉ</label>
+ <label class="layui-form-label" style="width: 85px;">鍚堝悓棰勪及浜哄ぉ<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HConWorkDays" name="HConWorkDays" id="HConWorkDays" value="0" style="width:190px;">
</div>
@@ -163,7 +163,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -447,7 +447,7 @@
//#region 閫夋嫨瀹㈡埛鎸夐挳
form.on('submit(btnSearchHCusID)', function () {
- get_checkSearchHSendEmp();
+ get_checkSearchHCus();
});
//#endregion
@@ -712,7 +712,34 @@
})
}
//#endregion
+ //#region 瀹㈡埛閫夋嫨椤甸潰
+ function get_checkSearchHCus() {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '瀹㈡埛琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HCusID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
//#region 浜や粯鏂归�夋嫨椤甸潰
function get_checkSearchHPMTeam() {
var HOrgID = $("#HOrgID").val();
@@ -882,7 +909,7 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
- if ($("#HProID").val() == "0") {
+ if ($("#HProjecID").val() == "0") {
layer.msg("椤圭洰浠ｇ爜娌℃湁閫夋嫨!");
return false;
}
@@ -890,7 +917,38 @@
layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
-
+ if ($("#HManagerID").val() == "0") {
+ layer.msg("绠＄悊鍛樹笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HWorkEmpID").val() == "0") {
+ layer.msg("瀹炴柦鎷呭綋涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HPMEmpID").val() == "0") {
+ layer.msg("椤圭洰缁忕悊涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HPMTeamID").val() == "0") {
+ layer.msg("浜や粯鏂逛笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HCusID").val() == "0") {
+ layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HSumMoney").val() == "") {
+ layer.msg("鍚堝悓鎬婚噾棰濅笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HMoney").val() == "") {
+ layer.msg("缁撶畻閲戦涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HConWorkDays").val() == "") {
+ layer.msg("鍚堝悓棰勪及浜哄ぉ涓嶈兘涓虹┖!");
+ return false;
+ }
return true;
}
//#endregion
@@ -1061,7 +1119,11 @@
$("#HPMTeamID").val(obj[0].HItemID);//浜や粯鏂筰d
$("#HPMTeamName").val(obj[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
}
-
+ //瀹㈡埛
+ function GetHCusNameValue(obj) {
+ $("#HCusID").val(obj[0].HItemID);//浜や粯鏂筰d
+ $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);//渚涘簲鍟嗗悕绉�
+ }
</script>
</body>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index f88679a..480e2ee 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -1311,7 +1311,7 @@
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰绫诲埆琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectClass.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_ProjectClass.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMain.html"
index 1ed224b..61646be 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMain.html"
@@ -110,7 +110,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -177,7 +177,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -187,7 +187,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰缁忕悊</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰缁忕悊<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HPMEmpName" name="HPMEmpName" id="HPMEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">
@@ -197,7 +197,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹炴柦鎷呭綋</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹炴柦鎷呭綋<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HWorkEmpName" name="HWorkEmpName" id="HWorkEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HWorkEmpID" id="HWorkEmpID" lay-verify="HWorkEmpID" value="0">
@@ -458,7 +458,7 @@
//#region 閫夋嫨瀹㈡埛鎸夐挳
form.on('submit(btnSearchHCusID)', function () {
- get_checkSearchHSendEmp();
+ get_checkSearchHCus();
});
//#endregion
@@ -695,7 +695,34 @@
})
}
//#endregion
+ //#region 瀹㈡埛閫夋嫨椤甸潰
+ function get_checkSearchHCus() {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '瀹㈡埛琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HCusID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
//#region 绠＄悊鍛橀�夋嫨椤甸潰
function get_checkSearchHManager() {
var HOrgID = $("#HOrgID").val();
@@ -910,12 +937,32 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
- if ($("#HProID").val() == "0") {
+ if ($("#HProjecID").val() == "0") {
layer.msg("椤圭洰浠ｇ爜娌℃湁閫夋嫨!");
return false;
}
if ($("#HDate").val() == "") {
layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HManagerID").val() == "0") {
+ layer.msg("绠＄悊鍛樹笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HWorkEmpID").val() == "0") {
+ layer.msg("瀹炴柦鎷呭綋涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HPMEmpID").val() == "0") {
+ layer.msg("椤圭洰缁忕悊涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HPMTeamID").val() == "0") {
+ layer.msg("浜や粯鏂逛笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HCusID").val() == "0") {
+ layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
return false;
}
@@ -1096,6 +1143,12 @@
$("#HTestEmp").val(obj[0].HItemID);//娴嬭瘯浜哄憳id
$("#HTestEmpName").val(obj[0].鑱屽憳鍚嶇О);//娴嬭瘯浜哄憳鍚嶇О
}
+ //瀹㈡埛
+ function GetHCusNameValue(obj) {
+ $("#HCusID").val(obj[0].HItemID);//浜や粯鏂筰d
+ $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);//渚涘簲鍟嗗悕绉�
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMain.html"
index 32e380d..b14bd45 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMain.html"
@@ -108,7 +108,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -121,7 +121,7 @@
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜や粯鏂�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -409,7 +409,7 @@
//#region 閫夋嫨瀹㈡埛鎸夐挳
form.on('submit(btnSearchHCusID)', function () {
- get_checkSearchHSendEmp();
+ get_checkSearchHCus();
});
//#endregion
@@ -454,7 +454,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProMoneyID": "", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0",
+ "HProMoneyID": "0", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
};
switch (obj.event) {
@@ -771,7 +771,34 @@
})
}
//#endregion
+ //#region 瀹㈡埛閫夋嫨椤甸潰
+ function get_checkSearchHCus() {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '瀹㈡埛琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HCusID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
//#region 绠＄悊鍛橀�夋嫨椤甸潰
function get_checkSearchHManager() {
var HOrgID = $("#HOrgID").val();
@@ -867,10 +894,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HProMoneyID": optiondata.HItemID
- , "HProMoneyName": optiondata.椤圭洰璐圭敤鍚嶇О
- })
+ if (optiondata.length == undefined) {
+ obj.update({
+ "HProMoneyID": optiondata.HItemID
+ , "HProMoneyName": optiondata.椤圭洰璐圭敤鍚嶇О
+ })
+ optiondata = [];
+ }
+
}
})
}
@@ -1026,7 +1057,7 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
- if ($("#HProID").val() == "0") {
+ if ($("#HProjecID").val() == "0") {
layer.msg("椤圭洰浠ｇ爜娌℃湁閫夋嫨!");
return false;
}
@@ -1034,7 +1065,26 @@
layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
-
+ if($("#HManagerID").val() == "0") {
+ layer.msg("绠＄悊鍛樹笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HWorkEmpID").val() == "0") {
+ layer.msg("瀹炴柦鎷呭綋涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HPMEmpID").val() == "0") {
+ layer.msg("椤圭洰缁忕悊涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HPMTeamID").val() == "0") {
+ layer.msg("浜や粯鏂逛笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HCusID").val() == "0") {
+ layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+ return false;
+ }
return true;
}
//#endregion
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_StepFoldOutBillEdit.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_StepFoldOutBillEdit.html"
index 61f79f5..e97faf3 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_StepFoldOutBillEdit.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_StepFoldOutBillEdit.html"
@@ -68,7 +68,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -81,18 +81,18 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
- <div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <div class="layui-col-xs4 layui-inline" style="width: 542px">
+ <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline" style="width: 420px">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:380px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 380px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撶鍛�</label>
+ <label class="layui-form-label">浠撶鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -102,7 +102,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
+ <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -114,7 +114,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨叆浠撳簱</label>
+ <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -124,7 +124,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -134,7 +134,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹</label>
+ <label class="layui-form-label">楠屾敹<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -146,7 +146,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�</label>
+ <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -156,7 +156,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -297,7 +297,7 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
//鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
- window.OptionData = {};
+ window.OptionData = [];
//#endregion
@@ -332,6 +332,27 @@
/* $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撶畻鏂瑰紡*/
}
});
+ //椤甸潰鍒濆鍖栧姞杞�
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+
+ //鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鐨勯儴闂� 鑾峰彇 涓荤
+ if ($("#HDeptID").val() != 0) {
+ $.ajax({
+ url: GetWEBURL() + "Gy_Department/list",
+ async: false,
+ type: "GET",
+ data: {
+ "sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
+ },
+ success: function (result) {
+ $("#HManagerID").val(result.data[0].HEmpID);
+ $("#HManagerName").val(result.data[0].璐熻矗浜�);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
} else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HInterID").val(linterid);
RoadBillMain(linterid);
@@ -460,6 +481,8 @@
}
});
+
+
//#endregion
@@ -528,6 +551,109 @@
table.render(option);
}
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ switch (field) {
+ case "HQty": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = value * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ /* table.render(option);*/
+ break;
+ case "HPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = value * 1;
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1;
+ var HPrice = (HMoney / HQty).toFixed(2); //鍗曚环=閲戦/鏁伴噺
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ table.render(option);
+ default:
+ }
+ });
+ //#endregion
+
//#region 鍔犺浇琛ㄥご
function RoadBillMain(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -540,65 +666,65 @@
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
+ var data = result.data;
allVal = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": formatDate(data[0].鏃ユ湡)
/*, "HSSDate": formatDate(data.缁撶畻鏃ユ湡)*/
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HAddress": data.浜よ揣鍦扮偣
- , "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.浠撶鍛�
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HWHID": data.HWHID
- , "HWHName": data.璋冨叆浠撳簱
- , "HSCWHID": data.HSCWHID
- , "HSCWHName": data.璋冨嚭浠撳簱
- , "HManagerName": data.璐熻矗浜�
- , "HManagerID": data.HManagerID
- , "HSecManagerID": data.HSecManagerID
- , "HSecManagerName": data.楠屾敹
- , "HKeeperID": data.HKeeperID
- , "HKeeperName": data.淇濈鍛�
- , "HPSStyleID": data.HPSStyleID
- , "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HSSID": data.HSSID
- , "HSSName": data.缁撶畻鏂瑰紡
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HInnerBillNo": data.杈呭姪瀛楁
- , "HRemark": data.琛ㄥご澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HAddress": data[0].浜よ揣鍦扮偣
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HDeptID": data[0].HDeptID
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].渚涘簲鍟�
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].浠撶鍛�
+ , "HCurID": data[0].HCurID
+ , "HCurName": data[0].甯佸埆
+ , "HExRate": data[0].姹囩巼
+ , "HWHID": data[0].HWHID
+ , "HWHName": data[0].璋冨叆浠撳簱
+ , "HSCWHID": data[0].HSCWHID
+ , "HSCWHName": data[0].璋冨嚭浠撳簱
+ , "HManagerName": data[0].璐熻矗浜�
+ , "HManagerID": data[0].HManagerID
+ , "HSecManagerID": data[0].HSecManagerID
+ , "HSecManagerName": data[0].楠屾敹
+ , "HKeeperID": data[0].HKeeperID
+ , "HKeeperName": data[0].淇濈鍛�
+ , "HPSStyleID": data[0].HPSStyleID
+ , "HPSStyleName": data[0].閲囪喘鏂瑰紡
+ , "HSSID": data[0].HSSID
+ , "HSSName": data[0].缁撶畻鏂瑰紡
+ , "HLinkMan": data[0].鑱旂郴浜�
+ , "HLinkPhone": data[0].鑱旂郴鐢佃瘽
+ , "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡
+ , "HUpDater": data[0].淇敼浜�
+ , "HUpDateDate": data[0].淇敼鏃ユ湡
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡
+ , "HDeleteMan": data[0].浣滃簾浜�
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡
});
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
- , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQtyMust": data.HQtyMust, "HQtyMust": data.搴旀敹鏁伴噺, "HQty": data.瀹炴敹鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HOrderPrice": data.閲囪喘閲戦, "HWHID": data.HWHID, "璋冨叆浠撳簱": data.璋冨叆浠撳簱, "HSCWHID": data.HSCWHID, "璋冨嚭浠撳簱": data.璋冨嚭浠撳簱, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
- , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
- , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd"),"HBatchNo":data.鎵规
+ "HMaterID": data[i].HMaterID, "鐗╂枡浠ｇ爜": data[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿, "HUnitID": data[i].HUnitID
+ , "璁￠噺鍗曚綅": data[i].璁￠噺鍗曚綅, "HQtyMust": data[i].HQtyMust, "HQtyMust": data[i].搴旀敹鏁伴噺, "HQty": data[i].瀹炴敹鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+ , "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HOrderPrice": data[i].閲囪喘閲戦, "HWHID": data[i].HWHID, "璋冨叆浠撳簱": data[i].璋冨叆浠撳簱, "HSCWHID": data[i].HSCWHID, "璋冨嚭浠撳簱": data[i].璋冨嚭浠撳簱, "HTaxRate": data[i].绋庣巼
+ , "HTaxMoney": data[i].閲戦 * data[i].绋庣巼, "HlineTotal": data[i].閲戦 + data[i].绋庨, "HlineTotalBB": (data[i].閲戦 + data.绋庨) * data[i].姹囩巼
+ , "HTaxPrice": data[i].鍚◣鍗曚环, "HDiscountRate": data[i].鎶樻墸鐜�, "HRelTaxPrice": data[i].瀹為檯鍚◣鍗曚环
+ , "HDate": Format(new Date(data[i].浜よ揣鏃ユ湡), "yyyy-MM-dd"), "HBatchNo": data[i].鎵规
}
)
}
@@ -626,13 +752,34 @@
layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
-
if ($("#HSCWHID").val() == 0) {
layer.msg("璇烽�夋嫨璋冨嚭浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
-
-
+ if ($("#HManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSecManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨楠屾敹浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠撶鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HKeeperID ").val() == 0) {
+ layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HDeptID").val() == 0) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
@@ -711,7 +858,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length>0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
"HMaterID": OptionData.HItemID
, "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
@@ -722,6 +869,7 @@
})
OptionData = [];
}
+
}
})
@@ -736,7 +884,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -756,8 +904,8 @@
, end: function () {
if (OptionData.length > 0) {
obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ "HUnitID": OptionData[0].HItemID
+ , "璁￠噺鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
})
OptionData = [];
}
@@ -832,13 +980,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
"HWHID": OptionData.HItemID
, "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
})
OptionData = [];
}
+
}
})
@@ -871,13 +1020,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != null && OptionData.length == undefined) {
obj.update({
"HSCWHID": OptionData.HItemID
, "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
})
OptionData = [];
}
+
}
@@ -907,7 +1057,7 @@
});
}
}
-
+ //浠撶鍛�
function get_checkEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -930,7 +1080,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //渚涘簲鍟�
function get_checkSup() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -953,7 +1103,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //楠屾敹浜�
function get_checkSecManager() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -976,7 +1126,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //閮ㄩ棬
function get_checkDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -999,7 +1149,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //璐熻矗浜�
function get_checkManager() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1022,7 +1172,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //淇濈鍛�
function get_checkKeeper() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1045,6 +1195,7 @@
, btn2: function (index, layero) { }
})
}
+ //璋冨叆浠撳簱
function get_checkWH() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1067,7 +1218,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //璋冨嚭浠撳簱
function get_checkSCWH() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1127,12 +1278,30 @@
{
$("#HWHName").val(obj[0].浠撳簱鍚嶇О);
$("#HWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HWHID"] == 0) {
+ option.data[i]["HWHID"] = obj[0].HItemID;
+ option.data[i]["璋冨叆浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
}
-
+
function GetHSCWHValue(obj) //杩斿洖璋冨嚭浠撳簱
{
$("#HSCWHName").val(obj[0].浠撳簱鍚嶇О);
- $("#HSCWHID").val(obj[0].HItemID);
+ $("#HSCWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HSCWHID"] == 0) {
+ option.data[i]["HSCWHID"] = obj[0].HItemID;
+ option.data[i]["璋冨嚭浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
}
function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
@@ -1155,10 +1324,10 @@
//鍙屽嚮杩斿洖鐗╂枡
function GetGyMaterial(data) {
- OptionData = data
+ OptionData = data;
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
+ function GetAuxiliaryUnitValue(data) {
OptionData = data
}
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 10465de..3375758 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"
@@ -12,6 +12,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
@@ -439,31 +440,36 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Fb_StepFoldOutBill/DeltetFb_StepFoldOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
- 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();
- });
+ if (data[0].鐘舵�� == "鍒涘缓") {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Fb_StepFoldOutBill/DeltetFb_StepFoldOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,涓嶅彲鍒犻櫎锛�');
+ }
+
})
}
else {
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_SellOutBill.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_SellOutBill.html"
index 60b0219..74d119e 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_SellOutBill.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_SellOutBill.html"
@@ -78,13 +78,12 @@
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
- <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">-->
- <!--鍔ㄦ�佽幏鍙栨簮鍗�-->
- <!--</select>-->
<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
- <option style="color:blue;" value="1402">鍙戣揣閫氱煡鍗�</option>
+ <!--鍔ㄦ�佽幏鍙栨簮鍗�-->
</select>
+ <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -561,7 +560,7 @@
Organ();
//鍔ㄦ�佽幏鍙栨簮鍗�
- //HBillType
+ HBillType();
//#region 椤甸潰鍒濆鍖栧悗锛屾牴鎹鎴疯幏鍙栧鎴蜂綑棰�
getCustomerBalance($("#HSupID").val());
@@ -596,27 +595,53 @@
//#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
if (OperationType == 1 || OperationType == 4) {
- //#region 鍒ゆ柇婧愬崟鐘舵��
- for (var i = 0; i < option.data.length; i++) {
- var HSourceBillData = "";
- var HSourceBillData = getPushSourceBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
- if (HSourceBillData != "none") {
- if (HSourceBillData == null) {
- layer.alert("淇濆瓨澶辫触!绗�" + (i+1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
- return;
- } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
- var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
- layer.alert(err, { icon: 5 });
- return;
- } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ if ($("#BillType").val() == "1401") {
+ //#region 鍒ゆ柇婧愬崟鐘舵�� 閿�鍞鍗�
+ for (var i = 0; i < option.data.length; i++) {
+ var HSourceBillData = "";
+ var HSourceBillData = getPushSourceBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
+ if (HSourceBillData != "none") {
+ if (HSourceBillData == null) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ return;
+ }
+ } else {
return;
}
- } else {
- return;
}
+ //#endregion
}
+ else if ($("#BillType").val() == "1402") {
+ //#region 鍒ゆ柇婧愬崟鐘舵�� 鍙戣揣閫氱煡鍗�
+ for (var i = 0; i < option.data.length; i++) {
+ var HSourceBillData = "";
+ var HSourceBillData = getPushSeOutStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
+ if (HSourceBillData != "none") {
+ if (HSourceBillData == null) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ return;
+ }
+ } else {
+ return;
+ }
+ }
//#endregion
+ }
+
}
@@ -877,7 +902,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = value * 1; //鏁伴噺
var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxRate = obj.data.HTaxRate !== undefined ? obj.data.HTaxRate * 0.01 : 0 //绋庣巼
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -922,7 +947,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
var HPrice = value * 1; //鍗曚环
- var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxRate = obj.data.HTaxRate !== undefined ? obj.data.HTaxRate * 0.01 : 0; //绋庣巼
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -967,7 +992,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HTaxRate = value * 0.01; //绋庣巼
+ var HTaxRate = value * 0.01 ; //绋庣巼
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -1009,7 +1034,7 @@
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
- var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxRate = (obj.data.HTaxRate !== undefined ? value * 0.01 : 0 ) * 0.01; //绋庣巼
var HTaxPrice = value * 1; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
@@ -1162,6 +1187,7 @@
});
}
//#endregion
+
//#region 寮圭獥閫夋嫨鏂规硶
//#region 閫夋嫨閿�鍞儴闂�
function get_checkDept() {
@@ -2756,11 +2782,14 @@
var temp = getPushSeOutStockBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
if (temp != "none") {
dataArray.push(temp);
- if (temp.瀹℃牳浜� != "") {
+ if (temp.鐘舵�� != "宸插鏍�") {
layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
return;
}
-
+ if (temp.琛岀姸鎬� == "宸插叧闂�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ return;
+ }
if (temp.鍏抽棴浜� != "") {
layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
return;
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 73616f3..506de7f 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"
@@ -405,6 +405,7 @@
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200, sort: true }
, { field: '浠舵暟', title: '浠舵暟', totalRow: true, width: 200, sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', totalRow: true, width: 200, sort: true }
+ //, { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
, { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true}
, { field: '绋庣巼', title: '绋庣巼', width: 200, sort: true, totalRow: true }
, { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 200, sort: true, totalRow: true }
@@ -840,28 +841,33 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- });
+ if (data[0].鐘舵��=="鍒涘缓") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Kf_SellOutBill/DeltetSellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+ }
+
})
}
else {
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/Add_Edit_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/Add_Edit_Kf_POStockInBillList.html"
index 0b0495f..e8dd74f 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/Add_Edit_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/Add_Edit_Kf_POStockInBillList.html"
@@ -1012,9 +1012,9 @@
}
//#endregion
- //if (AllowLoadData(data)) {
+ if (AllowLoadData(data)) {
set_SaveBill(data);
- //}
+ }
});
//#endregion
@@ -1816,8 +1816,15 @@
$("#HDeptID").val(checkStatus.data[0].HDeptID);
$("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
- $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
- $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+ //涓よ竟鏄剧ず鐨勫瓧娈典笉涓�鏍锋墍浠ョ敤鍒ゆ柇鍘昏祴鍊�
+ if ($("#HSourceBillType").val() == "1102") { //閲囪喘璁㈠崟
+ $("#HWHID").val(checkStatus.data[0].HWHID);
+ $("#HWHName").val(checkStatus.data[0].浠撳簱);
+ } else if ($("#HSourceBillType").val() == "1103") { //鏀惰揣閫氱煡鍗�
+ $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
+ $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+ }
+
$("#HSupID").val(checkStatus.data[0].HSupID);
$("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
$("#HEmpID").val(checkStatus.data[0].HEmpID);
@@ -1964,7 +1971,7 @@
//#endregion
- //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曟暟鎹�
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曟暟鎹�
function getPushSource_POOrderBillInit(HSourceInterID, HSourceEntryID) {
var res = "none";
$.ajax({
@@ -1992,7 +1999,7 @@
//#endregion
- //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹�
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曟暟鎹�
function getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID) {
var res = "none";
$.ajax({
@@ -2018,6 +2025,50 @@
return res;
}
//#endregion
+
+ //#region 淇濆瓨鏂规硶鏍￠獙
+ function AllowLoadData(data) {
+ if ($("#HWHID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HKeeperID").val() == 0) {
+ layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSecManagerID").val() == 0) {
+ layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HDeptID").val() == 0) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSupID").val() == 0) {
+ layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HPSStyleID").val() == 0) {
+ layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSSID").val() == 0) {
+ layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ return true;
+ }
+
+ //endregion
+
//#endregion
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_POStockInBackBill_Add_Up.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_POStockInBackBill_Add_Up.html"
index 7b83378..a286279 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_POStockInBackBill_Add_Up.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_POStockInBackBill_Add_Up.html"
@@ -289,7 +289,6 @@
</div>
</div>
</div>
- </div>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
--
Gitblit v1.9.1