From 1ba2d912e2e7faef6c47d91a9a4f779bf1a48d23 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 07 五月 2024 15:50:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 11
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 42 ++-
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 4
WebTM/views/车间管理/工序流转卡/MES_ColorRecordBillList.html | 2
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 26 +
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html | 50 ++--
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 30 ++
WebTM/views/项目管理/工作任务/PM_WorkTaskMoneyBillList.html | 2
WebTM/views/项目管理/工作任务/PM_WorkTaskMoneyBill.html | 42 +++
WebTM/views/项目管理/工程项目/PM_ProjectMoneyBillMain.html | 67 +++++
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 1
WebTM/views/基础资料/公用基础资料/xmlLBM_Xs_SeOrderBill.aspx | 2
WebTM/views/项目管理/基础建模/Gy_TaskClass.html | 13 +
WebTM/views/项目管理/工程项目/PM_ProjectBeginBillMain.html | 74 ++++++
WebTM/views/项目管理/工程项目/PM_ProjectEndBillMain.html | 30 ++
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 15
WebTM/views/销售管理/应收退款单/YS_ReceiveBackBill.html | 41 +++
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 41 +++
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 2
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 78 ++++--
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 3
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 53 ++++
WebTM/WebTM.csproj | 2
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 2
24 files changed, 507 insertions(+), 126 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 85ac6d3..8aa5aea 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1757,6 +1757,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/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 1c4612a..b781eaf 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"
@@ -651,7 +651,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;
@@ -759,17 +782,18 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- //if (OptionData.length>0) {
- // OptionData = [];
- //}
- obj.update({
- "HMaterID": OptionData.HItemID
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ if (OptionData.length > 0) {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
@@ -880,13 +904,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- //if (OptionData.length > 0) {
- // OptionData = [];
- //}
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (OptionData.length > 0) {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
@@ -919,13 +944,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- //if (OptionData.length > 0) {
- // OptionData = [];
- //}
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (optiondata.length > 0) {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ optiondata = [];
+ }
+
}
})
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/\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/\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/\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 bcff8f2..d64afc3 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);
@@ -414,7 +414,7 @@
}
layer.closeAll("loading");
}
- })
+ }
}
//#endregion
@@ -422,6 +422,7 @@
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
+ OptionData = 1;
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HInterID").val("0");
$("#HBillNo").val("");
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 c926121..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 }
@@ -544,19 +548,19 @@
//, { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 125, sort: true }
//, { 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: '甯佸埆', 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, hide: true,sort: true }
- //, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
- , { field: 'HManagerID', title: 'HManagerID', hide: true, 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: 'HCurID', title: 'HCurID', hide: true, 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, hide: true,sort: true }
+ ////, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
+ //, { field: 'HManagerID', title: 'HManagerID', hide: true, 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 }
@@ -1267,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();
@@ -1389,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');
}
@@ -1430,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..d76d92d 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 style="color:red"> * </label></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..114dcb8 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">
@@ -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,21 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
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>0) {
+ obj.update({
+ "HProMoneyID": OptionData.HItemID,
+ "HProMoneyName": OptionData.椤圭洰璐圭敤鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -942,7 +947,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..d58db1e 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
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..21dc4ae 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">
@@ -910,7 +910,7 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
- if ($("#HProID").val() == "0") {
+ if ($("#HProjecID").val() == "0") {
layer.msg("椤圭洰浠ｇ爜娌℃湁閫夋嫨!");
return false;
}
@@ -918,6 +918,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;
}
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..aec20a5 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
@@ -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,13 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HProMoneyID": optiondata.HItemID
- , "HProMoneyName": optiondata.椤圭洰璐圭敤鍚嶇О
- })
+ if (optiondata.length>0) {
+ obj.update({
+ "HProMoneyID": optiondata.HItemID
+ , "HProMoneyName": optiondata.椤圭洰璐圭敤鍚嶇О
+ })
+ }
+ optiondata = [];
}
})
}
@@ -1026,7 +1056,7 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
- if ($("#HProID").val() == "0") {
+ if ($("#HProjecID").val() == "0") {
layer.msg("椤圭洰浠ｇ爜娌℃湁閫夋嫨!");
return false;
}
@@ -1034,7 +1064,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 129a4d3..6eb4202 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"
@@ -753,14 +753,18 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HMaterID": OptionData.HItemID
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ if (OptionData.length>0) {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
@@ -871,13 +875,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- //if (OptionData.length > 0) {
- // OptionData = [];
- //}
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (OptionData.length > 0) {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
@@ -910,13 +915,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- //if (OptionData.length > 0) {
- // OptionData = [];
- //}
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
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 0d5194f..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"
@@ -992,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; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
@@ -1034,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+绋庣巼)
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 f0bd441..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,7 +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: '宸插叧鑱旀暟閲�', 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 }
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