From b9ba707dab17f1b24dfacc94a902265c1834ca2e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 05 九月 2024 08:08:53 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj.user | 2
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 2
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 562 +++++++++--
WebTM/views/模治具管理/器具报表/Sc_MouldLifeUsePicReport.html | 290 +-----
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 4
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 83 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 75 +
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 45
WebTM/views/grf/流转卡TK.grf | 725 +++++++++++++++
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 56
WebTM/views/基础资料/公用基础资料/grf/流转卡TK.grf | 725 +++++++++++++++
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html | 134 ++
WebTM/views/home/console111.html | 5
13 files changed, 2,227 insertions(+), 481 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index e39639b..9f5f7b5 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf" "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf"
new file mode 100644
index 0000000..a00f322
--- /dev/null
+++ "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf"
@@ -0,0 +1,725 @@
+锘縊bject Report
+ Version='6.8.9.1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='娲惧伐鍗曞彿'
+ End
+ Item
+ Name='鐢熶骇杞﹂棿'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
+ Item
+ Name='鍗℃暟閲�'
+ End
+ Item
+ Name='鎵规'
+ End
+ Item
+ Name='宸ュ簭鍙�'
+ End
+ Item
+ Name='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ End
+ Item
+ Name='鐝粍'
+ End
+ Item
+ Name='鏈哄彴'
+ End
+ Item
+ Name='瀹炰綔鏁伴噺'
+ End
+ Item
+ Name='宸ュ簭璇存槑'
+ End
+ Item
+ Name='鐝彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column14'
+ Width=1.69333
+ End
+ Item
+ Name='Column1'
+ Width=1.87854
+ End
+ Item
+ Name='Column2'
+ Width=2.77813
+ End
+ Item
+ Name='Column3'
+ Width=1.61396
+ End
+ Item
+ Name='Column8'
+ Width=2.80458
+ End
+ Item
+ Name='Column9'
+ Width=2.01083
+ End
+ Item
+ Name='Column12'
+ Width=3.38667
+ End
+ Item
+ Name='Column15'
+ Width=1.79917
+ End
+ End
+Object ColumnContent
+ Height=1.19063
+ AdjustRowHeight=F
+ RowsPerPage=6
+ Items ColumnContentCell
+ Item
+ Column='Column14'
+ FreeCell=T
+ Items Control
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox3'
+ Left=0.5
+ Top=-0.8
+ Width=1.5875
+ Height=0.608542
+ SystemVar=RowNo
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox14'
+ Dock=Fill
+ DataField='宸ュ簭鍙�'
+ End
+ End
+ End
+ Item
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ CanGrow=T
+ CanShrink=T
+ ShrinkFontToFit=T
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='鐝粍'
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鏈哄彴'
+ End
+ Item
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='瀹炰綔鏁伴噺'
+ End
+ Item
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭璇存槑'
+ End
+ Item
+ Column='Column15'
+ DataField='鐝彿'
+ End
+End
+End
+Object ColumnTitle
+ Height=1.19063
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column14'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭浠ｇ爜'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐝粍'
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏈哄彴'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='瀹炰綔鏁伴噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭璇存槑'
+ End
+ Item
+ GroupTitle=F
+ Column='Column15'
+ TextAlign=MiddleCenter
+ Text='鐝彿'
+ End
+ End
+End
+End
+Items Parameter
+ Item
+ Name='椤电爜'
+ End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ CanGrow=T
+ CanShrink=T
+ Height=4.60375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=5.00063
+ Width=4.78896
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=180000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='娴佽浆鍗�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=11.5888
+ Top=2.19604
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=4.20688
+ Top=1.00542
+ Width=2.98979
+ Height=0.608542
+ TextAlign=MiddleCenter
+ Text='QC妫�鏌ユ柟寮忥細'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.60917
+ Top=2.19604
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏃ユ湡锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=13.2027
+ Top=2.19604
+ Width=3.99521
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=6.61458
+ Top=2.19604
+ Width=3.78354
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox1'
+ Left=16.5894
+ Top=1.19063
+ Width=2.80458
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='鍏�0椤�'
+ SystemVar=PageCount
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox2'
+ Left=15.3988
+ Top=1.19063
+ Width=2.40771
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='绗�0椤�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox18'
+ Left=0.79375
+ Top=2.98979
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧浠ｇ爜锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox19'
+ Left=0.79375
+ Top=2.19604
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='娲惧伐鍗�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=2.40771
+ Top=2.19604
+ Width=2.38125
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='娲惧伐鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=2.59292
+ Top=2.98979
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox21'
+ Left=11.5888
+ Top=3.81
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎵规锛�'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=12.1973
+ Top=0.79375
+ Width=1.98438
+ Height=1.21708
+ BarcodeType=QRCode
+ CaptionPosition=None
+ CaptionAlignment=Far
+ CheckSum=T
+ Text='#鍗曟嵁鍙�#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=12.5942
+ Top=3.81
+ Width=4.60375
+ Height=0.582083
+ DataField='鎵规'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode2'
+ Left=1.5875
+ Top=0.608542
+ Width=2.59292
+ Height=1.40229
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='#浠诲姟鍗曞彿#'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox1'
+ Left=10.795
+ Top=0.211667
+ Width=1.79917
+ Height=0.582083
+ Text='娴佽浆鍗″彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=12.5942
+ Top=0.211667
+ Width=4.20688
+ Height=0.582083
+ DataField='鍗曟嵁鍙�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox24'
+ Left=0.211667
+ Width=5.79438
+ Height=0.582083
+ Text='浠诲姟鍗曞彿锛歔#浠诲姟鍗曞彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox25'
+ Left=7.19667
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox1'
+ Left=8.59896
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox26'
+ Left=9.60438
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox2'
+ Left=11.0067
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox27'
+ Left=5.60917
+ Top=2.98979
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox28'
+ Left=11.5888
+ Top=2.98979
+ Width=6.21771
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox29'
+ Left=0.79375
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇鏁伴噺锛歔#鐢熶骇鏁伴噺#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox30'
+ Left=5.60917
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗℃暟閲忥細[#鍗℃暟閲�#]'
+ End
+ End
+ RepeatOnPage=T
+End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=2.01083
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Dock=Left
+ Object Border
+ Styles=[DrawLeft|DrawRight|DrawBottom]
+ End
+ ColumnCount=7
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.6933
+ End
+ Item[2]
+ Width=1.8785
+ End
+ Item[3]
+ Width=2.7781
+ End
+ Item[4]
+ Width=1.614
+ End
+ Item[5]
+ Width=2.8046
+ End
+ Item[6]
+ Width=2.01083
+ End
+ Item[7]
+ Width=5.18583
+ End
+ End
+ Items FreeGridRow
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Text='鍏ュ簱璁板綍'
+ End
+ Item[2,1]
+ Text='棰嗙敤璁板綍'
+ End
+ End
+End
+End
+End
+End
+End
diff --git a/WebTM/views/home/console111.html b/WebTM/views/home/console111.html
index ee6e0f3..f0816c8 100644
--- a/WebTM/views/home/console111.html
+++ b/WebTM/views/home/console111.html
@@ -28,6 +28,7 @@
.layui-table-box {
height: 400px;
}
+
.welcome .layui-card {
border: 1px solid #f2f2f2;
border-radius: 5px;
@@ -71,7 +72,7 @@
<script>
/^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶');
</script>
-
+ <script src="./js/index.js"></script>
</head>
<body layadmin-themealias="default">
<div class="layui-fluid">
@@ -303,7 +304,6 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <script src="./js/index.js"></script>
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -462,6 +462,7 @@
var liObj = document.createElement("li");
liObj.innerHTML = "<span>" + layui.util.toDateString(noticeInfoList[i].鏃ユ湡, 'MM-dd') + "</span>";
/* + " < a href = \"viewpage.html\" >" + noticeInfoList[i].涓婚 + "</a >";*/
+ console.log(liObj);
list.appendChild(liObj);
}
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 64f6691..e2e88f9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -101,15 +101,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
- <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+ <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
@@ -229,7 +229,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓�娆″悎鏍�<br/>鐜囨爣鍑嗗��</label>
+ <label class="layui-form-label">涓�娆″悎鏍�<br />鐜囨爣鍑嗗��</label>
<div class="layui-input-inline">
<input class="layui-input" name="HOnceRightRate" id="HOnceRightRate" autocomplete="off" onfocus="this.select();" value="0" style="margin-top:10px;">
</div>
@@ -332,8 +332,8 @@
<div class="layui-input-inline">
<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>-->
<!--<input id="HDormID" name="HDormID" type="hidden" />-->
</div>
</div>
@@ -432,9 +432,9 @@
</div>
<div class="layui-inline">
<!--<label class="layui-form-label"> 璁￠噺鍗曚綅缁勶細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
<div class="layui-input-inline">
@@ -503,14 +503,25 @@
</button>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">浜嬩笟閮細</label>
+ <div class="layui-input-inline">
+ <div class="layui-form-item">
+ <select name="HDivisionID" id="HDivisionID" lay-verify="HDivisionID">
+ <option value="0" selected>璇烽�夋嫨</option>
+ <option value="3" selected>娉ㄥ浜嬩笟閮�</option>
+ <option value="4">杞浜嬩笟閮�</option>
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -533,6 +544,12 @@
<label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 娴佽浆鍗℃暟閲忥細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HLotcardQty" lay-verify="HLotcardQty" id="HLotcardQty" autocomplete="off" value="0">
</div>
</div>
</div>
@@ -790,7 +807,7 @@
if (OperationType == 4) {
$("#HNumber").attr("readonly", true);
setHNumber(HMaterTypeID);
-
+
}
$(this).removeAttr("lay-key");
@@ -907,8 +924,8 @@
} else {
var TaxRate = $("#HTaxRate").val();
var HProfitRate = $("#HProfitRate").val();
- var HTaxCost = Number((value * (100 + TaxRate*1) / 100).toFixed(4)) //鍚◣鎴愭湰浠� = 涓嶅惈绋庢垚鏈� * 锛�100 + 绋庣巼锛�/100
- var HFootPrice = Number((HTaxCost * (100 + HProfitRate*1) / 100).toFixed(4))// 缁撶畻浠� = 鍚◣鎴愭湰浠� * 锛�100+ 鍒╂鼎鐜囷級/100
+ var HTaxCost = Number((value * (100 + TaxRate * 1) / 100).toFixed(4)) //鍚◣鎴愭湰浠� = 涓嶅惈绋庢垚鏈� * 锛�100 + 绋庣巼锛�/100
+ var HFootPrice = Number((HTaxCost * (100 + HProfitRate * 1) / 100).toFixed(4))// 缁撶畻浠� = 鍚◣鎴愭湰浠� * 锛�100+ 鍒╂鼎鐜囷級/100
$("#HTaxCost").val(HTaxCost);
$("#HFootPrice").val(HFootPrice);
}
@@ -923,8 +940,8 @@
} else {
var TaxRate = $("#HTaxRate").val();
var HProfitRate = $("#HProfitRate").val();
- var HNoTaxCost = Number((value / (100 + TaxRate*1) * 100).toFixed(4))//涓嶅惈绋庢垚鏈环 = 鍚◣鎴愭湰/ 锛�100 + 绋庣巼锛�/100 缁撶畻浠�
- var HFootPrice = Number((value * (100 + HProfitRate*1) / 100).toFixed(4))
+ var HNoTaxCost = Number((value / (100 + TaxRate * 1) * 100).toFixed(4))//涓嶅惈绋庢垚鏈环 = 鍚◣鎴愭湰/ 锛�100 + 绋庣巼锛�/100 缁撶畻浠�
+ var HFootPrice = Number((value * (100 + HProfitRate * 1) / 100).toFixed(4))
$("#HNoTaxCost").val(HNoTaxCost);
$("#HFootPrice").val(HFootPrice);
}
@@ -1074,7 +1091,7 @@
, "HTela_M": data.姣涚罕鍚嶇О鍙婅鏍�
, "HUnderTela_M": data.搴曚笣
, "HSizing_M": data.瀹氬瀷娴嗘枡
-
+ , "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲�
});
@@ -1099,7 +1116,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_Material/getMaxNum',
type: "GET",
- data: { "HMaterTypeID": TypeID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
+ data: { "HMaterTypeID": TypeID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (data1) {
if (data1.data != null) {
layer.close(ajaxLoad);
@@ -1320,6 +1337,18 @@
} else {
var ref = /^[0-9]+\.?[0-9]*$/;
if (!ref.test(HMinPickQty)) {
+ layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HLotcardQty = $('#HLotcardQty').val();
+ if (HLotcardQty.substring(HLotcardQty.length - 1, HLotcardQty.length) == ".") {
+ layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HLotcardQty)) {
layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
return;
}
@@ -1656,8 +1685,6 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- console.log(checkStatus.data[0].椤圭洰缁�);
- console.log(checkStatus.data[0].HInterID);
$("#HProjectName").val(checkStatus.data[0].椤圭洰缁�);
$("#HProjectBillMainID ").val(checkStatus.data[0].HInterID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
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/\346\265\201\350\275\254\345\215\241TK.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/\346\265\201\350\275\254\345\215\241TK.grf"
new file mode 100644
index 0000000..a00f322
--- /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/grf/\346\265\201\350\275\254\345\215\241TK.grf"
@@ -0,0 +1,725 @@
+锘縊bject Report
+ Version='6.8.9.1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='娲惧伐鍗曞彿'
+ End
+ Item
+ Name='鐢熶骇杞﹂棿'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
+ Item
+ Name='鍗℃暟閲�'
+ End
+ Item
+ Name='鎵规'
+ End
+ Item
+ Name='宸ュ簭鍙�'
+ End
+ Item
+ Name='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ End
+ Item
+ Name='鐝粍'
+ End
+ Item
+ Name='鏈哄彴'
+ End
+ Item
+ Name='瀹炰綔鏁伴噺'
+ End
+ Item
+ Name='宸ュ簭璇存槑'
+ End
+ Item
+ Name='鐝彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column14'
+ Width=1.69333
+ End
+ Item
+ Name='Column1'
+ Width=1.87854
+ End
+ Item
+ Name='Column2'
+ Width=2.77813
+ End
+ Item
+ Name='Column3'
+ Width=1.61396
+ End
+ Item
+ Name='Column8'
+ Width=2.80458
+ End
+ Item
+ Name='Column9'
+ Width=2.01083
+ End
+ Item
+ Name='Column12'
+ Width=3.38667
+ End
+ Item
+ Name='Column15'
+ Width=1.79917
+ End
+ End
+Object ColumnContent
+ Height=1.19063
+ AdjustRowHeight=F
+ RowsPerPage=6
+ Items ColumnContentCell
+ Item
+ Column='Column14'
+ FreeCell=T
+ Items Control
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox3'
+ Left=0.5
+ Top=-0.8
+ Width=1.5875
+ Height=0.608542
+ SystemVar=RowNo
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox14'
+ Dock=Fill
+ DataField='宸ュ簭鍙�'
+ End
+ End
+ End
+ Item
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ CanGrow=T
+ CanShrink=T
+ ShrinkFontToFit=T
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='鐝粍'
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鏈哄彴'
+ End
+ Item
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='瀹炰綔鏁伴噺'
+ End
+ Item
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭璇存槑'
+ End
+ Item
+ Column='Column15'
+ DataField='鐝彿'
+ End
+End
+End
+Object ColumnTitle
+ Height=1.19063
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column14'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭浠ｇ爜'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐝粍'
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏈哄彴'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='瀹炰綔鏁伴噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭璇存槑'
+ End
+ Item
+ GroupTitle=F
+ Column='Column15'
+ TextAlign=MiddleCenter
+ Text='鐝彿'
+ End
+ End
+End
+End
+Items Parameter
+ Item
+ Name='椤电爜'
+ End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ CanGrow=T
+ CanShrink=T
+ Height=4.60375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=5.00063
+ Width=4.78896
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=180000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='娴佽浆鍗�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=11.5888
+ Top=2.19604
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=4.20688
+ Top=1.00542
+ Width=2.98979
+ Height=0.608542
+ TextAlign=MiddleCenter
+ Text='QC妫�鏌ユ柟寮忥細'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.60917
+ Top=2.19604
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏃ユ湡锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=13.2027
+ Top=2.19604
+ Width=3.99521
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=6.61458
+ Top=2.19604
+ Width=3.78354
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox1'
+ Left=16.5894
+ Top=1.19063
+ Width=2.80458
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='鍏�0椤�'
+ SystemVar=PageCount
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox2'
+ Left=15.3988
+ Top=1.19063
+ Width=2.40771
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='绗�0椤�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox18'
+ Left=0.79375
+ Top=2.98979
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧浠ｇ爜锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox19'
+ Left=0.79375
+ Top=2.19604
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='娲惧伐鍗�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=2.40771
+ Top=2.19604
+ Width=2.38125
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='娲惧伐鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=2.59292
+ Top=2.98979
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox21'
+ Left=11.5888
+ Top=3.81
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎵规锛�'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=12.1973
+ Top=0.79375
+ Width=1.98438
+ Height=1.21708
+ BarcodeType=QRCode
+ CaptionPosition=None
+ CaptionAlignment=Far
+ CheckSum=T
+ Text='#鍗曟嵁鍙�#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=12.5942
+ Top=3.81
+ Width=4.60375
+ Height=0.582083
+ DataField='鎵规'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode2'
+ Left=1.5875
+ Top=0.608542
+ Width=2.59292
+ Height=1.40229
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='#浠诲姟鍗曞彿#'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox1'
+ Left=10.795
+ Top=0.211667
+ Width=1.79917
+ Height=0.582083
+ Text='娴佽浆鍗″彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=12.5942
+ Top=0.211667
+ Width=4.20688
+ Height=0.582083
+ DataField='鍗曟嵁鍙�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox24'
+ Left=0.211667
+ Width=5.79438
+ Height=0.582083
+ Text='浠诲姟鍗曞彿锛歔#浠诲姟鍗曞彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox25'
+ Left=7.19667
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox1'
+ Left=8.59896
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox26'
+ Left=9.60438
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox2'
+ Left=11.0067
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox27'
+ Left=5.60917
+ Top=2.98979
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox28'
+ Left=11.5888
+ Top=2.98979
+ Width=6.21771
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox29'
+ Left=0.79375
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇鏁伴噺锛歔#鐢熶骇鏁伴噺#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox30'
+ Left=5.60917
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗℃暟閲忥細[#鍗℃暟閲�#]'
+ End
+ End
+ RepeatOnPage=T
+End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=2.01083
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Dock=Left
+ Object Border
+ Styles=[DrawLeft|DrawRight|DrawBottom]
+ End
+ ColumnCount=7
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.6933
+ End
+ Item[2]
+ Width=1.8785
+ End
+ Item[3]
+ Width=2.7781
+ End
+ Item[4]
+ Width=1.614
+ End
+ Item[5]
+ Width=2.8046
+ End
+ Item[6]
+ Width=2.01083
+ End
+ Item[7]
+ Width=5.18583
+ End
+ End
+ Items FreeGridRow
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Text='鍏ュ簱璁板綍'
+ End
+ Item[2,1]
+ Text='棰嗙敤璁板綍'
+ End
+ End
+End
+End
+End
+End
+End
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
index 5b68379..b20ffc2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
@@ -32,13 +32,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡闂撮殧</label>
- <div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
@@ -51,11 +44,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">妯″叿缂栧彿</label>
+ <label class="layui-form-label" >妯″叿缂栧彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMouldNo" id="HMouldNo" style="width:190px;">
+ <input type="text" class="layui-input" lay-verify="HMouldNo" name="HMouldNo" id="HMouldNo" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouldNo" id="btnHMouldNo" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">妯″叿鍚嶇О</label>
<div class="layui-input-block">
@@ -65,90 +61,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
- </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
<div>
@@ -159,13 +72,7 @@
</div>
</div>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- </div>
+
</script>
</form>
@@ -238,6 +145,43 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+ //宸ュ簭
+ form.on('submit(btnHMouldNo)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妯″叿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMouldNo").val(checkStatus.data[0].妯″叿缂栧彿);
+ $("#HName").val(checkStatus.data[0].妯″叿鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -260,43 +204,14 @@
});
})
//#endregion
-
- //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
- form.on('select(HInitTimeCycle)', function (data) {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
-
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery();
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
- });
+
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
- //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- setSelect_HInitTimeCycle();
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
-
+
//鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date().setMonth(new Date().getMonth() - 3)), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃
set_InitGrid();
@@ -397,82 +312,7 @@
var HBeginDate = $("#HBeginDate").val();
var HEndDate = $("#HEndDate").val();
var HMouldNo = $("#HMouldNo").val();
- var HName = $("#HName").val();
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
+ var HName = $("#HName").val();
if (HBeginDate) {
sWhere += " and CONVERT(varchar(7),鏃ユ湡, 23) >= '" + HBeginDate + "'";
@@ -506,41 +346,15 @@
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date().setMonth(new Date().getMonth() - 3)), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
- $("#btnSearch").click();
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
+ $("#btnSearch").click();
form.render('select');
sWhere = "";
}
- //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
- function setSelect_HInitTimeCycle() {
- var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
- var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
-
- var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
- for (var i = 0; i < valueList.length; i++) {
- HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
- }
-
- $("#HInitTimeCycle").empty();
- $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
- form.render('select');
-
- $("#HInitTimeCycle").val("29");
- }
- //#endregion
+
//鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
index 967f337..129360f 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
@@ -974,7 +974,7 @@
"HStd": "0",
"HMax": "0",
"HMin": "0",
- "HDataForm": "鎵嬪伐褰曞叆",
+ "HDataForm": "璁惧閲囬泦",
"HDataUnit": "绉�",
"HDataTimes": "0",
"HTechParamClassID": "0",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index b4b4428..8dad322 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -592,11 +592,11 @@
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', width: 100 }
- , { field: 'HTechParamClassID', title: '宸ヨ壓鍙傛暟澶х被', width: 100 ,hide: true,}
- , { field: 'HTechParamClassName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 120, style: 'background-color:#efefef4d;' }
+ , { field: 'HTechParamClassID', title: '宸ヨ壓鍙傛暟澶х被', width: 100, hide: true, }
+ , { field: 'HTechParamClassName', title: '宸ヨ壓鍙傛暟澶х被鍚嶇О', width: 120, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamID', title: 'HTechParamID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamNumber', title: '宸ヨ壓鍙傛暟浠ｇ爜', width: 110, edit: 'text', event: "HTechParamNumber" } //F7
- , { field: 'HTechParamName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 110, style: 'background-color:#efefef4d;' }
+ , { field: 'HTechParamName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 110, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamUnitID', title: 'HTechParamUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamUnitNumber', title: '宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜', width: 130, edit: 'text', event: "HTechParamUnitNumber" } //F7
, { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', width: 130, style: 'background-color:#efefef4d;' }
@@ -604,14 +604,14 @@
, { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', width: 130, edit: 'text', event: "HTechParamIDStdName" }
, { field: 'HResultStd', title: '璁惧璁惧畾鍊�', width: 130, edit: 'text' }
- , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: 'text' }
+ , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: 'text', event: "HVaule" }
, { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' }
, { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' }
, { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' }
- , { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
+ , { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
+ ]]
}
var rowdata = [{
@@ -1230,21 +1230,28 @@
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
- var data = obj.data;
- if (obj.event == 'HDate') {
+ var data = obj.data;
+ if (obj.event == 'HVaule') {
var field = $(this).data('field');
- laydate.render({
- elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
- , closeStop: this
- , done: function (nowDate) {
- //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
- data[field] = nowDate;
- obj.update(data);
- }
- });
+ var row = obj.data; // 鑾峰彇褰撳墠琛屾暟鎹�
+ if (row['HRemark'] === '璁惧閲囬泦') {
+ layer.msg('姝ゅ崟鍏冩牸鐨勫�间负鈥滆澶囬噰闆嗏��,鏃犳硶缂栬緫'); // 鎻愮ず淇℃伅
+ } else {
+ // 鍏佽缂栬緫鍗曞厓鏍�
+ $(this).attr('contenteditable', 'true'); // 浣垮崟鍏冩牸鍙紪杈�
+ $(this).focus(); // 鑱氱劍鍒扮紪杈戠殑鍗曞厓鏍�
+ }
}
- });
+ // 鐩戝惉鍗曞厓鏍肩紪杈戠粨鏉熶簨浠�
+ $(document).on('blur', '[contenteditable]', function () {
+ var newValue = $(this).text(); // 鑾峰彇鏂板��
+ var field = $(this).data('field');
+ var row = obj.data; // 鑾峰彇褰撳墠琛屾暟鎹�
+ row[field] = newValue; // 鏇存柊鏁版嵁
+ obj.update(row); // 鏇存柊琛屾暟鎹�
+ $(this).removeAttr('contenteditable'); // 鍙栨秷缂栬緫鐘舵��
+ });
+ });
//#endregion
//#region 琛屽唴鍒犻櫎
@@ -1423,20 +1430,21 @@
{
"HTechParamClassID": result.data[i]["HTechParamClassID"] == null ? 0 : result.data[i]["HTechParamClassID"],
"HTechParamClassName": result.data[i]["宸ヨ壓鍙傛暟澶х被鍚嶇О"],
- "HTechParamID": result.data[i]["HTechParamID"] == null ? 0 : result.data[i]["HTechParamClassID"],
+ "HTechParamID": result.data[i]["HTechParamID"] == null ? 0 : result.data[i]["HTechParamID"],
"HTechParamNumber": result.data[i]["宸ヨ壓鍙傛暟浠ｇ爜"],
"HTechParamName": result.data[i]["宸ヨ壓鍙傛暟鍚嶇О"],
- "HTechParamUnitID": result.data[i]["HTechParamUnitID"] == null ? 0 : result.data[i]["HTechParamClassID"],
+ "HTechParamUnitID": result.data[i]["HTechParamUnitID"] == null ? 0 : result.data[i]["HTechParamUnitID"],
"HTechParamUnitNumber": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜"],
"HTechParamUnitName": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"] ,
- "HSNO": result.data[i]["宸ヨ壓娆″簭"] == null ? 0 : result.data[i]["HTechParamClassID"],
- "HTechParamIDStd": result.data[i]["HTechParamIDStd"] == null ? 0 : result.data[i]["HTechParamClassID"],
+ "HSNO": result.data[i]["宸ヨ壓娆″簭"] == null ? 0 : result.data[i]["宸ヨ壓娆″簭"],
+ "HTechParamIDStd": result.data[i]["HTechParamIDStd"] == null ? 0 : result.data[i]["HTechParamIDStd"],
"HTechParamIDStdName": result.data[i]["瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�"],
"HResultStd": "",
"HVaule": result.data[i]["鏁伴噰鍊�"],
"HStd": result.data[i]["鏍囧噯鍊�"],
"HMax": result.data[i]["涓婇檺鍊�"],
"HMin": result.data[i]["涓嬮檺鍊�"],
+ "HRemark": result.data[i]["閲囬泦鏉ユ簮"]
}
);
}
@@ -1455,7 +1463,7 @@
})
}
//#endregion
-
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index 9d9133e..1900430 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -88,41 +88,43 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
- <div class="layui-col-xs7 layui-inline" style="margin-top:20px;">
- <ul class="layui-tab-title">
- <li class="layui-this">浜�</li>
- <li>鏈�</li>
- <li>鏂�</li>
- <li>娉�</li>
- <li>鐜�</li>
- <li>娴�</li>
- </ul>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <!--浜�-->
- <table class="layui-hide" id="mainTable_Man" lay-filter="mainTable_Man"></table>
+ <div class="layui-col-xs7 layui-inline" style="margin-top:20px;">
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">浜�</li>
+ <li>鏈�</li>
+ <li>鏂�</li>
+ <li>娉�</li>
+ <li>鐜�</li>
+ <li>娴�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--浜�-->
+ <table class="layui-hide" id="mainTable_Man" lay-filter="mainTable_Man"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鏈�-->
+ <table class="layui-hide" id="mainTable_Machine" lay-filter="mainTable_Machine"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鏂�-->
+ <table class="layui-hide" id="mainTable_Material" lay-filter="mainTable_Material"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--娉�-->
+ <table class="layui-hide" id="mainTable_Method" lay-filter="mainTable_Method"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鐜�-->
+ <table class="layui-hide" id="mainTable_Environments" lay-filter="mainTable_Environments"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--娴�-->
+ <table class="layui-hide" id="mainTable_Measure" lay-filter="mainTable_Measure"></table>
+ </div>
</div>
- <div class="layui-tab-item">
- <!--鏈�-->
- <table class="layui-hide" id="mainTable_Machine" lay-filter="mainTable_Machine"></table>
- </div>
- <div class="layui-tab-item">
- <!--鏂�-->
- <table class="layui-hide" id="mainTable_Material" lay-filter="mainTable_Material"></table>
- </div>
- <div class="layui-tab-item">
- <!--娉�-->
- <table class="layui-hide" id="mainTable_Method" lay-filter="mainTable_Method"></table>
- </div>
- <div class="layui-tab-item">
- <!--鐜�-->
- <table class="layui-hide" id="mainTable_Environments" lay-filter="mainTable_Environments"></table>
- </div>
- <div class="layui-tab-item">
- <!--娴�-->
- <table class="layui-hide" id="mainTable_Measure" lay-filter="mainTable_Measure"></table>
- </div>
- </div>
+ </div>
</div>
</div>
<script type="text/html" id="toolbarDemo">
@@ -166,7 +168,7 @@
//
var HModName = "QC_FiveMenOneRingList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
- var titleData = ["涓绘祦杞崱id", "閰嶄欢娴佽浆鍗d", "鎴愬搧鐗╂枡id", "閰嶄欢鐗╂枡id", "涓荤敓浜ц鍗�", "閰嶄欢鐢熶骇璁㈠崟", "鎴愬搧鐗╂枡浠ｇ爜", "鎴愬搧瑙勬牸鍨嬪彿", "閰嶄欢鐗╂枡浠ｇ爜", "閰嶄欢瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d"];
+ var titleData = ["涓绘祦杞崱id", "閰嶄欢娴佽浆鍗d", "鎴愬搧鐗╂枡id", "閰嶄欢鐗╂枡id", "涓荤敓浜ц鍗�", "閰嶄欢鐢熶骇璁㈠崟", "鎴愬搧鐗╂枡浠ｇ爜", "鎴愬搧瑙勬牸鍨嬪彿", "閰嶄欢鐗╂枡浠ｇ爜", "閰嶄欢瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d","鐗╂枡id","鐢熶骇璧勬簮id","鑱屽憳id","妯″叿id"];
//鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -190,7 +192,7 @@
//#endregion
//#region SN鐮佸洖杞︽柟娉�
- $('#HICNumber').on('keydown', function (event) {
+ $('#SN').on('keydown', function (event) {
if (event.keyCode == 13) {
get_FastQuery();//鏌ヨ
}
@@ -363,25 +365,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '涓绘祦杞崱id', title: '涓绘祦杞崱id', sort: true, hide: true }
- // , { field: '涓绘祦杞崱', title: '涓绘祦杞崱', sort: true }
- // , { field: '涓荤敓浜ц鍗�', title: '涓荤敓浜ц鍗�', sort: true }
- // , { field: '閰嶄欢娴佽浆鍗d ', title: '閰嶄欢娴佽浆鍗d ', sort: true, hide: true }
- // , { field: '閰嶄欢娴佽浆鍗� ', title: '閰嶄欢娴佽浆鍗� ', sort: true }
- // , { field: '閰嶄欢鐢熶骇璁㈠崟 ', title: '閰嶄欢鐢熶骇璁㈠崟 ', sort: true }
- // , { field: '鎴愬搧鐗╂枡id ', title: '鎴愬搧鐗╂枡id ', sort: true, hide: true }
- // , { field: '鎴愬搧鐗╂枡浠ｇ爜 ', title: '鎴愬搧鐗╂枡浠ｇ爜 ', sort: true }
- // , { field: '鎴愬搧鐗╂枡 ', title: '鎴愬搧鐗╂枡 ', sort: true }
- // , { field: '鎴愬搧瑙勬牸鍨嬪彿 ', title: '鎴愬搧瑙勬牸鍨嬪彿 ', sort: true }
- // , { field: '閰嶄欢鐗╂枡id ', title: '閰嶄欢鐗╂枡id ', sort: true, hide: true }
- // , { field: '閰嶄欢鐗╂枡浠ｇ爜 ', title: '閰嶄欢鐗╂枡浠ｇ爜 ', sort: true }
- // , { field: '閰嶄欢鐗╂枡 ', title: '閰嶄欢鐗╂枡 ', sort: true }
- // , { field: '閰嶄欢瑙勬牸鍨嬪彿 ', title: '閰嶄欢瑙勬牸鍨嬪彿 ', sort: true }
- //]
- ]
+ , cols: []
,data:[]
};
}
@@ -397,15 +381,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -421,15 +397,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -445,15 +413,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -469,15 +429,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -491,15 +443,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -513,15 +457,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -551,14 +487,28 @@
if ($.inArray(data[j].name, titleData) > -1) {
col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
+ else if (data[j].name == '閰嶄欢娴佽浆鍗�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '閰嶄欢娴佽浆鍗�', templet: function (d) {
+ return '<span style="color: blue;">' + d.閰嶄欢娴佽浆鍗� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '涓绘祦杞崱') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '涓绘祦杞崱', templet: function (d) {
+ return '<span style="color: blue;">' + d.涓绘祦杞崱 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
else {
- switch (data[i].Type) {
+ switch (data[j].Type) {
//int
case 'DateTime':
col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200});
}
}
}
@@ -657,32 +607,386 @@
}
//#endregion
-
- // 鑾峰彇鏍囩
- function getActiveTab() {
- var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
- var activeTab;
- for (var i = 0; i < tabs.length; i++) {
- if (tabs[i].classList.contains("layui-this")) {
- activeTab = tabs[i].innerText;
- break;
- }
- }
- return activeTab;
-
- }
-
- //涓昏〃鏍� 閰嶄欢娴佽浆鍗＄偣鍑绘椂闂�
+
//#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+
+ //#region 涓昏〃鏍� 娴佽浆鍗＄偣鍑绘椂闂�
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
+ var ajaxLoad = layer.load();
+ var linterid;
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '閰嶄欢娴佽浆鍗�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.閰嶄欢娴佽浆鍗d; //澹版槑鍙橀噺linterid 涓� data.hmainid
-
+ linterid = data.閰嶄欢娴佽浆鍗d;
+ } else if (obj.event == '涓绘祦杞崱') {
+ linterid = data.涓绘祦杞崱id;
+ }
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right',
+ type: "GET",
+ data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var Listcol = [];
+ for (var i = 0; i < data1.list.length; i++) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list[i].Columns) {
+ data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
+ }
+ var col = [];
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var j = 0; j < data.length; j++) {
+ if ($.inArray(data[j].name, titleData) > -1) {
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[j].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '鑱屽憳') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '鑱屽憳', templet: function (d) {
+ return '<span style="color: blue;">' + d.鑱屽憳 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '妯″叿鍚嶇О') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '妯″叿鍚嶇О', templet: function (d) {
+ return '<span style="color: blue;">' + d.妯″叿鍚嶇О + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '璁惧鍚嶇О') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '璁惧鍚嶇О', templet: function (d) {
+ return '<span style="color: blue;">' + d.璁惧鍚嶇О + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else {
+ switch (data[j].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: data[j].name });
+ }
+ }
+ }
+ Listcol.push(col);
+ }
+ //浜�
+ option_Man = {
+ elem: '#mainTable_Man'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[0]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Man);
+ //鏈�
+ option_Machine = {
+ elem: '#mainTable_Machine'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Machine);
+ //鏂�
+ option_Material = {
+ elem: '#mainTable_Material'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[2]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query2
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Material);
+ //娉�
+ option_Method = {
+ elem: '#mainTable_Method'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[3]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query3
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Method);
+ //鐜�
+ option_Environments = {
+ elem: '#mainTable_Environments'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[4]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query4
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Environments);
+ //娴�
+ option_Measure = {
+ elem: '#mainTable_Measure'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[5]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query5
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Measure);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ });
+ //#endregion
+
+ //#region鍓〃鏍�
+ //浜�
+ table.on('tool(mainTable_Man)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍑虹珯鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ });
+
+ //鏈�
+ table.on('tool(mainTable_Machine)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧鍚姩鐐规娓呭崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '妯″叿鍚嶇О') {
+ var linterid = data.妯″叿id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妯″叿妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '璁惧鍚嶇О') {
+ var linterid = data.璁惧id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
}
});
+ //鏂�
+ table.on('tool(mainTable_Material)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅涓婃枡闃查敊鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ });
+
+ //娉�
+ table.on('tool(mainTable_Method)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟鐐规'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '妯″叿鍚嶇О') {
+ var linterid = data.妯″叿id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妯″叿妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '璁惧鍚嶇О') {
+ var linterid = data.璁惧id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ });
+
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index b65e773..5f744b7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -1054,6 +1054,10 @@
if (sessionStorage["HDeptID"] != "0") {
$("#HDeptName").val(sessionStorage["HDeptID"]);
+ //鐢ㄦ埛缁戝畾鐨勮溅闂翠笉瀛樺湪锛屽垯榛樿鏄剧ず鍏ㄩ儴杞﹂棿
+ if ($("#HDeptName").val() == null || $("#HDeptName").val() == undefined) {
+ $("#HDeptName").val(0);
+ }
}
form.render('select');
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
index b4a80f5..c139ab5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
@@ -45,7 +45,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>-->
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:50px !important;">閫�鍑�</button>
</div>
</div>
@@ -127,9 +127,8 @@
data[0].HProQty = 0;
data[0].HSheetQty = Number(data[0].HSheetQty) + Number(1);
- switch (obj.event) {
+ switch (obj.event) {
case 'btn-CopyLine':
- var copydata = JSON.stringify(data);
if (data.length <= 0) {
layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
}
@@ -137,6 +136,19 @@
layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
}
else {
+ //鑾峰彇鏂版祦杞崱鍗曞彿锛屽唴鐮�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ data[0].HInterID = d.data[0].HInterID;
+ data[0].HBillNo = d.data[0].HBillNo;
+ }
+ });
+ var copydata = JSON.stringify(data);
+
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
var HArrIndex = -1;
@@ -154,7 +166,7 @@
//option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
}
- break;
+ break;
}
});
//#endregion
@@ -186,10 +198,10 @@
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
+ , field = obj.field; //寰楀埌瀛楁
switch (field) {
- case "HProQty":
+ case "HProQty":
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HProQty: value
@@ -232,7 +244,7 @@
} else if (params[1] == null) {
Pub_Close(2);
}
- })
+ })
//#endregion
//#region 椤甸潰鏂规硶
@@ -257,10 +269,14 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
- , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110 }
+ , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
- , { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170 }
+ , { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170, edit: 'text', event: "HRoutingName" }
, { field: 'HSheetQty', title: '鎷嗗垎娴佽浆鍗″紶鏁�', width: 130 }
+ , { field: 'HDate', title: '娴佽浆鍗℃棩鏈�', width: 120, event: 'HDate' }
+ , { field: 'HInterID', title: '娴佽浆鍗″唴鐮�', width: 130, hide: true }
+ , { field: 'HBillNo', title: '娴佽浆鍗″彿', width: 170 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -270,6 +286,7 @@
"HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
, "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
, "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
+ , "HInterID": 0, "HBillNo": "", "HBatchNo": ""
}];
option.data = rowdata;
@@ -288,7 +305,22 @@
//缃戞牸鏁版嵁璧嬪��
var subdata = result.data
var rowdata = [];
+ var HInterID = 0;
+ var HBillNo = "";
for (var i = 0; i < subdata.length; i++) {
+
+ //鑾峰彇娴佽浆鍗″崟鍙凤紝鍐呯爜
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ HInterID = d.data[0].HInterID;
+ HBillNo = d.data[0].HBillNo;
+ }
+ });
+
rowdata.push(
{
"HICMOInterID": subdata[i].HICMOInterID, "HICMOEntryID": subdata[i].HICMOEntryID, "HICMOBillNo": subdata[i].HICMOBillNo
@@ -296,6 +328,7 @@
, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
, "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
+ , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": ""
}
)
}
@@ -319,10 +352,13 @@
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
, { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170, edit: 'text', event: "HRoutingName" }
, { field: 'HSheetQty', title: '鎷嗗垎娴佽浆鍗″紶鏁�', width: 130 }
, { field: 'HDate', title: '娴佽浆鍗℃棩鏈�', width: 120, event: 'HDate' }
+ , { field: 'HInterID', title: '娴佽浆鍗″唴鐮�', width: 130, hide: true }
+ , { field: 'HBillNo', title: '娴佽浆鍗″彿', width: 170 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
, data: rowdata
@@ -370,6 +406,8 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
var sSubTable = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
@@ -390,16 +428,18 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#print-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵撳嵃鎸夐挳鍚敤
layer.close(index);
}
else {
layer.alert(data.Message, { icon: 5 });
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.close(index);
}
},
error: function (err) {
layer.alert("閿欒:" + err, { icon: 5 });
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.close(index);
}
});
@@ -439,7 +479,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
})
- }
+ }
obj.event = "";
return false;
@@ -453,13 +493,10 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var rows = [];
- var arr = [];
- var ieid = [];
+ var HInterID_Arr = [];
+
for (var i = 0; i < data.length; i++) {
- rows.push(data[i].hmainid.toString());
- arr.push(data[i].hentryid.toString());
- ieid.push(data[i].hmainid.toString() + data[i].hentryid.toString())
+ HInterID_Arr.push(data[i].HInterID.toString());
}
layer.open({
@@ -469,7 +506,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HInterID_Arr.toString() + "|" + 0 + '&MyMsg=' + HInterID_Arr.toString() + '&Type=HProcessExchange', 'yes']
, resize: false
})
}
@@ -529,7 +566,7 @@
}
}
}
-
+
return true;
}
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 2e89225..1cd7a9d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -934,6 +934,27 @@
}
//#endregion
+ //#region 鍏蜂綋鏃堕棿杞崲
+ function formatSpecificDate(date) {
+ var d = new Date(date), //瀹氫箟涓�涓皢date鍊艰浆鎹负鏃堕棿绫诲瀷璧嬪�肩粰d 鍒涘缓涓�涓柊鐨凞ate瀵硅薄d锛屼娇鐢ㄤ紶鍏ョ殑date鍙傛暟锛堝瓧绗︿覆鎴栨椂闂存埑锛変綔涓烘瀯閫犲嚱鏁扮殑鍙傛暟
+ month = '' + (d.getMonth() + 1), //浠巇瀵硅薄涓幏鍙栨湀浠�,灏嗚繖涓湀浠芥暟瀛楄浆鎹㈡垚瀛楃涓�
+ day = '' + d.getDate(), //浠巇瀵硅薄涓幏鍙�,灏嗚繖涓棩瀛楄浆鎹㈡垚瀛楃涓�
+ year = d.getFullYear(),
+ hour = '' + d.getHours(),
+ minutes = '' + d.getMinutes(),
+ secondes = '' + d.getSeconds(); // 浠巇瀵硅薄涓幏鍙栧畬鏁寸殑骞翠唤
+
+ if (month.length < 2) month = '0' + month; //鍒ゆ柇鏈堜唤鐨勯暱搴︽槸鍚﹀皬浜�2浣嶆暟 灏忎簬杩欏湪鍓嶅姞涓�0
+ if (day.length < 2) day = '0' + day; //鍒ゆ柇澶╂暟闀垮害鏄惁灏忎簬2浣嶆暟 灏忎簬杩欏湪鍓嶅姞涓�0
+ if (hour.length < 2) hour = '0' + hour;
+ if (minutes.length < 2) minutes = '0' + minutes;
+ if (secondes.length < 2) secondes = '0' + secondes;
+ var specific = hour + ':' + minutes + ':' + secondes;
+ var time = [year, month, day].join('-');
+ return [time, specific].join(' '); //灏嗗勾浠姐�佹湀浠藉拰鏃ュ瓧绗︿覆鏀惧叆涓�涓暟缁勪腑锛屽苟浣跨敤join鏂规硶灏嗗畠浠繛鎺ユ垚涓�涓瓧绗︿覆
+ }
+ //#endregion
+
//#region 鎵撳嵃
function get_PrintReport() {
if (linterid == null || linterid == "") {
@@ -1039,11 +1060,11 @@
, "HMaker": data[0].鍒跺崟浜� // 璁剧疆鈥滃埗鍗曚汉鈥濆悕绉板瓧娈电殑鍊笺��
, "HChecker": data[0].瀹℃牳浜� // 璁剧疆鈥滃鏍镐汉鈥濆悕绉板瓧娈电殑鍊笺��
, "HCloseMan": data[0].鍏抽棴浜� // 璁剧疆鈥滃叧闂汉鈥濆悕绉板瓧娈电殑鍊笺��
- , "HMakeDate": data[0].鍒跺崟鏃ユ湡 // 璁剧疆鈥滃埗鍗曟棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
- , "HCheckDate": data[0].瀹℃牳鏃ユ湡 // 璁剧疆鈥滃鏍告棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
- , "HCloseDate": data[0].鍏抽棴鏃ユ湡 // 璁剧疆鈥滃叧闂棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
- , "HUpDateDate": data[0].淇敼鏃ユ湡 // 璁剧疆鈥滀慨鏀规棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
- , "HDeleteDate": data[0].浣滃簾鏃ユ湡 // 璁剧疆鈥滀綔搴熸棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HMakeDate": formatSpecificDate(data[0].鍒跺崟鏃ユ湡) // 璁剧疆鈥滃埗鍗曟棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HCheckDate": formatSpecificDate(data[0].瀹℃牳鏃ユ湡) // 璁剧疆鈥滃鏍告棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HCloseDate": formatSpecificDate(data[0].鍏抽棴鏃ユ湡) // 璁剧疆鈥滃叧闂棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HUpDateDate": formatSpecificDate(data[0].淇敼鏃ユ湡) // 璁剧疆鈥滀慨鏀规棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
+ , "HDeleteDate": formatSpecificDate(data[0].浣滃簾鏃ユ湡) // 璁剧疆鈥滀綔搴熸棩鏈熲�濆悕绉板瓧娈电殑鍊笺��
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
@@ -2095,7 +2116,19 @@
$("#HPSStyleID").val(obj[0].HPSStyleID == "" ? 0 : obj[0].HPSStyleID);
}
-
+ //鏃堕棿鏍煎紡
+ function formatDateTime(date) {
+ const year = date.getFullYear();
+ const month = date.getMonth() + 1;
+ const day = date.getDate();
+ const hour = date.getHours();
+ const minute = date.getMinutes();
+ const second = date.getSeconds();
+ return `${year}-${pad(month)}-${pad(day)} ${pad(hour)}:${pad(minute)}:${pad(
+ second
+ )}`;
+ }
+
function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
{
$("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
index 194bb81..0c140f5 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -198,7 +198,8 @@
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
- //鎵弿鏉″舰鐮佹柟娉�
+
+ //鎵弿鏉″舰鐮佹柟娉昻ew
function GetMeesageByBarCode() {
var HBarCode = $('#HBarCode').val();
if (!HBarCode) {
@@ -211,40 +212,82 @@
return;
}
var index = layer.load();
- var sSubStr = table.cache['mainTable'];
- if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
- sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
- table.render(option);
- return;
- }
- layer.close(index);
- //$.ajax({
- // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
- // type: "GET",
- // data: { "HBarCode": HBarCode, "HInterID": HInterID },
- // success: function (result) {
- // if (result.code == "1") {
- // var sSubStr = table.cache['mainTable'];
- // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
- // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
- // table.render(option);
- // break;
- // }
- // layer.close(index);
- // }
- // else {
- // layer.close(index);
- // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // },
- // error: function (err) {
- // layer.close(index);
- // layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- //});
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ success: function (result) {
+ if (result.code == "1") {
+ var sSubStr = table.cache['mainTable'];
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMaterID == result.data[0].HMaterID) {
+ sSubStr[i].HSQty += result.data[0].HQty;
+ table.render(option);
+ break;
+ }
+ }
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
$('#HBarCode').val("");
$("#HBarCode").focus();
}
+ ////鎵弿鏉″舰鐮佹柟娉�
+ //function GetMeesageByBarCode() {
+ // var HBarCode = $('#HBarCode').val();
+ // if (!HBarCode) {
+ // layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ // return;
+ // }
+ // var HInterID = $('#HInterID').val();
+ // if (!HInterID) {
+ // layer.msg("璇峰厛杈撳叆鏀舵枡閫氱煡鍗曞崟鎹彿锛�")
+ // return;
+ // }
+ // var index = layer.load();
+ // var sSubStr = table.cache['mainTable'];
+ // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ // table.render(option);
+ // return;
+ // }
+ // layer.close(index);
+ // //$.ajax({
+ // // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ // // type: "GET",
+ // // data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ // // success: function (result) {
+ // // if (result.code == "1") {
+ // // var sSubStr = table.cache['mainTable'];
+ // // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ // // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ // // table.render(option);
+ // // break;
+ // // }
+ // // layer.close(index);
+ // // }
+ // // else {
+ // // layer.close(index);
+ // // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // // }
+ // // },
+ // // error: function (err) {
+ // // layer.close(index);
+ // // layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // // }
+ // //});
+ // $('#HBarCode').val("");
+ // $("#HBarCode").focus();
+ //}
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.location.href = "../../../views/index_Mobile.html";
@@ -253,6 +296,7 @@
//瀹℃牳
form.on('submit(btn_Check)', function (data) {//瀹℃牳
var sSubStr = table.cache['mainTable'];
+ var HReturn = "";
for (var i = 0; i < sSubStr.length; i++) {
if (parseInt(sSubStr[i].HSQty) > parseInt(sSubStr[i].HQty)) {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓嶈兘瓒呭嚭璁㈠崟鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -262,11 +306,35 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓�0", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if (parseInt(sSubStr[i].HSQty) != parseInt(sSubStr[i].HQty)) {
+ HReturn += "绗�" + (i + 1) + "琛�,璁㈠崟鏁伴噺涓庢潯鐮佹暟閲忎笉涓�鑷达紝鏄惁缁х画瀹℃牳<br/>";
+ }
}
+ if (HReturn != "") {
+ layer.confirm(HReturn, {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['纭', '鍙栨秷'] //鍙互鏃犻檺涓寜閽�
+ }, function (index, layero) {
+ //鎸夐挳涓�鍥炶皟
+ set_Aduit();
+ }, function (index) {
+ //鎸夐挳浜屽洖璋�
+ return;
+ });
+ } else {
+ set_Aduit();
+ }
+
+ });
+
+ //瀹℃牳鎸夐挳鏂规硶
+ function set_Aduit() {
var index = layer.load();
var HInterID = $('#HInterID').val();
var HBillNo = $('#HBillNo').val();
+ var sSubStr = table.cache['mainTable'];
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost",
type: "Post",
@@ -291,7 +359,7 @@
layer.close(index);
}
});
- });
+ }
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
--
Gitblit v1.9.1