From b1a5994fefbb3244275c161a9a455191d2b467a9 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 10 十月 2024 16:08:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 14
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport.html | 86 ----
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 4
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 1
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_TK.html | 2
WebTM/views/工资管理/工资运算/Pay_SalaryCalculate_New.html | 200 ++++++++++
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html | 8
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBillList.html | 6
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html | 6
WebTM/views/系统管理/用户管理/Xt_UserList.html | 2
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 12
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 12
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 8
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 14
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 32
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 5
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 20
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 14
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 18
WebTM/views/Baseset/基础资料/Gy_GetProductionTeamList.html | 8
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html | 3
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 15
WebTM/views/质量管理/库存检验单/QC_Add_Edit_StockCheckBill.html | 8
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 42 --
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 26
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 25
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 6
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 4
WebTM/WebTM.csproj.user | 2
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 8
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 23
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 97 ++++
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html | 4
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 4
WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html | 192 +++++++--
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 1
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html | 147 +++++++
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 15
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html | 4
WebTM/WebTM.csproj | 1
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 14
42 files changed, 785 insertions(+), 330 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 3911b23..3e5d64f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -403,6 +403,7 @@
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 005e8c8..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index bf7e891..b71d476 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,7 +10,7 @@
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
index ff83d3c..5e8e3b1 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
@@ -105,9 +105,11 @@
}
$.ajax({
type: "get",
- url: GetWEBURL() + "/Web/GetProductionTeamList_Json",
- async: true,
- data: { "sWhere": Value },
+ //url: GetWEBURL() + "/Web/GetProductionTeamList_Json", //鍘熻繑鍥炴暟鎹皟鐢ㄦ柟娉�
+ url: GetWEBURL() + "/Web/GetGroupListByUser_Json",
+ async: false,
+ //data: { "sWhere": Value },
+ data: { "sWhere": Value, "user": sessionStorage["HUserName"] },
success: function (result) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
table.reload('mainTable', {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 9635ad6..424da0a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -405,18 +405,18 @@
, cellMinWidth: 90
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- // , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜', sort: true }
- // , { field: '鑱屽憳鍚嶇О', title: '鑱屽憳鍚嶇О', sort: true }
+ // , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
+ // , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜', sort: false }
+ // , { field: '鑱屽憳鍚嶇О', title: '鑱屽憳鍚嶇О', sort: false }
// , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
// , { field: 'HDeptID', title: 'HDeptID', hide: true }
- // , { field: '杞﹂棿浠ｇ爜', title: '杞﹂棿浠ｇ爜', sort: true }
- // , { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О', sort: true }
+ // , { field: '杞﹂棿浠ｇ爜', title: '杞﹂棿浠ｇ爜', sort: false }
+ // , { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О', sort: false }
// , { field: 'HGroupID', title: 'HGroupID', hide: true }
- // , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', sort: true }
- // , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', sort: true }
+ // , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', sort: false }
+ // , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', sort: false }
// , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
- // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪', sort: true }
+ // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪', sort: false }
// , { field: '澶囨敞', title: '澶囨敞' }
//]]
};
@@ -452,10 +452,10 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
index 664131c..fe01877 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_List.html"
@@ -307,10 +307,10 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 4543708..c903dd4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -394,7 +394,7 @@
, cellMinWidth: 90
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ // , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
// , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜' }
// , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
// , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
@@ -445,10 +445,10 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
index 1ef84bb..02fc0f7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
@@ -421,8 +421,8 @@
, cellMinWidth: 90
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
- // , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ // , { field: 'ParentID', title: 'ParentID', sort: false, hide: true }
+ // , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
// , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
// , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' }
// , { field: '缁勭粐', title: '缁勭粐' }
@@ -526,24 +526,24 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
} else if (data[i].name == '宸ヤ綔涓績浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '宸ヤ綔涓績浠ｇ爜'});
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '宸ヤ綔涓績浠ｇ爜'});
} else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
case 'long':
case 'Int32':
case 'Int64':
case 'double':
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index eedff85..118050d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -405,8 +405,8 @@
, cellMinWidth: 90
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- // , { field: 'HDeptID', title: 'HDeptID', sort: true, hide: true }
+ // , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
+ // , { field: 'HDeptID', title: 'HDeptID', sort: false, hide: true }
// , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
// , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
// , { field: '缁勭粐', title: '缁勭粐' }
@@ -500,25 +500,25 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
} else if (data[i].name == '鐝粍浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐝粍浠ｇ爜' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '鐝粍浠ｇ爜' });
}
else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
case 'long':
case 'Int32':
case 'Int64':
case 'double':
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index 4156093..73b6879 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -77,6 +77,16 @@
<input class="layui-input" name="HCompName" lay-verify="HCompName" id="HCompName">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁′欢绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HPayMentType" id="HPayMentType" lay-verify="HPayMentType">
+ <option value="涓汉璁′欢">涓汉璁′欢</option>
+ <option value="闆嗕綋璁′欢">闆嗕綋璁′欢</option>
+ <option value="鍏跺畠" selected="selected">鍏跺畠</option>
+ </select>
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
@@ -88,7 +98,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label" >缁勭粐</label>
+ <label class="layui-form-label">缁勭粐</label>
<div class="layui-input-inline" style="margin-bottom: -15px;">
<div class="layui-form">
<div class="layui-form-item" style=" width: 375%;">
@@ -299,12 +309,13 @@
, "HDeptID": data.HDeptID
, "HHelpCode": data.鍔╄鐮�
, "HBarCodeForBase": data.鏉＄爜缂栧彿
- ,"HCompName":data.鍔冲姟鍗曚綅
+ , "HCompName":data.鍔冲姟鍗曚綅
, "HProcID": data.HProcID
, "HProcName": data.宸ュ簭
, "HStopflag": data.绂佺敤鏍囪
, "HRemark": data.澶囨敞
, "HUSEORGID": data.HUSEORGID
+ , "HPayMentType": data.璁′欢绫诲瀷
});
layer.close(ajaxLoad);
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index fe650c7..03f475d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -358,7 +358,7 @@
//, cellMinWidth: 90
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ // , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
// , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
// , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
// , { field: '缁勭粐', title: '缁勭粐' }
@@ -470,25 +470,25 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
} else if (data[i].name == '宸ュ簭浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '宸ュ簭浠ｇ爜' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '宸ュ簭浠ｇ爜' });
} else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
break;
case 'long':
case 'Int32':
case 'Int64':
case 'double':
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 3376d0b..7ff32aa 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -394,7 +394,7 @@
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ // , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
// , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
// , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О' }
// , { field: '缁勭粐', title: '缁勭粐' }
@@ -462,24 +462,24 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
} else if (data[i].name == '鐢熶骇璧勬簮浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐢熶骇璧勬簮浠ｇ爜' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '鐢熶骇璧勬簮浠ｇ爜' });
} else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
case 'long':
case 'Int32':
case 'Int64':
case 'double':
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index 4e869ac..d039eb6 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -862,16 +862,16 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
break;
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
case 'Int32':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
}
}
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index 16d0fca..1647339 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -864,16 +864,16 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
break;
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
case 'Int32':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
}
}
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SalaryCalculate_New.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SalaryCalculate_New.html"
new file mode 100644
index 0000000..e8635f1
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\350\277\220\347\256\227/Pay_SalaryCalculate_New.html"
@@ -0,0 +1,200 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>宸ヨ祫杩愮畻</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <h1 style="text-align: center; padding: 30px 0;"><b>宸ヨ祫杩愮畻</b></h1>
+ <div class="layui-colla-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐝粍<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate" style="padding:0 30px">寮�濮嬪伐璧勮繍绠�</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel" style="padding:0 20px">閫�鍑�</button>
+ </div>
+ <div class="layui-colla-item" style="height:600px;margin-top:20px;">
+ <font size="5" color="blue" id="HRemark"></font>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/javascript">
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var HModName = "Pay_SalaryCalculate_New";
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ $("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ }
+ //#endregion
+
+
+ //#region 閫夋嫨鐝粍鎸夐挳
+ form.on('submit(HGroupList)', function () {
+ get_checkGroup();
+ });
+
+ function get_checkGroup() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐝粍鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ }
+ })
+ }
+ //#endregion
+
+
+ //#region 寮�濮嬪伐璧勮繍绠�
+ form.on('submit(btn_Calculate)', function (data) {
+ set_Calculate(data);
+ });
+
+ function set_Calculate(data) {
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+ var HGroupID = $("#HGroupID").val();
+ var HSourceBillType = "3791"; //宸ュ簭鍑虹珯姹囨姤鍗�
+ if (HBeginDate == "" || HEndDate == "") {
+ layer.msg("璇峰厛閫夋嫨寮�濮嬫棩鏈熷拰缁撴潫鏃ユ湡锛�", { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/Pay_SalaryCulateController/GetSalaryCalculate_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBeginDate": HBeginDate, "HEndDate": HEndDate, "HGroupID": HGroupID, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ success: function (data) {
+ if (data.count == 1) {
+ $("#HRemark").html(data.Message);
+ layer.close(index);
+ } else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ });
+ }
+ //#endregion
+
+
+ //#region 閫�鍑�
+ form.on('submit(btn_Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ Pub_Close(2);
+ });
+ })
+ //#endregion
+
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
index 5600974..f549f2d 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
@@ -864,13 +864,13 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
break;
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
}
}
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
index 82adad2..e78b188 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
@@ -446,10 +446,10 @@
, { field: 'HEmpID', title: 'HEmpID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 100, edit: 'text', event: "HEmpNumber" } //F7
, { field: 'HEmpName', title: '鑱屽憳鍚嶇О', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', width: 100, edit: 'text' }
+ , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', width: 100, edit: 'text', event: "HEmpRate" }
, { field: 'HAMTimes', title: '涓婂崍宸ユ椂', width: 100, edit: 'text', totalRow: true }
, { field: 'HPMTimes', title: '涓嬪崍宸ユ椂', width: 100, edit: 'text', totalRow: true }
- , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', width: 100, edit: 'text', totalRow: true, event: "HBaseTimes" }
, { field: 'HBaseDays', title: '鍩烘湰澶╂暟', width: 100, edit: 'text', totalRow: true }
, { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', width: 100, edit: 'text', totalRow: true }
, { field: 'HOverDays', title: '鍔犵彮澶╂暟', width: 100, edit: 'text', totalRow: true }
@@ -592,8 +592,10 @@
}
$("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
$("#HGroupID").val(checkStatus.data[0].HItemID);
- $("#HDeptID").val(checkStatus.data[0].HDeptID);//閮ㄩ棬浠ｇ爜
- $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+ if (checkStatus.data[0].HDeptID != 0) {
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ }
layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -614,6 +616,10 @@
}
function GetEmployee() {
+ if ($("#HGroupName").val() == '') {
+ return;
+ }
+
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_EmployeeController/GetEmpInfoByGroup_Json",
@@ -1035,7 +1041,8 @@
} else {
obj.del();
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.reload(option);
+ table.cache["mainTable"].splice(rowIndex, 1);
+ table.render(option);
layer.close(index);
}
});
@@ -1188,9 +1195,93 @@
}
})
}
+ //obj.event = "";
+ return false;
+ }
+
+
+ //#region 鎵归噺濉厖
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+ //鎿嶄綔琛岀储寮�
+ var rowIndex = $(obj.tr).attr("data-index");
+
+ if (event.key == "F6") {
+ //鑱屽憳绯绘暟
+ if (obj.event == "HEmpRate") {
+ var oldText = table.cache["mainTable"][rowIndex].HEmpRate;
+ var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ option.data[rowIndex].HEmpRate = oldText;
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+
+ layer.msg("鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ for (var i = rowIndex * 1; i < option.data.length; i++) {
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HEmpRate = isNaN(value) ? 0 : value * 1; //鑱屽憳绯绘暟
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ option.data[i].HEmpRate = HEmpRate;
+ }
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+ }
+
+ //鍩烘湰宸ユ椂
+ if (obj.event == "HBaseTimes") {
+ var oldText = table.cache["mainTable"][rowIndex].HBaseTimes;
+ var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ option.data[rowIndex].HBaseTimes = oldText;
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+
+ layer.msg("鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ for (var i = rowIndex * 1; i < option.data.length; i++) {
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HBaseTimes = isNaN(value) ? 0 : value * 1; //鍩烘湰宸ユ椂
+ var HAMTimes = HBaseTimes / 2; //涓婂崍宸ユ椂
+ var HPMTimes = HBaseTimes / 2; //涓嬪崍宸ユ椂
+ var HPayMoney = isNaN(option.data[i].HPayMoney) ? 0 : option.data[i].HPayMoney; //灏忔椂宸ヨ祫
+ var HMoney = HPayMoney * HBaseTimes; //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ option.data[i].HBaseTimes = HBaseTimes;
+ option.data[i].HAMTimes = HAMTimes;
+ option.data[i].HPMTimes = HPMTimes;
+ option.data[i].HMoney = HMoney;
+ }
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+ }
+
obj.event = "";
return false;
}
+
+ //#endregion
})
}
//#endregion
@@ -1226,7 +1317,7 @@
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HAMTimes = isNaN(value) ? 0 : value; //涓婂崍宸ユ椂
+ var HAMTimes = isNaN(value) ? 0 : value * 1; //涓婂崍宸ユ椂
var HPMTimes = isNaN(obj.data.HPMTimes) ? 0 : obj.data.HPMTimes; //涓嬪崍宸ユ椂
var HBaseTimes = Number(HPMTimes) + Number(HAMTimes); //鍩烘湰宸ユ椂=涓婂崍宸ユ椂+涓嬪崍宸ユ椂
var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //灏忔椂宸ヨ祫
@@ -1259,7 +1350,7 @@
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HPMTimes = isNaN(value) ? 0 : value; //涓嬪崍宸ユ椂
+ var HPMTimes = isNaN(value) ? 0 : value * 1; //涓嬪崍宸ユ椂
var HAMTimes = isNaN(obj.data.HAMTimes) ? 0 : obj.data.HAMTimes; //涓婂崍宸ユ椂
var HBaseTimes = Number(HPMTimes) + Number(HAMTimes); //鍩烘湰宸ユ椂=涓婂崍宸ユ椂+涓嬪崍宸ユ椂
var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //灏忔椂宸ヨ祫
@@ -1269,6 +1360,40 @@
obj.update({
HPMTimes: HPMTimes
, HBaseTimes: HBaseTimes
+ , HMoney: HMoney
+ });
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+ break;
+ case "HBaseTimes": //鍩烘湰宸ユ椂
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HBaseTimes: oldText
+ });
+ table.render(option);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub();
+
+ layer.msg("鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HBaseTimes = isNaN(value) ? 0 : value * 1; //鍩烘湰宸ユ椂
+ var HAMTimes = HBaseTimes / 2; //涓婂崍宸ユ椂
+ var HPMTimes = HBaseTimes / 2; //涓嬪崍宸ユ椂
+ var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //灏忔椂宸ヨ祫
+ var HMoney = HPayMoney * HBaseTimes; //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HBaseTimes: HBaseTimes
+ , HAMTimes: HAMTimes
+ , HPMTimes: HPMTimes
, HMoney: HMoney
});
table.render(option);
@@ -1292,7 +1417,7 @@
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HPayMoney = isNaN(value) ? 0 : value; //灏忔椂宸ヨ祫
+ var HPayMoney = isNaN(value) ? 0 : value * 1; //灏忔椂宸ヨ祫
var HBaseTimes = isNaN(obj.data.HBaseTimes) ? 0 : obj.data.HBaseTimes; //鍩烘湰宸ユ椂
var HMoney = HPayMoney * HBaseTimes; //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
@@ -1413,8 +1538,10 @@
{
$("#HGroupName").val(obj[0].鐝粍鍚嶇О);
$("#HGroupID").val(obj[0].HItemID);
- $("#HDeptID").val(obj[0].HDeptID);//閮ㄩ棬浠ｇ爜
- $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+ if (obj[0].HDeptID != 0) {
+ $("#HDeptID").val(obj[0].HDeptID);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ }
}
//鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 鍒楄〃
function GetHEmpListValue(data) //杩斿洖鑱屽憳
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
index 7b6972e..f6428a9 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -858,16 +858,16 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
break;
case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
case 'Int32':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
}
}
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index ed21005..7ecf284 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -839,6 +839,11 @@
if ($("#ColName option").length < 1) {
ColFilter();
}
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "鏉＄爜涓绘。";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
option.data = [[]]
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
index 8955797..e737644 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
@@ -200,21 +200,27 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-inline" style="width: 100%;">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div id="page" style="position:relative;bottom:0;"></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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -245,6 +251,8 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
var HModName = "Sc_PPBomBillList";
//#endregion
var titleData = ["hmainid", "HDeptID", "HMaterID", "HUnitID", "hsubid", "hmaterid2", "hunitid2", "HWHID", "HSPID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -257,13 +265,22 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//閲嶆柊鍚屾鎸夐挳
@@ -401,14 +418,13 @@
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
- //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -430,10 +446,10 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
+ , height: 'full-180'
+ , page: false
, cellMinWidth: 90
- , totalRow: true
+ , totalRow: false
, limit: 50
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
@@ -481,8 +497,30 @@
, { field: '璁″垝妯″紡', title: '璁″垝妯″紡', sort: true }
]]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
- //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ //#region 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
@@ -585,6 +623,70 @@
});
}
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ //var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_PPBomBill/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],"page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ //option.data = [[]]
+ //table.render(option);
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
// 蹇�熻繃婊�
function get_FastQuery() {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -612,19 +714,19 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName + " " + com;
@@ -634,19 +736,19 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like''%" + ColContent1 + "%''";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like''%" + ColContent1 + "''";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like''" + ColContent1 + "%''";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like''%" + ColContent1 + "%''";
break;
default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ com1 = "" + Comparator1 + "''" + ColContent1 + "''";
break;
}
sWhere += " and " + ColName1 + " " + com1;
@@ -655,55 +757,55 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like''%" + ColContent2 + "%''";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like''%" + ColContent2 + "''";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like''" + ColContent2 + "%''";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like''%" + ColContent2 + "%''";
break;
default:
- com2 = "" + Comparator + "'" + ColContent + "'";
+ com2 = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName2 + " " + com2;
}
if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + HDate + "''";
}
if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HDate1 + "''";
}
if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%''";
}
if (HDeptID) {
- sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+ sWhere += " and 閮ㄩ棬 like ''%" + HDeptID + "%''";
}
if (MaterialCode) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
+ sWhere += " and 鐗╂枡浠ｇ爜 like ''%" + MaterialCode + "%''";
}
if (MaterialName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+ sWhere += " and 鐗╂枡鍚嶇О like ''%" + MaterialName + "%''";
}
if (SpecificationModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ sWhere += " and 瑙勬牸鍨嬪彿 like ''%" + SpecificationModel + "%''";
}
if (HSourceBillNo) {
- sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ sWhere += " and 婧愬崟鍗曞彿 like ''%" + HSourceBillNo + "%''";
}
if (Warehouse) {
- sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'";
+ sWhere += " and 鍙戣揣浠撳簱 like ''%" + Warehouse + "%''";
}
if (Hmaker) {
- sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+ sWhere += " and 鍒跺崟浜� like ''%" + Hmaker + "%''";
}
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1006,7 +1108,7 @@
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
- table.on('row(mainTablemainTable)', function (obj) {
+ table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
index 11b3dd3..0528ed2 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
@@ -283,6 +283,8 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鐢ㄦ埛缂栫爜', title: '鐢ㄦ埛缂栫爜' }
, { field: '鐢ㄦ埛鍚嶇О', title: '鐢ㄦ埛鍚嶇О' }
+ , { field: '鐢ㄦ埛绫诲瀷', title: '鐢ㄦ埛绫诲瀷' }
+ , { field: '瀵瑰簲鐝粍', title:'瀵瑰簲鐝粍' }
, { field: '瀵瑰簲鑱屽憳', title: '瀵瑰簲鑱屽憳' }
, { field: '瀵瑰簲淇濈', title: '瀵瑰簲淇濈' }
, { field: '瀵瑰簲楠屾敹', title: '瀵瑰簲楠屾敹' }
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index dd2cca3..102079d 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -332,7 +332,6 @@
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
} else {
- debugger;
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
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_RoutingBillList.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_RoutingBillList.html"
index 37bf655..cfbaca9 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_RoutingBillList.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_RoutingBillList.html"
@@ -917,7 +917,7 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -926,11 +926,18 @@
else {
switch (data[i].Type) {
//int
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
}
}
}
@@ -1451,7 +1458,10 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index c9398b6..25358d6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -211,8 +211,8 @@
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
- <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" checked>
- <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�">
+ <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" >
+ <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�" checked>
</div>
</div>
<div class="layui-inline" id="hidediv1">
@@ -1526,6 +1526,8 @@
, "HBatchNo": data.鎵瑰彿
, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+ , "HProcID": data.HProcID
+ , "HProcName": data.HProcName
});
$("input[name=HLastResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
$("input[name=HLastResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
@@ -1864,7 +1866,7 @@
{
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁� == null ? 0 : data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁� == null ? 0 : data[i].鎷掔粷鏁�,
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
@@ -2270,7 +2272,7 @@
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
- , { field: 'HInspectVal', title: '妫�楠屽��' }
+ , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
@@ -2409,10 +2411,10 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
form.render('radio');
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 7fc76a5..954c58f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -208,8 +208,8 @@
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
- <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" checked>
- <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�">
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" >
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�" checked>
</div>
</div>
<div class="layui-inline" id="hidediv1">
@@ -645,7 +645,6 @@
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
- <input type="hidden" name="HProcID" id="HProcID" value="1">
</form>
</div>
</div>
@@ -1485,7 +1484,13 @@
, "HBatchNo": data.鎵瑰彿
, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+ , "HProcID": data.HProcID
+ , "HProcName": data.HProcName
});
+
+ $("input[name=HCheckerResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
+ $("input[name=HCheckerResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
+ form.render();
data = result.data;
//瀛愯〃 璧嬪��
var rowdata = [];
@@ -1898,7 +1903,7 @@
{
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
@@ -2219,7 +2224,7 @@
//, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
- , { field: 'HInspectVal', title: '妫�楠屽��' }
+ , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
index 0db6d77..a1b5981 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
@@ -1418,6 +1418,10 @@
layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if ($("#HBatchNo").val() == "") {
+ layer.msg("鎵规鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var sSubTable = table.cache['mainTable'];
for (var i = 0; i < sSubTable.length; i++) {
if (!sSubTable[i].HQCCheckItemID) {
@@ -2386,10 +2390,10 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
form.render('radio');
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 280790e..26c98c4 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -33,15 +33,21 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">妫�楠屾柟妗堝悕绉�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HDate1" id="HDate1">
+ <input type="date" class="layui-input" name="HDate1" id="HDate1">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HDate2" id="HDate2">
+ <input type="date" class="layui-input" name="HDate2" id="HDate2">
</div>
</div>
<div class="layui-inline">
@@ -295,6 +301,10 @@
var HBillNo = $("#HBillNo").val();
var HDate1 = $("#HDate1").val();
var HDate2 = $("#HDate2").val();
+ var HQCCheckProjectName = $("#HQCCheckProjectName").val();
+ if (HQCCheckProjectName) {
+ sWhere += " and 妫�楠屾柟妗堝悕绉� like '%" + HQCCheckProjectName + "%'";
+ }
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
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_InspectionFormReport.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_InspectionFormReport.html"
index 5500596..69ecbc6 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_InspectionFormReport.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_InspectionFormReport.html"
@@ -682,7 +682,7 @@
option_ZXT_Avg = {
title: {
- text: '骞冲潎鍊�',
+ text: 'x虅绠″埗鍥�',
left: 'center'
},
grid: {
@@ -741,7 +741,7 @@
option_ZXT_Diff = {
title: {
- text: '宸��',
+ text: 'R绠″埗鍥�',
left: 'center'
},
grid: {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
index 01f9935..bc2a5d3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
@@ -150,9 +150,13 @@
</div>
</div>
<div class="layui-inline" id="hidediv1">
- <label class="layui-form-label" style="width: 85px;">宸ュ簭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
</div>
</div>
</div>
@@ -733,7 +737,7 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
- $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤
+ //$('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤
$('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
$('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
$('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
@@ -1035,6 +1039,45 @@
}
});
//#endregion
+
+ //琛ㄥご淇℃伅宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_ICMOBillStatusList();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//閫�鍑烘寜閽�
form.on('submit(btn-Exit)', function (data) {
@@ -1504,6 +1547,8 @@
, "HShiftsID": data.HShiftsID
, "HShiftsName": data.鐝鍚嶇О
, "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
+ , "HProcID": data.HProcID
+ , "HProcName": data.HProcName
});
$("input[name=HLastResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
$("input[name=HLastResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
@@ -2031,6 +2076,7 @@
}
$("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
+ get_ICMOBillStatusList();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -2343,10 +2389,10 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
form.render('radio');
}
@@ -3535,6 +3581,45 @@
}
//#endregion
+ //鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
+ function get_ICMOBillStatusList() {
+ var sWhere = "";
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ var HProcExchInterID = $("#HProcExchInterID").val();
+
+ if (HProcID != "0") {
+ sWhere += " and HProcID=" + HProcID;
+ }
+ if (HSourceID != "0") {
+ sWhere += " and HSourceID=" + HSourceID
+ }
+
+ sWhere += " and HSourceInterID=" + HProcExchInterID;
+
+ $.ajax({
+ url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HProcID").val(result.data[0]["HProcID"]);
+ $("#HProcName").val(result.data[0]["宸ュ簭"]);
+ $("#HSourceID").val(result.data[0]["HSourceID"]);
+ $("#HSourceName").val(result.data[0]["鐢熶骇璧勬簮"]);
+
+ } else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
+
+
//#region 銆愰殣钘忔娴嬪�煎瓧娈点��
function IsHide(HAnalysisMethod_Value) {
if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 9cb547d..357a768 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -214,8 +214,8 @@
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
- <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" checked>
- <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�">
+ <input type="radio" name="HLastResult" value="true" title="鍚堟牸" >
+ <input type="radio" name="HLastResult" value="false" title="涓嶅悎鏍�" checked>
</div>
</div>
<div class="layui-inline" id="hidediv1" style="margin-left:20px;">
@@ -1274,7 +1274,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1527,6 +1527,8 @@
, "HICMOEntryID": data.HICMOEntryID
, "HMaterID": data.HMaterID
, "HMaterName": data.鐗╂枡鍚嶇О
+ , "HProcID": data.HProcID
+ , "HProcName": data.HProcName
, "HProcExchQty": data.HProcExchQty
, "HProcExchBillNo": data.HProcExchBillNo
, "HProcExchInterID": data.HProcExchInterID
@@ -1589,7 +1591,7 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
@@ -1952,7 +1954,7 @@
{
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊� , "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
@@ -2423,7 +2425,7 @@
//閫夋嫨鐨剆elect瀵硅薄鍊硷紱
var selectValue = data.value;
- if (selectValue == 1) {
+ if (selectValue == "1") {
selectValue = "鍚堟牸"
$("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
$("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
@@ -2454,12 +2456,12 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value='false']").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value='true']").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
- form.render('radio');
+ form.render("radio");
}
////琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級-- 澶囦唤
@@ -3769,8 +3771,10 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
- $("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+ if (result.data.length > 0) {
+ $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
+ $("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+ }
}
},
error: function (err) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
index d762f21..ff6779c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
@@ -460,9 +460,10 @@
//#region 鏌ヨ
function RoadHBillNo(sqlWhere) {
var ajaxLoad = layer.load();
+ sqlWhere+=" order by 鍗曟嵁鍙� desc "
$.ajax({
//h_v_QC_FirstPieceCheckBill
- url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
+ url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainList',
type: "GET",
async: false,
data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
index cc50e32..ad0c5be 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
@@ -359,8 +359,8 @@
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
} else {
- if (HBarCode.length != 29) {
- layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ if (HBarCode.length != 29 && HBarCode.length != 50) {
+ layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
index 89c9061..ee21f2e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
@@ -387,8 +387,8 @@
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
} else {
- if (HBarCode.length != 29) {
- layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ if (HBarCode.length != 29 && HBarCode.length != 50) {
+ layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index 6146859..daa9edd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -338,8 +338,8 @@
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
} else {
- if (HBarCode.length != 29) {
- layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ if (HBarCode.length != 29 && HBarCode.length != 50) {
+ layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 6508b7a..56ce912 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -458,19 +458,19 @@
if ($.inArray(data[i].name, "") > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '鍗曟嵁鍙�' });
}
else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
}
else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
@@ -600,13 +600,13 @@
}
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: 'hmainid', title: 'hmainid', sort: false, hide: true }
, { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', hide: true }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', sort: true }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�', sort: false }
, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
, { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
@@ -1732,10 +1732,10 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
}
}
}
@@ -1812,13 +1812,13 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺' || data[i].name == '宸ユ椂') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
} else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
@@ -2132,6 +2132,9 @@
if (item.瑙勬牸鍨嬪彿.length > 0) { // 鍋囪瀛楁鍚嶄负field
item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
+ if (item.浜у搧鍚嶇О.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.浜у搧鍚嶇О = item.浜у搧鍚嶇О.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
});
table.exportFile(ins.config.id, option.data, "xls");
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index 0512c19..252b3ee 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -102,6 +102,7 @@
th {
width: 70px;
text-align: left;
+ font-size: 17px;
}
</style>
</head>
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_ProcessExchangeArrangement_PG.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_ProcessExchangeArrangement_PG.html"
index 418eecd..6497387 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_ProcessExchangeArrangement_PG.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_ProcessExchangeArrangement_PG.html"
@@ -520,7 +520,11 @@
//鏌ヨ鏈淳宸ョ殑娴佽浆鍗�
function get_Display2(sWhere) {
- sWhere += " and 鐢熶骇璧勬簮 is null and HBillSubType<>'SUB'";
+ sWhere += " and 鐢熶骇璧勬簮 is null and HBillSubType<>'SUB' and 宸ュ簭<>'杞伐搴�' ";
+ if ($("#HDeptName").val() != "") {
+ sWhere += " and 閮ㄩ棬='" + $("#HDeptName").val() + "'";
+ }
+
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/LEMS/MES_ProcessExchangeBillList_PG',
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.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.html"
index 9f66a95..40793d5 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.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.html"
@@ -345,6 +345,12 @@
<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鍘熸枡鎵规</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -573,12 +579,7 @@
<input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍘熸枡鎵规</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
+
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鏉愯川</label>
<div class="layui-input-inline">
@@ -2066,11 +2067,11 @@
layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!sSubTable[i].HCenterID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if (!sSubTable[i].HCenterID) {
+ // var indexRow = i + 1;
+ // layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if (sSubTable[i].HSupFlag == "true") {
if (!sSubTable[i].HSupID) {
var indexRow = i + 1;
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 74f02d9..0574321 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"
@@ -385,7 +385,7 @@
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜富琛級
var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "鏉愯川", "鎴愬搧缂栧彿", "鐗堟湰", "鎬昏鍥惧彿", "鍥惧彿鐗堟湰", "瀛愪欢浠ｇ爜", "瀛愪欢鍚嶇О", "瀛愪欢瑙勬牸", "濮斿鍔犲伐鍗曚綅浠ｇ爜", "濮斿鍔犲伐鍗曚綅", "璁惧鍚嶇О", "璁惧浠ｇ爜", "鍘熸枡鎵规", "琛ユ枡鏍囪", "椤圭洰缂栧彿", "涓昏鏉愭枡", "鍏抽敭鏉愭枡", "浜у搧CODE", "瀹㈡埛绠�绉�", "瀹㈡埛瑕佹眰鏉愭枡鎴愬垎", "浜у搧鍚嶇О2", "瀹㈡埛鍚嶇О", "鐢熶骇澶囨敞", "閲嶈鎻愮ず", "鍘熸潗鏂欑紪鍙稟", "鍘熸潗鏂欑紪鍙稡", "鍘熸潗鏂欑紪鍙稢", "鍘熸潗鏂欑紪鍙稤", "鍘熸潗鏂欏唴鐮丄", "鍘熸潗鏂欏唴鐮丅", "鍘熸潗鏂欏唴鐮丆", "鍘熸潗鏂欏唴鐮丏", "鏃ヨ鍒掑伐鍗曞彿", "瀹㈡埛缂栫爜", "鑺綋瑙勬牸鍨嬪彿", "鑺綋鐗╂枡浠ｇ爜", "婧愬崟瀹㈡埛浠ｇ爜", "HEmpID", "HCusID","HBillSubType"];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹烘祦绋嬶級
- var titleData2 = ["宸ュ簭鍙�", "鍑虹珯鎶ュ簾鍏宠仈鏁伴噺", "HProcID", "宸ュ簭浠ｇ爜", "HBackProc", "鍔犲伐璇存槑", "妯″叿缂栧彿", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "HGroupID", "鐝粍浠ｇ爜", "鐝粍", "HWorkerID", "鎿嶄綔宸ヤ唬鐮乫", "鎿嶄綔宸�", "HSourceID", "鐢熶骇璧勬簮浠ｇ爜", "鐢熶骇璧勬簮", "璁″垝鏁伴噺", "hmainid", "鍗曟嵁鍙�", "hicmointerid", "浠诲姟鍗曞彿", "HICMOEntryID", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HMaterID", "浜у搧浠ｇ爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鐢熶骇鏁伴噺", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鎽樿", "鍐呴儴鍗曟嵁鍙�", "濮斿璁㈠崟鍐呯爜", "濮斿璁㈠崟瀛愬唴鐮�", "濮斿璁㈠崟鍙�", "HSupID", "渚涘簲鍟�", "渚涘簲鍟嗕唬鐮�", "琛ㄥご澶囨敞", "HBillType", "isEntrust", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "瀛愯鍒掑紑宸ユ棩鏈�", "瀛愯鍒掑畬宸ユ棩鏈�", "瀹為檯寮�宸ユ棩鏈�", "瀹為檯瀹屽伐鏃ユ湡", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "涓婇亾鍥哄畾澶╂暟", "鐢熶骇鍛ㄦ湡", "鍔犲伐鍗曚环", "鏈�鍚庢眹鎶ユ棩鏈�", "鍔犲伐璐圭敤閲戦", "鏈亾宸ュ簭", "棣栭亾宸ュ簭", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "娴佽浆鍗℃暟閲�", "濮斿宸ュ崟鏁伴噺", "涓嶅悎鏍兼暟閲�", "瓒呴姣斾緥", "鑹巼", "绱鑹巼", "鍥剧焊缂栧彿", "鏈伐搴忕‘璁よ褰�", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷", "姹囨姤鏁伴噺", "HEntryID", "hsubid", "HPRDORGID", "缁勭粐", "HOrderProcNO"];
+ var titleData2 = ["宸ュ簭鍙�", "鍑虹珯鎶ュ簾鍏宠仈鏁伴噺", "HProcID", "宸ュ簭浠ｇ爜", "HBackProc", "鍔犲伐璇存槑", "妯″叿缂栧彿", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "HGroupID", "鐝粍浠ｇ爜", "鐝粍", "HWorkerID", "鎿嶄綔宸ヤ唬鐮�", "鎿嶄綔宸�", "HSourceID", "璁″垝鏁伴噺", "hmainid", "鍗曟嵁鍙�", "hicmointerid", "浠诲姟鍗曞彿", "HICMOEntryID", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HMaterID", "浜у搧浠ｇ爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "鎵瑰彿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鐢熶骇鏁伴噺", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鎽樿", "鍐呴儴鍗曟嵁鍙�", "濮斿璁㈠崟鍐呯爜", "濮斿璁㈠崟瀛愬唴鐮�", "濮斿璁㈠崟鍙�", "HSupID", "渚涘簲鍟�", "渚涘簲鍟嗕唬鐮�", "琛ㄥご澶囨敞", "HBillType", "isEntrust", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "瀛愯鍒掑紑宸ユ棩鏈�", "瀛愯鍒掑畬宸ユ棩鏈�", "瀹為檯寮�宸ユ棩鏈�", "瀹為檯瀹屽伐鏃ユ湡", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "涓婇亾鍥哄畾澶╂暟", "鐢熶骇鍛ㄦ湡", "鍔犲伐鍗曚环", "鏈�鍚庢眹鎶ユ棩鏈�", "鍔犲伐璐圭敤閲戦", "鏈亾宸ュ簭", "棣栭亾宸ュ簭", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "娴佽浆鍗℃暟閲�", "濮斿宸ュ崟鏁伴噺", "涓嶅悎鏍兼暟閲�", "瓒呴姣斾緥", "鑹巼", "绱鑹巼", "鍥剧焊缂栧彿", "鏈伐搴忕‘璁よ褰�", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷", "姹囨姤鏁伴噺", "HEntryID", "hsubid", "HPRDORGID", "缁勭粐", "HOrderProcNO"];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝櫒鍏锋竻鍗曪級
var titleData3 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid","hicmointerid"];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹哄弬鏁版竻鍗曪級
@@ -897,10 +897,10 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
}
}
}
@@ -975,10 +975,10 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
@@ -1068,10 +1068,10 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
@@ -1197,10 +1197,10 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
}
}
}
@@ -1272,7 +1272,7 @@
// , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
// , { field: '绫诲瀷', title: '绫诲瀷' }
// , {
- // field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
+ // field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: false, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
// }
// , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
// , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
@@ -1375,7 +1375,7 @@
//, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
//, { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
//, { field: 'hmainid', title: 'hmainid', hide: true }
- //, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+ //, { field: '鏃ユ湡', title: '鏃ユ湡', sort: false }
//, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
//, { field: 'hicmointerid', title: 'hicmointerid', hide: true }
//, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 100 }
@@ -1498,22 +1498,22 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
//else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
//}
else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '鍗曟嵁鍙�' });
}
else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
if (data[i].name == '鐢熶骇鏁伴噺' || data[i].name == '娴佽浆鍗℃暟閲�' || data[i].name == '鍏ュ簱鏁伴噺' || data[i].name == '绱杩涚珯鏁伴噺' || data[i].name == '绱鍚堟牸鍑虹珯鏁伴噺' || data[i].name == '绱鎶ュ簾鏁伴噺' || data[i].name == '绱涓嶈壇鏁伴噺' || data[i].name == '鏈亾宸ュ簭鍑虹珯鏁伴噺') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
} else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200});
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200});
}
}
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index da1e394..8fce09d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -252,48 +252,6 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇璧勬簮2</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <input type="hidden" name="HSourceID" id="HSourceID" value="0">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇璧勬簮3</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <input type="hidden" name="HSourceID" id="HSourceID" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇璧勬簮4</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <input type="hidden" name="HSourceID" id="HSourceID" value="0">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇璧勬簮5</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <input type="hidden" name="HSourceID" id="HSourceID" value="0">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">杩涚珯鏃堕棿</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
index 06dec3a..729eed8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
@@ -58,89 +58,7 @@
</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: 10px; margin-left: 70px;">
- <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: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
-
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
+
</div>
</div>
</div>
@@ -227,7 +145,7 @@
get_FastQuery();
//DisPlay_HideColumn();
- ColFilter();
+ //ColFilter();
}
//鍒濆鍖栬〃鏍�
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_TK.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_TK.html"
index 72daa2a..15d73ed 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_TK.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_TK.html"
@@ -244,7 +244,7 @@
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost_TianKang",
type: "Post",
- data: { "msg": JSON.stringify(sSubStr) },
+ data: { "HInterID": HInterID, "FID": option.data[0].FID },
success: function (result) {
if (result.code == "1") {
layer.msg("瀹℃牳鎴愬姛", {
--
Gitblit v1.9.1