From 917f616d7841dde25a1dd79ab696097e87bf33e8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 11 二月 2025 09:08:14 +0800
Subject: [PATCH] 1
---
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBackBillList_PDA.html | 18
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_PDA.html | 56
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBackBill_PDA.html | 60
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 80
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_PDA.html | 68
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 53
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_Mould_PDA.html | 22
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html | 64
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBackBillList_PDA.html | 18
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_PDA.html | 60
WebTM/views/PublicPage/FaultReasonInformation.html | 127
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillList.html | 127
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBackBillList_PDA.html | 18
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldConkBookBill_PDA.html | 49
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html | 295 +
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 227
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldConkBookBillList_PDA.html | 2
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 4
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBackBillList_PDA.html | 18
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldRepairWorkBill_PDA.html | 39
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBackBill_PDA.html | 56
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html | 296 +
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 27
WebTM/views/车间管理/产线/MES_ProductionLinePackaging_MXG.html | 3
WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html | 128
WebTM/views/生产管理/生产报表/SC_BOMReport.html | 554 ++++
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 2
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBillList_PDA.html | 18
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 30
WebTM/views/WMS扫码模块/上料防错单/Sc_MaterToSourceBillList_PDA.html | 8
WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html | 5
WebTM/views/WMS扫码模块/上料防错单/Sc_MaterToSourceBill_PDA.html | 54
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html | 18
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBillList_PDA.html | 18
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html | 84
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html | 323 +
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_PDA.html | 68
WebTM/views/基础资料/公用基础资料/Gy_AreaSet.html | 8
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList_His.html | 46
WebTM/views/index.html | 1
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_Mould_PDA.html | 60
WebTM/WebTM.csproj.user | 2
WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBillList_PDA.html | 18
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html | 60
WebTM/views/车间管理/报表分析/Sc_OEEReport_WorkShift.html | 869 ++++++
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 8
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_Mould_PDA.html | 72
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 22
WebTM/views/车间管理/产线/MES_BarcodeWhiteLabelReport.html | 2
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_CusBar_PDA.html | 98
WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBackBillList_PDA.html | 18
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html | 34
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 145 +
WebTM/views/PublicPage/RepairItemInformation_PDA.html | 142
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 33
WebTM/views/生产管理/订单状态分布/Sc_OrderStateDistribution.html | 52
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 16
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_PDA.html | 68
WebTM/layuiadmin/modules/tableSelect.js | 206
WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBillList_PDA.html | 18
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBill_PDA.html | 56
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_Mould_PDA.html | 88
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html | 3
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 59
WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBackBillList_PDA.html | 18
WebTM/views/设备管理/设备报表/Sb_EquipMentCollectionTechParam.html | 1
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html | 171
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_CusBar_PDA.html | 82
WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBill_PDA.html | 60
WebTM/views/WMS扫码模块/生产汇报/Sc_ICMOReportBillList_PDA.html | 18
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillList.html | 28
WebTM/views/车间管理/报表分析/Sc_OEEReport.html | 127
WebTM/views/user/login_ICCard.html | 20
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html | 47
WebTM/views/质量管理/基础建模/Gy_ErrMsgBackType.html | 12
WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html | 130
WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html | 133
WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html | 2
WebTM/views/质量管理/检验取样还样单/QC_TakeSampleCheckBillMainList.html | 15
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_PDA.html | 18
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_Mould_PDA.html | 72
WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBill_PDA.html | 68
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html | 18
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBillList_PDA.html | 18
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBackBillList_PDA.html | 18
WebTM/WebTM.csproj | 3
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 192
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBillList_PDA.html | 18
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBillList_PDA.html | 18
WebTM/views/WMS扫码模块/生产汇报/Sc_ICMOReportBill_PDA.html | 52
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html | 60
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldRepairWorkBillList_PDA.html | 2
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_Mould_PDA.html | 64
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBackBillList_PDA.html | 18
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_Mould_PDA.html | 22
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBillList_PDA.html | 18
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillList.html | 126
WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillList.html | 229
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 351 +-
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBillList_PDA.html | 18
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 4
WebTM/views/WMS扫码模块/库存查询/KF_ICInventoryByCLD_PDA.html | 10
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_PDA.html | 64
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html | 18
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 14
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 202
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBillList_Mould_PDA.html | 22
WebTM/views/模治具管理/模具投产验收单/Sc_MouldBatchWorkCheckBillList.html | 12
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 5
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_CusBar_PDA.html | 82
WebTM/views/基础资料/公用基础资料/Gy_ConkTypeList_PDA.html | 106
WebTM/views/车间管理/产线/Sc_GroupOrderBill.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 59
WebTM/views/系统管理/快捷方式自定义/Xt_UserFastMenu_IconSet.html | 13
114 files changed, 5,486 insertions(+), 2,695 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 0982124..507f1c3 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -89,6 +89,7 @@
<Content Include="layuiadmin\ax\ax-response.css" />
<Content Include="layuiadmin\ax\ax.css" />
<Content Include="layuiadmin\ax\ax.min.js" />
+ <Content Include="layuiadmin\ax\images\iccard-bg.jpg" />
<Content Include="layuiadmin\ax\images\login-bg.jpg" />
<Content Include="layuiadmin\ax\images\login-left.jpg" />
<Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
@@ -556,6 +557,7 @@
<Content Include="views\鐢熶骇绠＄悊\鎻愭枡璁″垝\JIT_PickUpCalculate.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList_PDA.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\SC_BOMReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_ProductionInProgressReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_NutInspectionCCDPassRate.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
@@ -706,6 +708,7 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_CompareOrderToSelloutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_HICMMaterStatisticsList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_OEEReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_OEEReport_WorkShift.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_PlanAchievementRateReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProductedRateReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_HMaterYieldStatisticsList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 1daf955..8233a56 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/modules/tableSelect.js b/WebTM/layuiadmin/modules/tableSelect.js
index dce9fa1..0c64501 100644
--- a/WebTM/layuiadmin/modules/tableSelect.js
+++ b/WebTM/layuiadmin/modules/tableSelect.js
@@ -10,7 +10,7 @@
table = layui.table,
form = layui.form;
var tableSelect = function () {
- this.v = '1.2.0';
+ this.v = '1.4.0';
};
/**
@@ -20,8 +20,7 @@
var elem = $(opt.elem);
//榛樿璁剧疆
- opt.searchKey = opt.searchKey || 'keyword';
- opt.checkedKey = opt.checkedKey;
+ opt.searchKey = opt.searchKey || 'keyword';//鍙涓敤锛屽垎鍓�
opt.table.page = opt.table.page || false;
opt.table.height = opt.table.height || 290;
elem.off('click').on('click', function(e) {
@@ -41,12 +40,15 @@
tableBox += '</div>';
tableBox = $(tableBox);
$('body').append(tableBox);
- //鏁版嵁缂撳瓨
- var checkedData = [];
//娓叉煋TABLE
opt.table.elem = "#"+tableName;
opt.table.id = tableName;
- opt.table.where['sWhere'] = opt.sWhere
+ //鑻ユ病鏈塽rl琛ㄧず涓哄墠绔垎椤�
+ if (opt.table.url != undefined) {
+ opt.table.where['sWhere'] = opt.sWhere
+ } else {
+ opt.table.data = opt.ajaxSelect(opt.sWhere);
+ }
opt.table.request={//璁剧疆椤靛弬鏁�
pageName: 'page', // 椤电爜鐨勫弬鏁板悕绉帮紝榛樿锛歱age
limitName: 'size' // 姣忛〉鏁版嵁鏉℃暟鐨勫弬鏁板悕锛岄粯璁わ細limit
@@ -59,97 +61,19 @@
"data": res.data // 瑙ｆ瀽鏁版嵁鍒楄〃
};
}
- opt.table.done = function(res, curr, count){
- defaultChecked(res, curr, count);
- setChecked(res, curr, count);
- };
+ //鐢╦ump鏇夸唬鍘熸潵琛ㄦ牸pagejump鐢ㄤ簬鏇存柊鎸夐挳閫変腑鏁伴噺姝ゅ姛鑳藉彂鐜版棤鐢ㄥ垹闄�
+ //opt.table.done = function (res, curr, count, origin) {
+ // this.page.jump = jump;
+ //}
+
var tableSelect_table = table.render(opt.table);
- //鍒嗛〉閫変腑淇濆瓨鏁扮粍
- table.on('radio('+tableName+')', function(obj){
- if(opt.checkedKey){
- checkedData = table.checkStatus(tableName).data
- }
- updataButton(table.checkStatus(tableName).data.length)
- })
- table.on('checkbox(' + tableName + ')', function (obj) {
- if(opt.checkedKey){
- if(obj.checked){
- for (var i=0;i<table.checkStatus(tableName).data.length;i++){
- checkedData.push(table.checkStatus(tableName).data[i])
- }
- }else{
- if(obj.type=='all'){
- for (var j=0;j<table.cache[tableName].length;j++) {
- for (var i=0;i<checkedData.length;i++){
- if(checkedData[i][opt.checkedKey] == table.cache[tableName][j][opt.checkedKey]){
- checkedData.splice(i,1)
- }
- }
- }
- }else{
- //鍥犱负LAYUI闂锛屾搷浣滃埌鍙樺寲鍏ㄩ�夌姸鎬佹椂鑾峰彇鍒扮殑obj涓虹┖锛岃繖閲岀敤鍑芥暟鑾峰彇鏈�変腑鐨勯」銆�
- function nu (){
- var noCheckedKey = '';
- for (var i=0;i<table.cache[tableName].length;i++){
- if(!table.cache[tableName][i].LAY_CHECKED){
- noCheckedKey = table.cache[tableName][i][opt.checkedKey];
- }
- }
- return noCheckedKey
- }
- var noCheckedKey = obj.data[opt.checkedKey] || nu();
- for (var i=0;i<checkedData.length;i++){
- if(checkedData[i][opt.checkedKey] == noCheckedKey){
- checkedData.splice(i,1);
- }
- }
- }
- }
- checkedData = uniqueObjArray(checkedData, opt.checkedKey);
- updataButton(checkedData.length)
- }else{
- updataButton(table.checkStatus(tableName).data.length)
- }
- });
-
- //娓叉煋琛ㄦ牸鍚庨�変腑
- function setChecked (res, curr, count) {
- for(var i=0;i<res.data.length;i++){
- for (var j=0;j<checkedData.length;j++) {
- if(res.data[i][opt.checkedKey] == checkedData[j][opt.checkedKey]){
- res.data[i].LAY_CHECKED = true;
- var index= res.data[i]['LAY_TABLE_INDEX'];
- var checkbox = $('#'+tableName+'').next().find('tr[data-index=' + index + '] input[type="checkbox"]');
- checkbox.prop('checked', true).next().addClass('layui-form-checked');
- var radio = $('#'+tableName+'').next().find('tr[data-index=' + index + '] input[type="radio"]');
- radio.prop('checked', true).next().addClass('layui-form-radioed').find("i").html('');
- radio.closest('tr').addClass('layui-table-click');
- }
- }
- }
- var checkStatus = table.checkStatus(tableName);
- if(checkStatus.isAll){
- $('#'+tableName+'').next().find('.layui-table-header th[data-field="0"] input[type="checkbox"]').prop('checked', true);
- $('#'+tableName+'').next().find('.layui-table-header th[data-field="0"] input[type="checkbox"]').next().addClass('layui-form-checked');
- }
- updataButton(checkedData.length)
- }
-
- //鍐欏叆榛樿閫変腑鍊�(puash checkedData)
- function defaultChecked (res, curr, count){
- if(opt.checkedKey && elem.attr('ts-selected')){
- var selected = elem.attr('ts-selected').split(",");
- for(var i=0;i<res.data.length;i++){
- for(var j=0;j<selected.length;j++){
- if(res.data[i][opt.checkedKey] == selected[j]){
- checkedData.push(res.data[i])
- }
- }
- }
- checkedData = uniqueObjArray(checkedData, opt.checkedKey);
- }
- }
+ //jump鍒嗛〉瑙﹀彂鍑芥暟
+ //function jump(obj, first) {
+ // table.reload(tableName);
+ // //鏇存柊鎸夐挳
+ // updataButton(table.checkStatus(tableName).data.length)
+ //}
//鏇存柊閫変腑鏁伴噺
function updataButton (n) {
@@ -224,16 +148,16 @@
if (tr.length == 0) {
tableElem.find('tr:first').children('td').eq(0).click();
} else {
- tr.children('td').click();
- tr['prev']().children('td').click();
+ tr.children('td').eq(0).click();
+ tr['prev']().children('td').eq(0).click();
}
break;
case "ArrowDown"://涓嬮敭
if (tr.length == 0) {
- tr = tableElem.find('tr:first').children('td').eq(0).click();
+ tableElem.find('tr:first').children('td').eq(0).click();
} else {
- tr.children('td').click();
- tr['next']().children('td').click();
+ tr.children('td').eq(0).click();
+ tr['next']().children('td').eq(0).click();
}
break;
case "Enter"://鍥炶溅
@@ -243,32 +167,50 @@
}
})
+ // 闃叉姈鍑芥暟
+ function debounce(func, wait) {
+ let timeout;
+ return function () {
+ const context = this, args = arguments;
+ clearTimeout(timeout);
+ timeout = setTimeout(() => func.apply(context, args), wait);
+ };
+ }
+
+
//杈撳叆妗嗚緭鍏ユ墽琛�
- elem.off('input').on('input', function (e) {
+ elem.off('input').on('input', debounce(
+ function (e) {
// 闃绘琛ㄥ崟鎻愪氦锛堝鏋滆緭鍏ユ鍦ㄨ〃鍗曞唴锛�
e.preventDefault();
- opt.table.where['sWhere'] = opt.sWhere + " and " + opt.searchKey + " like '%" + elem.val() + "%' ";
- tableSelect_table.reload({
- where: opt.table.where,
- page: {
- curr: 1
+ var searchKeyList = opt.searchKey.split(',');//鑾峰彇鏌ユ壘鐨勫叧閿瓧鎼滅储妗�
+ //鎷兼帴sql瀛楃涓�
+ var sWhereStr = " and ("
+ searchKeyList.forEach(function (value, index) {
+ if (index == 0) {
+ sWhereStr += (value + " like '%" + elem.val() + "%' ")
+ } else {
+ sWhereStr += ("or " + value + " like '%" + elem.val() + "%' ")
}
- });
+ })
+ sWhereStr +=")"
+ //鍚庣鍒嗛〉鎼滅储
+ if (opt.table.where != undefined) {
+ opt.table.where['sWhere'] = opt.sWhere + sWhereStr;
+ tableSelect_table.reload({
+ where: opt.table.where,
+ page: {
+ curr: 1
+ }
+ });
+ } else {
+ var sWhere = opt.sWhere + sWhereStr;
+ tableSelect_table.reload({
+ data: opt.ajaxSelect(sWhere)
+ });
+ }
- })
- // //鍏抽敭璇嶆悳绱�
- // form.on('submit(tableSelect_btn_search)', function(data){
- // // console.log(" and "+opt.searchKey +"='" + data.opt.searchKey +"'")
- // console.log(data);
- // opt.table.where['sWhere'] = " and "+opt.searchKey +" like '%" + data.field[opt.searchKey] +"%' ";
- // tableSelect_table.reload({
- // where: opt.table.where,
- // page: {
- // curr: 1
- // }
- // });
- // return false;
- // });
+ },200))
//鍙屽嚮琛岄�変腑
table.on('rowDouble('+tableName+')', function(obj){
@@ -298,32 +240,27 @@
l.LAY_CHECKED = flag;
}
});
- //鏇存柊鎸夐挳
- updataButton(table.checkStatus(tableName).data.length)
+ //鏇存柊鎸夐挳锛堟棤鐢ㄥ垹闄わ級
+ //updataButton(table.checkStatus(tableName).data.length)
}
})
//鎸夐挳閫変腑
tableBox.find('.tableSelect_btn_select').on('click', function() {
var checkStatus = table.checkStatus(tableName);
- if(checkedData.length > 1){
- checkStatus.data = checkedData;
+ if (checkStatus.data.length > 0) {
+ selectDone(checkStatus);
+ } else {
+ tableBox.remove();
+ delete table.cache[tableName];
}
- selectDone(checkStatus);
+
})
//鍐欏�煎洖璋冨拰鍏抽棴
function selectDone (checkStatus){
- if(opt.checkedKey){
- var selected = [];
- for(var i=0;i<checkStatus.data.length;i++){
- selected.push(checkStatus.data[i][opt.checkedKey])
- }
- elem.attr("ts-selected",selected.join(","));
- }
opt.done(elem, checkStatus);
tableBox.remove();
delete table.cache[tableName];
- checkedData = [];
}
//鐐瑰嚮鍏朵粬鍖哄煙鍏抽棴
@@ -332,7 +269,6 @@
if(!userSet_con.is(e.target) && userSet_con.has(e.target).length === 0){
tableBox.remove();
delete table.cache[tableName];
- checkedData = [];
}
});
})
diff --git a/WebTM/views/PublicPage/FaultReasonInformation.html b/WebTM/views/PublicPage/FaultReasonInformation.html
index fe45012..28dcb45 100644
--- a/WebTM/views/PublicPage/FaultReasonInformation.html
+++ b/WebTM/views/PublicPage/FaultReasonInformation.html
@@ -35,21 +35,12 @@
</div>
<div class="layui-col-xs12 layui-inline">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearch">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
</div>
<div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -136,23 +127,30 @@
//});
table.on('row(mainTable)', function (obj) {
- //閫変腑琛屾敼鍙橀鑹�
+ // 娓呴櫎鎵�鏈夎鐨勮儗鏅壊鍜岄�変腑鐘舵��
+ $(".layui-table-body tr").attr({ "style": "background:" }); // 鎭㈠鎵�鏈夎鑳屾櫙棰滆壊
+ $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // 娓呴櫎澶嶉�夋閫変腑鏍峰紡
+
+ // 璁剧疆褰撳墠琛岀殑閫変腑鐘舵��
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
+
if (flag) {
- obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); // 璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); // 鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
} else {
- obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked'); // 鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" }); // 鍙栨秷褰撳墠tr棰滆壊
}
- //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+
+ // 鏇存柊琛ㄦ牸缂撳瓨涓殑閫変腑鐘舵��
layui.each(table.cache.mainTable, function (i, l) {
if (obj.tr.index() == l.LAY_TABLE_INDEX) {
l.LAY_CHECKED = flag;
}
});
- })
+ });
+
var option = {
elem: '#mainTable'
@@ -169,55 +167,72 @@
]]
};
- var index = layer.load(0, { shade: false });
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+ get_Display(sWhere);
+
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
+ url: GetWEBURL() + '/PublicPageMethod/Gy_ConkReasonList_PDA',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(index);
} else {
+ layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ var index = parent.layer.getFrameIndex(window.name);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 0) {
+ parent.layer.close(index);
+ return;
+ }
+ parent.GetConkReasonValue(data);
+ parent.layer.close(index);
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ //var HNumber = $("#HNumber").val();
+ //var HName = $("#HName").val();
+ //if (HNumber) {
+ // sWhere += " and HNumber like '%" + HNumber + "%'";
+ //}
+ //if (HName) {
+ // sWhere += " and HName like '%" + HName + "%'";
+ //}
+ //$.ajax({
+ // url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+ //sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ get_Display($('#Value').val());
});
//浠ヤ笂鏄痩ayui妯″潡
diff --git a/WebTM/views/PublicPage/RepairItemInformation_PDA.html b/WebTM/views/PublicPage/RepairItemInformation_PDA.html
index 0f6a4fb..3e87115 100644
--- a/WebTM/views/PublicPage/RepairItemInformation_PDA.html
+++ b/WebTM/views/PublicPage/RepairItemInformation_PDA.html
@@ -34,7 +34,15 @@
<div id="treeRepairItem" lay-filter="treeRepairItem" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
</div>
<div>
- <div class="layui-inline" style="margin-left:5px;">
+ <div class="layui-row">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearch">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ <!--<div class="layui-inline" style="margin-left:5px;">
<label style="width: 28px;">浠ｇ爜</label>
<input type="text" name="HNumber" id="HNumber" style="width:75px">
@@ -45,7 +53,7 @@
<button type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- </div>
+ </div>-->
<div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
@@ -138,7 +146,7 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { type: 'radio', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
, { field: 'HNumber', title: '缁翠慨椤圭洰浠ｇ爜' }
@@ -146,38 +154,35 @@
]]
};
- var index = layer.load(0, { shade: false });
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
+
+ get_Display(sWhere);
+
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/Gy_RepairList_PDA',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ }
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+ function get_Display_old(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
type: "GET",
@@ -186,15 +191,84 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(index);
} else {
+ layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ var index = parent.layer.getFrameIndex(window.name);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 0) {
+ parent.layer.close(index);
+ return;
+ }
+ parent.GetRepairValue(data);
+ parent.layer.close(index);
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ //var HNumber = $("#HNumber").val();
+ //var HName = $("#HName").val();
+ //if (HNumber) {
+ // sWhere += " and HNumber like '%" + HNumber + "%'";
+ //}
+ //if (HName) {
+ // sWhere += " and HName like '%" + HName + "%'";
+ //}
+ //$.ajax({
+ // url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+ //sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ get_Display($('#Value').val());
+ });
+
+ table.on('row(mainTable)', function (obj) {
+ // 娓呴櫎鎵�鏈夎鐨勮儗鏅壊鍜岄�変腑鐘舵��
+ $(".layui-table-body tr").attr({ "style": "background:" }); // 鎭㈠鎵�鏈夎鑳屾櫙棰滆壊
+ $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // 娓呴櫎澶嶉�夋閫変腑鏍峰紡
+
+ // 璁剧疆褰撳墠琛岀殑閫変腑鐘舵��
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); // 璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); // 鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked'); // 鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" }); // 鍙栨秷褰撳墠tr棰滆壊
+ }
+
+ // 鏇存柊琛ㄦ牸缂撳瓨涓殑閫変腑鐘舵��
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
});
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBillList_PDA.html"
index 45f1b16..77e5e03 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBillList_PDA.html"
@@ -111,7 +111,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -235,12 +235,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -324,7 +324,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
index 8f2152e..2101827 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
@@ -308,7 +308,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -438,7 +438,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -497,7 +497,7 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
else {
- layer.msg(d.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -518,7 +518,7 @@
$("#HProcID").val("0");
$("#HProcName").val("");
layer.msg("宸ュ簭鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HProcName").select();
$("#HProcName").focus();
@@ -546,7 +546,7 @@
$("#HProcID").val("0");
$("#HProcName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HProcName").select();
$("#HProcName").focus();
@@ -588,7 +588,7 @@
$("#HEquipID").val("0");
$("#HEquipName").val("");
layer.msg("鐢熶骇璁惧鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HEquipName").select();
$("#HEquipName").focus();
@@ -618,7 +618,7 @@
$("#HEquipName").val("");
$("#HSourceID").val("0");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HEquipName").select();
$("#HEquipName").focus();
@@ -660,7 +660,7 @@
$("#HWorkerID").val("0");
$("#HWorkerName").val("");
layer.msg("鎿嶄綔宸ユ潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWorkerName").select();
$("#HWorkerName").focus();
@@ -688,7 +688,7 @@
$("#HWorkerID").val("0");
$("#HWorkerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWorkerName").select();
$("#HWorkerName").focus();
@@ -730,7 +730,7 @@
$("#HGroupID").val("0");
$("#HGroupName").val("");
layer.msg("鐝粍鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HGroupName").select();
$("#HGroupName").focus();
@@ -758,7 +758,7 @@
$("#HGroupID").val("0");
$("#HGroupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HGroupName").select();
$("#HGroupName").focus();
@@ -847,12 +847,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -888,12 +888,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -984,7 +984,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1045,7 +1045,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
$("#HProcNo").select();
@@ -1088,7 +1088,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1115,7 +1115,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1126,7 +1126,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1140,7 +1140,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1166,7 +1166,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1177,7 +1177,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1302,15 +1302,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1322,7 +1322,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBackBillList_PDA.html"
index f375616..2184793 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBackBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBackBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
index f0ba97b..52971d1 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
index 2d670d9..478804f 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
@@ -444,7 +444,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -596,7 +596,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
, done: function () {
layer.closeAll("loading");
}
@@ -668,7 +668,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -747,7 +747,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -788,7 +788,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -837,7 +837,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -868,7 +868,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -914,7 +914,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -942,7 +942,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -984,7 +984,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1012,7 +1012,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1054,7 +1054,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1082,7 +1082,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1124,7 +1124,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("渚涘簲鍟嗘潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1152,7 +1152,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1247,12 +1247,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1324,12 +1324,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1451,7 +1451,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_OtherInBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1507,7 +1507,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1536,7 +1536,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1547,7 +1547,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1561,7 +1561,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1700,7 +1700,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1711,7 +1711,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1912,15 +1912,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1932,7 +1932,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBackBillList_PDA.html"
index a21ea78..0f9bcd9 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBackBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBackBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
index 2e2d561..3cd0a0c 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
index fd0989b..6d2b3c3 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
@@ -468,7 +468,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -622,7 +622,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -717,7 +717,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -792,7 +792,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -820,7 +820,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -865,7 +865,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -906,7 +906,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -955,7 +955,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -986,7 +986,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1032,7 +1032,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1060,7 +1060,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1102,7 +1102,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("棰嗘枡鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1130,7 +1130,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1172,7 +1172,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1200,7 +1200,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1242,7 +1242,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1270,7 +1270,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1365,12 +1365,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1442,12 +1442,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1483,12 +1483,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1593,7 +1593,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_OtherOutBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1649,7 +1649,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1678,7 +1678,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1689,7 +1689,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1703,7 +1703,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1820,7 +1820,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1831,7 +1831,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2047,15 +2047,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2067,7 +2067,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBackBillList_PDA.html"
index 178bf2e..fbb6f77 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBackBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBackBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html"
index 6e2d72b..e364b87 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -422,7 +422,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -519,7 +519,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -555,12 +555,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
index 05c149e..a923508 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_PDA.html"
@@ -423,7 +423,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -530,7 +530,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
}
@@ -599,7 +599,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -687,7 +687,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -728,7 +728,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -777,7 +777,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -808,7 +808,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -854,7 +854,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -882,7 +882,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -924,7 +924,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -952,7 +952,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -994,7 +994,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1022,7 +1022,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1064,7 +1064,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("渚涘簲鍟嗘潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1092,7 +1092,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1187,12 +1187,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1264,12 +1264,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1392,7 +1392,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_EntrustInBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1448,7 +1448,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1477,7 +1477,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1488,7 +1488,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1502,7 +1502,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1652,7 +1652,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1663,7 +1663,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1864,15 +1864,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1884,7 +1884,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBackBillList_PDA.html"
index 1a14a6b..7e22f1e 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBackBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBackBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html"
index cfcfebb..7461f29 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
index 778797f..5f7f7b0 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
@@ -446,7 +446,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -555,7 +555,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -650,7 +650,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -725,7 +725,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -753,7 +753,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -798,7 +798,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -839,7 +839,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -888,7 +888,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -919,7 +919,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -965,7 +965,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("鍙戞枡鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -993,7 +993,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1035,7 +1035,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("棰嗘枡鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1063,7 +1063,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1105,7 +1105,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1133,7 +1133,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1175,7 +1175,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("渚涘簲鍟嗘潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1203,7 +1203,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1298,12 +1298,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1375,12 +1375,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1416,12 +1416,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1524,7 +1524,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_EntrustOutBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1580,7 +1580,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1609,7 +1609,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1620,7 +1620,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1634,7 +1634,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1748,7 +1748,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1759,7 +1759,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1975,15 +1975,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1995,7 +1995,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventoryByCLD_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventoryByCLD_PDA.html"
index 61f2d73..cd45635 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventoryByCLD_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventoryByCLD_PDA.html"
@@ -199,7 +199,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -241,7 +241,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -290,7 +290,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -322,7 +322,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -462,7 +462,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBackBillList_PDA.html"
index 014b824..d4e3756 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBackBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBackBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
index 58ea125..cab1a63 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
//listOption.totalRow = true;
table.cache['dj-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
index d5e6f23..bc2e2b9 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
@@ -419,7 +419,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -528,7 +528,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//姹囨姤鏉＄爜
@@ -626,7 +626,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -714,7 +714,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -755,7 +755,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -804,7 +804,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -835,7 +835,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -881,7 +881,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -909,7 +909,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -951,7 +951,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -979,7 +979,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1021,7 +1021,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1049,7 +1049,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1140,12 +1140,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1217,12 +1217,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1343,7 +1343,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_ProductInBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1399,7 +1399,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1428,7 +1428,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1439,7 +1439,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1453,7 +1453,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1609,7 +1609,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1620,7 +1620,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1819,15 +1819,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1839,7 +1839,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBillList_PDA.html"
index d09fead..cfdb42a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
index 89b9397..cc02b7f 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\346\261\207\346\212\245/Sc_ICMOReportBill_PDA.html"
@@ -307,7 +307,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -412,7 +412,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//鏉＄爜鏄庣粏
@@ -484,7 +484,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -556,7 +556,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -597,7 +597,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -646,7 +646,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -677,7 +677,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -723,7 +723,7 @@
$("#HGroupID").val("0");
$("#HGroupName").val("");
layer.msg("鐝粍鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HGroupName").select();
$("#HGroupName").focus();
@@ -751,7 +751,7 @@
$("#HGroupID").val("0");
$("#HGroupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HGroupName").select();
$("#HGroupName").focus();
@@ -793,7 +793,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -821,7 +821,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -908,12 +908,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -985,12 +985,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1105,7 +1105,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Sc_ICMOReportBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1161,7 +1161,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1190,7 +1190,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1201,7 +1201,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1215,7 +1215,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1339,7 +1339,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1350,7 +1350,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1512,15 +1512,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1532,7 +1532,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
index dcca339..bdc8240 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
index c2bbd26..1cc8004 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
@@ -429,7 +429,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -538,7 +538,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -633,7 +633,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -703,7 +703,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -731,7 +731,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -776,7 +776,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -817,7 +817,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -866,7 +866,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -897,7 +897,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -943,7 +943,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -971,7 +971,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1013,7 +1013,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("棰嗘枡鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1041,7 +1041,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1083,7 +1083,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1111,7 +1111,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1202,12 +1202,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1279,12 +1279,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1320,12 +1320,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1425,7 +1425,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MateReplenishOutBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1481,7 +1481,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1510,7 +1510,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1521,7 +1521,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1535,7 +1535,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1644,7 +1644,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1655,7 +1655,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1864,15 +1864,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1884,7 +1884,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_Mould_PDA.html"
index fd57733..196fda3 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_Mould_PDA.html"
@@ -152,7 +152,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -273,12 +273,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -318,12 +318,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -359,12 +359,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -449,7 +449,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -546,7 +546,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -582,12 +582,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
index fe99860..2e1cf48 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_CusBar_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_CusBar_PDA.html"
index 2160cbb..9b7ecc0 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_CusBar_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_CusBar_PDA.html"
@@ -582,7 +582,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -798,7 +798,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -946,7 +946,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -1110,7 +1110,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -1138,7 +1138,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -1183,7 +1183,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1224,7 +1224,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1273,7 +1273,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1304,7 +1304,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1346,7 +1346,7 @@
if (event.keyCode == 13) {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1361,7 +1361,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1403,7 +1403,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1420,7 +1420,7 @@
form.on('submit(HWHID-BT)', function () {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1448,7 +1448,7 @@
if (event.keyCode == 13) {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1466,7 +1466,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1498,7 +1498,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1515,7 +1515,7 @@
form.on('submit(HSpID-BT)', function () {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1551,7 +1551,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1579,7 +1579,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1621,7 +1621,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1649,7 +1649,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1691,7 +1691,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1719,7 +1719,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1761,7 +1761,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1789,7 +1789,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1892,12 +1892,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1969,12 +1969,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -2010,12 +2010,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -2048,12 +2048,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -2210,7 +2210,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockBill_CusBar_PDA', '1');
$("#HSourceBillNo").select();
@@ -2292,7 +2292,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2321,7 +2321,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2332,7 +2332,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2346,7 +2346,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2359,7 +2359,7 @@
if (sHCusID == "0") {
playSound();
layer.msg("缂哄皯瀹㈡埛淇℃伅锛岃鍏堟壂鎻忔簮鍗曟潯鐮侊紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_CusBar_PDA', '1');
$("#HSourceBillNo").select();
@@ -2370,7 +2370,7 @@
if (sHCP == '') {
playSound();
layer.msg("浼犵エ鍙蜂笉鑳戒负绌猴紝璇锋壂鎻忎紶绁ㄥ彿锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HCP").select();
$("#HCP").focus();
@@ -2581,7 +2581,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2592,7 +2592,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2604,7 +2604,7 @@
else {
playSound();
layer.msg("鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HCP").select();
$("#HCP").focus();
@@ -2812,7 +2812,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2823,7 +2823,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -3135,15 +3135,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -3155,7 +3155,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Mould_PDA.html"
index 181f596..68c4b68 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Mould_PDA.html"
@@ -574,7 +574,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -790,7 +790,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -938,7 +938,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -1102,7 +1102,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -1130,7 +1130,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -1175,7 +1175,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1216,7 +1216,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1265,7 +1265,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1296,7 +1296,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1338,7 +1338,7 @@
if (event.keyCode == 13) {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1353,7 +1353,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1395,7 +1395,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1412,7 +1412,7 @@
form.on('submit(HWHID-BT)', function () {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1440,7 +1440,7 @@
if (event.keyCode == 13) {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1458,7 +1458,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1490,7 +1490,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1507,7 +1507,7 @@
form.on('submit(HSpID-BT)', function () {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1543,7 +1543,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1571,7 +1571,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1613,7 +1613,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1641,7 +1641,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1683,7 +1683,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1711,7 +1711,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1753,7 +1753,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1781,7 +1781,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1884,12 +1884,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1961,12 +1961,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -2002,12 +2002,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -2040,12 +2040,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -2202,7 +2202,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockBill_Mould_PDA', '1');
$("#HSourceBillNo").select();
@@ -2266,7 +2266,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2295,7 +2295,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2306,7 +2306,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2320,7 +2320,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2522,7 +2522,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2533,7 +2533,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2844,15 +2844,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2864,7 +2864,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
index 5688c84..2022227 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
@@ -560,7 +560,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -774,7 +774,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -890,7 +890,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -1054,7 +1054,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -1082,7 +1082,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -1127,7 +1127,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1168,7 +1168,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1217,7 +1217,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1248,7 +1248,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1290,7 +1290,7 @@
if (event.keyCode == 13) {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1305,7 +1305,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1347,7 +1347,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1364,7 +1364,7 @@
form.on('submit(HWHID-BT)', function () {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1392,7 +1392,7 @@
if (event.keyCode == 13) {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1410,7 +1410,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1442,7 +1442,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1459,7 +1459,7 @@
form.on('submit(HSpID-BT)', function () {
if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
});
return;
@@ -1495,7 +1495,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1523,7 +1523,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1565,7 +1565,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1593,7 +1593,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1635,7 +1635,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1663,7 +1663,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1705,7 +1705,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1733,7 +1733,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1836,12 +1836,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1913,12 +1913,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1954,12 +1954,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -2111,7 +2111,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -2175,7 +2175,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2204,7 +2204,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2215,7 +2215,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2229,7 +2229,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2425,7 +2425,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2436,7 +2436,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2738,15 +2738,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2758,7 +2758,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBillList_PDA.html"
index c8f2793..de49eb3 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_Mould_PDA.html"
index c02cbf9..e0cd85d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_Mould_PDA.html"
@@ -476,7 +476,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -622,7 +622,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//鍣ㄥ叿淇℃伅
@@ -747,7 +747,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -830,7 +830,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -871,7 +871,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -920,7 +920,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -951,7 +951,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1001,7 +1001,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1043,7 +1043,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1092,7 +1092,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1124,7 +1124,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1170,7 +1170,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1198,7 +1198,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1289,12 +1289,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1366,12 +1366,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1426,12 +1426,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1559,7 +1559,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockStepInBill_Mould_PDA', '1');
$("#HSourceBillNo").select();
@@ -1623,7 +1623,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1652,7 +1652,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1663,7 +1663,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1677,7 +1677,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1823,7 +1823,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1834,7 +1834,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2057,15 +2057,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2077,7 +2077,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
index 84d4fe1..60028e1 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
@@ -462,7 +462,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -606,7 +606,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//婧愬崟瀵瑰簲鎵�鎵弿鏉＄爜
@@ -699,7 +699,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -782,7 +782,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -823,7 +823,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -872,7 +872,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -903,7 +903,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -953,7 +953,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -995,7 +995,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1044,7 +1044,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1076,7 +1076,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1122,7 +1122,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1150,7 +1150,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1241,12 +1241,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1318,12 +1318,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1468,7 +1468,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1532,7 +1532,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1561,7 +1561,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1572,7 +1572,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1586,7 +1586,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1726,7 +1726,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1737,7 +1737,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1951,15 +1951,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1971,7 +1971,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_Mould_PDA.html"
index fabf756..e3da369 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_Mould_PDA.html"
@@ -152,7 +152,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -273,12 +273,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -318,12 +318,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -359,12 +359,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -449,7 +449,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -546,7 +546,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -582,12 +582,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_PDA.html"
index 644762b..2f19b34 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_CusBar_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_CusBar_PDA.html"
index 5653457..812f220 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_CusBar_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_CusBar_PDA.html"
@@ -515,7 +515,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -661,7 +661,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -809,7 +809,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -904,7 +904,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -932,7 +932,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -977,7 +977,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1018,7 +1018,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1067,7 +1067,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1098,7 +1098,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1148,7 +1148,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1190,7 +1190,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1239,7 +1239,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1271,7 +1271,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1317,7 +1317,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1345,7 +1345,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1387,7 +1387,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1415,7 +1415,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1510,12 +1510,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1587,12 +1587,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1628,12 +1628,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1666,12 +1666,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1811,7 +1811,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockStepOutBill_CusBar_PDA', '1');
$("#HSourceBillNo").select();
@@ -1893,7 +1893,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1922,7 +1922,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1933,7 +1933,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1947,7 +1947,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1960,7 +1960,7 @@
if (sHCusID == "0") {
playSound();
layer.msg("缂哄皯瀹㈡埛淇℃伅锛岃鍏堟壂鎻忔簮鍗曟潯鐮侊紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_CusBar_PDA', '1');
$("#HSourceBillNo").select();
@@ -1971,7 +1971,7 @@
if (sHCP == '') {
playSound();
layer.msg("浼犵エ鍙蜂笉鑳戒负绌猴紝璇锋壂鎻忎紶绁ㄥ彿锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HCP").select();
$("#HCP").focus();
@@ -2139,7 +2139,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2150,7 +2150,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2162,7 +2162,7 @@
else {
playSound();
layer.msg("鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HCP").select();
$("#HCP").focus();
@@ -2327,7 +2327,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2338,7 +2338,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2582,15 +2582,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2602,7 +2602,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_Mould_PDA.html"
index e2ef831..9dc4679 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_Mould_PDA.html"
@@ -507,7 +507,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -653,7 +653,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -801,7 +801,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -896,7 +896,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -924,7 +924,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -969,7 +969,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1010,7 +1010,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1059,7 +1059,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1090,7 +1090,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1140,7 +1140,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1182,7 +1182,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1231,7 +1231,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1263,7 +1263,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1309,7 +1309,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1337,7 +1337,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1379,7 +1379,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1407,7 +1407,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1502,12 +1502,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1579,12 +1579,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1620,12 +1620,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1658,12 +1658,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1803,7 +1803,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockStepOutBill_Mould_PDA', '1');
$("#HSourceBillNo").select();
@@ -1867,7 +1867,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1896,7 +1896,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1907,7 +1907,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1921,7 +1921,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2080,7 +2080,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2091,7 +2091,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2334,15 +2334,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2354,7 +2354,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
index 2667d8c..8615906 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
@@ -493,7 +493,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -637,7 +637,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -753,7 +753,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -848,7 +848,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -876,7 +876,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -921,7 +921,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -962,7 +962,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -1011,7 +1011,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1042,7 +1042,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -1092,7 +1092,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1134,7 +1134,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1183,7 +1183,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1215,7 +1215,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1261,7 +1261,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1289,7 +1289,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1331,7 +1331,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1359,7 +1359,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1454,12 +1454,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1531,12 +1531,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1572,12 +1572,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1712,7 +1712,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1776,7 +1776,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1805,7 +1805,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1816,7 +1816,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1830,7 +1830,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1983,7 +1983,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1994,7 +1994,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2228,15 +2228,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2248,7 +2248,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBillList_PDA.html"
index 72c7566..a4cdfc6 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBill_PDA.html"
index 0439b1b..5c0fca5 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBackBill_PDA.html"
@@ -399,7 +399,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -506,7 +506,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
}
@@ -539,7 +539,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -613,7 +613,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -654,7 +654,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -703,7 +703,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -734,7 +734,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -780,7 +780,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -808,7 +808,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -850,7 +850,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("閫�鏂欏憳鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -878,7 +878,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -920,7 +920,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -948,7 +948,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1039,12 +1039,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1116,12 +1116,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1203,7 +1203,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MateOutBackBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1259,7 +1259,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1288,7 +1288,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1299,7 +1299,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1313,7 +1313,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1422,7 +1422,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1433,7 +1433,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1617,15 +1617,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1637,7 +1637,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
index 122756e..5646c0b 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
index 53dd07b..f8a232f 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
@@ -433,7 +433,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -542,7 +542,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -637,7 +637,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -731,7 +731,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -759,7 +759,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -804,7 +804,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -845,7 +845,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -894,7 +894,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -925,7 +925,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -971,7 +971,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("鍙戞枡鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -999,7 +999,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1041,7 +1041,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("棰嗘枡鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1069,7 +1069,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1111,7 +1111,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1139,7 +1139,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1230,12 +1230,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1307,12 +1307,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1348,12 +1348,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1462,7 +1462,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MateOutBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1518,7 +1518,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1547,7 +1547,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1558,7 +1558,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1572,7 +1572,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1705,7 +1705,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1716,7 +1716,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1925,15 +1925,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1945,7 +1945,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList_PDA.html"
index a9a57df..67dd4d0 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_PDA.html"
index 9de8e8a..213cb4a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_PDA.html"
@@ -423,7 +423,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -530,7 +530,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
}
@@ -573,7 +573,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -663,7 +663,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -704,7 +704,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -753,7 +753,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -784,7 +784,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -830,7 +830,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -858,7 +858,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -900,7 +900,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -928,7 +928,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -970,7 +970,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -998,7 +998,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1040,7 +1040,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("渚涘簲鍟嗘潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1068,7 +1068,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1163,12 +1163,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1240,12 +1240,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1368,7 +1368,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_POStockInBackBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1424,7 +1424,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1453,7 +1453,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1464,7 +1464,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1478,7 +1478,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1600,7 +1600,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1611,7 +1611,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1809,15 +1809,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1829,7 +1829,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList_PDA.html"
index b2eddfa..1d17240 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Mould_PDA.html"
index bc84fe4..c22ab93 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Mould_PDA.html"
@@ -437,7 +437,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -546,7 +546,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//鍣ㄥ叿淇℃伅
@@ -647,7 +647,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -735,7 +735,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -776,7 +776,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -825,7 +825,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -856,7 +856,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -902,7 +902,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -930,7 +930,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -972,7 +972,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1000,7 +1000,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1042,7 +1042,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1070,7 +1070,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1112,7 +1112,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("渚涘簲鍟嗘潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1140,7 +1140,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1235,12 +1235,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1312,12 +1312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1372,12 +1372,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1483,7 +1483,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_POStockInBill_Mould_PDA', '1');
$("#HSourceBillNo").select();
@@ -1539,7 +1539,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1568,7 +1568,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1579,7 +1579,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1593,7 +1593,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1749,7 +1749,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1760,7 +1760,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1969,15 +1969,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1989,7 +1989,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
index 7924047..f018deb 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
@@ -423,7 +423,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -530,7 +530,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
}
@@ -599,7 +599,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -687,7 +687,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -728,7 +728,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -777,7 +777,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -808,7 +808,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -854,7 +854,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -882,7 +882,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -924,7 +924,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -952,7 +952,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -994,7 +994,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1022,7 +1022,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1064,7 +1064,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("渚涘簲鍟嗘潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1092,7 +1092,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1187,12 +1187,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1264,12 +1264,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1392,7 +1392,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_POStockInBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1448,7 +1448,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1477,7 +1477,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1488,7 +1488,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1502,7 +1502,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1652,7 +1652,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1663,7 +1663,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1864,15 +1864,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1884,7 +1884,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBillList_PDA.html"
index a1ffa93..fc0be51 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -270,12 +270,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -311,12 +311,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -401,7 +401,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -498,7 +498,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -534,12 +534,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_Mould_PDA.html"
index c95c45a..2de119d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_Mould_PDA.html"
@@ -152,7 +152,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -273,12 +273,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -318,12 +318,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -359,12 +359,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -449,7 +449,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -546,7 +546,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -582,12 +582,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_PDA.html"
index 80a331e..77694ed 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_PDA.html"
@@ -149,7 +149,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -271,12 +271,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -312,12 +312,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -402,7 +402,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -499,7 +499,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -535,12 +535,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
index 6a63e0b..af3a6e6 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
@@ -165,7 +165,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile_QiaoYi.html"; });
}
},
@@ -286,12 +286,12 @@
})
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
@@ -327,12 +327,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -417,7 +417,7 @@
listOption.data = data;
//listOption.totalRow = true;
table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -538,7 +538,7 @@
Uploadedoption.data = data;
//Uploadedoption.totalRow = true;
table.render(Uploadedoption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -574,12 +574,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
index 7b4d11b..fcea279 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
@@ -469,7 +469,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -580,7 +580,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -707,7 +707,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -793,7 +793,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -821,7 +821,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -866,7 +866,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -907,7 +907,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -956,7 +956,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -987,7 +987,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1033,7 +1033,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1061,7 +1061,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1103,7 +1103,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("鍙戣揣鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1131,7 +1131,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1173,7 +1173,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1201,7 +1201,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1243,7 +1243,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1271,7 +1271,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1366,12 +1366,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1443,12 +1443,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1484,12 +1484,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1522,12 +1522,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1638,7 +1638,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_CusBar_PDA', '1');
$("#HSourceBillNo").select();
@@ -1712,7 +1712,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1741,7 +1741,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1752,7 +1752,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1766,7 +1766,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1779,7 +1779,7 @@
if (sHCusID == "0") {
playSound();
layer.msg("缂哄皯瀹㈡埛淇℃伅锛岃鍏堟壂鎻忔簮鍗曟潯鐮侊紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_CusBar_PDA', '1');
$("#HSourceBillNo").select();
@@ -1790,7 +1790,7 @@
if (sHCP == '') {
playSound();
layer.msg("浼犵エ鍙蜂笉鑳戒负绌猴紝璇锋壂鎻忎紶绁ㄥ彿锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HCP").select();
$("#HCP").focus();
@@ -1927,7 +1927,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1938,7 +1938,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1950,7 +1950,7 @@
else {
playSound();
layer.msg("鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HCP").select();
$("#HCP").focus();
@@ -2085,7 +2085,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2096,7 +2096,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2326,15 +2326,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2346,7 +2346,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Mould_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Mould_PDA.html"
index 452984b..2d2d904 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Mould_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Mould_PDA.html"
@@ -461,7 +461,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -572,7 +572,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -699,7 +699,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -785,7 +785,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -813,7 +813,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -858,7 +858,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -899,7 +899,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -948,7 +948,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -979,7 +979,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1025,7 +1025,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1053,7 +1053,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1095,7 +1095,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("鍙戣揣鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1123,7 +1123,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1165,7 +1165,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1193,7 +1193,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1235,7 +1235,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1263,7 +1263,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1358,12 +1358,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1435,12 +1435,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1476,12 +1476,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1514,12 +1514,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1630,7 +1630,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_Mould_PDA', '1');
$("#HSourceBillNo").select();
@@ -1686,7 +1686,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1715,7 +1715,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1726,7 +1726,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1740,7 +1740,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1868,7 +1868,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1879,7 +1879,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -2104,15 +2104,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2124,7 +2124,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_PDA.html"
index aae7087..6d3a396 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_PDA.html"
@@ -447,7 +447,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -556,7 +556,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//涓嬫灦淇℃伅
@@ -651,7 +651,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -737,7 +737,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -765,7 +765,7 @@
$("#HFIFOWHID").val("0");
$("#HFIFOWHName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HFIFOWHName").select();
$("#HFIFOWHName").focus();
@@ -810,7 +810,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -851,7 +851,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -900,7 +900,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -931,7 +931,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -977,7 +977,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1005,7 +1005,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -1047,7 +1047,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("鍙戣揣鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1075,7 +1075,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -1117,7 +1117,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1145,7 +1145,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1187,7 +1187,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1215,7 +1215,7 @@
$("#HSupID").val("0");
$("#HSupName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSupName").select();
$("#HSupName").focus();
@@ -1310,12 +1310,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1387,12 +1387,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1428,12 +1428,12 @@
}
}
else {
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
});
@@ -1539,7 +1539,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1595,7 +1595,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1624,7 +1624,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1635,7 +1635,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1649,7 +1649,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1771,7 +1771,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1782,7 +1782,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1998,15 +1998,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2018,7 +2018,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index aa1bc6e..f9be807 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -334,7 +334,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile_QiaoYi.html"; });
}
},
@@ -487,7 +487,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -573,7 +573,7 @@
$("#HStockPlaceName").removeAttr("readonly");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -614,7 +614,7 @@
$("#HStockPlaceName").removeAttr("readonly");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -659,7 +659,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -690,7 +690,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -732,7 +732,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -759,7 +759,7 @@
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HKeeperName").select();
$("#HKeeperName").focus();
@@ -801,7 +801,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg("鍙戣揣鍛樻潯鐮佷负绌猴紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -828,7 +828,7 @@
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSecManagerName").select();
$("#HSecManagerName").focus();
@@ -870,7 +870,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -897,7 +897,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -973,12 +973,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1050,12 +1050,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
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.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1112,7 +1112,7 @@
if (HSourceFlag == false) {
playSound();
layer.msg("璇峰厛鎵弿婧愬崟鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
$("#HSourceBillNo").select();
@@ -1123,7 +1123,7 @@
if (sHWHID == 0) {
playSound();
layer.msg("浠撳簱鏈�夋嫨锛岃鍏堥�夋嫨浠撳簱鎴栦粨浣嶏紒", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
$("#HStockPlaceName").select();
@@ -1210,7 +1210,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
$("#HSourceBillNo").select();
@@ -1262,7 +1262,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1290,7 +1290,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1301,7 +1301,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1314,7 +1314,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1434,7 +1434,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1445,7 +1445,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1532,7 +1532,7 @@
}
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -1600,15 +1600,15 @@
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1620,7 +1620,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 6f7e4ed..19049ec 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -589,6 +589,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_SPCOscillationCurve.html">SPC闇囪崱鏇茬嚎鍥�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_HeatTreatmentTemperatureCurveChart.html">鐑鐞嗘俯搴︽洸绾垮浘</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_TemperatureCurveDryingMachine.html">骞茬嚗鏈烘俯搴︽洸绾垮浘</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_OEEReport_WorkShift.html">OEE鎶ヨ〃(鐝)</a></dd>
</dl>
</dd>
<dd>
diff --git a/WebTM/views/user/login_ICCard.html b/WebTM/views/user/login_ICCard.html
index eb1d1f3..010a0e2 100644
--- a/WebTM/views/user/login_ICCard.html
+++ b/WebTM/views/user/login_ICCard.html
@@ -7,16 +7,16 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<!--寮曠敤layui鏍峰紡鏂囦欢-->
- <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<!--寮曠敤layui js鏂囦欢-->
- <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>
- <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <script src="../../../../layuiadmin/PageTitle.js"></script>
+ <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>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
@@ -48,7 +48,7 @@
</html>
<script>
layui.config({
- base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
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_AreaSet.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_AreaSet.html"
index 7ca3257..bd712ca 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_AreaSet.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_AreaSet.html"
@@ -673,6 +673,12 @@
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
-
+ <!--<script src="https://cdn.staticfile.net/translate.js/3.12.0/translate.js"></script>
+ <script>
+ translate.language.setLocal('English'); //璁剧疆鏈湴璇锛堝綋鍓嶇綉椤电殑璇锛夈�傚鏋滀笉璁剧疆锛岄粯璁よ嚜鍔ㄨ瘑鍒綋鍓嶇綉椤垫樉绀烘枃瀛楃殑璇銆� 鍙～鍐欏 'english'銆�'chinese_simplified' 绛夛紝鍏蜂綋鍙傝鏂囨。涓嬫柟鍏充簬姝ょ殑璇存槑銆�
+ translate.service.use('client.edge'); //璁剧疆鏈哄櫒缈昏瘧鏈嶅姟閫氶亾锛岀洿鎺ュ鎴风鏈韩锛屼笉渚濊禆鏈嶅姟绔� 銆傜浉鍏宠鏄庡弬鑰� http://translate.zvo.cn/43086.html
+ translate.execute();//杩涜缈昏瘧
+ </script>-->
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkTypeList_PDA.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_ConkTypeList_PDA.html"
index c954f3b..0ce781a 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_ConkTypeList_PDA.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_ConkTypeList_PDA.html"
@@ -21,35 +21,19 @@
<div class="layui-colla-item">
<div style="margin-top:5px;margin-bottom:5px;">
<div class="layui-inline" style="margin-left:5px;">
- <label style="width: 28px;">浠ｇ爜</label>
-
- <input type="text" name="HNumber" id="HNumber" style="width:75px">
-
- <label style="width: 28px;">鍚嶇О</label>
-
- <input type="text" name="HName" id="HName" style="width:75px">
- <button type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
</div>
<div style="margin-top:5px;">
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
</div>
- </div>
-
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-
- </div>
- </script>
+ </div>
</form>
</div>
</div>
@@ -88,6 +72,12 @@
set_ClearBill();
//#endregion
+
+ $('#Value').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_Display($('#Value').val());
+ }
+ });
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -132,10 +122,38 @@
//#endregion
//#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+ get_Display($('#Value').val());
});
//#endregion
+
+ table.on('row(mainTable)', function (obj) {
+ // 娓呴櫎鎵�鏈夎鐨勮儗鏅壊鍜岄�変腑鐘舵��
+ $(".layui-table-body tr").attr({ "style": "background:" }); // 鎭㈠鎵�鏈夎鑳屾櫙棰滆壊
+ $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // 娓呴櫎澶嶉�夋閫変腑鏍峰紡
+
+ // 璁剧疆褰撳墠琛岀殑閫変腑鐘舵��
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); // 璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); // 鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked'); // 鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" }); // 鍙栨秷褰撳墠tr棰滆壊
+ }
+
+ // 鏇存柊琛ㄦ牸缂撳瓨涓殑閫変腑鐘舵��
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
+
+
+
//#endregion
@@ -154,20 +172,11 @@
function set_InitGrid() {
option = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
- , cellMinWidth: 90
- //, cols: [[
- // { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- // , { field: '鏁呴殰绫诲埆浠ｇ爜', title: '鏁呴殰绫诲埆浠ｇ爜' }
- // , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆鍚嶇О' }
- // , { field: 'hlevel', title: '绛夌骇' }
- // , { field: '澶囨敞', title: '澶囨敞' }
- //]]
+ , cellMinWidth: 90
};
}
//#endregion
@@ -176,10 +185,9 @@
//#region 鏌ヨ
function get_Display(sWhere) {
- var ajaxLoad = layer.load();
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Gy_ConkType/list',
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_ConkType/List_PDA',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -224,14 +232,9 @@
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ /* DisPlay_HideColumn();*/
layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
- }
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -283,7 +286,18 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
-
+
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ var index = parent.layer.getFrameIndex(window.name);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 0) {
+ parent.layer.close(index);
+ return;
+ }
+ parent.GetConkTypeValue(data);
+ parent.layer.close(index);
+ });
//#region 鍒锋柊閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillList.html"
index 550cfd8..292aa60 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillList.html"
@@ -29,13 +29,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鏃ユ湡</label>
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
<input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">----</label>
+ <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
<div class="layui-input-inline">
<input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -140,6 +140,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
@@ -194,6 +195,8 @@
var option = [];
var titleData = [];
var HModName = "Sc_MouldLowerBillList";
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -289,7 +292,11 @@
//鏌ヨ
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
// 閲嶇疆鎸夐挳
@@ -304,6 +311,7 @@
//鍒濆鍖栨煡璇�
function set_ClearBill() {
+ set_InitGrid();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -402,11 +410,121 @@
sWhere += GetDataCols;
}
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
GetDataCols = "";
}
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 450
+ , page: false
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+
+ 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) {
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
+ };
+
+ //鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldUpperBill/Sc_MouldLowerBillListPage',
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 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: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ 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: false, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+ option.totalRow = true;
+ laypage.render(optionPage);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "3847";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
index 7dcf7e0..8ec8f28 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillList.html"
@@ -29,13 +29,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鏃ユ湡</label>
+ <label class="layui-form-label" style="width: 85px;">寮�鏃ユ湡</label>
<div class="layui-input-inline">
<input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">----</label>
+ <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
<div class="layui-input-inline">
<input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -140,6 +140,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
@@ -194,6 +195,8 @@
var option = [];
var titleData = [];
var HModName = "Sc_MouldUpperBillList";
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -289,7 +292,11 @@
//鏌ヨ
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
// 閲嶇疆鎸夐挳
@@ -304,12 +311,123 @@
//鍒濆鍖栨煡璇�
function set_ClearBill() {
+ set_InitGrid();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//get_FastQuery();
}
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 450
+ , page: false
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+
+ 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) {
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
+ };
+
+ //鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldUpperBill/Sc_MouldUpperBillListPage',
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 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: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ 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: false, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+ option.totalRow = true;
+ laypage.render(optionPage);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "3846";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//蹇�熻繃婊�
function get_FastQuery() {
@@ -402,7 +520,8 @@
sWhere += GetDataCols;
}
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
GetDataCols = "";
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
index e041009..86e5c49 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
@@ -57,50 +57,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-colla-content">
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
- </div>
- </div>
- <!--<hr />-->
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">婧愬崟鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浠撳簱</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="Warehouse" id="Warehouse" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
- </div>
- </div>
+ <div class="layui-colla-content">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -186,6 +143,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
@@ -229,7 +187,9 @@
var option = [];
var HBillType = "3843";
var HModName = "Sc_MouldRepairSendWorkBillList";
-
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#endregion
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -252,7 +212,11 @@
// 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//澶村伐鍏锋爮浜嬩欢
@@ -351,14 +315,15 @@
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
- //鏌ヨ
- get_Display(sWhere);
//鍒濆鍖栨棩鏈�
//褰卞搷鍒板揩閫熻繃婊ょ殑鏌ヨ锛屾墍浠ュ厛娉ㄩ噴
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ //get_Display(sWhere);
+ get_FastQuery();
}
//鍒濆鍖栬〃鏍�
@@ -367,8 +332,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
- , totalRow: true
+ , page: false
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -434,6 +398,101 @@
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", 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) {
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
+ }
+
+
+ //鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldRepairSendWorkBill/GetMouldRepairSendWorkBillListPage',
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 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: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ 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: false, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+ option.totalRow = true;
+ laypage.render(optionPage);
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -473,13 +532,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- var HDeptID = $("#HDeptID").val();//閮ㄩ棬
- var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
- var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
- var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
- var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
- var Warehouse = $("#Warehouse").val();//浠撳簱
- var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -563,50 +616,9 @@
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
- }
- if (HDeptID) {
- sWhere += " and 缁翠慨閮ㄩ棬 like '%" + HDeptID + "%'";
- }
- if (MaterialCode) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
- }
- if (MaterialName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
- }
- if (SpecificationModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
- }
- if (HSourceBillNo) {
- sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
- }
- if (Warehouse) {
- sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'";
- }
- if (Hmaker) {
- sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
- }
- //var index = layer.load(0);
- //$.ajax({
- // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- // url: GetWEBURL() + '/Sc_MouldRepairSendWorkBill/GetMouldRepairSendWorkBillList',
- // type: "GET",
- // data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.close(index);
- // layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- // } else {
- // layer.close(index);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(index);
- // layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- // }
- //});
- get_Display(sWhere);
+ }
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -636,14 +648,7 @@
function set_ClearQuery() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HBillNo").val("");//鍗曟嵁鍙�
- $("#HDeptID").val("");//閮ㄩ棬
- $("#MaterialCode").val("");//鐗╂枡浠ｇ爜
- $("#MaterialName").val("");//鐗╂枡鍚嶇О
- $("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
- $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
- $("#Warehouse").val("");//浠撳簱
- $("#Hmaker").val("");//鍒跺崟浜�
+ $("#HBillNo").val("");//鍗曟嵁鍙�
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -661,7 +666,7 @@
// 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//鍒犻櫎
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillList.html"
index ea378ea..1e2d31a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillList.html"
@@ -38,12 +38,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
@@ -55,6 +49,12 @@
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 45px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 80px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBillList_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBillList_PDA.html"
index 03896ff..cbcf699 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBillList_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBillList_PDA.html"
@@ -220,7 +220,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
index 5db1179..7d8dcf0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
@@ -86,9 +86,9 @@
<td class="bz_td">
<input type="text" name="HConkTypeName" class="layui-input" id="HConkTypeName" placeholder="閫夋嫨鏁呴殰绫诲埆" style="background-color:#efefef4d;">
<input type="hidden" name="HConkTypeID" id="HConkTypeID" value="0" autocomplete="off" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ConkType" id="ConkType" style="font-weight:bolder">...</button>
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btn_ConkType" id="btn_ConkType" style="font-weight:bolder">...</button>
</td>
- </tr>
+ </tr>
<tr>
<th>鏁呴殰鍘熷洜<span style="color:red">*</span></th>
<td class="bz_td">
@@ -345,8 +345,8 @@
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
+ $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鏁呴殰鍙戠敓鏃ユ湡
+
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
@@ -385,7 +385,7 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
option.data = [{ "HConkReasonID": $("#HConkReasonID").val(), "HConkReasonCode": "", "HConkReasonName": $("#HConkReasonName").val(), "HConkExplanation": $("#HExplanation").val(), "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": $("#HManagerName").val(), "HRemark": " " }];
table.render(option);
-
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var oMain = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -432,7 +432,7 @@
//#endregion
//鏁呴殰绫诲埆
- form.on('submit(ConkType)', function () {
+ form.on('submit(btn_ConkType)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -467,7 +467,7 @@
}
});
});
-
+
//鏁呴殰鍘熷洜
form.on('submit(ConkReason)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -579,7 +579,7 @@
}
});
});
-
+
//璐熻矗浜哄脊绐�
form.on('submit(HManager)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -591,7 +591,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -617,7 +617,7 @@
}
});
});
-
+
//浠ヤ笅涓烘椤甸潰鎵�鏈夋柟娉�
//鍒濆鍖栬〃鏍�
@@ -696,7 +696,7 @@
}
if (HManagerID == "") {
return layer.msg('璇烽�夋嫨璐熻矗浜�');
- }
+ }
buttonArr = [];//娓呯┖鏁扮粍
var checkrow = {
"HRepairID": HRepairID, "HRepairCode": HRepairCode, "HRepairName": HRepairName,
@@ -764,7 +764,7 @@
layer.msg("鍙戠幇浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
-
+
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -788,7 +788,7 @@
return true;
}
//鎵潯鐮�
- function GetMeesageByBarCode(obj) {
+ function GetMeesageByBarCode(obj) {
var HBarCode = $('#HBarCode').val();//鏉″舰鐮�
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -827,6 +827,29 @@
}
//浠ヤ笂涓簂ayui妯″潡
});
+ function GetHEmpValue(obj) { //杩斿洖鍙戠幇浜�
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ function GetConkTypeValue(obj) { //鏁呴殰绫诲埆
+ $("#HConkTypeName").val(obj[0].鏁呴殰绫诲埆);
+ $("#HConkTypeID").val(obj[0].hitemid);
+ }
+
+ function GetConkReasonValue(obj) { //涓嶈壇鍘熷洜
+ $("#HConkReasonName").val(obj[0].HName);
+ $("#HConkReasonID").val(obj[0].hitemid);
+ }
+
+ function GetHManagerValue(obj) { //杩斿洖璐熻矗浜�
+ $("#HManagerName").val(obj[0].HName);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
+
+ function GetHEmpValue(obj) { //杩斿洖鍙戠幇浜�
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
</script>
</body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBillList_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBillList_PDA.html"
index 2c6bb8a..ac6742c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBillList_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBillList_PDA.html"
@@ -220,7 +220,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
index f3f01e8..09c8f32 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
@@ -79,7 +79,7 @@
<th>婧愬崟绫诲瀷</th>
<td class="bz_td">
<select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
- <option value="鎵嬪伐褰曞叆" selected="selected">鎵嬪伐褰曞叆</option>
+ <option value="1" selected="selected">鎵嬪伐褰曞叆</option>
<option value="3815">妯″叿鏁呴殰鐧昏鍗�</option>
</select>
</td>
@@ -115,6 +115,18 @@
<th>缁翠慨鍐呭</th>
<td class="bz_td">
<textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <th>璁″垝缁翠慨宸ユ椂</th>
+ <td class="bz_td">
+ <input type="text" name="HPlanTimes" class="layui-input" id="HPlanTimes" placeholder="璇疯緭鍏ヨ鍒掔淮淇伐鏃�" value="0">
+ </td>
+ </tr>
+ <tr>
+ <th>瀹為檯缁翠慨宸ユ椂</th>
+ <td class="bz_td">
+ <input type="text" name="HTimes" class="layui-input" id="HTimes" placeholder="璇疯緭鍏ュ疄闄呯淮淇伐鏃�" value="0">
</td>
</tr>
<tr>
@@ -157,7 +169,7 @@
<tr>
<th>缁翠慨椤圭洰<span style=" color:red">*</span></th>
<td class="bz_td">
- <input type="text" name="HRepair" class="layui-input" id="HRepair" placeholder="閫夋嫨缁翠慨椤圭洰" style="background-color:#efefef4d;">
+ <input type="text" name="HRepairName" class="layui-input" id="HRepairName" placeholder="閫夋嫨缁翠慨椤圭洰" style="background-color:#efefef4d;">
<input type="hidden" name="HRepairID" id="HRepairID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HRepairList" id="HRepairList" style="font-weight:bolder">...</button>
</td>
@@ -588,7 +600,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -625,7 +637,7 @@
title: '璁惧缁翠慨鐧昏鍗�',
shift: 2,
area: ['90%', '90%'],
- content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html', 'yes'],
+ content: ['../../妯℃不鍏风鐞�/妯″叿鏁呴殰缁翠慨鍗昉DA/Sc_MouldConkBookBillList_PDA.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -677,7 +689,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HRepair").val(checkStatus.data[0].HName);
+ $("#HRepairName").val(checkStatus.data[0].HName);
$("#HRepairID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -940,7 +952,22 @@
}
//浠ヤ笂涓簂ayui妯″潡
});
-
+ function GetHManagerValue(obj) { //杩斿洖璐熻矗浜�
+ $("#HManagerName").val(obj[0].HName);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
+ function GetHEmpValue(obj) { //杩斿洖缁翠慨浜�
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
+ }
+ function GetRepairValue(obj) { //杩斿洖缁翠慨椤�
+ $("#HRepairName").val(obj[0].HName);
+ $("#HRepairID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
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 8e4f235..4566285 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"
@@ -40,7 +40,7 @@
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
@@ -66,30 +66,33 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBarCode" id="HBarCode">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">婧愬崟鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo">
+ <div class="layui-row" style="margin-top: 5px; margin-left: 70px;" >
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+ </div>
+ </div> <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ </div>
</div>
- </div> <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--鏄剧ず褰撳墠杩囨护鏂规-->
- <div class="layui-inline" style="margin-left:5px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -117,7 +120,7 @@
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -144,7 +147,7 @@
<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-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -220,7 +223,7 @@
var option = [];
var ins;
- var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID", "HItemID", "hmainid", "hsubid", "HInterID", "HUnitID", "HAuxPropID","HSTOCKORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var page = 1;//鍒嗛〉鏁版嵁
var size = 50;
//#region 銆愯繃婊ゆ柟妗堛��
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/Sb_Add_MouldRepairWorkBillList.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/Sb_Add_MouldRepairWorkBillList.html"
index 9bc42e3..68d6a3b 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/Sb_Add_MouldRepairWorkBillList.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/Sb_Add_MouldRepairWorkBillList.html"
@@ -211,9 +211,9 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
- <option value="2" selected="selected">鏁呴殰鐧昏鍗�</option>
+ <option value="3815" selected="selected">鏁呴殰鐧昏鍗�</option>
<option value="1">鎵嬪伐褰曞叆</option>
- <option value="3">缁翠慨娲惧伐鍗�</option>
+ <option value="3843">缁翠慨娲惧伐鍗�</option>
</select>
</div>
</div>
@@ -223,7 +223,7 @@
<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
+ <button type="button" lay-submit="XDHList" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -383,12 +383,12 @@
$('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
break;
//鏈夋簮鍗曟柊澧灺� 聽 鏁呴殰鐧昏鍗�
- case '2':
+ case '3815':
$('#HMainSourceBillNo').attr("disabled", true);
$('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
break;
//鏈夋簮鍗曟柊澧灺� 聽 缁翠慨娲惧伐鍗�
- case '3':
+ case '3843':
$('#HMainSourceBillNo').attr("disabled", true);
$('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
break;
@@ -712,7 +712,7 @@
//#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
var HMainSourceBillType = $("#HMainSourceBillType").val();
- if (HMainSourceBillType == "2") {
+ if (HMainSourceBillType == "3815") {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -821,7 +821,7 @@
//layer.full(index);
}
});
- } else if (HMainSourceBillType == "3") {
+ } else if (HMainSourceBillType == "3843") {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.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/Sb_MouldRepairWorkBillList.html"
index c7c1947..d8755ad 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/Sb_MouldRepairWorkBillList.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/Sb_MouldRepairWorkBillList.html"
@@ -64,14 +64,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-colla-content">
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- </div>
+ <div class="layui-colla-content">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鍣ㄥ叿缂栫爜</label>
@@ -92,7 +85,7 @@
</div>
</div>
</div>
- <div class="layui-row">
+ <div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -190,6 +183,7 @@
</div>
</div>
</div>
+ <div id="page" style="position: relative; bottom: 0;"></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>-->
@@ -199,10 +193,10 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-reload" id="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="btn-details" id="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-exit" id="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -214,7 +208,7 @@
<script type="text/html" id="xuhao1">
{{d.LAY_TABLE_INDEX+1}}
</script>
- </form>
+</form>
</div>
</div>
</div>
@@ -246,7 +240,9 @@
var option = [];
var HBillType = "3807";
var HModName = "Sb_MouldRepairWorkBillList";
- var titleData = ["hmainid","鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HMouldID", "HEquipID", "HEmpID", "HManagerID", "HDeptID", "HSupID", "hsubid", "HRepairID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#endregion
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -361,7 +357,11 @@
// 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
// 閲嶇疆鎸夐挳
@@ -394,7 +394,8 @@
//鍒濆鍖栬〃鏍�(瀛愯〃2)
set_InitGrid2();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_FastQuery();
}
//鍒濆鍖栬〃鏍�
@@ -405,8 +406,7 @@
, height: 'full-50'
, limit: 50
, limits: [50, 500, 5000, 20000]
- , page: true
- , totalRow: true
+ , page: false
, cellMinWidth: 90
, cols: [[
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
@@ -475,6 +475,97 @@
, { field: 'HBillType', title: 'HBillType', width: 200, hide: 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) {
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
+ }
+
+ //鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillListPage',
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 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: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ 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: false, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+ option.totalRow = true;
+ laypage.render(optionPage);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
//鏌ヨ
@@ -902,7 +993,8 @@
sWhere += " and 缁翠慨椤圭洰 like '%" + RepairItem + "%'";
}
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
index b6a5489..82386d4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
@@ -33,15 +33,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-input-block">
+ <select name="HBillType" id="HBillType">
+ <option value="">鎵�鏈�</option>
+ <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
+ <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -162,6 +162,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></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>-->
@@ -179,7 +180,7 @@
</div>
</script>
- </form>
+</form>
</div>
</div>
</div>
@@ -211,7 +212,9 @@
var option = [];
var HModName = "Sc_MouldConkBookBillList";
var HBillType = "3815";
- var titleData = ["hmainid","鍗曟嵁ID", "鍗曟嵁绫诲瀷", "hempid", "HConkTypeID", "HDeptID", "HMouldID", "hsubid", "HConkReasonID", "HManagerID", "琛ㄤ綋澶囨敞", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�","HEmpID","HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "鍗曟嵁ID", "鍗曟嵁绫诲瀷", "hempid", "HConkTypeID", "HDeptID", "HMouldID", "hsubid", "HConkReasonID", "HManagerID", "琛ㄤ綋澶囨敞", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HEmpID", "HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -261,7 +264,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//閲嶇疆鎸夐挳
@@ -324,7 +331,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_FastQuery();
}
//鍒濆鍖栬〃鏍�
@@ -333,7 +341,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -391,6 +399,25 @@
, { field: 'hbilltype', title: 'hbilltype', width: 200 }
]]
};
+
+ 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) {
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//鏌ヨ
@@ -564,10 +591,83 @@
if (EndHCreateDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
}
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+ //鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillListPage',
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 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: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ 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: false, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+ option.totalRow = true;
+ laypage.render(optionPage);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//鏂板
function set_AddNew() {
//椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
index a6ceb04..a5fea7f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
@@ -38,127 +38,120 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿</label>
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="PartModul" id="PartModul">
+ <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐐规椤圭洰</label>
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="CheckItem" id="CheckItem">
+ <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<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">
<div class="layui-row">
<div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="PartModul" id="PartModul">
</div>
</div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐐规椤圭洰</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="CheckItem" id="CheckItem">
</div>
</div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" 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>
+ </div>
+ <div class="layui-ro" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
</div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
</select>
</div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
</div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
</select>
</div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
@@ -211,7 +204,10 @@
var option2 = [];
var HModName = "Sc_MouldDotCheckBillList";
var HBillType = "3821";
- var titleData = ["hmainid", "HPlanInterID", "HDotCheckItemID", "鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HBillType", "HMouldDotCheckRuleID","HShiftsID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HPlanInterID", "HDotCheckItemID", "鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HBillType", "HMouldDotCheckRuleID", "HShiftsID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -228,9 +224,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
- //鍒濆鍖栬〃鏍�
- DisPlay_HideColumn();
+ //get_Display(sWhere);
+ get_FastQuery();
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -343,7 +338,11 @@
}
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//蹇�熻繃婊�
function get_FastQuery() {
@@ -443,7 +442,8 @@
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
}
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
+ //get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//鍒濆鍖栬〃鏍�
@@ -452,7 +452,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 450
- , page: true
+ , page: false
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -500,7 +500,102 @@
// , { field: 'hbilltype', title: 'hbilltype', width: 200 }
//]]
}
+
+ 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) {
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
};
+
+ //鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillListPage',
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 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: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ 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: false, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+ option.totalRow = true;
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//鏂板
function set_AddNew() {
@@ -803,12 +898,13 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /*var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�","婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
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/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
index 0f0624c..3fc0baa 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
@@ -32,13 +32,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
<div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
+ <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
</div>
</div>
<div class="layui-inline">
@@ -60,104 +62,83 @@
<div class="layui-colla-content">
<div class="layui-row">
<div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" 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>
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
</div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
</select>
</div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
</div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
</select>
</div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -177,6 +158,7 @@
</div>
</div>
</div>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
@@ -199,6 +181,8 @@
<script type="text/html" id="xuhao1">
{{d.LAY_TABLE_INDEX+1}}
</script>
+ </div>
+ </div>
</form>
</div>
</div>
@@ -238,6 +222,8 @@
var option2 = [];
var HModName = "Sc_MouldMaintainBillList";
var HBillType = "3819";
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
var titleData = ["hmainid","鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HMouldID","HEmpID","HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#endregion
@@ -328,7 +314,11 @@
// 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
// 閲嶇疆鎸夐挳
@@ -350,7 +340,8 @@
//鍒濆鍖栬〃鏍�(瀛愯〃)
set_InitGrid2();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
@@ -360,7 +351,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: '400'
- , page: true
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -394,6 +385,25 @@
]]
};
table.render(option);
+
+ 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) {
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -578,6 +588,82 @@
});
}
+ //鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldMaintainBill/GetMouldMaintainBillListPage',
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 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: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ 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: false, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+ option.totalRow = true;
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//蹇�熻繃婊�
function get_FastQuery() {
var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
@@ -661,17 +747,15 @@
}
if (HBillNo) {
sWhere += " and HBillNo like '%" + HBillNo + "%'";
- }
- if (HCreateBy) {
- sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
- }
+ }
if (BenginHCreateDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
}
if (EndHCreateDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
}
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
+ //get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -694,7 +778,8 @@
$("#Comparator1").val("0");
form.render('select');
sWhere = "";
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//鏂板
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
index c714d1d..c7571e8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
@@ -30,17 +30,7 @@
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
- </div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -64,92 +54,87 @@
</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">
- <div class="layui-inline">
+ <div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
</div>
</div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
</div>
-
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
index de943db..19dc6ec 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
@@ -31,17 +31,7 @@
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
- </div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -156,6 +146,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></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>-->
@@ -163,14 +154,12 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-reload" id="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="btn-details" id="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-exit" id="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-
-
</div>
</script>
</form>
@@ -205,6 +194,9 @@
var option = [];
var HBillType = "3817";
var HModName = "Sc_MouldRepairCheckBillList";
+ var titleData = [];
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -220,7 +212,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_FastQuery();
//#endregion
@@ -268,7 +261,11 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function () {//閫夋嫨浠撲綅
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function () {
@@ -285,8 +282,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
- , totalRow: true
+ , page: false
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -344,7 +340,100 @@
, { field: '瀛愯礋璐ｄ汉', title: '瀛愯礋璐ｄ汉', width: 200, 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) {
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
};
+
+ //鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldRepairCheckBill/GetMouldRepairCheckBillListPage',
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 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: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ 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: false, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+ option.cols = [col];
+ option.data = data1.data;
+ option.totalRow = true;
+ laypage.render(optionPage);
+ table.render(option);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ layer.close(ajaxLoad);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//鏌ヨ
function get_Display(sWhere) {
@@ -583,7 +672,8 @@
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
}
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -604,7 +694,8 @@
$("#Comparator1").val("0");
form.render('select');
sWhere = "";
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index 3e62b4c..bcbc734 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -207,6 +207,11 @@
HSourceNo = params[params[2]]; //宸ュ崟鍙�
HSourceEntryID = params[params[3]]; //婧愬崟瀛愬唴鐮�
HProcID = params[params[4]]; //宸ュ簭ID
+ HTypes = params[params[5]]; //绫诲瀷
+ if (HTypes != undefined && HTypes != null && HTypes != '') {
+ $("#HType").val(HTypes);
+ form.render('select');
+ }
document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index c27a486..d2bc3b1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -1043,7 +1043,7 @@
columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true });
columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150, sort: true });
columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 150, sort: true });
- columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
+ /*columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0*/
columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
index e4dcc4d..c74debd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
@@ -52,6 +52,9 @@
#mainTable tr {
height: 100px; /* 浣犳兂瑕佺殑琛岄珮 */
}
+ #btnSignIn,#btnErrMSg,#btnQuery,#btnEdit {
+ font-size: 36px; /* 璁剧疆瀛椾綋澶у皬 */
+ }
</style>
</head>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 8b4d6bd..563a5be 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -31,6 +31,25 @@
<span>鏇村</span>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
@@ -75,7 +94,7 @@
</div>
</div>
</div>
- <div class="layui-row">
+ <div class="layui-row" style="margin-bottom:20px">
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
@@ -131,6 +150,13 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HERPID" id="HERPID">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
@@ -222,36 +248,7 @@
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
-
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡闂撮殧</label>
- <div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
- </select>
- </div>
- </div>
- </div>
+ </div>
</div>
</div>
</div>
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\245\350\241\250/SC_BOMReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/SC_BOMReport.html"
new file mode 100644
index 0000000..7d8a8b6
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/SC_BOMReport.html"
@@ -0,0 +1,554 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>BOM灞傜骇灞曞紑鎶ヨ〃</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">
+ <link href="../../../layuiadmin/resize/ResizeLeftRight.css" rel="stylesheet" />
+ <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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/modules/treeTable.js"></script>
+</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-tab layui-tab-card" style="margin-top:20px;">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="hidden" class="layui-input ForFilteringSchemes" name="HMaterID" id="HMaterID" value="" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMater" id="btnHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn">鏌ヨ</i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div class="box" style="padding:10px 0" id="box">
+ <div class="left" id="left" style="margin-top:20px;">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ <!-- 娣诲姞鐢ㄤ簬鎷栨嫿鐨勬墜鏌勫厓绱� -->
+ <div id="resize" class="resize" title="鏀剁缉渚ц竟鏍�"> </div>
+ <div class="mid" id="right" style="margin-top:20px;">
+ <div class="layui-tab layui-tab-card">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--宸ヨ壓璺嚎-->
+ <table class="layui-hide" id="mainTable_Routing" lay-filter="mainTable_Routing"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/resize/ResizeLeftRight.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ //treeTable: 'treeTable'
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','treeTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , treeTable = layui.treeTable
+ var sWhere = "";
+ var option = ""; //涓昏〃鏍�
+ var option_Routing = ""; //宸ヨ壓璺嚎
+ var ins;
+ //#endregion
+
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "SC_BOMReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
+ var titleData = ["ParentID", "涓籭d", "涓荤墿鏂檌d", "瀛恑d", "瀛愮墿鏂檌d"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();//鏌ヨ
+ });
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ treeTable.on("toolbar(mainTable)", function (obj) {
+
+ });
+
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栧乏鍒楄〃
+ set_InitGrid();
+ //鍒濆鍖栦汉鍒楄〃
+ set_InitGrid_Routing();
+
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery( ) {
+
+ var HMaterID = $("#HMaterID").val(); //鐗╂枡缂栫爜
+ get_Display(HMaterID);
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HMaterID").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ var HMaterID = "";
+ get_Display(HMaterID);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栭〉闈�
+
+ //鍒濆鍖栧乏渚у垪琛�
+ function set_InitGrid() {
+ option= {
+ elem: '#mainTable',
+ toolbar: '#toolbarDemo',
+ totalRow: true,
+ cellMinWidth: 90,
+ limit: Number.MAX_VALUE, // 榛樿鏄剧ず鍏ㄩ儴
+ defaultToolbar: [], // 闅愯棌榛樿鐨勫鍑恒�佹墦鍗扮瓑鎸夐挳
+ cols: [],
+ data: []
+ };
+
+ treeTable.render(option);
+ }
+
+ //鍒濆鍖栧伐鑹哄垪琛�
+ function set_InitGrid_Routing() {
+ option_Routing = {
+ elem: '#mainTable_Routing'
+ , toolbar: '#toolbarDemo2'
+ , totalRow: true
+ , height: 600
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ , data: []
+ };
+ }
+ //#endregion
+
+ //#region BOM鏌ヨ
+ function get_Display(HMaterID) {
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProductReport/Get_BOMReportList',
+ type: "GET",
+ data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var Listcol = [];
+ for (var i = 0; i < data1.list.length; i++) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list[i].Columns) {
+ data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
+ }
+ var col = [];
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var j = 0; j < data.length; j++) {
+ if ($.inArray(data[j].name, titleData) > -1) {
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[j].name == '鎴愬搧鐗╂枡') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '鎴愬搧鐗╂枡', templet: function (d) {
+ return '<span style="color: blue;">' + d.鎴愬搧鐗╂枡 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '瀛愪欢鐗╂枡') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 150, event: '瀛愪欢鐗╂枡', templet: function (d) {
+ return '<span style="color: blue;">' + d.瀛愪欢鐗╂枡 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else {
+ switch (data[j].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 100});
+ }
+ }
+ }
+ Listcol.push(col);
+ }
+ var TreeDate = LoadTree(data1.data.h_p_Sc_BOMReportList);
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[0]]
+ , data: TreeDate
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , page: false
+ }
+ treeTable.render(option);
+
+ //宸ヨ壓
+ option_Routing = {
+ elem: '#mainTable_Routing'
+ , toolbar: '#toolbarDemo2'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_Sc_BOMReportList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Routing);
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region BOM鐐瑰嚮鏌ヨ 宸ヨ壓璺嚎
+ function getTable_Right(HMaterID) {
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProductReport/Get_BOMReportList_Routing',
+ type: "GET",
+ data: { "HMaterID": HMaterID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //宸ヨ壓璺嚎
+ option_Routing = {
+ elem: '#mainTable_Routing'
+ , toolbar: '#toolbarDemo2'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , page: false
+ }
+ table.render(option_Routing);
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 鐗╂枡寮圭獥
+ form.on('submit(btnHMater)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html' ,'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+
+ layer.closeAll();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () { }
+ });
+ });
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑 + 鏌ヨ鍙充晶琛ㄦ牸
+ treeTable.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+
+ var HMaterID = obj.data.瀛恑d == 0 ? obj.data.涓荤墿鏂檌d : obj.data.瀛恑d;
+
+ getTable_Right(HMaterID);
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ btndate = [];
+ }
+ })
+ //#endregion
+
+ /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+ function LoadTree(data) {
+ let map = {};
+ let treeData = [];
+ data.forEach(it => {
+ map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
+ })
+ //鐢熸垚缁撴灉闆�
+ data.forEach(it => {
+ const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
+ if (parent) {
+ if (!Array.isArray(parent.children)) parent.children = [];
+ parent.children.push(it);
+ } else {
+ treeData.push(it)
+ }
+ })
+ return treeData;
+ }
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 3e1b595..98529f6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -1912,6 +1912,7 @@
}
HinterID_S.push(option.data[i]["hmainid"]);
}
+ //鑾峰彇璁″垝閿佸畾鐨勫ぉ鏁�
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
@@ -1946,10 +1947,11 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
-
+ //灏嗚〃鏍兼暟鎹姞杞藉埌TableData閲岄潰
get_HFData(0, 0);
//鍒濆鍖栬〃鏍兼暟鎹�
+ //娓呯┖閿佸畾鏃ユ湡浠ュ鐨勬暟鎹�
for (var i = 0; i < option.data.length; i++) {
for (var j = (22 + HPlanDay); j < 53; j++) {
if (option.data[i][option.cols[0][j].field] != null) {
@@ -1985,9 +1987,9 @@
sWorkQty = option.data[i]["灏忔椂浜ц兘"];
sYX = option.data[i]["浼樺厛绾�"];
HReportQty = option.data[i]["鎷嗗崟姹囨姤鏁伴噺"];
-
+ //鎷嗗崟鏁伴噺鍑忓幓姹囨姤鏁伴噺閿佸畾鏁伴噺
if (SDSum > 0) {
- sPlanQty = sPlanQty - SDSum - HReportQty;
+ sPlanQty = sPlanQty - SDSum;
}
//鍓╀綑闇�姹傚伐鏃�
iLeftQty = sPlanQty - HReportQty;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
index a7eb017..b5d3706 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
@@ -28,12 +28,14 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">缁勮鎺掍骇</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙ｉ攣宸ュ崟</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnGetCompletionDate" id="btnGetCompletionDate">鑾峰彇瀹屽伐鏃ユ湡</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnGetEarlyDate" id="btnGetEarlyDate">鑾峰彇鏈�鏃╁紑宸ユ棩鏈�</button>
</div>
<div class="layui-collapse resizable-container">
<div class="layui-colla-item">
@@ -71,9 +73,7 @@
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
- <div class="layui-progress layui-progress-big" lay-showpercent="true" lay-filter="demo">
- <div class="layui-progress-bar layui-bg-primary" lay-percent="0%"></div>
- </div>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
@@ -251,7 +251,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鐢熶骇璁㈠崟</li>
<li>缂烘枡鍒嗘瀽</li>
- </ul>
+ </ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-inline">
@@ -287,7 +287,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch_ICMO" id="btnSearch_ICMO">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_ICMO" id="btnReSearch_ICMO">閲嶇疆</button>
<!--寰呮帓璁㈠崟-->
- <table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
+ <table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
</div>
<div class="layui-tab-item">
<table class="layui-hide" id="mainTable_Material" lay-filter="mainTable_Material"></table>
@@ -297,7 +297,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button>
@@ -581,7 +581,7 @@
//閫夋搷浣滃伐
case 'set_Emp':
set_Emp(data);
- break;
+ break;
//鏌ョ湅宸ヨ壓璺嚎
case 'set_Routing':
set_Routing();
@@ -730,7 +730,7 @@
//娣诲姞鐢熶骇璁㈠崟
form.on('submit(btnAddICMO)', function (data) {
get_btnAddICMO();
- })
+ })
//鍑嗗
form.on('submit(btnReady)', function (data) {
@@ -781,7 +781,7 @@
layer.close(index);
}, 1000)
}
- })
+ })
//宸ヨ壓璺嚎缂栬緫
form.on('submit(btnRoutEdit)', function (data) {
@@ -811,6 +811,20 @@
});
}
+ //鏈�鏃╁紑宸ユ棩鏈�
+ if (obj.event == 'HEarlyDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ }
+ });
+ }
//#endregion
});
@@ -835,7 +849,7 @@
get_btnUnlock(HWorkShopID);
}
})
-
+
//閿佸畾宸ュ崟
form.on('submit(btnLockOrder)', function (data) {
get_btnLockOrder();
@@ -845,6 +859,16 @@
form.on('submit(btnUnlockOrder)', function (data) {
get_btnUnlockOrder();
})
+
+ //鑾峰彇瀹屽伐鏃ユ湡
+ form.on('submit(btnGetCompletionDate)', function (data) {
+ get_btnGetCompletionDate();
+ })
+
+ //鑾峰彇鏈�鏃╁紑宸ユ棩鏈�
+ form.on('submit(btnGetCompletionDate)', function (data) {
+ get_btnGetEarlyDate();
+ })
//#endregion
@@ -899,7 +923,7 @@
var myDate = new Date();
var oneday = 1000 * 60 * 60 * 24;
- columns.push({ type: 'checkbox', fixed: 'left', sort: true });
+ columns.push({ type: 'checkbox', fixed: 'left', sort: true });
columns.push({ type: 'numbers', field: '搴忓彿', title: '搴忓彿', sort: true, filter: true });
columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true, filter: true});
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true, filter: true });
@@ -912,171 +936,192 @@
columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text', filter: true });
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true, filter: true });//0
columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true, filter: true});//0
- columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true, filter: true });//0
- columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, filter: true});
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true});
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true});
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true, filter: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", filter: true });
- columns.push({ field: '鏈�鏃╁紑宸ユ棩鏈�', title: '鏈�鏃╁紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�鏃╁紑宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '鏈�鏃╁紑宸ユ棩鏈�', title: '鏈�鏃╁紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�鏃╁紑宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({
- field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + (-3) * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + (-3) * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + (-3) * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + (-3) * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + (-3) * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + (-2) * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + (-2) * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + (-2) * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + (-2) * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + (-2) * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + (-1) * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + (-1) * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + (-1) * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + (-1) * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + (-1) * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, filter: true, templet: function (d) {
+ field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
}
})//0
+
+ for (var i = 31; i < 180;i++) {
+ columns.push({
+ field: Format(myDate.getTime() + i * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + i * oneday, 'MM.dd'), edit: 'text', width: 90, filter: true, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + i * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + i * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + i * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ }
+
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true, filter: true });
columns.push({ field: 'T31', title: 'T31', width: 70, filter: true});//0
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150, sort: true, filter: true });
@@ -1111,6 +1156,10 @@
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true, filter: true });//0
+ columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true, filter: true });//0
+ columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '閿�鍞鍗曞鏍告棩鏈�', title: '閿�鍞鍗曞鏍告棩鏈�', width: 150, templet: "<div>{{d.閿�鍞鍗曞鏍告棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞鍗曞鏍告棩鏈�, 'yyyy-MM-dd')}}</div>",sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({ field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', width: 150, edit: 'text', event: "HEmpID" });
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
@@ -1124,7 +1173,7 @@
, limit: 500//榛樿鏄剧ず鍏ㄩ儴
, limits: [500,1000,1500,3000,5000,10000,20000]
, done: function (res, page, count) {
-
+
$('.layui-table thead').on('click', 'th', function () {
// 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
var field = $(this).data('field');
@@ -1164,7 +1213,7 @@
//for (var i = 0; i < HBackgroundColorIndex.length;i++) {
// $("tr[data-index='" + i + "']").attr({ "style": "background:#F74848;color:black;" });
- //}
+ //}
soulTable.render(this)
}
}
@@ -1686,7 +1735,7 @@
$("#ColName2").val("0");
$("#Comparator2").val("0");
form.render('select');
- sWhere = "";
+ sWhere = "";
}
//閲嶇疆
@@ -1799,7 +1848,7 @@
, btn2: function (index, layero) { }
})
}
-
+
//娣诲姞鐢熶骇璁㈠崟
function get_btnAddICMO() {
var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
@@ -2361,7 +2410,7 @@
}
//缁勮鎺掍骇
- function get_btnProZZPC(HWorkShopID) {
+ function get_btnProZZPC(HWorkShopID) {
var JDTLen = 0;
var lMainID = 0;
var sICMOBillNo = "";
@@ -2389,7 +2438,7 @@
var HDelData = 0;
JDTLen = (100 / option.data.length).toFixed(2);
var HJDLen = 0;
- var HReportQty = 0;
+ var HReportQty = 0;
//濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
//鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
@@ -2449,8 +2498,10 @@
//get_FastQuery(2);
//涓洪槻姝㈢敤鎴锋墜鍔ㄧ鏀逛紭鍏堢骇锛岄噸鏂版牴鎹紭鍏堢骇鎺掑簭鏁扮粍
- option.data.sort(function (a, b) { return a.浼樺厛绾� - b.浼樺厛绾� });
-
+ option.data.sort(function (a, b) {
+ return a.浼樺厛绾� - b.浼樺厛绾�
+ });
+
window.HPCDate = Format(new Date().toLocaleDateString().replaceAll('/', '-'), 'yyyy/MM/dd') //褰撳墠鎺掍骇鏃ユ湡
window.HArrIndex = []; //鐢ㄤ簬瀛樺偍鍥犱负褰撳墠鏃ユ湡涓嶆弧瓒虫渶鏃╁紑宸ユ棩鏈熻�屾湭鑳芥帓浜х殑璁㈠崟涓嬫爣
window.HArrIndex_PC = [];//鐢ㄤ簬瀛樺偍宸茬粡鎺掍骇鐨勮鍗曚笅鏍�
@@ -2458,29 +2509,28 @@
var HDataLen = option.data.length;//鎬绘帓浜ц鍗曢暱搴�
var HProgress = parseInt(100 / HDataLen);
-
+ var HCount = 0;
//鎸変换鍔″崟浼樺厛绾� 寰幆
- for (var i = 0; i < HDataLen; i++) {
- var timer = setInterval(function () {
- if ((i + 1) * HProgress > 100) {
- clearInterval(timer);
- }
- element.progress('demo', Math.round(Math.random() * 100) + '%')
- }, 500);
+ for (var i = 0; i < HDataLen; i++) {
+ HCount++;
+ if (HCount > 50000) {
+ break;
+ }
+ var old_date = new Date();
+
//element.progress('demo', (i + 1) * HProgress + '%')
//鍒ゆ柇鏁扮粍闀垮害鏄惁鍙戠敓鍙樺寲锛屾槸鍒欓噸缃暟缁勯暱搴�
if (HDataLen != option.data.length) {
HDataLen = option.data.length;
if (i == option.data.length) {
i = option.data.length - 1;
- }
- }
- //console.log("1.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
-
+ }
+ }
+ console.log("1.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
//鎺掍骇鏈�鍚庝竴绗旇鍗曪紙鑻ユ湰娆′负鏈�鍚庝竴绗旇鍗曟帓浜э紝浣嗗綋鍓嶆帓浜ф棩鏈熻繕涓嶆弧瓒虫渶鏃╁紑宸ユ棩鏈燂紝鍒欏綋鍓嶆棩鏈熻繘琛岀疮鍔狅紝鐩村埌婊¤冻鏈�鏃╁紑宸ユ棩鏈熶负姝級
if (HArrIndex_PC.length == option.data.length - 1 && HArrIndex.length > 0 && Format(option.data[HArrIndex[0]].鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd') > HPCDate) {
for (var k = 0; k < 100; k++) {
- //鎺掍骇鏃ユ湡寰�鍚庢帹涓�澶�
+ //鎺掍骇鏃ユ湡寰�鍚庢帹涓�澶�
var dateTime = new Date(HPCDate);
HPCDate = Format(new Date(dateTime.setDate(dateTime.getDate() + 1)), 'yyyy/MM/dd');
//褰撳墠鎺掍骇鏃ユ湡婊¤冻鏈�鏃╁紑宸ユ棩鏈燂紝缁堟绱姞
@@ -2491,16 +2541,16 @@
}
//鍒ゆ柇鏄惁鏈夋湭鎺掍骇鐨勮鍗曪紝鑻ユ湁鍒欒ˉ鎺�
- if (HArrIndex.length > 0 && HIsPriority == false) {//(HIsPriority == false || HArrIndex.length >= 2)
+ if (HArrIndex.length > 0 && (HIsPriority == false || HArrIndex.length + HArrIndex_PC.length == option.data.length)){//(HIsPriority == false || HArrIndex.length >= 2)
//鑾峰彇涔嬪墠鎺掍骇鏃舵湭鑳芥帓浜х殑璁㈠崟
i = HArrIndex[0];
var index = 0;
//濡傛灉瀛樺湪澶氫釜涔嬪墠鏈兘鎺掍骇鐨勮鍗曪紝鍒欑湅鍝釜璁㈠崟鑳藉浼樺厛婊¤冻鏈�鏃╁紑宸ユ棩鏈燂紝浼樺厛鎺掍骇
if (HArrIndex.length > 1) {
- //鎺掍骇鏃ユ湡寰�鍚庢帹涓�澶�
+ //鎺掍骇鏃ユ湡寰�鍚庢帹涓�澶�
var dateTime = new Date(HPCDate);
- HPCDate = Format(new Date(dateTime.setDate(dateTime.getDate() + 1)), 'yyyy/MM/dd');
+ HPCDate = Format(new Date(dateTime.setDate(dateTime.getDate() + 1)), 'yyyy/MM/dd');
for (var j = 0; j < HArrIndex.length; j++) {
//鍖归厤鍒版弧瓒虫渶鏃╁紑宸ユ棩鏈熺殑璁㈠崟锛屾妸杩欎釜璁㈠崟浼樺厛鎷垮幓鎺掍骇锛屽苟缁堟寰幆鍖归厤
if (Format(option.data[HArrIndex[j]].鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd') <= HPCDate) {
@@ -2516,7 +2566,7 @@
HArrIndex.splice(index, 1)
}
- //濡傛灉褰撳墠璁㈠崟鐨勬渶鏃╁紑宸ユ棩鏈熶笉婊¤冻褰撳墠鎺掍骇鏃ユ湡锛堟渶鏃╁紑宸ユ棩鏈� > 褰撳墠鎺掍骇鏃ユ湡锛夛紝鍒欒烦鍑哄綋鍓嶈鍗曠殑鎺掍骇锛屽厛鎺掍笅涓�涓鍗�
+ //濡傛灉褰撳墠璁㈠崟鐨勬渶鏃╁紑宸ユ棩鏈熶笉婊¤冻褰撳墠鎺掍骇鏃ユ湡锛堟渶鏃╁紑宸ユ棩鏈� > 褰撳墠鎺掍骇鏃ユ湡锛夛紝鍒欒烦鍑哄綋鍓嶈鍗曠殑鎺掍骇锛屽厛鎺掍笅涓�涓鍗�
if (Format(option.data[i].鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd') > HPCDate) {
if (HArrIndex.indexOf(i) == -1) {
@@ -2527,7 +2577,6 @@
if (HArrIndex.length > 0 && i == HDataLen - 1) {
HDataLen = HDataLen + 1;
}
-
continue;
}
//濡傛灉褰撳墠琛岃鍗曞凡缁忔帓浜ц繃锛屽垯璺冲嚭褰撳墠璁㈠崟鎺掍骇锛屾帴鐫�涓嬩竴琛岃鍗曠殑鎺掍骇
@@ -2536,6 +2585,7 @@
}
//璁板綍宸茬粡鎺掍骇鐨勮鍗曚笅鏍�
HArrIndex_PC.push(i);
+
//console.log("2.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
//濡傛灉鏈鏈�鍚庝竴绗旇鍗曟帓浜э紝浣嗚繕瀛樺湪鍥犳渶鏃╁紑宸ユ棩鏈熶笉婊¤冻鐨勮�屾帓浜т笉浜嗙殑璁㈠崟鍒欏姞闀垮惊鐜暱搴�
@@ -2577,7 +2627,7 @@
}
else {
sLeftProdTimes = iLeftQty / sWorkQty;
- }
+ }
//鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
//鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
@@ -2603,9 +2653,9 @@
});
}
else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
- {
+ {
//鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource_TK " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
+ var sql = "exec h_p_Sc_ICMOGetWorkSource_TK " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
type: "GET",
@@ -2613,7 +2663,7 @@
data: { "sWhere": sql },
success: function (data1) {
if (data1.count == 1) {
- ds = data1.data
+ ds = data1.data
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -2669,13 +2719,11 @@
});
if (dsSub == null || dsSub.length == 0) {
- console.log("i鍊�1锛氾細锛�" + (i + 1));
get_HFData(1, i);
continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
}
if (dsSub != null)//涓嶅姞鐝帓绋�
{
- console.log("i鍊�2锛氾細锛�" + (i + 1));
iRow = i + 1;
//灏嗘暟鎹帓鍒扮綉鏍间腑
SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
@@ -2689,8 +2737,16 @@
} else {
get_HFData(1, i);
}
- }
- }
+ }
+ }
+ var new_date = new Date();
+ var difftime = (new_date - old_date) / 1000; //璁＄畻鏃堕棿宸�,骞舵妸姣杞崲鎴愮
+
+ var days = parseInt(difftime / 86400); // 澶� 24*60*60*1000
+ var hours = parseInt(difftime / 3600) - 24 * days; // 灏忔椂 60*60 鎬诲皬鏃舵暟-杩囧幓鐨勫皬鏃舵暟=鐜板湪鐨勫皬鏃舵暟
+ var minutes = parseInt(difftime % 3600 / 60); // 鍒嗛挓 -(day*24) 浠�60绉掍负涓�鏁翠唤 鍙栦綑 鍓╀笅绉掓暟 绉掓暟/60 灏辨槸鍒嗛挓鏁�
+ var seconds = parseInt(difftime % 60); // 浠�60绉掍负涓�鏁翠唤 鍙栦綑 鍓╀笅绉掓暟
+ console.log("鏃堕棿宸槸: " + days + "澶�, " + hours + "灏忔椂, " + minutes + "鍒嗛挓, " + seconds + "绉�");
}
table.render(option);
get_FastQuery(2);
@@ -2713,19 +2769,25 @@
//鍒ゆ柇褰撳墠鐢熶骇璧勬簮宸茬粡鎺掍骇鍒板摢涓棩鏈熶簡锛屽綋鍓嶇敓浜ц祫婧愯繕鏈変骇鑳界殑鏈�杩戞棩鏈熶笌褰撳墠璁㈠崟鐨勬帓浜ф棩鏈熶笉绗︼紝鍒欓噸缃綋鍓嶆帓浜ф棩鏈�
if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') != Format(HPCDate, 'yyyy/MM/dd')) {
//褰撳墠鐢熶骇璧勬簮鍓╀綑浜ц兘鏈�杩戠殑鏃ユ湡婊¤冻鏈�鏃╁紑宸ユ棩鏈燂紝鍒欓噸缃帓浜ф棩鏈熶负褰撳墠鐢熶骇璧勬簮鍓╀綑浜ц兘鏈�杩戠殑鏃ユ湡
- if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length) {
- HPCDate = Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd');
+ if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
+
+ if (HArrIndex.length + HArrIndex_PC.length == option.data.length) {
+ HPCDate = Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd');
+ } else {
+ HPCDate = Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd');
+ }
+
//濡傛灉鏄渶鍚庝竴绗旇鍗曞湪鎺掍骇锛屽垯閲嶇疆鎺掍骇鏃ユ湡涓烘渶鏃╁紑宸ユ棩鏈燂紙涓嬫柟浼氬垽鏂紝涓嶄細瓒呬骇鑳芥帓浜э級
if (HArrIndex_PC.length == option.data.length) {
HPCDate = Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd');
}
} else { //褰撳墠鏃ユ湡涓嶇鍚堣鍗曠殑鏈�鏃╁紑宸ユ棩鏈燂紝鍒欐妸璁㈠崟閲嶆柊鍔犲叆寰呮帓浜у垪琛�
-
+
//灏嗕笅鏍囧姞鍏ユ湭鎺掍骇璁㈠崟鏁扮粍
if (HArrIndex.indexOf(iRow) == -1) {
HArrIndex.push(iRow);
}
-
+
//浠庡凡鎺掍骇璁㈠崟鏁扮粍涓Щ闄ゆ湰娆¤鍗曚笅鏍�
var index = HArrIndex_PC.indexOf(iRow);
if (index !== -1) {
@@ -2846,12 +2908,12 @@
else {
for (var i = 0; i < ds.length; i++) {
//鎵惧埌瀵瑰簲鐨勫垪
- for (var j = 22; j < 53; j++) {
+ for (var j = 22; j < 201; j++) {
//濡傛灉璁㈠崟鐨勫墿浣欐帓浜ф暟閲忓ぇ浜�0锛屽垯鎺ョ潃杩涜鎺掍骇
if (sLeftQty > 0) {
//鎺掍骇鏃ユ湡婊¤冻鏈�鏃╁紑宸ユ棩鏈熸墠鑳借繘琛屾帓浜�
if (ds[i]["鏃ユ湡"] == grd.cols[0][j].field && Format(grd.cols[0][j].field, 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd')) {
-
+
//濡傛灉鏃堕棿琚� 涓婇亾浣欓噺鍗犵敤 鍒� 璺宠繃
b = false;
//if (dsPre != null && dsPre.Tables[0].Rows.Count > 0) {
@@ -2915,7 +2977,7 @@
dayWorkQty = parseInt(Numzu[0]);
}
//璁㈠崟鍓╀綑鏈帓浜ф暟閲� > 褰撴棩鍓╀綑浜ц兘
- if (sLeftQty > dayWorkQty) {
+ if (sLeftQty > dayWorkQty) {
grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
sLeftQty = sLeftQty - dayWorkQty;
//oSub = new ClsGridValues();
@@ -2955,7 +3017,6 @@
}
}
- console.log("i鍊�3锛氾細锛�" + (iRow + 1));
}
//鏌ヨ鐢熶骇璁㈠崟
@@ -3163,8 +3224,29 @@
function set_Priority() {
var data = table.cache["mainTable"];
- //鏍规嵁璁″垝寮�宸ユ棩鏈熸帓搴忔暟缁�
- data.sort(function (a, b) { return Format(a.璁″垝寮�濮嬫棩鏈�, 'yyyy/MM/dd') - Format(b.璁″垝寮�濮嬫棩鏈�, 'yyyy/MM/dd') });
+
+ if ($("#HWorkShopIDName").val().indexOf("缁勮") !== -1) {
+ //鏍规嵁璁″垝寮�宸ユ棩鏈熸帓搴忔暟缁�
+ data.sort(function (a, b) {
+ // 榛樿鏍规嵁鏈�鏃╁紑宸ユ棩鏈熸帓搴忥紝鏈�鏃╁紑宸ユ棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
+ if (Format(a.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd') == Format(b.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd')) {
+ return Format(a.閿�鍞鍗曞鏍告棩鏈�, 'yyyy/MM/dd') - Format(b.閿�鍞鍗曞鏍告棩鏈�, 'yyyy/MM/dd')
+ }
+ return Format(a.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd') - Format(b.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd')
+ });
+ } else {
+ //鏍规嵁璁″垝缁撴潫鏃ユ湡鎺掑簭鏁扮粍
+ data.sort(function (a, b) {
+ // 榛樿鏍规嵁璁″垝缁撴潫鏃ユ湡鎺掑簭锛岃鍒掔粨鏉熸棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
+ if (Format(a.璁″垝缁撴潫鏃ユ湡, 'yyyy/MM/dd') == Format(b.璁″垝缁撴潫鏃ユ湡, 'yyyy/MM/dd')) {
+ return Format(a.閿�鍞鍗曞鏍告棩鏈�, 'yyyy/MM/dd') - Format(b.閿�鍞鍗曞鏍告棩鏈�, 'yyyy/MM/dd')
+ }
+ return Format(a.璁″垝缁撴潫鏃ユ湡, 'yyyy/MM/dd') - Format(b.璁″垝缁撴潫鏃ユ湡, 'yyyy/MM/dd')
+ });
+ }
+
+
+
for (var i = 0; i < data.length; i++) {
data[i]["浼樺厛绾�"] = ((i + 1) * 5);
@@ -3266,7 +3348,7 @@
return layer.msg("璇烽�夋嫨鏁版嵁!")
}
}
-
+
//閫夋搷浣滃伐
function set_Emp(data) {
if (data != 0) {
@@ -3372,7 +3454,7 @@
var sSubStr = "["+JSON.stringify(num)+"]";
var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
- var index = layer.load();
+ //var index = layer.load();
$.ajax({
type: "POST",
url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
@@ -3381,20 +3463,19 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
- layer.msg("淇濆瓨鎴愬姛");
- layer.close(index);
+ //layer.msg("淇濆瓨鎴愬姛");
+ //layer.close(index);
}
else {
- layer.close(index);
+ //layer.close(index);
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
error: function (err) {
- layer.close(index);
+ //layer.close(index);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- console.log("i鍊�4锛氾細锛�");
}
//琛屽唴蹇嵎閿�
@@ -3584,7 +3665,7 @@
});
}
}
-
+
//閿佸畾宸ュ崟
function get_btnLockOrder() {
var checkStatus = table.checkStatus('mainTable')
@@ -3621,7 +3702,7 @@
layer.msg('璇烽�夋嫨浣犺閿佸畾鐨勫伐鍗曪紒');
}
}
-
+
//瑙ｉ攣宸ュ崟
function get_btnUnlockOrder() {
var checkStatus = table.checkStatus('mainTable')
@@ -3659,6 +3740,48 @@
}
}
+ //鑾峰彇瀹屽伐鏃ユ湡
+ function get_btnGetCompletionDate() {
+ var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetICMOCompletionDate',
+ type: "GET",
+ data: { "HDeptID": HDeptID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ get_Display();
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇鏈�鏃╁紑宸ユ棩鏈�
+ function get_btnGetEarlyDate() {
+ var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetICMOEarlyDate',
+ type: "GET",
+ data: { "HDeptID": HDeptID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ get_Display();
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//鏌ヨ鏈帓浜х殑鐢熶骇璁㈠崟
function get_Display2(sWhere_ICMO) {
var ajaxLoad = layer.load();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
index 0619d6f..2bbe018 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
@@ -356,7 +356,7 @@
// 鏍戠姸鍥炬煡璇�
function get_Display_Tree() {
- var sWhere = " and HUSEORGID=" + sessionStorage["OrganizationID"];
+ var sWhere = " and HWorkShopFlag =1 and HUSEORGID=" + sessionStorage["OrganizationID"];
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Gy_Department/Gy_DepartmentTreeList',
@@ -453,7 +453,7 @@
$('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
$("#bs" + i + "").addClass('check1'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
- if (workcode != "" && workcode != null) {
+ if (HEquipID != "" && HEquipID != null) {
wktag = 1;
}
sWhere = {
@@ -464,8 +464,7 @@
}
//鏌ヨ 閮ㄩ棬+浜х嚎 4涓浘琛� 璧嬪��
- function FourReport(sWhere) {
- wktag = 0;
+ function FourReport(sWhere) {
$.ajax({
url: GetWEBURL() + '/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport',
type: "GET",
@@ -499,7 +498,7 @@
// 榛樿鐨刼ption缁撴瀯
var option = {
title: {
- text: '浜ц兘', // 榛樿鏍囬涓虹┖
+ text: '杩戜竷澶╀骇鑳�', // 榛樿鏍囬涓虹┖
left: 'center',
top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
textStyle: {
@@ -530,7 +529,7 @@
// 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
if (chartData && chartData.length > 0) {
- option.title.text = '浜ц兘'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
+ option.title.text = '杩戜竷澶╀骇鑳�'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
option.xAxis.data = chartData.map(item => item.鏃ユ湡); // 璁剧疆x杞存暟鎹�
option.series[0].data = chartData.map(item => item['鐢熶骇鎬绘暟']); // 璁剧疆y杞存暟鎹�
@@ -561,12 +560,12 @@
mychart11.setOption(option);
}
- //鎶樼嚎鍥�
+ //鏌辩姸鍥�2
function get_LineChart(mychart22, chartData1) {
// 榛樿鐨刼ption缁撴瀯
var option = {
title: {
- text: '涓嶈壇鍘熷洜', // 榛樿鏍囬涓虹┖
+ text: '缁翠慨', // 榛樿鏍囬涓虹┖
left: 'center',
top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
textStyle: {
@@ -616,35 +615,46 @@
series: [
{
data: [], // 榛樿series鏁版嵁涓虹┖
- type: 'line', // 灏嗘煴鐘跺浘鏀逛负鎶樼嚎鍥�
- smooth: true, // 浣挎姌绾垮浘骞虫粦
- lineStyle: {
- color: '#15b1fa' // 璁剧疆绾挎潯棰滆壊
- },
- label: {
- show: true, // 鍦ㄦ姌绾垮浘涓婃樉绀烘暟鎹�
- position: 'top',
- formatter: function (params) {
- return echarts.format.addCommas(params.value);
- }
- }
+ type: 'bar'
}
]
};
+
+
// 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
if (chartData1 && chartData1.length > 0) {
option.title.text = '涓嶈壇鍘熷洜'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
option.xAxis.data = chartData1.map(item => item.涓嶈壇鍘熷洜); // 璁剧疆x杞存暟鎹�
option.series[0].data = chartData1.map(item => item['鏁伴噺']); // 璁剧疆y杞存暟鎹�
+
+ option.series[0].label = {
+ normal: {
+ show: true,
+ position: 'top',
+ formatter: function (params) {
+ return echarts.format.addCommas(params.value);
+ }
+ }
+ };
+
+ option.series[0].itemStyle = {
+ normal: {
+ color: '#15b1fa',
+ label: {
+ show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
+ }
+ }
+ };
} else {
// 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
option.title.text = '鏆傛棤鏁版嵁';
}
+ // 鏇存柊鍥捐〃
mychart22.setOption(option);
}
-
+
//楗煎浘
function get_Statistics(mychart3, chartData2) {
// 濡傛灉 chartData2 涓虹┖锛屾彁渚涗竴涓�滄棤鏁版嵁鈥濇彁绀�
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu_IconSet.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu_IconSet.html"
index 26ccca6..bcc22d3 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu_IconSet.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu_IconSet.html"
@@ -199,13 +199,16 @@
table.render(option);
//椤甸潰澶氶�夋 閲嶆柊娓叉煋
- for (var i = 0; i < IconList.length; i++) {
- if (IconList[i] == data1.data[0]["HPicNum"]) {
- $("#selected" + (i + 1)).attr("checked", true);
- table.cache["mainTable"][i].selected = true;
- break;
+ if (data1.data.length > 0) {
+ for (var i = 0; i < IconList.length; i++) {
+ if (IconList[i] == data1.data[0]["HPicNum"]) {
+ $("#selected" + (i + 1)).attr("checked", true);
+ table.cache["mainTable"][i].selected = true;
+ break;
+ }
}
}
+
form.render('checkbox');
layer.close(ajaxLoad);
}, error: function () {
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_MaterialTechParamBillMainList.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_MaterialTechParamBillMainList.html"
index d42c186..b37915f 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_MaterialTechParamBillMainList.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_MaterialTechParamBillMainList.html"
@@ -31,12 +31,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -55,18 +49,26 @@
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
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_RoutingBill.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_RoutingBill.html"
index 3f0cdc9..ab09f35 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_RoutingBill.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_RoutingBill.html"
@@ -555,7 +555,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element','tableSelect'], function () {
//#region 鍏叡鍙橀噺
@@ -564,7 +564,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , tableSelect = layui.tableSelect;
//瀹氫箟鍏ㄥ眬鍙橀噺
var HReasonName, ReasonID, EmpName, SQProcName,
@@ -2596,6 +2597,146 @@
}
})
+
+ //宸ュ簭琛ㄦ牸涓嬫媺鎼滅储妗�
+ tableSelect.render({
+ elem: 'td[data-field="宸ュ簭"] .layui-table-edit',
+ searchKey: '宸ュ簭浠ｇ爜,宸ュ簭鍚嶇О',
+ sWhere: " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 != 'Y'",//table鎼滅储sWhere鏉′欢
+ ajaxSelect: function (sWhere) {
+ var data = '';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Process/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": '缈佹稕娑�'},
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+ }
+ });
+ return data;
+ },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+ table: {
+ cols: [[
+ { type: 'radio', fixed: 'left' },
+ { field: 'HItemID', title: 'HItemID', hide: true },
+ { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' },
+ { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' },
+ { field: 'HProcMulID', title: 'HProcMulID', hide: true },
+ { field: '宸ユ鍚嶇О', title: '宸ユ鍚嶇О' }
+ ]],
+ page: true,
+ limit: 5,
+ //limits: [5]
+ },
+ done: function (elem, data) {
+ $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+ //鑾峰彇宸ュ簭浠ｇ爜
+ var ProcessNumber = [];
+ for (var i = 0; i < data.data.length; i++) {
+ ProcessNumber.push("'" + data.data[i]["宸ュ簭浠ｇ爜"] + "'");
+ }
+
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
+ NowNum = i + 1;
+ }
+ }
+
+ //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
+ var WorkCente = [];
+ var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ WorkCente = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ });
+
+ //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+ if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
+ //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+ var num = ProcessNumber.length - option.data.length + (NowNum - 1);
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < option.data.length; i++) {
+ option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["宸ュ簭浠ｇ爜"] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
+ option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
+ j++;
+ }
+
+ //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+ for (var i = 0; i < num; i++) {
+ option.data.push({
+ "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": "", "宸ュ簭浠ｇ爜": ProcessNumber[j].substring(1, ProcessNumber[j].length - 1)
+ , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
+ , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": WorkCente[j]["宸ュ簭鍚嶇О"]
+ , "HProcID": WorkCente[j]["HProcID"], "宸ヤ綔涓績浠ｇ爜": WorkCente[j]["宸ヤ綔涓績浠ｇ爜"], "HCenterID": WorkCente[j]["HCenterID"], "宸ヤ綔涓績": WorkCente[j]["宸ヤ綔涓績鍚嶇О"], "HSupID": 0
+ , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
+ , "HWorkQty": 1, "HSNCtrl": false, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
+ , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
+ , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
+ , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
+ , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
+ , "HWHID": 0, "HWHName": "", "HRemark": "", "HWorkTimes_S": 0
+ , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+ , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
+ , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
+ , "HSubStdEmpAvg_S": 0
+ })
+ j++;
+ }
+ } else {
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
+ option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["宸ュ簭浠ｇ爜"] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
+ option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
+ j++;
+ }
+ }
+ table.render(option);
+
+
+
+ //setTableByHMater(obj, data);
+ }
+ })
+
+
}
//缂栬緫 椤甸潰璧嬪��
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 6909d7e..0b0275e 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"
@@ -55,21 +55,17 @@
<input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <!--鏄剧ず褰撳墠杩囨护鏂规-->
- <div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
- </div>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
@@ -106,7 +102,10 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
</div>
-
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
@@ -219,16 +218,16 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></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-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></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-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>鎵规敼灏忔椂浜ц兘</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>浜х嚎浜ц兘</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>鎵规敼灏忔椂浜ц兘</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>浜х嚎浜ц兘</button>
</div>
</script>
</form>
@@ -493,7 +492,7 @@
set_InitGrid();
Organ();
//鏌ヨ
- get_FastQuery(1);
+ //get_FastQuery(1);
//鑾峰彇椤圭洰鍙�
Get_HProject();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -1396,7 +1395,7 @@
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-
+
}
});
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
@@ -1482,7 +1481,7 @@
layer.close(index);
}
//layer.closeAll('dialog');
-
+
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -1699,7 +1698,7 @@
if (HProject != '0') {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
}
-
+
sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType<>'SUB'"
//鏌ヨ璇彞
$.ajax({
@@ -1857,7 +1856,7 @@
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
$("#btnSearch").trigger('click');
-
+
});
} else {
@@ -2031,7 +2030,7 @@
// if (dataCol[i]) {
// var dataCols = dataCol[i].split('|');
// }
-
+
// //闅愯棌鍒�
// if (dataCols[1] == 1) {
// option.cols[0][i + 1]["hide"] = true;
@@ -2467,7 +2466,7 @@
//#endregion
//#region 浜х嚎浜ц兘
- function set_SourceWorkQty() {
+ function set_SourceWorkQty() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
@@ -2491,12 +2490,12 @@
})
} else {
layer.msg('鎵�閫夊伐搴忥細' + HProcName + '锛屼笉涓烘帓浜у伐搴忥紒');
- }
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ }
}
- //#endregion
+ //#endregion
//#endregion
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_RoutingBillListQuery.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_RoutingBillListQuery.html"
index 9dcd1dd..e05f664 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_RoutingBillListQuery.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_RoutingBillListQuery.html"
@@ -55,14 +55,28 @@
<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 107px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HModel" id="HModel">
+ </div>
</div>
</div>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
@@ -86,21 +100,6 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
- </div>
- <div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <!--鍏朵粬鏉′欢-->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 107px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
- </div>
- </div>
- <div class="layui-inline">
- <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="HModel" id="HModel">
- </div>
- </div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
@@ -281,7 +280,7 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
//鍒濆鍖栬〃鏍�
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
//#endregion
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_His.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_His.html"
index 70414aa..68e3dde 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_His.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_His.html"
@@ -53,30 +53,18 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ </div>
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;margin-bottom:20px">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:10px;margin-left:5%;">
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
@@ -90,6 +78,18 @@
<input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index 185225d..0217f83 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -51,7 +51,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" type="date">
</div>
</div>
<div class="layui-inline">
@@ -119,7 +119,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏁呴殰鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" type="date">
</div>
</div>
<div class="layui-inline">
@@ -184,7 +184,7 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
var OptionData = [];
//鑾峰彇鍙傛暟
@@ -229,15 +229,15 @@
, element = layui.element;
//甯歌鐢ㄦ硶
- laydate.render({
- elem: '#HDate',
- format: 'yyyy-MM-dd',
+ //laydate.render({
+ // elem: '#HDate',
+ // format: 'yyyy-MM-dd',
- });
- laydate.render({
- elem: '#HConkBeginDate',
- format: 'yyyy-MM-dd',
- });
+ //});
+ //laydate.render({
+ // elem: '#HConkBeginDate',
+ // format: 'yyyy-MM-dd',
+ //});
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index 54807c2..7575bd2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -456,6 +456,20 @@
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 2) { //缂栬緫
+
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(HInterID);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(HMaker);
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ OperationType = 1;
+ }
+ else if (OperationType == 3) { //缂栬緫
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
@@ -521,7 +535,7 @@
$('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
+ "HBillNo": OperationType== 2? '': data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HICMOInterID": data.HICMOInterID
, "HICMOEntryID": data.HICMOEntryID
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
index 739efa8..2443354 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
@@ -116,6 +116,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -417,6 +418,9 @@
//鏂板鎸夐挳
case 'btn_Add': btn_Add();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫鎸夐挳
case 'btn_Edit': btn_Edit();
break;
@@ -509,6 +513,28 @@
}
//#endregion
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璁惧鍚姩鐐规娓呭崟鍒楄〃-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//#region 缂栬緫
function btn_Edit() {
var checkStatus = table.checkStatus('mainTable')
@@ -520,7 +546,7 @@
, area: ['100%', '100%']
, title: HPageTitle + '- 缂栬緫'
, shift: 0 //寮瑰嚭鍔ㄧ敾
- , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + HInterID
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=3&linterid=' + HInterID
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
index 77458df..dfcf62c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
@@ -554,6 +554,7 @@
//蹇�熻繃婊�
function get_FastQuery(table, option,number) {
var HSourceCode = $("#HSourceCode").val();//璁惧缂栫爜
+ var HTechParamName = $("#HTechParamName").val();//璁惧缂栫爜
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
//浠绘剰瀛楁杩囨护
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index c126a74..01887d6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -292,6 +292,32 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鏁伴噰IP鍦板潃</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HIPAddress" id="HIPAddress">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱旂綉鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HLinkNETMode" id="HLinkNETMode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囬泦鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCollectMode" id="HCollectMode">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囬泦绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCollectClass" id="HCollectClass">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏄惁涓荤敓浜ц澶�</label>
<div class="layui-input-block" style="margin-left: 125px;width:55%;">
<select name="HMainSourceFlag" lay-filter="HMainSourceFlag" id="HMainSourceFlag">
@@ -1338,6 +1364,10 @@
$("#HSourceID").val(d.data[0].HSourceID);
$("#HSourceName").val(d.data[0].HSourceName);
$("#HMacAddress").val(d.data[0].鏁伴噰鐗╃悊鍦板潃);
+ $("#HIPAddress").val(d.data[0].鏁伴噰IP鍦板潃);
+ $("#HLinkNETMode").val(d.data[0].鑱旂綉鏂瑰紡);
+ $("#HCollectMode").val(d.data[0].閲囬泦鏂瑰紡);
+ $("#HCollectClass").val(d.data[0].閲囬泦绫诲瀷);
$("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
$("#HMainSourceID").val(d.data[0].HMainSourceID);
$("#HMainSourceName").val(d.data[0].鎵�灞炰富鐢熶骇璁惧);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
index 810f62c..fa52266 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
@@ -28,16 +28,16 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">寮傚父鍙嶉绫诲瀷浠ｇ爜</label>
+ <div class="layui-inline" style="width:400px">
+ <label class="layui-form-label" style="white-space: nowrap;width:100px">寮傚父鍙嶉绫诲瀷浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:200px">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">寮傚父鍙嶉绫诲瀷鍚嶇О</label>
+ <div class="layui-inline" style="width:400px">
+ <label class="layui-form-label" style="white-space: nowrap;width:100px">寮傚父鍙嶉绫诲瀷鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HName" id="HName">
+ <input type="text" class="layui-input" name="HName" id="HName" style="width:200px">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
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 66ac015..84706eb 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"
@@ -47,13 +47,18 @@
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
- <div style="padding: 10px;">
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
- </div>
+ <div style="position: relative; display: flex; align-items: center; padding: 10px;">
+ <!-- 鎸夐挳缁� -->
+ <div style="z-index: 1;">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-SIP" id="btn-SIP">SIP鏌ョ湅</button>
+ </div>
+ <!-- 鏍囬锛屼娇鐢ㄧ粷瀵瑰畾浣嶄娇鍏跺湪鐖跺鍣ㄥ唴灞呬腑 -->
+ <h1 style="position: absolute; left: 50%; transform: translateX(-50%); z-index: 0; text-align: center; width: fit-content; margin: 0; padding: 0 10px;"><b>宸℃鍗�</b></h1>
+ </div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
- <h1 style="text-align: center; padding: 10px 0;"><b>宸℃鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -80,34 +85,10 @@
<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="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" 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="HSourceID" id="HSourceID" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <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="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline" style="display: none">
- <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="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -122,22 +103,29 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗D</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <div class="layui-inline">
+ <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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″瓙ID</label>
+ <div class="layui-inline">
+ <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="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline" id="hidediv2">
<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="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -149,12 +137,6 @@
<input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="1">
</div>
</div>
- <div class="layui-inline">
- <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="HBatchNo" id="HBatchNo" style="">
- </div>
- </div>
</div>
<div class="layui-row">
@@ -162,7 +144,7 @@
<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="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -172,10 +154,10 @@
<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="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" 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="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
</div>
</div>
<div class="layui-inline">
@@ -188,22 +170,10 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
- </div>
- <div class="layui-row">
- <div class="layui-inline" style="width: 58%">
- <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-inline">
+ <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="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline" style="width: 58%;">
- <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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="">
</div>
</div>
</div>
@@ -211,7 +181,7 @@
<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="鍚堟牸" >
+ <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸">
<input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�" checked>
</div>
</div>
@@ -233,6 +203,21 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 45%;">
+ <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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%">
+ <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
+ </div>
+ </div>
+
+ </div>
</div>
</div>
<!--鍒跺崟淇℃伅-->
@@ -399,14 +384,14 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">妫�楠岀粨鏋�</label>
- <div class="layui-input-block">
- <select name="HResult" lay-filter="HResult" style="width:190px;">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block">
+ <select name="HResult" lay-filter="HResult" style="width:190px;">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -418,15 +403,15 @@
<div class="layui-inline">
<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="HRejectQty" id="HRejectQty" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -500,11 +485,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
@@ -515,14 +500,14 @@
</div>
<div class="layui-row" style="margin-top:5px;">
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
- <div class="layui-input-block" style="margin-left: 100px; width: 182px">
- <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
<div class="layui-input-block" style="margin-left: 100px; width: 182px">
@@ -1087,6 +1072,35 @@
});
//#endregion
+ //SIP鏌ョ湅鎸夐挳
+ form.on('submit(btn-SIP)', function () {
+ var HProcID = $("#HProcID").val();
+ var HMaterID = $("#HMaterID").val();
+ if (HProcID == 0 && HMaterID == 0) {
+ layer.alert("鐗╂枡鍚嶇О涓庡伐搴忎笉鑳戒负绌�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅浣滀笟鎸囧涔�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID + '&HType=SIP'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ });
+
+
+
//閫�鍑烘寜閽�
form.on('submit(btn-Exit)', function (data) {
get_Exit();
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 b9f975c..8b386f4 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"
@@ -42,19 +42,18 @@
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
- <div style="padding: 10px;">
- <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
- </button>-->
- <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
- </button>-->
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <div style="position: relative; display: flex; align-items: center; padding: 10px;">
+ <!-- 鎸夐挳缁� -->
+ <div style="z-index: 1;">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-SIP" id="btn-SIP">SIP鏌ョ湅</button>
+ </div>
+ <!-- 鏍囬锛屼娇鐢ㄧ粷瀵瑰畾浣嶄娇鍏跺湪鐖跺鍣ㄥ唴灞呬腑 -->
+ <h1 style="position: absolute; left: 50%; transform: translateX(-50%); z-index: 0; text-align: center; width: fit-content; margin: 0; padding: 0 10px;"><b>宸ュ簭妫�楠屽崟</b></h1>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
- <h1 style="text-align: center; padding: 10px 0;"><b>宸ュ簭妫�楠屽崟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -80,98 +79,11 @@
<div class="layui-inline">
<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="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" 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="HSourceID" id="HSourceID" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <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="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <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="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <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="HMaterName" id="HMaterName" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <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="HProcExchQty" id="HProcExchQty" value="1" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <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="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗D</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″瓙ID</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <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="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" 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="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <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="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" 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="HQCSchemeID" id="HQCSchemeID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -184,10 +96,105 @@
<input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
</div>
</div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HProcExchQty" id="HProcExchQty" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" 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="HQCSchemeID" id="HQCSchemeID" value="0">
+ </div>
+ </div>
<div class="layui-inline">
<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="HBatchNo" id="HBatchNo" style="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="鍚堟牸">
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�" checked>
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1">
+ <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>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
</div>
</div>
</div>
@@ -205,32 +212,7 @@
</div>
</div>
</div>
- <div class="layui-row">
- <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="鍚堟牸">
- <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�" checked>
- </div>
- </div>
- <div class="layui-inline" id="hidediv1">
- <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 class="layui-inline">
- <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="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
- </div>
- </div>
- </div>
+
</div>
</div>
<!--鍒跺崟淇℃伅-->
@@ -323,11 +305,11 @@
<div class="layui-tab-item">
<!--鎶芥牱妫�楠�-->
<!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
- </div>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+ </div>-->
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">椤圭洰搴忓彿</label>
@@ -402,14 +384,14 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">妫�楠岀粨鏋�</label>
- <div class="layui-input-block">
- <select name="HResult" lay-filter="HResult" style="width:190px;">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block">
+ <select name="HResult" lay-filter="HResult" style="width:190px;">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -425,11 +407,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -458,11 +440,11 @@
<div class="layui-tab-item" style="height:590px">
<!--妫�娴嬪��-->
<!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
- </div>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+ </div>-->
<div class="left" style="width:50%;height:450px;float:left;">
<div class="layui-row">
<div class="layui-inline">
@@ -496,14 +478,14 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
- <div class="layui-input-block" style="margin-left: 100px; width: 182px">
- <select name="HInspectResult" lay-filter="HInspectResult">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HInspectResult" lay-filter="HInspectResult">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -519,11 +501,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
@@ -534,14 +516,14 @@
</div>
<div class="layui-row" style="margin-top:5px;">
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
- <div class="layui-input-block" style="margin-left: 100px; width: 182px">
- <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
<div class="layui-input-block" style="margin-left: 100px; width: 182px">
@@ -1051,6 +1033,35 @@
}
});
+ //SIP鏌ョ湅鎸夐挳
+ form.on('submit(btn-SIP)', function () {
+ var HProcID = $("#HProcID").val();
+ var HMaterID = $("#HMaterID").val();
+ if (HProcID == 0 && HMaterID == 0) {
+ layer.alert("鐗╂枡鍚嶇О涓庡伐搴忎笉鑳戒负绌�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅浣滀笟鎸囧涔�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID + '&HType=SIP'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ });
+
+
+
//閫�鍑烘寜閽�
form.on('submit(btn-Exit)', function (data) {
get_Exit();
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_TakeSampleCheckBillMainList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_TakeSampleCheckBillMainList.html"
index ad50612..eee9f4b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_TakeSampleCheckBillMainList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_TakeSampleCheckBillMainList.html"
@@ -152,6 +152,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -193,6 +194,7 @@
, soulTable = layui.soulTable
var option = [];
var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "OA_ErrMsgBackReceiveBillMainList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -232,6 +234,9 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
//鏂板
case 'set_AddNew': set_AddNew();
break;
@@ -485,7 +490,7 @@
option.cols = [col];
option.data = data1.data;
table.render(option);
-
+ ins=table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -645,6 +650,14 @@
$("#HInitTimeCycle").val("29");
}
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+
//#region 鏂板
function set_AddNew() {
layer.open({
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 bdb6793..fb57f64 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"
@@ -25,35 +25,42 @@
<div class="layui-card-body">
<!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
<form class="layui-form" action="">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
</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 class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="HDate1" id="HDate1">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="white-space: nowrap">妫�楠屾柟妗堝悕绉�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="HDate2" id="HDate2">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HDate1" id="HDate1">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HDate2" id="HDate2">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
</div>
</div>
@@ -87,14 +94,7 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script>
- //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
- var params = get_UrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- } else {
- var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var HName = decodeURI(params[params[1]]);//鐗╂枡鍚嶇О
- }
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -110,11 +110,19 @@
, soulTable = layui.soulTable
, element = layui.element;
-
-
var sWhere = "";
+ var HName = "";
var option = [];
var HModName = "QC_CheckProjectList";
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ HName = decodeURI(params[params[1]]) == "undefined" ? "" : decodeURI(params[params[1]]);//鐗╂枡鍚嶇О
+ }
//#endregion
//鍒濆鍖栬〃鏍�
@@ -223,7 +231,7 @@
sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
get_Display(sWhere);
}
-
+
}
//鍒濆鍖栫綉鏍�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index 5ef5902..12f1d3f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -819,7 +819,7 @@
//#region 瀵煎嚭Execel
function btn_Export() {
- table.exportFile(ins.config.id, option.data, "xls");
+ table.exportFile(ins.config.id, option_HB_SN.data, "xls");
}
//#endregion
@@ -1221,7 +1221,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
, resize: false,
end: function () {
}
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 fcd23a4..969f015 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"
@@ -47,13 +47,18 @@
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
- <div style="padding: 10px;">
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <div style="position: relative; display: flex; align-items: center; padding: 10px;">
+ <!-- 鎸夐挳缁� -->
+ <div style="z-index: 1;">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-SIP" id="btn-SIP">SIP鏌ョ湅</button>
+ </div>
+ <!-- 鏍囬锛屼娇鐢ㄧ粷瀵瑰畾浣嶄娇鍏跺湪鐖跺鍣ㄥ唴灞呬腑 -->
+ <h1 style="position: absolute; left: 50%; transform: translateX(-50%); z-index: 0; text-align: center; width: fit-content; margin: 0; padding: 0 10px;"><b>杞﹂棿鑷鍗�</b></h1>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
- <h1 style="text-align: center; padding: 10px 0;"><b>杞﹂棿鑷鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -80,10 +85,20 @@
<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="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" 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="HSourceID" id="HSourceID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -92,6 +107,8 @@
<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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -100,44 +117,15 @@
<div class="layui-inline">
<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="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline" style="display: none">
- <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="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <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="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" 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="HShiftsID" id="HShiftsID" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗D</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″瓙ID</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly value="0">
</div>
</div>
<div class="layui-inline" id="hidediv2">
<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="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -146,22 +134,15 @@
<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="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="1">
- </div>
- </div>
- <div class="layui-inline" id="hidediv1">
- <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">
+ <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="0">
</div>
</div>
</div>
<div class="layui-row">
+
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -194,29 +175,35 @@
</div>
</div>
<div class="layui-row">
- </div>
- <div class="layui-row">
- <div class="layui-inline" style="width: 58%">
- <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline" style="width: 58%;">
- <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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
- </div>
- </div>
- </div>
- <div class="layui-row">
<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="涓嶅悎鏍�">
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1">
+ <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>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <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>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 45%;">
+ <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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%">
+ <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
</div>
</div>
</div>
@@ -386,14 +373,14 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">妫�楠岀粨鏋�</label>
- <div class="layui-input-block">
- <select name="HResult" lay-filter="HResult" style="width:190px;">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block">
+ <select name="HResult" lay-filter="HResult" style="width:190px;">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -409,11 +396,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -487,11 +474,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
@@ -502,14 +489,14 @@
</div>
<div class="layui-row" style="margin-top:5px;">
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
- <div class="layui-input-block" style="margin-left: 100px; width: 182px">
- <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
<div class="layui-input-block" style="margin-left: 100px; width: 182px">
@@ -1114,6 +1101,35 @@
});
});
+ //SIP鏌ョ湅鎸夐挳
+ form.on('submit(btn-SIP)', function () {
+ var HProcID = $("#HProcID").val();
+ var HMaterID = $("#HMaterID").val();
+ if (HProcID == 0 && HMaterID == 0) {
+ layer.alert("鐗╂枡鍚嶇О涓庡伐搴忎笉鑳戒负绌�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅浣滀笟鎸囧涔�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID + '&HType=SIP'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ });
+
+
+
//閫�鍑烘寜閽�
form.on('submit(btn-Exit)', function (data) {
get_Exit();
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 efe4f76..c7ad0bf 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"
@@ -47,19 +47,18 @@
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
- <div style="padding: 10px;">
- <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
- </button>-->
- <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
- </button>-->
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <div style="position: relative; display: flex; align-items: center; padding: 10px;">
+ <!-- 鎸夐挳缁� -->
+ <div style="z-index: 1;">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-SIP" id="btn-SIP">SIP鏌ョ湅</button>
+ </div>
+ <!-- 鏍囬锛屼娇鐢ㄧ粷瀵瑰畾浣嶄娇鍏跺湪鐖跺鍣ㄥ唴灞呬腑 -->
+ <h1 style="position: absolute; left: 50%; transform: translateX(-50%); z-index: 0; text-align: center; width: fit-content; margin: 0; padding: 0 10px;"><b>棣栦欢妫�楠屽崟</b></h1>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill">
- <h1 style="text-align: center; padding: 10px 0;"><b>棣栦欢妫�楠屽崟</b></h1>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -92,30 +91,6 @@
<input type="hidden" name="HSourceID" id="HSourceID" value="0">
</div>
</div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <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="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline" style="display: none">
- <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="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -128,46 +103,47 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" id="hidediv1">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
+ <div class="layui-inline">
+ <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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="1">
+ <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly value="0">
</div>
</div>
<div class="layui-inline" id="hidediv2">
<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="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鎵瑰彿</label>
+ </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="HBatchNo" id="HBatchNo" style="">
+ <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="0">
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗D</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″瓙ID</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
<div class="layui-inline">
<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="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -177,24 +153,55 @@
<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="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" 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="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
</div>
</div>
<div class="layui-inline">
<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="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" 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="HQCSchemeID" id="HQCSchemeID" value="0">
+
</div>
</div>
- </div>
+ <div class="layui-inline">
+ <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="HBatchNo" id="HBatchNo" style="">
+ </div>
+ </div>
+ </div>
<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒ゆ柇缁撹</label>
+ <div class="layui-input-block">
+ <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;">
+ <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>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 45%;">
@@ -209,33 +216,7 @@
<input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
</div>
</div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">鍒ゆ柇缁撹</label>
- <div class="layui-input-block">
- <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;">
- <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 class="layui-inline">
- <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="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
- </div>
- </div>
- </div>
+ </div>
</div>
</div>
<!--鍒跺崟淇℃伅-->
@@ -377,13 +358,13 @@
<div class="layui-inline">
<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="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<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="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
+ <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
</div>
</div>
</div>
@@ -485,7 +466,7 @@
</button>
<input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
</div>
- </div>
+ </div>
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -708,7 +689,7 @@
, laydate = layui.laydate
, element = layui.element;
//鍏敤鍙橀噺
- debugger;
+ //debugger;
var rowdata = [];
var option = [];
var HDeptID = "";//閮ㄩ棬id 鑾峰彇鐝
@@ -857,7 +838,7 @@
$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
-
+
//#region 鏍规嵁婧愬崟鑾峰彇淇℃伅
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅(杩涚珯鎺ユ敹鍗�)
function LoadingInformation_StationInBill() {
@@ -995,7 +976,7 @@
$.ajax({
url: GetWEBURL() + "/QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp",
type: "GET",
- async:false,
+ async: false,
data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
var data = result.data[0];
@@ -1074,7 +1055,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0","妫�楠屼华鍣ㄤ唬鐮�":"", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -1256,7 +1237,7 @@
var data = obj.data;
if (obj.event == '妫�楠屼华鍣ㄤ唬鐮�') {
var HNumber = data.妫�楠屼华鍣ㄤ唬鐮�;
- var linterid= data.HInspectInstruMentID;
+ var linterid = data.HInspectInstruMentID;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1341,7 +1322,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�
- ,妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+ , 妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1645,7 +1626,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].妫�楠屼华鍣ㄤ唬鐮�,"妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣ㄤ唬鐮�": data[i].妫�楠屼华鍣ㄤ唬鐮�, "妫�楠屼华鍣�": 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,
@@ -1715,7 +1696,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName+'', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1741,6 +1722,33 @@
}
});
+ });
+
+ //SIP鏌ョ湅鎸夐挳
+ form.on('submit(btn-SIP)', function () {
+ var HProcID = $("#HProcID").val();
+ var HMaterID = $("#HMaterID").val();
+ if (HProcID == 0 && HMaterID == 0) {
+ layer.alert("鐗╂枡鍚嶇О涓庡伐搴忎笉鑳戒负绌�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅浣滀笟鎸囧涔�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID +'&HType=SIP'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
});
//#region銆愯〃浣撴斁澶ч暅銆�
@@ -2010,7 +2018,7 @@
{
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": 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": + data[i].涓婇檺鍊� , "HDownLimit": + data[i].涓嬮檺鍊�, "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].鎶芥牱绫诲瀷
}
@@ -2321,7 +2329,7 @@
});
});
-
+
//琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
form.on('submit(btnHShifts)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -2415,7 +2423,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0","妫�楠屼华鍣ㄤ唬鐮�":"", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -2432,18 +2440,21 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
- , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�'}
+ , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�' }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
- , { field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true ,templet: function (d) {
- return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';}, style: 'cursor: pointer;'}
+ , {
+ field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true, templet: function (d) {
+ return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';
+ }, style: 'cursor: pointer;'
+ }
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
, { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
- , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text'}
+ , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
@@ -3866,7 +3877,7 @@
url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
type: "GET",
async: false,
- data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$("#HProcID").val(result.data[0]["HProcID"]);
@@ -3905,7 +3916,7 @@
$("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
$("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
}
- }
+ }
},
error: function (err) {
layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -4031,7 +4042,7 @@
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
+ , field = obj.field; //寰楀埌瀛楁
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
var HComparator = $("#HComparator").val(); //姣旇緝绗�
@@ -4123,7 +4134,7 @@
}
//鑾峰彇鐝
- function get_HWorkShift() {
+ function get_HWorkShift() {
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
index c44b355..f371509 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
@@ -93,7 +93,7 @@
sWhere += " and 鏉＄爜 like'%" + HBarcode+"%'";
}
if (HWhiteBardcode != "") {
- sWhere += " and 鐧芥爣 like'%" + HWhiteBardcode+"%'";
+ sWhere += " and 鐧芥爣 ='" + HWhiteBardcode+"'";
}
get_Display(sWhere);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
index fc98867..ca9ab09 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
@@ -865,6 +865,7 @@
}
});
}
+ $("#Print2").click();
$("#HBarCode_White").val("");
//瀛愪欢鏉＄爜鏁伴噺宸叉壂瀹� 鏉＄爜鎵畬鍚�
if (pcmQty == pcmQtyFlag) {
@@ -955,7 +956,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: { "sWhere": sWhere },
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBill.html"
index 64e0f0a..ba6b2ce 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBill.html"
@@ -454,7 +454,7 @@
if (data.count == 1) {
layer.close(index);
$('#Saver-btn').addClass("layui-btn-disabled").attr("disabled", true);
- $("#Print").click();
+ //$("#Print").click();
layer.confirm(
'淇濆瓨鎴愬姛锛佽缁х画閫夋嫨鎿嶄綔锛�',
{
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 f16eafb..728400b 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"
@@ -1232,6 +1232,11 @@
function set_AddAssemblyBill() {
var data = { "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HProcID": $("#HProcID").val(), "HMaterID": $("#HMaterID").val(), "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(), "HICMOInterID": $("#HICMOInterID").val(), "HICMOEntryID": $("#HICMOEntryID").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "HBarCode_P": $("#HBarCode_P").val(), "HProdOrgID": sessionStorage["OrganizationID"], "HEmpID2": $("#HEmpID2").val(), "HEmpID": $("#HEmpID").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HPieceQty": $("#HPieceQty").val(), "HICMOQty": $("#HICMOQty").val(), "HDeptID": $("#HDeptID").val(), "HProcNo": $("#HProcNo").val()} };
+ if ($("#HSourceID").val() == "0") {
+ layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖!");
+ return false;
+ }
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache["mainTable2"]);
var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] ;
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 379ba96..045b417 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"
@@ -56,7 +56,7 @@
</select>
</div>
</div>
- <div class="layui-row" style="margin-top:5px">
+ <div class="layui-row" style="margin-top:5px;margin-bottom:20px;margin-left:80px">
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -313,7 +313,7 @@
var HModName2 = "Sc_StationOutBillSub_Note";
var HModName3 = "Sc_StationOutBillSub_SN";
var HModName4 = "Sc_StationOutBillSub_Emp";
- var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID", "HCenterID", "HbillSubType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
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_StationInBillList.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_StationInBillList.html"
index 8e957cd..b21e448 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_StationInBillList.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_StationInBillList.html"
@@ -223,7 +223,7 @@
var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "Cj_StationInBillList";
- var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID", "HInterID", "HProcExchInterID", "HProcExchEntryID", "HICMOInterID", "HICMOEntryID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID", "HInterID", "HDeptID", "HProcExchInterID", "HProcExchEntryID", "HICMOInterID", "HICMOEntryID", "HICMOQty", "HRemark", "HBillType", "hsubid", "HBillStatus", "HBillSubType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//宸ュ簭娴佽浆鍗′笅鏌ユ爣璁�
var lookDownBar = 0; //(0:涓嬫煡鎿嶄綔锛�1锛氱洿鎺ユ煡鐪�)
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/Sc_OEEReport.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/Sc_OEEReport.html"
index 2073da7..0629d82 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/Sc_OEEReport.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/Sc_OEEReport.html"
@@ -115,6 +115,17 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" style="margin-top:40px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">OEE鏄庣粏</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--OEE鏄庣粏-->
+ <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
@@ -149,6 +160,7 @@
var HModName = "Sc_OEEReport";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = [];
+ var titleData2 = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
@@ -187,25 +199,15 @@
});
//#endregion
- //#region 鐐瑰嚮琛岄�変腑楂樹寒
- table.on('row(mainTable)', function (obj) {
+ //#region 鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+
//閫変腑琛屾敼鍙橀鑹�
- var flag = !obj.tr.find(':checkbox:first').prop('checked');
- obj.tr.find(':checkbox').prop('checked', flag);
- if (flag) {
- obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
- } else {
- obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
- }
- //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
- layui.each(table.cache.mainTable, function (i, l) {
- if (obj.tr.index() == l.LAY_TABLE_INDEX) {
- l.LAY_CHECKED = flag;
- }
- });
- })
+ check_row(obj);
+
+ get_DisplaySub(obj.data);
+
+ });
//#endregion
//#region 閲嶇疆鎸夐挳
@@ -225,6 +227,7 @@
changeInput_BySearchModel();
});
//#endregion
+
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -423,6 +426,94 @@
}
//#endregion
+ function check_row(obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ }
+
+
+ //鏌ヨ瀛愯〃鏁版嵁
+ function get_DisplaySub(obj) {
+ var datas = obj; //鑾峰緱褰撳墠琛屾暟鎹�
+ //HBillNo = datas["鍗曟嵁鍙�"].toString();
+ //var HMainID = datas.hmainid;
+ //var HMainID = 3382;
+ var HSourceCode = obj.璁惧缂栫爜;
+ var HDate = obj.鏃ユ湡;
+ var HType = $("#HSearchModel").val();
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_OEEReport/getSc_OEEReportDetailist',
+ type: "GET",
+ data: { "HSourceCode": HSourceCode, "HDate": HDate, "HType": HType, "user": sessionStorage["HUserName"]},
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ 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, titleData2) > -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 HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option2 = {
+ elem: '#mainTable2'
+ , toolbar: '#toolbarDemo2'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option2);
+
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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/Sc_OEEReport_WorkShift.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/Sc_OEEReport_WorkShift.html"
new file mode 100644
index 0000000..e29b4f5
--- /dev/null
+++ "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/Sc_OEEReport_WorkShift.html"
@@ -0,0 +1,869 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>OEE鎶ヨ〃</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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+</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">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HDeptName" id="HDeptName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HEquipFileNumber" id="HEquipFileNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HEquipFileType" id="HEquipFileType">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">妫�绱㈡ā寮�</label>
+ <div class="layui-input-block">
+ <select name="HSearchModel" id="HSearchModel" class="ForFilteringSchemes" lay-filter="HSearchModel" style="width:190px;">
+ </select>
+ </div>
+ </div>-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">骞�</label>
+ <div class="layui-input-block">
+ <select name="HYear" id="HYear" class="ForFilteringSchemes" lay-filter="HYear" style="width:80px;">
+ </select>
+ </div>
+ </div>-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <select name="HBeginMonth" id="HBeginMonth" class="ForFilteringSchemes" lay-filter="HBeginMonth" style="width:80px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <select name="HEndMonth" id="HEndMonth" class="ForFilteringSchemes" lay-filter="HEndMonth" style="width:80px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <select name="HBeginWeek" id="HBeginWeek" class="ForFilteringSchemes" lay-filter="HBeginWeek" style="width:80px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <select name="HEndWeek" id="HEndWeek" class="ForFilteringSchemes" lay-filter="HEndWeek" style="width:80px;">
+ </select>
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁煎悎OEE</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="OEE" id="OEE" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" style="margin-top:40px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">OEE鏄庣粏</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--OEE鏄庣粏-->
+ <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ var option = [];
+ var sWhere = "";
+ var HModName = "Sc_OEEReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+ var titleData2 = [];
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_OEEReport";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+
+ //閫変腑琛屾敼鍙橀鑹�
+ check_row(obj);
+
+ get_DisplaySub(obj.data);
+
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(2);
+ });
+ //#endregion
+
+ //#region 妫�绱㈡ā寮忎笅鎷夊垪琛ㄧ洃鍚�
+ //form.on('select(HSearchModel)', function (data) {
+ // changeInput_BySearchModel();
+ //});
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栦笅鎷夊垪琛�
+ //setInit_SelectElement();
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鏌ヨ
+ get_FastQuery(1);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ //, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ };
+ }
+ //#endregion
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_OEEReport/getSc_OEEReport_WorkShift',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray = [""];
+ 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', 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) {
+ 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 });
+ }
+ 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);
+
+
+ //璁＄畻缁煎悎OEE
+ var OEE = 0;
+ var num = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ if (data1.data[i].OEE.replace("%", "") * 1 != 0) {
+ OEE += data1.data[i].OEE.replace("%", "") * 1;
+ num += 1;
+ }
+
+ }
+ if (data1.data.length > 0) {
+ OEE = OEE / num + "%"
+ } else {
+ OEE += "%";
+ }
+ $("#OEE").val(OEE);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_OEEReport";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(number) {
+ var HDeptName = $("#HDeptName").val(); //杞﹂棿
+ var HEqiupFileNumber = $("#HEquipFileNumber").val();//璁惧缂栫爜
+ var HEquipFileType = $("#HEquipFileType").val();//璁惧绫诲瀷
+ //var HSearchModel = $("#HSearchModel").val();
+ //var HYear = $("#HYear").val();
+ var HBeginMonth = $("#HBeginMonth").val();
+ var HEndMonth = $("#HEndMonth").val();
+ var HBeginWeek = $("#HBeginWeek").val();
+ var HEndWeek = $("#HEndWeek").val();
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+
+ sWhere = " '" + HEqiupFileNumber + "','" + HEquipFileType + "','" + HDeptName + "'," + 2024 + ",'" + HBeginDate + "','" + HEndDate + "'";
+
+ //if (HSearchModel == 1) {
+ // sWhere += ",'" + "" + "','" + "" + "'";
+ //}
+ //else if (HSearchModel == 2) {
+ // sWhere += ",'" + HBeginMonth + "','" + HEndMonth + "'";
+ //}
+ //else if (HSearchModel == 3) {
+ // sWhere += ",'" + HBeginWeek + "','" + HEndWeek + "'";
+ //}
+ //else if (HSearchModel == 4) {
+ // sWhere += ",'" + HBeginDate + "','" + HEndDate + "'";
+ //}
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+ $("#HEqiupFileNumber").val("");
+ $("#HEqiupFileType").val("");
+
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render('select');
+
+ //鍒濆鍖栦笅鎷夊垪琛�
+ //setInit_SelectElement();
+
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Sc_OEEReport_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+ //#endregion
+
+ function check_row(obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ }
+
+
+ //鏌ヨ瀛愯〃鏁版嵁
+ function get_DisplaySub(obj) {
+ var datas = obj; //鑾峰緱褰撳墠琛屾暟鎹�
+ //HBillNo = datas["鍗曟嵁鍙�"].toString();
+ //var HMainID = datas.hmainid;
+ //var HMainID = 3382;
+ var HSourceCode = obj.璁惧缂栫爜;
+ var HDate = obj.鏃ユ湡;
+ var HType = "";
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_OEEReport/getSc_OEEReportDetailist_WorkShift',
+ type: "GET",
+ data: { "HSourceCode": HSourceCode, "HDate": HDate, "HType": HType, "user": sessionStorage["HUserName"]},
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ 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, titleData2) > -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 HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option2 = {
+ elem: '#mainTable2'
+ , toolbar: '#toolbarDemo2'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option2);
+
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏍规嵁妫�绱㈡ā寮忚皟鏁� 鎼滅储妗�
+ function changeInput_BySearchModel() {
+ var HSearchModel = $("#HSearchModel").val() * 1;
+
+ if (HSearchModel == 1) {
+ var element_HYear = document.getElementById("HYear").parentElement.parentElement;
+ element_HYear.style = ""
+
+ var element_HBeginMonth = document.getElementById("HBeginMonth").parentElement.parentElement;
+ element_HBeginMonth.style = "display:none;"
+
+ var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
+ element_HEndMonth.style = "display:none;"
+
+ var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
+ element_HBeginWeek.style = "display:none;"
+
+ var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
+ element_HEndWeek.style = "display:none;"
+
+ var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
+ element_HBeginDate.style = "display:none;"
+
+ var element_HEndDate = document.getElementById("HEndDate").parentElement.parentElement;
+ element_HEndDate.style = "display:none;"
+
+ //鎵ц鏌ヨ鏂规硶
+ //get_FastQuery();
+ }
+ else if (HSearchModel == 2) {
+ var element_HYear = document.getElementById("HYear").parentElement.parentElement;
+ element_HYear.style = ""
+
+ var element_HBeginMonth = document.getElementById("HBeginMonth").parentElement.parentElement;
+ element_HBeginMonth.style = ""
+
+ var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
+ element_HEndMonth.style = ""
+
+ var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
+ element_HBeginWeek.style = "display:none;"
+
+ var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
+ element_HEndWeek.style = "display:none;"
+
+ var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
+ element_HBeginDate.style = "display:none;"
+
+ var element_HEndDate = document.getElementById("HEndDate").parentElement.parentElement;
+ element_HEndDate.style = "display:none;"
+
+ //鎵ц鏌ヨ鏂规硶
+ //get_FastQuery();
+ }
+ else if (HSearchModel == 3) {
+ var element_HYear = document.getElementById("HYear").parentElement.parentElement;
+ element_HYear.style = ""
+
+ var element_HBeginMonth = document.getElementById("HBeginMonth").parentElement.parentElement;
+ element_HBeginMonth.style = "display:none;"
+
+ var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
+ element_HEndMonth.style = "display:none;"
+
+ var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
+ element_HBeginWeek.style = ""
+
+ var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
+ element_HEndWeek.style = ""
+
+ var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
+ element_HBeginDate.style = "display:none;"
+
+ var element_HEndDate = document.getElementById("HEndDate").parentElement.parentElement;
+ element_HEndDate.style = "display:none;"
+
+ //鎵ц鏌ヨ鏂规硶
+ //get_FastQuery();
+ }
+ else if (HSearchModel == 4) {
+ var element_HYear = document.getElementById("HYear").parentElement.parentElement;
+ element_HYear.style = "display:none;"
+
+ var element_HBeginMonth = document.getElementById("HBeginMonth").parentElement.parentElement;
+ element_HBeginMonth.style = "display:none;"
+
+ var element_HEndMonth = document.getElementById("HEndMonth").parentElement.parentElement;
+ element_HEndMonth.style = "display:none;"
+
+ var element_HBeginWeek = document.getElementById("HBeginWeek").parentElement.parentElement;
+ element_HBeginWeek.style = "display:none;"
+
+ var element_HEndWeek = document.getElementById("HEndWeek").parentElement.parentElement;
+ element_HEndWeek.style = "display:none;"
+
+ var element_HBeginDate = document.getElementById("HBeginDate").parentElement.parentElement;
+ element_HBeginDate.style = ""
+
+ var element_HEndDate = document.getElementById("HEndDate").parentElement.parentElement;
+ element_HEndDate.style = ""
+
+ //鎵ц鏌ヨ鏂规硶
+ //get_FastQuery();
+ }
+ }
+ //#endregion
+
+ //#region 鍒濆鍖� 涓嬫媺鍒楄〃
+ function setInit_SelectElement() {
+ var valueList = [];
+ var titleList = [];
+ var ArrayList = '';
+
+ //妫�绱㈡ā寮�
+ var HSearchModel = 4;
+ valueList = [1,2,3,4];
+ titleList = ['骞�','鏈�','鍛�','鏃�'];
+ ArrayList = '';
+ for (var i = 0; i < valueList.length; i++) {
+ ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+ $("#HSearchModel").empty();
+ $("#HSearchModel").append(ArrayList);
+
+ //骞�
+ var HYear = new Date().getFullYear() * 1;
+ valueList = [HYear - 3, HYear - 2, HYear - 1, HYear, HYear + 1, HYear + 2, HYear + 3];
+ titleList = [HYear - 3, HYear - 2, HYear - 1, HYear, HYear + 1, HYear + 2, HYear + 3];
+ ArrayList = '';
+ for (var i = 0; i < valueList.length; i++) {
+ ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+ $("#HYear").empty();
+ $("#HYear").append(ArrayList);
+
+
+ //鏈�
+ var HMonth = new Date().getMonth() * 1 + 1;
+ valueList = [1,2,3,4,5,6,7,8,9,10,11,12];
+ titleList = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+ ArrayList = '';
+ for (var i = 0; i < valueList.length; i++) {
+ ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+ $("#HBeginMonth").empty();
+ $("#HEndMonth").empty();
+ $("#HBeginMonth").append(ArrayList);
+ $("#HEndMonth").append(ArrayList);
+
+
+ //鍛�
+ var HWeek = getYearWeek(HYear, HMonth, new Date().getDate()) * 1;
+ var HMaxWeek = getNumOfWeeks(HYear);
+ valueList = [];
+ titleList = [];
+ ArrayList = '';
+ for (var i = 1; i <= HMaxWeek; i++) {
+ valueList.push(i);
+ titleList.push(i);
+ }
+
+ for (var i = 0; i < valueList.length; i++) {
+ ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+ $("#HBeginWeek").empty();
+ $("#HEndWeek").empty();
+ $("#HBeginWeek").append(ArrayList);
+ $("#HEndWeek").append(ArrayList);
+
+ $("#HYear").val(HYear);
+ $("#HBeginMonth").val(HMonth);
+ $("#HEndMonth").val(HMonth);
+ $("#HBeginWeek").val(HWeek);
+ $("#HEndWeek").val(HWeek);
+ $("#HSearchModel").val(HSearchModel);
+
+ form.render('select');
+
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+
+ //鏍规嵁妫�绱㈡ā寮忚皟鏁� 鎼滅储妗�
+ changeInput_BySearchModel();
+ }
+ //#endregion
+
+ //#region 璁＄畻鎸囧畾骞存湁澶氬皯鍛�
+ function getNumOfWeeks(year) {
+ year = Number(year)
+ if (isNaN(year)) return ''
+ // 鑾峰彇杩欎竴骞寸殑绗竴澶╂槸鏄熸湡鍑�
+ let week = new Date(year, 0, 1).getDay()
+
+ // 闂板勾366澶┿�佸钩骞�365澶�
+ let days = ((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0) ? 366 : 365
+ if (week === 1) {
+ // 濡傛灉绗竴鍙锋槸鍛ㄤ竴
+ return Math.ceil(days / 7)
+ } else {
+ // 濡傛灉涓嶆槸鍛ㄤ竴
+ return Math.ceil((days - 7 + week) / 7)
+ }
+ }
+ //#endregion
+
+ //#region 鑾峰彇褰撳墠鏄湰骞寸鍑犲懆
+ function getYearWeek(a, b, c) {
+ //a涓哄勾 b涓烘湀 c涓烘棩
+ /*
+ date1鏄綋鍓嶆棩鏈�
+ date2鏄綋骞寸涓�澶�
+ d鏄綋鍓嶆棩鏈熸槸浠婂勾绗灏戝ぉ
+ 鐢╠ + 褰撳墠骞寸殑绗竴澶╃殑鍛ㄥ樊璺濈殑鍜屽湪闄や互7灏辨槸鏈勾绗嚑鍛�
+ */
+ var date1 = new Date(a, parseInt(b) - 1, c),
+ date2 = new Date(a, 0, 1),
+ d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000);
+ return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
+ }
+ //#endregion
+ });
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 2ec7922..d2caa83 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -1015,14 +1015,31 @@
//渚涘簲鍟嗚緭鍏ユ
tableSelect.render({
elem: '#HSupName',//杈撳叆妗哾om閫夋嫨
- checkedKey: 'HItemID',//鏌ヨ鍒楄〃涓婚敭鐢ㄤ簬鑾峰彇鍘嗗彶
- searchKey: '渚涘簲鍟嗗悕绉�',//鏌ヨ鐨勫垪鍚�
+ searchKey: '渚涘簲鍟嗗悕绉�,HItemID',//鏌ヨ鐨勫垪鍚�
sWhere: '',//table鎼滅储sWhere鏉′欢 //榛樿绛涢�夐」
+ ajaxSelect: function (sWhere) {
+ var data = '';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Supplier/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": '缈佹稕娑�', "Organization": '娴欐睙鏅轰簯杩堟��' },
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+ }
+ });
+ return data;
+ },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
table: {
- url: GetWEBURL() + 'Gy_Supplier/page',
- where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
+ //url: GetWEBURL() + 'Gy_Supplier/page',
+ //where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
cols: [[
- { type: 'radio' },
+ { type: 'radio', fixed: 'left' },//闇�瑕佸姞杩欎釜fixed灞炴�т笉鐒剁偣鍑籧heckbox浼氳Е鍙戣鐐瑰嚮瀵艰嚧鏃犳硶姝ｇ‘鐐瑰嚮
{ field: 'HItemID', title: 'HItemID' },
{ field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' },
]],
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
index 0be2646..26fbd36 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
@@ -67,10 +67,19 @@
</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-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnResCnz" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -303,6 +312,30 @@
});
//#endregion
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ var HBillno2 = $('#HBillno2').val();
+ var sql = "exec h_p_IFCLD_ERPSourceBillToLocal_ProjectBill '" + HBillno2 + "'" ;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery(2);
+ });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ });
+
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
optionPage.curr = 1;
--
Gitblit v1.9.1