From 7c6dbc2da5bea1fa7b45a4c1fdaa26fc1be16be8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 18 九月 2023 08:41:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 1366 ++++++++++++++++++++++++++---------
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 131 ++
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_MateOutBillList.aspx.cs | 17
WebTM/views/PublicPage/PartInformation.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_MateOutBillList.aspx.designer.cs | 26
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 9
WebTM/views/grf/生产领料单.grf | 504 +++++++++++++
WebTM/views/项目管理/项目阶段/PM_ProjectReportBill.html | 32
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 108 ++
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 6
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_MateOutBillList.aspx | 28
WebTM/WebTM.csproj | 9
13 files changed, 1,825 insertions(+), 416 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index ff3b278..8aa4a4c 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1355,6 +1355,9 @@
<File Include="views/grf/鐢熶骇璁㈠崟.grf">
<publishTime>05/07/2022 15:22:21</publishTime>
</File>
+ <File Include="views/grf/鐢熶骇棰嗘枡鍗�.grf">
+ <publishTime>09/14/2023 13:52:48</publishTime>
+ </File>
<File Include="views/grf/鑺卞瀷鏉＄爜.grf">
<publishTime>06/07/2022 13:23:32</publishTime>
</File>
@@ -1994,6 +1997,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鐢熶骇鍗�.grf">
<publishTime>04/07/2022 16:34:50</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鐢熶骇棰嗘枡鍗�.grf">
+ <publishTime>09/14/2023 13:03:57</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/閿�鍞��璐у崟.grf">
<publishTime>12/29/2021 20:32:10</publishTime>
</File>
@@ -2267,6 +2273,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_ICStockBill.aspx">
<publishTime>02/25/2022 09:01:11</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Kf_MateOutBillList.aspx">
+ <publishTime>09/14/2023 12:19:16</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Kf_OtherOutBillList.aspx">
<publishTime>05/04/2023 08:13:44</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7ab83ca..02540f7 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -232,6 +232,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx" />
@@ -459,6 +460,7 @@
<Content Include="views\grf\娴佽浆鍗�.grf" />
<Content Include="views\grf\cs10.grf" />
<Content Include="views\grf\鎸囧紩鍗�1.grf" />
+ <Content Include="views\grf\鐢熶骇棰嗘枡鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1524,6 +1526,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherOutBillList.aspx.cs">
<DependentUpon>xmlLBM_Kf_OtherOutBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/PublicPage/PartInformation.html b/WebTM/views/PublicPage/PartInformation.html
index e930c04..a395bf0 100644
--- a/WebTM/views/PublicPage/PartInformation.html
+++ b/WebTM/views/PublicPage/PartInformation.html
@@ -144,7 +144,7 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { type: 'radio', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
, { field: 'HNumber', title: '鐗╂枡浠ｇ爜' }
diff --git "a/WebTM/views/grf/\347\224\237\344\272\247\351\242\206\346\226\231\345\215\225.grf" "b/WebTM/views/grf/\347\224\237\344\272\247\351\242\206\346\226\231\345\215\225.grf"
new file mode 100644
index 0000000..6143739
--- /dev/null
+++ "b/WebTM/views/grf/\347\224\237\344\272\247\351\242\206\346\226\231\345\215\225.grf"
@@ -0,0 +1,504 @@
+锘縶
+ "Version":"6.8.2.2",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":24,
+ "Height":14,
+ "LeftMargin":1,
+ "TopMargin":1,
+ "RightMargin":1,
+ "BottomMargin":1
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"浠诲姟鍗曞彿"
+ },
+ {
+ "Name":"宸ヨ壓鍙�",
+ "DBFieldName":"宸ュ簭娴佽浆鍗″彿"
+ },
+ {
+ "Name":"棰滆壊",
+ "DBFieldName":"涓讳骇鍝佸悕绉�"
+ },
+ {
+ "Name":"瀹㈡埛",
+ "DBFieldName":"瀹㈡埛鍚嶇О"
+ },
+ {
+ "Name":"瑙勬牸1",
+ "DBFieldName":"瑙勬牸鍨嬪彿1"
+ },
+ {
+ "Name":"瑙勬牸2",
+ "DBFieldName":"瑙勬牸鍨嬪彿2"
+ },
+ {
+ "Name":"鍙暟"
+ },
+ {
+ "Name":"甯冮噸",
+ "DBFieldName":"閲嶉噺"
+ },
+ {
+ "Name":"鎵撴祮浜�",
+ "DBFieldName":"鎵撴祮浜哄悕绉�"
+ },
+ {
+ "Name":"鍒跺崟浜�"
+ },
+ {
+ "Name":"缂栧彿",
+ "DBFieldName":"鍗曟嵁鍙�"
+ },
+ {
+ "Name":"杞﹂棿",
+ "DBFieldName":"閮ㄩ棬"
+ },
+ {
+ "Name":"鍒跺崟鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy骞碝M鏈坉d鏃�"
+ },
+ {
+ "Name":"鏌撴枡鍔╁墏鍚嶇О",
+ "DBFieldName":"鐗╂枡鍚嶇О"
+ },
+ {
+ "Name":"鐢ㄩ噺%",
+ "DBFieldName":"鐢ㄩ噺"
+ },
+ {
+ "Name":"閲嶉噺",
+ "DBFieldName":"瀹炴敹鏁伴噺"
+ },
+ {
+ "Name":"鍗曚綅",
+ "DBFieldName":"璁板綍鍗曚綅"
+ },
+ {
+ "Name":"澶囨敞",
+ "DBFieldName":"琛ㄤ綋澶囨敞"
+ },
+ {
+ "Name":"鏈洪��"
+ },
+ {
+ "Name":"姘村啿"
+ },
+ {
+ "Name":"姘撮噺"
+ },
+ {
+ "Name":"姘存瘮"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"搴忓彿",
+ "Width":1.16417
+ },
+ {
+ "Name":"鏌撴枡鍔╁墏鍚嶇О",
+ "Width":4.81542
+ },
+ {
+ "Name":"鐢ㄩ噺%",
+ "Width":2.98979
+ },
+ {
+ "Name":"閲嶉噺",
+ "Width":3.20146
+ },
+ {
+ "Name":"鍗曚綅",
+ "Width":2.40771
+ },
+ {
+ "Name":"澶囨敞",
+ "Width":7.38188
+ }
+ ],
+ "ColumnContent":{
+ "Height":0.79375,
+ "ColumnContentCell":[
+ {
+ "Column":"搴忓彿",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox1",
+ "Dock":"Fill",
+ "TextAlign":"MiddleCenter",
+ "SystemVar":"RowNo"
+ }
+ ]
+ },
+ {
+ "Column":"鏌撴枡鍔╁墏鍚嶇О",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Dock":"Fill",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鏌撴枡鍔╁墏鍚嶇О"
+ }
+ ]
+ },
+ {
+ "Column":"鐢ㄩ噺%",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox7",
+ "Dock":"Fill",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鐢ㄩ噺%"
+ }
+ ]
+ },
+ {
+ "Column":"閲嶉噺",
+ "TextAlign":"MiddleCenter",
+ "DataField":"閲嶉噺"
+ },
+ {
+ "Column":"鍗曚綅",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鍗曚綅"
+ },
+ {
+ "Column":"澶囨敞",
+ "TextAlign":"MiddleCenter",
+ "DataField":"澶囨敞"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":1.00542,
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"搴忓彿",
+ "TextAlign":"MiddleCenter",
+ "Text":"搴忓彿"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鏌撴枡鍔╁墏鍚嶇О",
+ "TextAlign":"MiddleCenter",
+ "Text":"鏌撴枡鍔╁墏鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鐢ㄩ噺%",
+ "TextAlign":"MiddleCenter",
+ "Text":"鐢ㄩ噺鈥�"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"閲嶉噺",
+ "TextAlign":"MiddleCenter",
+ "Text":"閲嶉噺"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鍗曚綅",
+ "TextAlign":"MiddleCenter",
+ "Text":"鍗曚綅"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"澶囨敞",
+ "TextAlign":"MiddleCenter",
+ "Text":"澶囨敞"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "Height":4.20688,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid1",
+ "Top":2.43417,
+ "Border":{
+ "Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+ },
+ "ColumnCount":8,
+ "RowCount":3,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":2.03729
+ },
+ {
+ "index":2,
+ "Width":3.14854
+ },
+ {
+ "index":3,
+ "Width":1.95792
+ },
+ {
+ "index":4,
+ "Width":3.33375
+ },
+ {
+ "index":5,
+ "Width":1.95792
+ },
+ {
+ "index":6,
+ "Width":3.25438
+ },
+ {
+ "index":7,
+ "Width":2.46063
+ },
+ {
+ "index":8,
+ "Width":3.78354
+ }
+ ],
+ "FreeGridRow":[
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "Text":"浠诲姟鍗曞彿锛�"
+ },
+ {
+ "row":1,
+ "col":2,
+ "Text":"[#浠诲姟鍗曞彿#]"
+ },
+ {
+ "row":1,
+ "col":3,
+ "Text":"宸ヨ壓鍙凤細"
+ },
+ {
+ "row":1,
+ "col":4,
+ "Text":"[#宸ヨ壓鍙�#]"
+ },
+ {
+ "row":1,
+ "col":5,
+ "Text":"棰滆壊"
+ },
+ {
+ "row":1,
+ "col":6,
+ "Text":"[#棰滆壊#]"
+ },
+ {
+ "row":1,
+ "col":7,
+ "Text":"姘村啿锛�"
+ },
+ {
+ "row":1,
+ "col":8,
+ "Text":"[#姘村啿#]"
+ },
+ {
+ "row":2,
+ "col":1,
+ "Text":"瀹㈡埛锛�"
+ },
+ {
+ "row":2,
+ "col":2,
+ "Text":"[#瀹㈡埛#]"
+ },
+ {
+ "row":2,
+ "col":3,
+ "Text":"瑙勬牸1锛�"
+ },
+ {
+ "row":2,
+ "col":4,
+ "Text":"[#瑙勬牸1#]"
+ },
+ {
+ "row":2,
+ "col":5,
+ "Text":"瑙勬牸2锛�"
+ },
+ {
+ "row":2,
+ "col":6,
+ "Text":"[#瑙勬牸1#]"
+ },
+ {
+ "row":2,
+ "col":7,
+ "Text":"鏈洪�燂細"
+ },
+ {
+ "row":2,
+ "col":8,
+ "Text":"[#鏈洪��#]"
+ },
+ {
+ "row":3,
+ "col":1,
+ "Text":"甯冮噸锛�"
+ },
+ {
+ "row":3,
+ "col":2,
+ "Text":"[#甯冮噸#]"
+ },
+ {
+ "row":3,
+ "col":3,
+ "Text":"姘存瘮锛�"
+ },
+ {
+ "row":3,
+ "col":4,
+ "Text":"[#姘存瘮#]"
+ },
+ {
+ "row":3,
+ "col":5,
+ "Text":"姘撮噺锛�"
+ },
+ {
+ "row":3,
+ "col":6,
+ "Text":"[#姘撮噺#]"
+ },
+ {
+ "row":3,
+ "col":7,
+ "Text":"鍙暟锛�"
+ },
+ {
+ "row":3,
+ "col":8,
+ "Text":"[#鍙暟#]"
+ }
+ ]
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":18.3885,
+ "Top":1.40229,
+ "Width":1.21708,
+ "Height":0.79375,
+ "Text":"杞﹂棿锛�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":19.6056,
+ "Top":1.40229,
+ "Width":2.01083,
+ "Height":0.79375,
+ "DataField":"杞﹂棿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox2",
+ "Left":7.99042,
+ "Top":1.40229,
+ "Width":6.00604,
+ "Height":0.79375,
+ "TextAlign":"MiddleCenter",
+ "DataField":"鍒跺崟鏃ユ湡"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox2",
+ "Left":7.99042,
+ "Top":0.396875,
+ "Width":6.00604,
+ "Height":0.79375,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":142500,
+ "Weight":400,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鏌撹壊杞﹂棿宸ヨ壓閰嶆柟鍗�"
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Width":4.20688,
+ "Height":2.19604,
+ "BarcodeType":"QRCode",
+ "Text":"[#缂栧彿#]"
+ }
+ ]
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":0.79375,
+ "Control":[
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox4",
+ "Left":1.00542,
+ "Top":0.211667,
+ "Width":1.61396,
+ "Height":0.608542,
+ "Text":"鎵撴祮浜猴細"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox4",
+ "Left":2.59292,
+ "Top":0.211667,
+ "Width":2.61938,
+ "Height":0.608542,
+ "DataField":"鎵撴祮浜�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox5",
+ "Left":17.1979,
+ "Top":0.211667,
+ "Width":1.61396,
+ "Height":0.582083,
+ "Text":"鍒跺崟浜猴細"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox5",
+ "Left":18.8119,
+ "Top":0.211667,
+ "Width":2.61938,
+ "Height":0.582083,
+ "DataField":"鍒跺崟浜�"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.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/HBarPlanPrint.html"
index 4fb710d..b9d84b9 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -207,6 +207,9 @@
case "Kf_OtherOutBillList"://鍏朵粬鍑哄簱鍗曠淮鎶� 鍑哄簱鐮佸崟
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_OtherOutBillList.aspx?linterid=" + value, true, "");
break;
+ case "Kf_MateOutBillList"://鐢熶骇棰嗘枡鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_MateOutBillList.aspx?linterid=" + value, true, "");
+ break;
case "Sc_ProcessExchangeArrangement"://宸ュ簭瀛愭祦杞帓缂�
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeArrangement.aspx?linterid=" + value, true, "");
break;
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_Kf_MateOutBillList.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_Kf_MateOutBillList.aspx"
new file mode 100644
index 0000000..124c75b
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_MateOutBillList.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Kf_MateOutBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Kf_MateOutBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_MateOutBillList where hmainid=" + Request.Params["linterid"]);
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_MateOutBillList.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_MateOutBillList.aspx.cs"
new file mode 100644
index 0000000..bfd16d5
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_MateOutBillList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Kf_MateOutBillList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_MateOutBillList.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_MateOutBillList.aspx.designer.cs"
new file mode 100644
index 0000000..4a93ea6
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_MateOutBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Kf_MateOutBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
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_WorkTaskBillList.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_WorkTaskBillList.html"
index 0e21f80..749a638 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_WorkTaskBillList.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_WorkTaskBillList.html"
@@ -139,7 +139,7 @@
var HModName = "PM_WorkTaskBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID","HProjectStageID","HOrgID","HEntryID", "HProjectID"];
+ var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HEntryID", "HProjectID", "HBillStatus"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -368,7 +368,7 @@
//鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
var HUserName = getHEmpByHUserName();
if (HUserName != "" && HUserName != null) {
- sWhere = " and (娲惧崟浜� = '" + HUserName + "' or 鎺ュ崟浜� = '" + HUserName + "' or 鎶勯�佷汉 like '%" + HUserName + "%') ";
+ sWhere += " and (娲惧崟浜� = '" + HUserName + "' or 鎺ュ崟浜� = '" + HUserName + "' or 鎶勯�佷汉 like '%" + HUserName + "%') ";
}
var HOrgID = "";
@@ -818,7 +818,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
if (openType == 2) {
- sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ sWhere += " and HBillStatus<3 and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
$("#HOrgID").val(HOrgID);
form.render("select");
return true;
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_WorkTaskReportBill.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_WorkTaskReportBill.html"
index f510a9f..31766c8 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_WorkTaskReportBill.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_WorkTaskReportBill.html"
@@ -254,6 +254,18 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
+ <!--澶嶉�夋 瀹屾垚鏍囪-->
+ <script type="text/html" id="HFinishFlag">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HFinishFlag" lay-filter="HFinishFlag" id="HFinishFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
+ <!--<script type="text/html" id="switchTpl">
+ 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀�
+ <input type="checkbox" name="checkbox" value="{{d.HFinishFlag}}" lay-skin="primary" lay-filter="HFinishFlag" {{ d.HFinishFlag == 1 ? 'checked' : '' }}>
+ </script>-->
+
<script>
layui.config({
@@ -314,6 +326,7 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
+ DisPlay_HideColumn();
}
//else if (OperationType == 2) { //澶嶅埗
// //绂佺敤缁勭粐閫夐」
@@ -336,6 +349,7 @@
//$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
+ DisPlay_HideColumn();
RoadBillMain(linterid);
} else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
////绂佺敤缁勭粐閫夐」
@@ -363,7 +377,7 @@
//#endregion
//#region 鍒濆鍖栬〃鏍�
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
//#endregion
//#endregion
@@ -434,16 +448,17 @@
{
"RowID": (table.cache["mainTable"].length + 1) * 10
, "HProjectID": "0"
- , 'HProNumber': ''
- , 'HProjectStageID': '0'
- , 'HProjectStageName': ''
- , 'HName': ''
- , 'HTaskNote': ''
- , 'HType': ''
- , 'HRelTimes': '0'
- , 'HReportNote': ''
- , 'HAdv': ''
- , 'HRemarkSub': ''
+ , "HProNumber": ""
+ , "HProjectStageID": "0"
+ , "HProjectStageName": ""
+ , "HName": ""
+ , "HTaskNote": ""
+ , "HType": ""
+ , "HRelTimes": "0"
+ , "HReportNote": ""
+ , "HFinishFlag": false
+ , "HAdv": ""
+ , "HRemarkSub": ""
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
, "HSourceBillNo": ""
@@ -454,6 +469,15 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+
+ for (var i = 1; i <= option.data.length; i++) {
+ //瀹屾垚鏍囪
+ if (option.data[i - 1].HFinishFlag) {
+ $('#HFinishFlag' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -469,6 +493,15 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+ for (var i = 1; i <= option.data.length; i++) {
+ //瀹屾垚鏍囪
+ if (option.data[i - 1].HFinishFlag) {
+ $('#HFinishFlag' + i + '').attr("checked", true);
+ }
+ }
+ form.render('checkbox');
+ form.render('select');
}
break;
//鍒楄缃�
@@ -513,7 +546,7 @@
//#endregion
-
+
//
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
@@ -614,14 +647,16 @@
, { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
, { field: 'HProjectID', title: '椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HProNumber', title: '椤圭洰浠ｇ爜', style: 'background-color: #f9f9f9;'}
+ , { field: 'HProNumber', title: '椤圭洰浠ｇ爜', style: 'background-color: #f9f9f9;' }
, { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HProjectStageName', title: '椤圭洰闃舵', style: 'background-color: #f9f9f9;' } //f7
, { field: 'HName', title: '浠诲姟鍚嶇О', edit: 'text', event: "HName" }
, { field: 'HTaskNote', title: '浠诲姟鎻忚堪', style: 'background-color: #f9f9f9;' }
- , { field: 'HType', title: '浠诲姟绫诲瀷', style: 'background-color: #f9f9f9;'}
+ , { field: 'HType', title: '浠诲姟绫诲瀷', style: 'background-color: #f9f9f9;' }
, { field: 'HRelTimes', title: '鑰楃敤宸ユ椂', edit: 'text', totalRow: true }
, { field: 'HReportNote', title: '姹囨姤鍐呭', edit: 'text' }
+ , { field: 'HFinishFlag', title: '瀹屾垚鏍囪', templet: "#HFinishFlag" }//checkbox
+ //, { field: 'HFinishFlag', title: '瀹屾垚鏍囪', width: 100, templet: '#switchTpl', unresize: false }
, { field: 'HAdv', title: '浼樺寲寤鸿', edit: 'text' }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
@@ -636,16 +671,17 @@
{
"RowID": 10
, "HProjectID": "0"
- , 'HProNumber': ''
- , 'HProjectStageID': '0'
- , 'HProjectStageName': ''
- , 'HName': ''
- , 'HTaskNote': ''
- , 'HType': ''
- , 'HRelTimes': '0'
- , 'HReportNote': ''
- , 'HAdv': ''
- , 'HRemarkSub': ''
+ , "HProNumber": ""
+ , "HProjectStageID": "0"
+ , "HProjectStageName": ""
+ , "HName": ""
+ , "HTaskNote": ""
+ , "HType": ""
+ , "HRelTimes": "0"
+ , "HReportNote": ""
+ , "HFinishFlag": false
+ , "HAdv": ""
+ , "HRemarkSub": ""
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
, "HSourceBillNo": ""
@@ -656,6 +692,18 @@
table.render(option);
}
//#endregion
+
+ //瀹屾垚鏍囪
+ form.on('checkbox(HFinishFlag)', 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.HFinishFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
//#region 姹囨姤浜洪�夋嫨椤甸潰
function get_checkSearchHReportEmp() {
@@ -709,7 +757,7 @@
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
//瀛愯〃鏁版嵁搴忓垪鍖�
- var sSubStr = JSON.stringify(num);
+ var sSubStr = JSON.stringify(num);
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
@@ -786,6 +834,14 @@
}
option.data = tableSub;
table.render(option);
+
+ for (var i = 0; i < tableSub.length; i++) {
+ if (tableSub[i].HFinishFlag) {
+ $('#HFinishFlag' + (i + 1)).attr("checked", true);
+ }
+ }
+ form.render('checkbox');
+ form.render('select');
}
})
}
@@ -1225,7 +1281,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["琛屽彿","椤圭洰闃舵ID","婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["琛屽彿", "椤圭洰闃舵ID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
index d4802e7..5ccaaac 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
@@ -92,9 +92,7 @@
<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="HProNumber" name="HProNumber" id="HProNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
- <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="0">
- <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="0">
+ <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -201,6 +199,11 @@
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
+
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" lay-verify="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" lay-verify="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
</div>
</div>
</div>
@@ -802,6 +805,7 @@
}
//璁剧疆琛ㄥご鏁版嵁
//璁剧疆鏂囨湰妗嗗��
+ $("#HProjectID").val(checkStatus.data[0].HInterID);
$("#HProNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
$("#HProjectStageID").val(checkStatus.data[0].HProjectStageID);
$("#HProjectStageName").val(checkStatus.data[0].椤圭洰闃舵);
@@ -810,6 +814,13 @@
$("#HRelationGoods").val(checkStatus.data[0].闃舵鐩稿叧浜や粯鐗�);
$("#HIsKey").val((checkStatus.data[0].閲岀▼纰�=='Y'?true:false));
$("#HRate").val(checkStatus.data[0].闃舵涓氱哗鍗犳瘮);
+
+ $("#HMainSourceInterID").val(checkStatus.data[0].HInterID);
+ $("#HMainSourceEntryID").val(checkStatus.data[0].HEntryID);
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceBillType").val(checkStatus.data[0].鍗曟嵁绫诲瀷);
+
+
//璁剧疆澶嶉�夋閫変腑鐘舵��
if ($("#HIsKey").val() == "true") {
@@ -1233,6 +1244,12 @@
, "HRate": tableMain[0]["HRate"]
, "HOrgID": tableMain[0]["HOrgID"]
, "HRemark": tableMain[0]["HRemark"]
+
+ , "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
+ , "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
+ , "HMainSourceBillNo": tableMain[0]["HMainSourceBillNo"]
+ , "HMainSourceBillType": tableMain[0]["HMainSourceBillType"]
+
, "HMaker": tableMain[0]["HMaker"]
, "HUpdater": tableMain[0]["HUpdater"]
, "HChecker": tableMain[0]["HChecker"]
@@ -1284,10 +1301,8 @@
//涓昏〃 璧嬪��
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProID": tableMain[0]["HInterID"]
+ "HProjectID": tableMain[0]["HInterID"]
, "HProNumber": tableMain[0]["椤圭洰浠ｇ爜"]
- , "HMainSourceBillNo": tableMain[0]["鍗曟嵁鍙�"]
- , "HMainSourceBillType": tableMain[0]["鍗曟嵁绫诲瀷"]
, "HProjectStageID": tableMain[0]["HProjectStageID"]
, "HProjectStageName": tableMain[0]["椤圭洰闃舵"]
, "HStageNote": tableMain[0]["椤圭洰闃舵璇︾粏鍐呭"]
@@ -1295,6 +1310,11 @@
, "HIsKey": tableMain[0]["閲岀▼纰�"]=="Y"?true:false
, "HRate": tableMain[0]["闃舵涓氱哗鍗犳瘮"]
, "HOrgID": tableMain[0]["HOrgID"]
+
+ , "HMainSourceInterID": tableMain[0]["HInterID"]
+ , "HMainSourceEntryID": tableMain[0]["HEntryID"]
+ , "HMainSourceBillNo": tableMain[0]["鍗曟嵁鍙�"]
+ , "HMainSourceBillType": tableMain[0]["鍗曟嵁绫诲瀷"]
});
//鑻ヨ闃舵涓洪噷绋嬬锛屽垯璁剧疆閲岀▼纰戝閫夋涓洪�変腑
if (tableMain[0]["閲岀▼纰�"]=="Y") {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
index 3208b44..1291fd3 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
@@ -40,106 +40,228 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="planview">棰勮</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
</div>
-
</div>
- <div class="layui-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
- <!--<li>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
- <h1 style="text-align:center;"><b>鐢熶骇棰嗘枡鍗�</b></h1>
- <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="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
- <input id="HInterID" name="HInterID" type="hidden" />
- <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-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-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
+
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <!--<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>-->
+ </ul>
+ <h1 style="text-align:center;"><b>鐢熶骇棰嗘枡鍗�</b></h1>
+ <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="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input id="HInterID" name="HInterID" type="hidden" />
+ <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">棰嗘枡鍛�<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" 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" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-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-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HMangerName" id="HMangerName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HManger" 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="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;">
- </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" readonly 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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
- <div class="layui-form-item">
- <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 class="layui-inline">
+ <label class="layui-form-label">宸ヨ壓鍗曞彿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" class="layui-input" value="" style="float:left;">
+ <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID" value="0">
+ <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID" value="0">
+ </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="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" readonly="readonly" autocomplete="off">
+ <input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0" />
+ <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">棰滆壊</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off">
+ <input id="HMaterID" name="HMaterID" type="hidden" value="0" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCusName" lay-verify="HCusName" id="HCusName" autocomplete="off">
+ <input id="HCusID" name="HCusID" type="hidden" value="0" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">姘村啿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWaterRush" id="HWaterRush" class="layui-input" value="" style="float:left;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸1</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HModel" id="HModel" class="layui-input" value="" style="float:left;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸2</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HModel2" lay-verify="HModel2" id="HModel2" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">甯冮噸</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWeight" id="HWeight" class="layui-input" value="" style="float:left;">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈洪��</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMachineSpeed" id="HMachineSpeed" class="layui-input" value="" style="float:left;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵撴祮浜�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMaterEmpName" id="HMaterEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMaterEmpID" id="HMaterEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHMaterEmp" 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="HWaterRate" id="HWaterRate" class="layui-input" value="" style="float:left;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">姘撮噺</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWaterQty" id="HWaterQty" class="layui-input" value="" style="float:left;" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍙暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HPieceQty" id="HPieceQty" class="layui-input" value="" style="float:left;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <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>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">棰嗘枡鍛�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSecManagerName" id="HSecManagerName" readonly 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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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="HKeeperName" id="HKeeperName" readonly 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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" 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="HMangerName" id="HMangerName" readonly 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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManger" 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 style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" readonly 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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" 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="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;">
+ </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="HVerNo" lay-verify="HVerNo" id="HVerNo" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绫虫暟</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HLong" lay-verify="HLong" id="HLong" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟《閲嶉噺</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSingeWeight" id="HSingeWeight" class="layui-input" value="0" style="float:left;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎬绘祮閲嶉噺</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMaterSumWeight" id="HMaterSumWeight" class="layui-input" value="0" style="float:left;">
</div>
</div>
</div>
@@ -183,18 +305,7 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script>
- //鑾峰彇鍙傛暟
- var params = get_UrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- var closeType = 2; //鍏抽棴绫诲瀷
- } else {
- 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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -209,21 +320,44 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+
+ //#region 纭鎿嶄綔绫诲瀷锛屽苟鑾峰彇瀵瑰簲鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+ //#endregion
+
//鏌ヨ鏉′欢
var option = [];
var option1 = [];
var sWhere = "";
var sBillType = "1204";
//#endregion
+
+
//#region 杩涘叆椤甸潰鏃㈠姞杞�
- //鍒濆鍖栬〃鍗曟彃浠�
+ //#region 鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
- //鍒濆鍖栬〃鏍�
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
set_InitGrid();
set_CountGrid();
- //鍒ゆ柇鎿嶄綔绫诲瀷
+ //#endregion
+
+ //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
+ }
+ else if (OperationType == 2) {//澶嶅埗
+ set_CopyFromGrid(linterid);
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
@@ -232,14 +366,15 @@
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
//#endregion
+ //#endregion
- //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
- //澶村伐鍏锋爮
+ //#region 鐩戝惉锛氳Е鍙戜簨浠�
+ //#region 瀛愯〃1锛氬ご宸ュ叿鏍忔寜閽Е鍙戜簨浠�
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
console.log(NewRow);
switch (obj.event) {
//鏂板涓�琛�
@@ -250,12 +385,95 @@
break;
}
});
- //琛屽唴浜嬩欢
+ //#endregion
+
+ //#region 琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
- //琛ㄥご淇℃伅浠撳簱寮圭獥
+ //#endregion
+
+ //#region 閫夋嫨寮圭獥瑙﹀彂浜嬩欢
+ //#region 閫夋嫨杞﹂棿寮圭獥
+ form.on('submit(Department)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '杞﹂棿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/DeptInformation.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].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨鎵撴祮浜哄脊绐�
+ form.on('submit(btnSearchHMaterEmp)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎵撴祮浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterEmpName").val(checkStatus.data[0].HName);
+ $("#HMaterEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨浠撳簱寮圭獥
form.on('submit(WareHouse)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -292,7 +510,9 @@
}
});
});
- //琛ㄥご淇℃伅楠屾敹鍛樺脊绐�
+ //#endregion
+
+ //#region 閫夋嫨楠屾敹鍛樺脊绐�
form.on('submit(HSecManagerList)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -329,7 +549,48 @@
}
});
});
- //涓荤
+ //#endregion
+
+ //#region 閫夋嫨淇濈鍛樺脊绐�
+ form.on('submit(HKeeperList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '淇濈鍛樺垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeperName").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨涓荤寮圭獥
form.on('submit(HManger)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -366,103 +627,9 @@
}
});
});
-
- //琛ㄥご淇℃伅淇濈鍛樺脊绐�
- form.on('submit(HKeeperList)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ叧鍛樺垪琛�',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
+ //#endregion
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- 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('璇烽�夋嫨鏁版嵁');
- }
- $("#HKeeperName").val(checkStatus.data[0].HName);
- $("#HKeeperID").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(Department)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '閮ㄩ棬鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/DeptInformation.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].HName);
- $("#HDeptID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- });
- });
- //涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂
- form.on('select(HSupTypeID)', function (data) {
- $("#HSupID").val("");
- $("#HSupName").val("");
- });
-
- function getSupType() {
- var type = $("#HSupTypeID").val();
- console.log(type)
- switch (type) {
- case '1':
- return "SupplierInformation";
- break;
- case '2':
- return "CustomerInformation";
- break;
- case '3':
- return "DeptInformation";
- break;
- }
- }
- //琛ㄥご淇℃伅寰�鏉ュ崟浣嶅脊绐�
+ //#region 閫夋嫨寰�鏉ュ崟浣嶅脊绐�
form.on('submit(HSupList)', function () {
if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
return layer.msg('璇烽�夋嫨寰�鏉ョ被鍨�');
@@ -504,19 +671,99 @@
}
});
});
- //淇濆瓨
+ //#endregion
+ //#endregion
+
+ //#region 涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂
+ form.on('select(HSupTypeID)', function (data) {
+ $("#HSupID").val("");
+ $("#HSupName").val("");
+ });
+ //#endregion
+
+ //#region 琛ㄥご鏂囨湰妗嗙洃鍚�
+ $(document).ready(function () {
+ //#region 宸ヨ壓鍗曞彿锛欵nter閿洃鍚�
+ $("#HProcExchBillNo").on('input keydown', function (data) {
+ if (data.keyCode == 13) {
+ getMainInfoByHProcExchBillNo();
+ }
+ });
+ //#endregion
+
+ //#region 姘存瘮鍙樻洿锛岃绠椾富琛ㄦ按閲忋�佸瓙琛ㄩ噸閲�
+ $("#HWaterRate").on('input change', function (data) {
+ var HWaterRate = $("#HWaterRate").val();
+ var HWeight = $("#HWeight").val();
+ var HWaterQty = HWeight * HWaterRate;
+ $("#HWaterQty").val(HWaterQty);
+
+ for (var i = 0; i < option.data.length; i++) {
+ var HMaterRuleType = option.data[i].HMaterRuleType;
+ if (HMaterRuleType == "鏌撴枡") {
+ option.data[i].HQty = option.data[i].HRate * HWeight;
+ } else if (HMaterRuleType == "鍔╁墏") {
+ option.data[i].HQty = option.data[i].HRate * HWaterQty;
+ }
+ }
+ table.render(option);
+ });
+ //#endregion
+
+ //#region 甯冮噸鍙樻洿锛岃绠楀瓙琛ㄩ噸閲�
+ $("#HWeight").on('input change', function (data) {
+ var HWaterRate = $("#HWaterRate").val();
+ var HWeight = $("#HWeight").val();
+ var HWaterQty = HWeight * HWaterRate;
+ $("#HWaterQty").val(HWaterQty);
+
+ for (var i = 0; i < option.data.length; i++) {
+ var HMaterRuleType = option.data[i].HMaterRuleType;
+ if (HMaterRuleType == "鏌撴枡") {
+ option.data[i].HQty = option.data[i].HRate * HWeight;
+ } else if (HMaterRuleType == "鍔╁墏") {
+ option.data[i].HQty = option.data[i].HRate * HWaterQty;
+ }
+ }
+ table.render(option);
+ });
+ //#endregion
+ });
+ //#endregion
+
+ //#region 妯″潡鎸夐挳瑙﹀彂浜嬩欢
+ //#region 澶嶅埗
+ form.on('submit(Copy)', function (data) {
+ clear();
+
+ var HInterID = $("#HInterID").val();
+ OperationType = 2;
+ set_CopyFromGrid(HInterID);
+ });
+ //#endregion
+
+ //#region 鏂板
+ form.on('submit(Add)', function (data) {
+ clear();
+ OperationType = 1;
+ set_AddFNew();
+ });
+ //#endregion
+
+ //#region 淇濆瓨
form.on('submit(Saver)', function (data) {
var refSav = "";
- if (linterid == "" || linterid == null) {
+ if (OperationType == 1 || OperationType==2) {
refSav = "Add";
}
- if (linterid != "" && linterid != null) {
+ if (OperationType==3) {
refSav = "Update";
}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
@@ -551,11 +798,15 @@
}
});
});
- //閫�鍑�
+ //#endregion
+
+ //#region 閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
});
- //棰勮
+ //#endregion
+
+ //#region 棰勮
form.on("submit(planview)", function (data) {
if (linterid != "" || linterid != null) {
layer.open({
@@ -573,9 +824,13 @@
layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
}
});
- //鎵撳嵃
+ //#endregion
+
+ //#region 鎵撳嵃
form.on("submit(print)", function (data) {
- if (linterid != "" || linterid != null) {
+ var HInterID = $("#HInterID").val();
+
+ if (HInterID != "" || HInterID != null) {
layer.open({
type: 2
, area: ['50%', '50%']
@@ -583,7 +838,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=Kf_MateOutBillList', 'yes']
, resize: false
})
}
@@ -592,12 +847,16 @@
}
});
- //鍏抽棴褰撳墠椤�
+ //#endregion
+
+ //#region 鍏抽棴褰撳墠椤�
form.on('submit(Cancel)', function () {
parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
- //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ //#endregion
+
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
table.on('edit(mainTable)', function (obj) {
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
@@ -607,60 +866,94 @@
//layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
switch (field) {
- case "HDesignLife": //璁捐瀵垮懡
- value = isNaN(value) ? 0 : value;
- var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //case "HDesignLife": //璁捐瀵垮懡
+ // value = isNaN(value) ? 0 : value;
+ // var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HDesignLife: value, //璁捐瀵垮懡
+ // HLeaveLife: value - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ // });
+ // break;
+ //case "HLeaveLife": //鍓╀綑瀵垮懡
+ // var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ // var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+ // obj.update({
+ // HLeaveLife: HDesignLife - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ // });
+ // break;
+ //case "HUseLife": //浣跨敤瀵垮懡
+ // var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ // value = isNaN(value) ? 0 : value;
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ // });
+ // break;
+ //case "HQty": //瀹炴敹鏁伴噺
+ // value = isNaN(value) ? 0 : value;
+ // var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ // });
+ // break;
+ //case "HPrice": //鍗曚环
+ // value = isNaN(value) ? 0 : value;
+ // var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ // });
+ // break;
+ //case "HMoney": //閲戦
+ // var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ // var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ // });
+ // break;
+ case "HRate": //鐢ㄩ噺
+ var HWeight = $("#HWeight").val();
+ var HWaterQty = $("#HWaterQty").val();
+ var HRate = value;
+ var HQty = 0;
+ var HMaterRuleType = obj.data.HMaterRuleType;
+ if (HMaterRuleType == "鏌撴枡") {
+ HQty = HRate * HWeight;
+ } else if (HMaterRuleType == "鍔╁墏") {
+ HQty = HRate * HWaterQty;
+ }
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HDesignLife: value, //璁捐瀵垮懡
- HLeaveLife: value - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ HQty: HQty
});
break;
- case "HLeaveLife": //鍓╀綑瀵垮懡
- var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
- var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
- obj.update({
- HLeaveLife: HDesignLife - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
- });
- break;
- case "HUseLife": //浣跨敤瀵垮懡
- var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
- value = isNaN(value) ? 0 : value;
+ case "HMaterRuleType":
+ var HWeight = $("#HWeight").val();
+ var HWaterQty = $("#HWaterQty").val();
+ var HRate = obj.data.HRate;
+ var HQty = 0;
+ var HMaterRuleType = value;
+ if (HMaterRuleType == "鏌撴枡") {
+ HQty = HRate * HWeight;
+ } else if (HMaterRuleType == "鍔╁墏") {
+ HQty = HRate * HWaterQty;
+ }
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
- });
- break;
- case "HQty": //瀹炴敹鏁伴噺
- value = isNaN(value) ? 0 : value;
- var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
- });
- break;
- case "HPrice": //鍗曚环
- value = isNaN(value) ? 0 : value;
- var HQty = isNaN(data.HQty) ? 0 : data.HQty;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
- });
- break;
- case "HMoney": //閲戦
- var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
- var HQty = isNaN(data.HQty) ? 0 : data.HQty;
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ HQty: HQty
});
break;
default:
}
});
- //鐩戝惉鎻愪氦
+ //#endregion
+
+ //#region 鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
// if (value != '') {
@@ -671,18 +964,115 @@
}
});
//#endregion
+ //#endregion
+
+ //#endregion
//#region 姝ら〉闈㈡墍鏈夋柟娉�
- //鍒濆鍖栬〃鍗曟彃浠�
+ //#region 娓呯┖鐣岄潰
+ function clear() {
+ $("#HDeptID").val("0");
+ $("#HDeptName").val("");
+ $("#HProcExchInterID").val("0");
+ $("#HProcExchEntryID").val("0");
+ $("#HProcExchBillNo").val("");
+ $("#HICMOInterID").val("0");
+ $("#HICMOEntryID").val("0");
+ $("#HICMOBillNo").val("");
+ $("#HMaterID").val("0");
+ $("#HMaterName").val("");
+ $("#HModel").val("");
+ $("#HModel2").val("");
+ $("#HPieceQty").val("");
+ $("#HCusID").val("0");
+ $("#HCusName").val("");
+ $("#HWeight").val("");
+ $("#HMachineSpeed").val("");
+ $("#HWaterRush").val("");
+ $("#HWaterQty").val("");
+ $("#HWaterRate").val("");
+ $("#HMaterEmpID").val("0");
+ $("#HMaterEmpName").val("");
+ $("#HRemark").val("");
+
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HSecManagerID").val("0");
+ $("#HSecManagerName").val("");
+ $("#HKeeperID").val("0");
+ $("#HKeeperName").val("");
+ $("#HManagerID").val("0");
+ $("#HManagerName").val("");
+ $("#HSourceBillType").val("");
+ $("#XDH").val("");
+
+ $("#HVerNo").val("");
+ $("#HLong").val("");
+ $("#HSingleWeight").val("0");
+ $("#HMaterSumWeight").val("0");
+ }
+ //#endregion
+
+ //#region 鏃ユ湡鏍煎紡鍖�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鍗曟彃浠�
function set_InitFrom() {
laydate.render({
elem: '#HDate'
});
}
+ //#endregion
-
+ //#region 鍒ゆ柇寰�鏉ュ崟浣嶇被鍨�
+ function getSupType() {
+ var type = $("#HSupTypeID").val();
+ console.log(type)
+ switch (type) {
+ case '1':
+ return "SupplierInformation";
+ break;
+ case '2':
+ return "CustomerInformation";
+ break;
+ case '3':
+ return "DeptInformation";
+ break;
+ }
+ }
+ //#endregion
- //鍒濆鍖栨槑缁嗚〃鏍�
+ //#region 鑾峰彇鏈�澶у崟鎹彿
+ function get_MAXNum() {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": sBillType },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HInterID").val(0);
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栨槑缁嗚〃鏍�
function set_InitGrid() {
columns = [
{ type: 'checkbox', fixed: 'left' }
@@ -690,17 +1080,19 @@
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HMaterRuleType', title: '鐗╂枡鍒嗙被', edit: 'text', width: 100 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
- , { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100 }
+ , { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100, hide: true }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', width: 100 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100 }
- , { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
- , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
- , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
- , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
- , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
- , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100, hide: true}
+ , { field: 'HRate', title: '鐢ㄩ噺鈥�', edit: 'text', width: 100 }
+ , { field: 'HQty', title: '閲嶉噺', edit: 'text', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100, hide: true}
+ , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100, hide: true}
+ , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true, hide: true }
+ , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120, hide: true}
+ , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', edit: 'text', width: 120, hide: true}
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -717,7 +1109,9 @@
}
};
}
- //鍒濆姹囨�讳俊鎭�
+ //#endregion
+
+ //#region 鍒濆姹囨�讳俊鎭�
function set_CountGrid() {
//琛ㄥご
columns = [
@@ -747,39 +1141,51 @@
}
};
}
+ //#endregion
- //鏃犳簮鍗曟柊澧�
+ //#region 鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate":0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
table.render(option);
}
- //鑾峰彇鏈�澶у崟鎹彿
- function get_MAXNum() {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": sBillType },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
- $("#HInterID").val(0);
- }
- });
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_CopyFromGrid(linterid) {
+ //鏍规嵁鎵�澶嶅埗鍗曟嵁鐨勫唴鐮佽幏鍙栧崟鎹俊鎭紝骞跺垵濮嬪寲椤甸潰
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
+ table.render(option);
+
+ //瑕嗙洊鍗曟嵁鍐呯爜銆佸崟鎹彿銆佹棩鏈�
+ get_MAXNum();
+
+ //娓呯┖ 浠诲姟鍗曞彿銆佸伐鑹哄崟鍙�
+ $("#HICMOInterID").val("0");
+ $("#HICMOEntryID").val("0");
+ $("#HICMOBillNo").val("");
+ $("#HProcExchInterID").val("0");
+ $("#HProcExchEntryID").val("0");
+ $("#HProcExchBillNo").val("");
}
- //缂栬緫
+ //#endregion
+
+ //#region 缂栬緫
function set_EditFromGrid(linterid) {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
table.render(option);
+
+ $("#HProcExchBillNo").prop("disabled", true);
+ $("#HICMOBillNo").prop("disabled", true);
}
- //缂栬緫鑾峰彇琛ㄥご
+ //#endregion
+
+ //#region 缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid){
$.ajax({
url: GetWEBURL() + "Kf_MateOutBill/Kf_MateOutBillListCheckDetai",
@@ -792,22 +1198,48 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Sc_MouldProdInHouseBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+
+ //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ //"HWHID": data.HWHIDMain //浠撳簱ID
+ //, "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ //, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
+ //, "HSecManagerName": data.棰嗘枡鍛� //楠屾敹鍛樺悕绉�
+ //, "HKeeperID": data.HKeeperID //淇濈鍛業D
+ //, "HKeeperName": data.淇濈鍛� //淇濈鍛樺悕绉�
+ //, "HManagerID": data.HManagerID //淇濈鍛樺悕绉�
+ //, "HMangerName": data.涓荤 //淇濈鍛樺悕绉�
+ //, "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
+ //, "XDH": "" //閫夊崟鍙�
+
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
- //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHIDMain //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
- , "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
- , "HSecManagerName": data.棰嗘枡鍛� //楠屾敹鍛樺悕绉�
- , "HKeeperID": data.hkeeperid //淇濈鍛業D
- , "HKeeperName": data.淇濈鍛� //淇濈鍛樺悕绉�
- , "HManagerID": data.hmanagerid //淇濈鍛樺悕绉�
- , "HMangerName": data.涓荤 //淇濈鍛樺悕绉�
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
- , "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
- , "XDH": "" //閫夊崟鍙�
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HICMOInterID": data.浠诲姟鍗曞唴鐮�
+ , "HICMOEntryID": data.浠诲姟鍗曞瓙鍐呯爜
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HProExitInterID": data.宸ュ簭娴佽浆鍗″唴鐮�
+ , "HProExitEntryID": data.宸ュ簭娴佽浆鍗″瓙鍐呯爜
+ , "HProExitBillNo": data.宸ュ簭娴佽浆鍗″彿
+ , "HMaterID": data.涓讳骇鍝佸唴鐮�
+ , "HMaterName": data.涓讳骇鍝佸悕绉�
+ , "HVerNo": data.鑺辩増鍙�
+ , "HModel": data.瑙勬牸鍨嬪彿1
+ , "HModel2": data.瑙勬牸鍨嬪彿2
+ , "HPieceQty": data.鍙暟
+ , "HCusID": data.瀹㈡埛鍐呯爜
+ , "HCusName": data.瀹㈡埛鍚嶇О
+ , "HWeight": data.閲嶉噺
+ , "HLong": data.绫虫暟
+ , "HSingleWeight": data.鍗曟《閲嶉噺
+ , "HMaterSumWeight": data.鎬绘祮閲嶉噺
+ , "HMaterEmpID": data.鎵撴祮浜哄唴鐮�
+ , "HMaterEmpName": data.鎵撴祮浜哄悕绉�
+ , "HMachineSpeed": data.鏈洪��
+ , "HWaterRush": data.姘村啿
+ , "HWaterQty": data.姘撮噺
+ , "HWaterRate": data.姘存瘮
});
} else {
@@ -818,7 +1250,9 @@
}
});
}
- //缂栬緫鑾峰彇琛ㄤ綋
+ //#endregion
+
+ //#region 缂栬緫鑾峰彇琛ㄤ綋
function set_EditGrid(linterid) {
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
@@ -842,19 +1276,9 @@
}
});
}
- //鏃ユ湡鏍煎紡鍖�
- function formatDate(date) {
- var d = new Date(date),
- month = '' + (d.getMonth() + 1),
- day = '' + d.getDate(),
- year = d.getFullYear();
+ //#endregion
- if (month.length < 2) month = '0' + month;
- if (day.length < 2) day = '0' + day;
-
- return [year, month, day].join('-');
- }
- //澧炲姞涓�琛�
+ //#region 澧炲姞涓�琛�
function btnAddLine(NewRow) {
//var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
//buttonArr = [];//娓呯┖鏁扮粍
@@ -869,10 +1293,12 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
- rows++;
+ //rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
}
- //澶嶅埗涓�琛�
+ //#endregion
+
+ //#region 澶嶅埗涓�琛�
function btnCopyLine(data) {
var copydata = JSON.stringify(data);
if (data.length <= 0) {
@@ -889,7 +1315,9 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
}
}
- // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ //#endregion
+
+ //#region 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
@@ -909,7 +1337,9 @@
});
}
}
- //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ //#endregion
+
+ //#region 琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
@@ -932,22 +1362,36 @@
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
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('璇烽�夋嫨鏁版嵁');
- }
+ //if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ //}
//console.log(obj.data);
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMaterID: checkStatus.data[0].HItemID,
- HMaterCode: checkStatus.data[0].HNumber,
- HMaterName: checkStatus.data[0].HName,
- HMaterSpec: checkStatus.data[0].HModel,
- HDesignLife: 0, //璁捐瀵垮懡
- HLeaveLife: 0, //鍓╀綑瀵垮懡
- HQty: 1, //瀹炴敹鏁伴噺
- HMoney: 0, //閲戦
- });
+
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+ btnAddLine(NewRow);
+ }
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].HMaterCode = resultData.HMaterNumber;
+ option.data[rowIndex + i].HMaterName = resultData.HMaterName;
+ option.data[rowIndex + i].HMaterRuleType = resultData.HMaterRuleType;
+ option.data[rowIndex + i].HMaterSpec = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].HUnitCode = resultData.HUnitNumber;
+ option.data[rowIndex + i].HUnitName = resultData.HUnitName;
+
+ option.data[rowIndex + i].HDesignLife = 0;
+ option.data[rowIndex + i].HLeaveLife = 0;
+ option.data[rowIndex + i].HQty = 1;
+ option.data[rowIndex + i].HMoney = 0;
+ }
+ table.render(option);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1138,34 +1582,141 @@
}
})
}
+ //#endregion
+
//?
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
}
- //闈炵┖楠岃瘉
+
+ //#region 闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
- layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+ //#region 涓昏〃鏍￠獙
+ var ref = /^\d+(\.\d+)?$/;
+ var temp = "";
+
+ //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+ // layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ //if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ // layer.msg("棰嗘枡鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ //if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+ // layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ //if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
+ // layer.msg("涓荤涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+
+
+ if ($("#HDeptID").val() == '0' || $("#HDeptID").val() == null) {
+ layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("棰嗘枡鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+ if ($("#HMaterEmpID").val() == '0' || $("#HMaterEmpID").val() == null) {
+ layer.msg("鎵撴祮浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
- layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+ temp = $("#HWeight").val() + "";
+ if (temp == "") {
+ layer.msg("甯冮噸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ } else if (!ref.test(temp)) {
+ layer.msg("甯冮噸锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
- layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var resultData = getHWeightByHProcExchBillNo(HProcExchBillNo);
+ if (typeof (resultData.HWeight) == "undefined") {
+ return Result = false;
+ } else {
+ var HWeight = resultData.HWeight * 1;
+ temp = temp * 1;
+ if (temp > HWeight) {
+ layer.msg("甯冮噸涓嶈兘瓒呭嚭宸ヨ壓鍗曞搴旀暟閲忥紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+
+ //temp = $("#HLong").val() + "";
+ //if (temp == "") {
+ // layer.msg("绫虫暟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //} else if (!ref.test(temp)) {
+ // layer.msg("绫虫暟锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+
+ //temp = $("#HSingleWeight").val() + "";
+ //if (temp == "") {
+ // layer.msg("鍗曟《閲嶉噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //} else if (!ref.test(temp)) {
+ // layer.msg("鍗曟《閲嶉噺锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+
+ //temp = $("#HMaterSumWeight").val() + "";
+ //if (temp == "") {
+ // layer.msg("鎬绘祮閲嶉噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //} else if (!ref.test(temp)) {
+ // layer.msg("鎬绘祮閲嶉噺锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+
+ temp = $("#HMachineSpeed").val() + "";
+ if (temp == "") {
+ layer.msg("鏈洪�熶笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ } else if (!ref.test(temp)) {
+ layer.msg("鏈洪�燂細璇疯緭鍏ラ潪璐熸暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
- layer.msg("涓荤涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+ temp = $("#HWaterRush").val() + "";
+ if (temp == "") {
+ layer.msg("姘村啿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ } else if (!ref.test(temp)) {
+ layer.msg("姘村啿锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+
+ temp = $("#HWaterQty").val() + "";
+ if (temp == "") {
+ layer.msg("姘撮噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ } else if (!ref.test(temp)) {
+ layer.msg("姘撮噺锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ temp = $("#HWaterRate").val() + "";
+ if (temp == "") {
+ layer.msg("姘存瘮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ } else if (!ref.test(temp)) {
+ layer.msg("姘存瘮锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+
+ //#endregion
+
+
+
+ //#region 瀛愯〃鏍￠獙
if (typeof (sSubStr) == "undefined" || sSubStr == "") {
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -1173,26 +1724,125 @@
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
- //if (sSubStr[i].HMaterID == "") {
- // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return Result = false;
- //}
+ if (sSubStr[i].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (sSubStr[i].HUnitID == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HWHID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if (sSubStr[i].HWHID == "") {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
}
}
else {
return Result = true;
}
+ //#endregion
+
+
return Result;
}
+ //#endregion
+ //#region 鏍规嵁宸ヨ壓鍗曞彿鑾峰彇琛ㄥご淇℃伅
+ function getMainInfoByHProcExchBillNo() {
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var resultData = {};
+ $.ajax({
+ url: GetWEBURL() + "Kf_MateOutBill/getMainDataByHProcExchBillNo",
+ type: "GET",
+ data: {
+ "HProcExchBillNo": HProcExchBillNo
+ },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+ resultData = data;
+
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.HICMOInterID
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HICMOBillNo": data.HICMOBillNo
+ , "HProcExchInterID": data.HProcExchInterID
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.HMaterName
+ /* , "HVerNo": data.鑺辩増鍙�*/
+ , "HModel": data.HModel
+ , "HModel2": data.HModel2
+ /*, "HPieceQty": data.鍙暟*/
+ , "HCusID": data.HCusID
+ , "HCusName": data.HCusName
+ , "HWeight": data.HWeight
+ //, "HLong": data.绫虫暟
+ //, "HMaterEmpID": data.鎵撴祮浜哄唴鐮�
+ //, "HMaterEmpName": data.鎵撴祮浜哄悕绉�
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return resultData;
+ }
+ //#endregion
+
+ //#region 鏍规嵁宸ヨ壓鍗曞彿鑾峰彇宸ヨ壓鍗曞竷閲�
+ function getHWeightByHProcExchBillNo() {
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var resultData = {};
+ $.ajax({
+ url: GetWEBURL() + "Kf_MateOutBill/getMainDataByHProcExchBillNo",
+ async:false,
+ type: "GET",
+ data: {
+ "HProcExchBillNo": HProcExchBillNo
+ },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+ resultData = data;
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return resultData;
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐗╂枡ID鑾峰彇鐗╂枡璇︾粏淇℃伅
+ function getMaterialByMaterID(HMaterID) {
+ var resultData = {};
+ $.ajax({
+ url: GetWEBURL() + "Kf_MateOutBill/getMaterialByMaterID",
+ async: false,
+ type: "GET",
+ data: {
+ "HMaterID": HMaterID
+ },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data;
+ resultData = data[0];
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return resultData;
+ }
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index df3a34d..85cdac0 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -114,8 +114,10 @@
<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-Copy" lay-event="btn-Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></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="btn-BarCodeDetail" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
@@ -162,6 +164,9 @@
switch (obj.event) {
//鏂板鎸夐挳
case 'btn-Add': set_AddNew();
+ break;
+ //澶嶅埗鎸夐挳
+ case 'btn-Copy': set_CopyBill();
break;
//缂栬緫鎸夐挳
case 'btn-Edit': set_ShowBill();
@@ -214,33 +219,42 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 }
- , { field: '浠撳簱', title: '浠撳簱', width: 160 }
- , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
- , { field: '棰嗘枡鍛�', title: '棰嗘枡鍛�', width: 200 }
- , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
- , { field: '淇濈鍛�', title: '淇濈鍛�', width: 160 }
- , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true }
- , { field: '涓荤', title: '涓荤', width: 200 }
, { field: 'HDeptID', title: 'HDeptID', width: 160, hide: true }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 }
- , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+ , { field: '閮ㄩ棬', title: '杞﹂棿', width: 160 }
+ , { field: '鎵撴祮浜哄唴鐮�', title: '鎵撴祮浜哄唴鐮�', width: 160, hide: true }
+ , { field: '鎵撴祮浜哄悕绉�', title: '鎵撴祮浜哄悕绉�', width: 160 }
+ , { field: '瀹㈡埛鍐呯爜', title: '瀹㈡埛鍐呯爜', width: 160, hide: true }
+ , { field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О', width: 160 }
+ , { field: '涓讳骇鍝佸唴鐮�', title: '涓讳骇鍝佸唴鐮�', width: 160, hide: true }
+ , { field: '涓讳骇鍝佸悕绉�', title: '棰滆壊', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿1', title: '瑙勬牸鍨嬪彿1', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿2', title: '瑙勬牸鍨嬪彿2', width: 160 }
+ , { field: '姘村啿', title: '姘村啿', width: 160 }
+ , { field: '鏈洪��', title: '鏈洪��', width: 160 }
+ , { field: '鍙暟', title: '鍙暟', width: 160 }
+ , { field: '閲嶉噺', title: '甯冮噸', width: 160 }
+ , { field: '姘存瘮', title: '姘存瘮', width: 160 }
+ , { field: '姘撮噺', title: '姘撮噺', width: 160 }
+ , { field: 'hsubid', title: 'hsubid', hide: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
- , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+ , { field: '鐗╂枡鍒嗙被', title: '鐗╂枡鍏紡', width: 200 }
+ , { field: 'HUnitID', title: 'HUnitID', width: 200, hide: true }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
- , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 }
- , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 115 }
- , { field: '鍗曚环', title: '鍗曚环', width: 200 }
- , { field: '閲戦', title: '閲戦', width: 200 }
- , { field: 'hwhid', title: 'hwhid', width: 115, hide: true }
- , { field: '棰嗘枡浠撳簱浠ｇ爜', title: '棰嗘枡浠撳簱浠ｇ爜', width: 200 }
- , { field: '棰嗘枡浠撳簱', title: '棰嗘枡浠撳簱', width: 200 }
+ , { field: '鐢ㄩ噺', title: '鐢ㄩ噺鈥�', width: 200 }
+ , { field: '瀹炴敹鏁伴噺', title: '閲嶉噺', width: 200 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 115 }
- , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 }
+
+ , { field: '浠诲姟鍗曞唴鐮�', title: '浠诲姟鍗曞唴鐮�', width: 200, hide: true }
+ , { field: '浠诲姟鍗曞瓙鍐呯爜', title: '浠诲姟鍗曞瓙鍐呯爜', width: 200, hide: true }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 200 }
+ , { field: '宸ュ簭娴佽浆鍗″唴鐮�', title: '宸ュ簭娴佽浆鍗″唴鐮�', width: 200, hide: true }
+ , { field: '宸ュ簭娴佽浆鍗″瓙鍐呯爜', title: '宸ュ簭娴佽浆鍗″瓙鍐呯爜', width: 200, hide: true }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 200 }
+
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100 }
@@ -251,6 +265,49 @@
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+
+ //, { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ //, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ //, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ //, { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 }
+ //, { field: '浠撳簱', title: '浠撳簱', width: 160 }
+ //, { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
+ //, { field: '棰嗘枡鍛�', title: '棰嗘枡鍛�', width: 200 }
+ //, { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
+ //, { field: '淇濈鍛�', title: '淇濈鍛�', width: 160 }
+ //, { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true }
+ //, { field: '涓荤', title: '涓荤', width: 200 }
+ //, { field: 'HDeptID', title: 'HDeptID', width: 160, hide: true }
+ //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 }
+ //, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+ //, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
+ //, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+ //, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
+ //, { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+ //, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
+ //, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
+ //, { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 }
+ //, { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 115 }
+ //, { field: '鍗曚环', title: '鍗曚环', width: 200 }
+ //, { field: '閲戦', title: '閲戦', width: 200 }
+ //, { field: 'hwhid', title: 'hwhid', width: 115, hide: true }
+ //, { field: '棰嗘枡浠撳簱浠ｇ爜', title: '棰嗘枡浠撳簱浠ｇ爜', width: 200 }
+ //, { field: '棰嗘枡浠撳簱', title: '棰嗘枡浠撳簱', width: 200 }
+ //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+ //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+ //, { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 115 }
+ //, { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 }
+ //, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ //, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ //, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100 }
+ //, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ //, { field: '淇敼浜�', title: '淇敼浜�', width: 100 }
+ //, { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ //, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100 }
+ //, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ //, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
+ //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
];
option = {
@@ -345,7 +402,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鍗曟嵁ID", "hsubid", "HDeptID", "鎵撴祮浜哄唴鐮�", "瀹㈡埛鍐呯爜", "涓讳骇鍝佸唴鐮�", "HMaterID", "HUnitID", "浠诲姟鍗曞唴鐮�", "浠诲姟鍗曞瓙鍐呯爜", "宸ュ簭娴佽浆鍗″唴鐮�", "宸ュ簭娴佽浆鍗″瓙鍐呯爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -445,6 +502,36 @@
}
});
}
+
+ //澶嶅埗鍗曟嵁
+ function set_CopyBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.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: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ get_FastQuery(table, option);
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//缂栬緫鍗曟嵁
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -578,7 +665,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_MateOutBillList', 'yes']
, resize: false
})
}
--
Gitblit v1.9.1