From 03d51f3887113f0cde89642eb8ac8f06580c39bb Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 05 十一月 2021 15:45:09 +0800
Subject: [PATCH] 器具出入库模块，所有编辑页加汇总项
---
WebTM/views/基础资料/公用基础资料/grf/器具报废入库单.grf | 30 +
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html | 46 +++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 53 +++
WebTM/views/基础资料/公用基础资料/grf/器具采购入库单.grf | 23
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html | 55 ++++
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html | 51 +++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 52 +++
WebTM/views/基础资料/公用基础资料/grf/器具改制入库单.grf | 32 +
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html | 41 +++
WebTM/views/基础资料/公用基础资料/grf/器具改制出库单.grf | 22
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 3
WebTM/views/基础资料/公用基础资料/grf/器具其他出库单.grf | 23 +
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html | 54 +++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html | 38 ++
WebTM/views/基础资料/公用基础资料/grf/器具处理出库单.grf | 24
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html | 40 ++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html | 53 +++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html | 54 +++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html | 52 +++
WebTM/WebTM.csproj | 2
WebTM/views/基础资料/公用基础资料/grf/器具其他入库单.grf | 30 +
21 files changed, 665 insertions(+), 113 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7ccd06f..0345885 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -138,13 +138,13 @@
<Content Include="views\grf\鍣ㄥ叿棰嗙敤閫�搴撳崟.grf" />
<Content Include="views\grf\鍣ㄥ叿棰嗙敤鍑哄簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿鐩存帴璋冩嫧鍗�.grf" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍑哄簱鍗�.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿澶勭悊鍑哄簱鍗�.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
index 2e2b8c2..47edaf6 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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
@@ -30,7 +30,7 @@
Name='璋冨嚭浠撳簱'
End
Item
- Name='璋冨叆浠撳簱'
+ Name='浠撳簱'
End
Item
Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
Name='瑙勬牸鍨嬪彿'
End
Item
- Name='鍗曚綅'
+ Name='璁￠噺鍗曚綅'
End
Item
- Name='鏁伴噺'
+ Name='瀹炴敹鏁伴噺'
End
Item
- Name='澶囨敞'
+ Name='琛ㄤ綋澶囨敞'
End
Item
Name='鍒跺崟浜�'
@@ -102,6 +102,9 @@
End
Item
Name='瀹℃牳浜�'
+ End
+ Item
+ Name='閮ㄩ棬'
End
End
End
@@ -217,7 +220,7 @@
Charset=134
End
WordWrap=T
- DataField='鍗曚綅'
+ DataField='璁￠噺鍗曚綅'
End
Item
Column='Column9'
@@ -229,7 +232,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
Item
Column='Column12'
@@ -239,7 +242,7 @@
Weight=400
Charset=134
End
- DataField='澶囨敞'
+ DataField='琛ㄤ綋澶囨敞'
End
End
End
@@ -556,7 +559,7 @@
Top=2.59292
Width=7.59354
Height=0.608542
- DataField='璋冨叆浠撳簱'
+ DataField='浠撳簱'
End
Item
Type=Barcode
@@ -568,6 +571,15 @@
CaptionPosition=None
CheckSum=T
Text='#鍗曟嵁缂栧彿#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=2.80458
+ Top=1.79917
+ Width=4.60375
+ Height=0.608542
+ DataField='閮ㄩ棬'
End
End
RepeatOnPage=T
@@ -618,7 +630,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
index d06b8e2..851c307 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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
@@ -30,7 +30,7 @@
Name='璋冨嚭浠撳簱'
End
Item
- Name='璋冨叆浠撳簱'
+ Name='浠撳簱'
End
Item
Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
Name='瑙勬牸鍨嬪彿'
End
Item
- Name='鍗曚綅'
+ Name='璁￠噺鍗曚綅'
End
Item
- Name='鏁伴噺'
+ Name='瀹炴敹鏁伴噺'
End
Item
- Name='澶囨敞'
+ Name='琛ㄤ綋澶囨敞'
End
Item
Name='鍒跺崟浜�'
@@ -102,6 +102,9 @@
End
Item
Name='瀹℃牳浜�'
+ End
+ Item
+ Name='閮ㄩ棬'
End
End
End
@@ -217,7 +220,7 @@
Charset=134
End
WordWrap=T
- DataField='鍗曚綅'
+ DataField='璁￠噺鍗曚綅'
End
Item
Column='Column9'
@@ -229,7 +232,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
Item
Column='Column12'
@@ -239,7 +242,7 @@
Weight=400
Charset=134
End
- DataField='澶囨敞'
+ DataField='琛ㄤ綋澶囨敞'
End
End
End
@@ -620,7 +623,7 @@
Bold=T
Charset=134
End
- DataField='璋冨叆浠撳簱'
+ DataField='浠撳簱'
End
Item
Type=MemoBox
@@ -671,7 +674,7 @@
Top=3.81
Width=5.21229
Height=0.582083
- DataField='璋冨嚭浠撳簱'
+ DataField='閮ㄩ棬'
End
End
RepeatOnPage=T
@@ -722,7 +725,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
index d06b8e2..3f1d7b7 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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
@@ -27,10 +27,10 @@
Format='yyyy/MM/dd'
End
Item
- Name='璋冨嚭浠撳簱'
+ Name='閮ㄩ棬'
End
Item
- Name='璋冨叆浠撳簱'
+ Name='浠撳簱'
End
Item
Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
Name='瑙勬牸鍨嬪彿'
End
Item
- Name='鍗曚綅'
+ Name='璁￠噺鍗曚綅'
End
Item
- Name='鏁伴噺'
+ Name='瀹炴敹鏁伴噺'
End
Item
- Name='澶囨敞'
+ Name='琛ㄤ綋澶囨敞'
End
Item
Name='鍒跺崟浜�'
@@ -217,7 +217,7 @@
Charset=134
End
WordWrap=T
- DataField='鍗曚綅'
+ DataField='璁￠噺鍗曚綅'
End
Item
Column='Column9'
@@ -229,7 +229,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
Item
Column='Column12'
@@ -239,7 +239,7 @@
Weight=400
Charset=134
End
- DataField='澶囨敞'
+ DataField='琛ㄤ綋澶囨敞'
End
End
End
@@ -391,7 +391,7 @@
Width=5.42396
Height=0.396875
TextAlign=MiddleCenter
- Text='鍣ㄥ叿鍏朵粬鍑哄簱鍗�'
+ Text='鍣ㄥ叿澶勭悊鍑哄簱鍗�'
End
Item
Type=MemoBox
@@ -620,7 +620,7 @@
Bold=T
Charset=134
End
- DataField='璋冨叆浠撳簱'
+ DataField='浠撳簱'
End
Item
Type=MemoBox
@@ -671,7 +671,7 @@
Top=3.81
Width=5.21229
Height=0.582083
- DataField='璋冨嚭浠撳簱'
+ DataField='閮ㄩ棬'
End
End
RepeatOnPage=T
@@ -722,7 +722,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
index 2e2b8c2..6990374 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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
@@ -30,7 +30,7 @@
Name='璋冨嚭浠撳簱'
End
Item
- Name='璋冨叆浠撳簱'
+ Name='鏀舵枡浠撳簱'
End
Item
Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
Name='瑙勬牸鍨嬪彿'
End
Item
- Name='鍗曚綅'
+ Name='璁￠噺鍗曚綅'
End
Item
- Name='鏁伴噺'
+ Name='瀹炴敹鏁伴噺'
End
Item
- Name='澶囨敞'
+ Name='瀛愬娉�'
End
Item
Name='鍒跺崟浜�'
@@ -102,6 +102,9 @@
End
Item
Name='瀹℃牳浜�'
+ End
+ Item
+ Name='閮ㄩ棬'
End
End
End
@@ -217,7 +220,7 @@
Charset=134
End
WordWrap=T
- DataField='鍗曚綅'
+ DataField='璁￠噺鍗曚綅'
End
Item
Column='Column9'
@@ -229,7 +232,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
Item
Column='Column12'
@@ -239,7 +242,7 @@
Weight=400
Charset=134
End
- DataField='澶囨敞'
+ DataField='瀛愬娉�'
End
End
End
@@ -556,7 +559,7 @@
Top=2.59292
Width=7.59354
Height=0.608542
- DataField='璋冨叆浠撳簱'
+ DataField='鏀舵枡浠撳簱'
End
Item
Type=Barcode
@@ -568,6 +571,15 @@
CaptionPosition=None
CheckSum=T
Text='#鍗曟嵁缂栧彿#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=2.80458
+ Top=1.79917
+ Width=6.19125
+ Height=0.608542
+ DataField='閮ㄩ棬'
End
End
RepeatOnPage=T
@@ -618,7 +630,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
index 2e2b8c2..dbcf8ba 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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
@@ -30,7 +30,7 @@
Name='璋冨嚭浠撳簱'
End
Item
- Name='璋冨叆浠撳簱'
+ Name='浠撳簱'
End
Item
Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
Name='瑙勬牸鍨嬪彿'
End
Item
- Name='鍗曚綅'
+ Name='璁￠噺鍗曚綅'
End
Item
- Name='鏁伴噺'
+ Name='瀹炴敹鏁伴噺'
End
Item
- Name='澶囨敞'
+ Name='瀛愬娉�'
End
Item
Name='鍒跺崟浜�'
@@ -102,6 +102,9 @@
End
Item
Name='瀹℃牳浜�'
+ End
+ Item
+ Name='閮ㄩ棬'
End
End
End
@@ -217,7 +220,7 @@
Charset=134
End
WordWrap=T
- DataField='鍗曚綅'
+ DataField='璁￠噺鍗曚綅'
End
Item
Column='Column9'
@@ -229,7 +232,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
Item
Column='Column12'
@@ -239,7 +242,7 @@
Weight=400
Charset=134
End
- DataField='澶囨敞'
+ DataField='瀛愬娉�'
End
End
End
@@ -391,7 +394,7 @@
Width=5.42396
Height=0.396875
TextAlign=MiddleCenter
- Text='鍣ㄥ叿鍏朵粬鍏ュ簱鍗�'
+ Text='鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�'
End
Item
Type=MemoBox
@@ -556,7 +559,7 @@
Top=2.59292
Width=7.59354
Height=0.608542
- DataField='璋冨叆浠撳簱'
+ DataField='浠撳簱'
End
Item
Type=Barcode
@@ -568,6 +571,15 @@
CaptionPosition=None
CheckSum=T
Text='#鍗曟嵁缂栧彿#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=2.80458
+ Top=1.79917
+ Width=3.20146
+ Height=0.608542
+ DataField='閮ㄩ棬'
End
End
RepeatOnPage=T
@@ -618,7 +630,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
index d06b8e2..34d56e6 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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
@@ -27,10 +27,10 @@
Format='yyyy/MM/dd'
End
Item
- Name='璋冨嚭浠撳簱'
+ Name='閮ㄩ棬'
End
Item
- Name='璋冨叆浠撳簱'
+ Name='浠撳簱'
End
Item
Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
Name='瑙勬牸鍨嬪彿'
End
Item
- Name='鍗曚綅'
+ Name='璁￠噺鍗曚綅'
End
Item
- Name='鏁伴噺'
+ Name='瀹炴敹鏁伴噺'
End
Item
- Name='澶囨敞'
+ Name='琛ㄤ綋澶囨敞'
End
Item
Name='鍒跺崟浜�'
@@ -217,7 +217,7 @@
Charset=134
End
WordWrap=T
- DataField='鍗曚綅'
+ DataField='璁￠噺鍗曚綅'
End
Item
Column='Column9'
@@ -229,7 +229,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
Item
Column='Column12'
@@ -239,7 +239,7 @@
Weight=400
Charset=134
End
- DataField='澶囨敞'
+ DataField='琛ㄤ綋澶囨敞'
End
End
End
@@ -620,7 +620,7 @@
Bold=T
Charset=134
End
- DataField='璋冨叆浠撳簱'
+ DataField='浠撳簱'
End
Item
Type=MemoBox
@@ -671,7 +671,7 @@
Top=3.81
Width=5.21229
Height=0.582083
- DataField='璋冨嚭浠撳簱'
+ DataField='閮ㄩ棬'
End
End
RepeatOnPage=T
@@ -722,7 +722,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
End
ColSpan=2
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/grf/\345\231\250\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.grf"
index f0af061..ad11958 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/grf/\345\231\250\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.grf"
@@ -30,11 +30,10 @@
Name='璋冨嚭浠撳簱'
End
Item
- Name='璋冨叆浠撳簱'
+ Name='鏀舵枡浠撳簱'
End
Item
- Name='鍙戝嚭鍗曚綅'
- DBFieldName='璋冨嚭缁勭粐'
+ Name='寰�鏉ュ崟浣�'
End
Item
Name='鎺ユ敹鍗曚綅'
@@ -50,13 +49,13 @@
Name='瑙勬牸鍨嬪彿'
End
Item
- Name='鍗曚綅'
+ Name='璁￠噺鍗曚綅'
End
Item
- Name='鏁伴噺'
+ Name='瀹炴敹鏁伴噺'
End
Item
- Name='澶囨敞'
+ Name='琛ㄤ綋澶囨敞'
End
Item
Name='鍒跺崟浜�'
@@ -217,7 +216,7 @@
Charset=134
End
WordWrap=T
- DataField='鍗曚綅'
+ DataField='璁￠噺鍗曚綅'
End
Item
Column='Column9'
@@ -229,7 +228,7 @@
End
WordWrap=T
ShrinkFontToFit=T
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
Item
Column='Column12'
@@ -239,7 +238,7 @@
Weight=400
Charset=134
End
- DataField='澶囨敞'
+ DataField='琛ㄤ綋澶囨敞'
End
End
End
@@ -587,7 +586,7 @@
Top=1.79917
Width=6.985
Height=0.608542
- DataField='鍙戝嚭鍗曚綅'
+ DataField='寰�鏉ュ崟浣�'
End
Item
Type=FieldBox
@@ -596,7 +595,7 @@
Top=2.59292
Width=7.59354
Height=0.608542
- DataField='璋冨叆浠撳簱'
+ DataField='鏀舵枡浠撳簱'
End
End
RepeatOnPage=T
@@ -647,7 +646,7 @@
Width=2.59292
Height=0.396875
TextAlign=MiddleCenter
- DataField='鏁伴噺'
+ DataField='瀹炴敹鏁伴噺'
End
End
ColSpan=2
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index 6e82c21..7acb9e9 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -31,7 +31,7 @@
<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 class="layui-this">鍩烘湰淇℃伅</li>-->
<!--<li>鍏朵粬淇℃伅</li>-->
<!--</ul>-->
<h1 style="text-align:center;"><b>鍣ㄥ叿閫�搴撳崟</b></h1>
@@ -156,7 +156,21 @@
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -213,6 +227,7 @@
//鏌ヨ鏉′欢
var option = [];
+ var option1 = [];
var sWhere = "";
var sBillType = "3803";
//#endregion
@@ -222,6 +237,7 @@
set_InitFrom();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ set_CountGrid();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
@@ -681,6 +697,36 @@
}
};
}
+ //鍒濆姹囨�讳俊鎭�
+ function set_CountGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HWHSonID', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: '鍙戞枡浠撳簱浠ｇ爜', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option1 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , height: 500
+ , page: true
+ , limit: 500
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ }
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -764,8 +810,10 @@
//console.log(result);
//console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html"
index e2cce6a..fdde849 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html"
@@ -30,12 +30,11 @@
<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 class="layui-this">鍩烘湰淇℃伅</li>-->
<!--<li>鍏朵粬淇℃伅</li>-->
<!--</ul>-->
<h1 style="text-align:center;"><b>鍣ㄥ叿棰嗙敤鍗�</b></h1>
@@ -140,8 +139,21 @@
</div>
</div>
</div>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -244,6 +256,28 @@
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
+ var option1 = {
+ id:'#mainTable1'
+ ,elem: '#mainTable1'
+ , height: 500
+ , page: true //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HWHSonID', title: 'HWHSonID', edit: 'text', width: 100, hide: true }
+ , { field: '鍙戞枡浠撳簱浠ｇ爜', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ ]]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
+
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
@@ -258,11 +292,11 @@
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
- //console.log(result);
- //console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
index 8de89ac..7d7917e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
@@ -163,7 +163,20 @@
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -271,6 +284,27 @@
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
};
+ var option1 = {
+ elem: '#mainTable1'
+ , height: 500
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: true //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'hwhid', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', edit: 'text', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ ]]
+ };
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
@@ -288,8 +322,10 @@
//console.log(result);
//console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
index f6e7fce..318cc1c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
@@ -148,7 +148,21 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -259,6 +273,24 @@
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
+ var option1 = {
+ elem: '#mainTable1'
+ , height: 500
+ , page: true //寮�鍚垎椤�
+ , cols: [{ type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'hscwhid', title: 'hscwhid', edit: 'text', width: 100, hide: true }
+ , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', edit: 'text', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
@@ -276,8 +308,10 @@
//console.log(result);
//console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
index 3ddfc59..2c7125b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
@@ -35,7 +35,7 @@
<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 class="layui-this">鍩烘湰淇℃伅</li>-->
<!--<li>鍏朵粬淇℃伅</li>-->
<!--</ul>-->
<h1 style="text-align:center;"><b>鍏朵粬鍑哄簱鍗�</b></h1>
@@ -140,8 +140,20 @@
</div>
</div>
</div>
-
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -198,6 +210,7 @@
, element = layui.element;
//鏌ヨ鏉′欢
var option = [];
+ var option1 = [];
var sBillType = "3828";
//#endregion
@@ -551,6 +564,7 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
Table(); //淇濆吇椤瑰垪琛�
+ Table1(); //姹囨�诲垪琛�
}
//鍒濆鍖栦繚鍏婚」鍒楄〃
function Table() {
@@ -588,6 +602,35 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: false
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ }
+ function Table1() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HWHSonID', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: '鍙戞枡浠撳簱浠ｇ爜', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option1 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , height: 500
+ , page: true
+ , limit: 500
, cellMinWidth: 120
, height: 500
, cols: [columns]
@@ -677,9 +720,10 @@
//console.log(result);
//console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
-
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index f6b7bea..382d2a8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -546,8 +546,6 @@
form.on('submit(Exit)', function (data) {
Pub_Close(1);
});
-
-
//棰勮
form.on("submit(planview)", function (data) {
if (linterid != "" || linterid != null) {
@@ -566,7 +564,6 @@
layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
}
});
-
//鎵撳嵃
form.on("submit(print)", function (data) {
if (linterid != "" || linterid != null) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
index 159c90a..4ef6655 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
@@ -148,7 +148,21 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -258,6 +272,27 @@
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
+ var option1 = {
+ elem: '#mainTable1'
+ , height: 500
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: true //寮�鍚垎椤�
+ , cols: [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HSCWHID', title: 'HSCWHID', edit: 'text', width: 100, hide: true }
+ , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', edit: 'text', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ ]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
@@ -275,8 +310,10 @@
//console.log(result);
//console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 6bc3c3a..8acd76d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -161,7 +161,21 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -218,6 +232,7 @@
, element = layui.element;
//鏌ヨ鏉′欢
var option = [];
+ var option1 = [];
var sWhere = "";
var sBillType = "3802";
@@ -228,6 +243,7 @@
set_InitFrom();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ set_CountGrid();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
@@ -684,6 +700,36 @@
}
};
}
+ //鍒濆姹囨�讳俊鎭�
+ function set_CountGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HWHSonID', title: 'HWHSonID', edit: 'text', width: 100, hide: true }
+ , { field: '鍙戞枡浠撳簱浠ｇ爜', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option1 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , height: 500
+ , page: true
+ , limit: 500
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ }
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -768,8 +814,10 @@
//console.log(result);
//console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
index 1fe812a..5a22532 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
@@ -36,7 +36,7 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
@@ -247,7 +247,22 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -292,6 +307,7 @@
, element = layui.element;
//鏌ヨ鏉′欢
var option = [];
+ var option1 = [];
var sWhere = "";
var sBillType = "3826";
@@ -303,6 +319,7 @@
set_InitFrom();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ set_CountGrid();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
@@ -869,6 +886,36 @@
}
};
}
+ //鍒濆姹囨�讳俊鎭�
+ function set_CountGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'hwhid', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '浠撳簱', title: '浠撳簱', edit: 'text', width: 120 }
+ , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option1 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , height: 500
+ , page: true
+ , limit: 500
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ }
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -968,8 +1015,10 @@
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
index c011cd2..3c8161d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
@@ -250,7 +250,22 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -295,6 +310,7 @@
, element = layui.element;
//鏌ヨ鏉′欢
var option = [];
+ var option1 = [];
var sWhere = "";
var sBillType = "3825";
//TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"],"HRemark": "" };
@@ -306,6 +322,7 @@
set_InitFrom();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ set_CountGrid();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
@@ -866,6 +883,36 @@
}
};
}
+ //鍒濆姹囨�讳俊鎭�
+ function set_CountGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'hwhid', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '浠撳簱', title: '浠撳簱', edit: 'text', width: 120 }
+ , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option1 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , height: 500
+ , page: true
+ , limit: 500
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ }
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -965,8 +1012,10 @@
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
index cdf11a0..ed67a57 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
@@ -171,7 +171,21 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -227,6 +241,7 @@
, element = layui.element;
//鏌ヨ鏉′欢
var option = [];
+ var option1 = [];
var sWhere = "";
var sBillType = "3831";
//TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"],"HRemark": "" };
@@ -237,6 +252,7 @@
set_InitFrom();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ set_CountGrid();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
@@ -727,6 +743,36 @@
}
};
}
+ //鍒濆姹囨�讳俊鎭�
+ function set_CountGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '鏀舵枡浠撳簱鍚嶇О', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+ , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option1 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , height: 500
+ , page: true
+ , limit: 500
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ }
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -811,8 +857,10 @@
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index be35af7..d3eca16 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -160,7 +160,21 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -228,7 +242,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
+ set_CountGrid();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -685,7 +699,36 @@
}
};
}
-
+ //鍒濆姹囨�讳俊鎭�
+ function set_CountGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: '鍙戣揣浠撳簱浠ｇ爜', title: '鍙戣揣浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '鍙戣揣浠撳簱鍚嶇О', title: '鍙戣揣浠撳簱鍚嶇О', edit: 'text', width: 120 }
+ , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option1 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , height: 500
+ , page: true
+ , limit: 500
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ }
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -789,8 +832,10 @@
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
index 1e38a89..be8a834 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
@@ -141,7 +141,20 @@
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -552,6 +565,7 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
Table(); //淇濆吇椤瑰垪琛�
+ Table1(); //姹囨�婚」鍒楄〃
}
//鍒濆鍖栦繚鍏婚」鍒楄〃
function Table() {
@@ -593,7 +607,36 @@
}
};
}
-
+ //鍒濆鍖栦繚鍏婚」鍒楄〃
+ function Table1() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+ , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HWHSonID', title: 'HWHSonID', edit: 'text', width: 100, hide: true }
+ , { field: '鍙戞枡浠撳簱浠ｇ爜', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option1 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , height: 500
+ , page: true
+ , limit: 500
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ }
+ };
+ }
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -675,8 +718,10 @@
data: { "sqlWhere": "and hmainid=" + hID },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+ option.data = result.list[0];
table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
--
Gitblit v1.9.1