From b7e59d2c81c7b36d198b88927af5612742eac513 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 06 三月 2024 08:35:26 +0800
Subject: [PATCH] PDA,设备，质量 扫码
---
WebTM/views/质量管理/首件检验单/MES_ColorRecordBillList_PDA.html | 426 ++++++++++++++++++++++++++
WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html | 34 +
WebTM/views/设备管理/Sb_EquipConkBookBill_PDA.html | 104 +++++
WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html | 149 +++++---
WebTM/views/设备管理/Sb_EqpMaintenanceBill_PDA.html | 67 +++
WebTM/views/index_Mobile.html | 6
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 2
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 162 ++++++---
WebTM/WebTM.csproj | 1
9 files changed, 801 insertions(+), 150 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index fe8c1f4..c9eff34 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -472,6 +472,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProductQtyWarningReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityTraceabilityReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProdBadReasonStatistics_Sum.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\MES_ColorRecordBillList_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\BadQueryReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill - 澶嶅埗.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_CollectionOfSingleProductDefects.html" />
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 52c0fdb..0f1dc3f 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -231,6 +231,12 @@
</a>
</dd>
<dd>
+ <a lay-href="璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/MES_ColorRecordBillList_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 瀵硅壊璁板綍鍗曞垪琛�
+ </a>
+ </dd>
+ <dd>
<a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_Sc_ProcessExchangeBillMain_Note_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
鎸囧紩鍗″彉鏇村崟
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 c94e19c..dc5dd56 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"
@@ -459,7 +459,7 @@
, "HManagerName": data.璐熻矗浜� //璐熻矗浜哄悕绉�
, "HEquipID": data.HEquipID //璁惧ID
, "HEquipName": data.璁惧鍚嶇О //璁惧鍚嶇О
- , "HConkTypeID": data.HEquipID //鏁呴殰绫诲埆ID
+ , "HConkTypeID": data.HConkTypeID //鏁呴殰绫诲埆ID
, "HConkTypeName": data.鏁呴殰绫诲埆 //鏁呴殰绫诲埆
, "HConkBeginDate": formatDate(data.鍙戠敓鏃ユ湡) //鏁呴殰鍙戠敓鏃ユ湡
, "HExplanation": data.鏁呴殰鎻忚堪 //鎽樿
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
index 7b21a00..c199c37 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
@@ -116,7 +116,7 @@
<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -192,7 +192,17 @@
<textarea name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
</td>
</tr>
- <tr style="display:none;">
+ <tr>
+ <th>婧愬崟绫诲瀷</th>
+ <td class="bz_td">
+ <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
+ <option value="璁惧缁翠慨鐧昏鍗�" selected="selected">璁惧缁翠慨鐧昏鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ <option value="璁惧缁翠慨娲惧伐鍗�">璁惧缁翠慨娲惧伐鍗�</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
<th>鏁呴殰鐧昏鍗�</th>
<td class="bz_td">
<input type="text" name="HMainSourceBillNo" class="layui-input" id="HMainSourceBillNo" placeholder="閫夋嫨鏁呴殰鐧昏鍗�" style="background-color:#efefef4d;">
@@ -216,6 +226,15 @@
</td>
</tr>
<tr>
+ <th>鏃堕棿鍗曚綅</th>
+ <td class="bz_td">
+ <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit" style="border-radius: 50px;">
+ <option value="灏忔椂">灏忔椂</option>
+ <option value="澶�">澶�</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
<th>璁惧鍚嶇О</th>
<td class="bz_td">
<input type="text" name="HBarName" class="layui-input LineHeight" id="HBarName" style="border-radius: 50px;background-color:#EDEDED;" readonly>
@@ -233,7 +252,7 @@
<td class="bz_td">
<input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
</td>
- </tr>
+ </tr>
</tbody>
</table>
</div>
@@ -334,7 +353,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- ,laydate = layui.laydate
+ , laydate = layui.laydate
, element = layui.element;
//#region 鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -385,7 +404,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HExplanation": "", "HRemark": ""};
+ var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -411,15 +430,15 @@
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- //$("#HEmpID").val(sessionStorage["HBillerID"]); //缁翠慨浜篒D
- //$("#HEmpName").val(sessionStorage["HUserName"]); //缁翠慨浜�
+ $("#HEmpID").val(sessionStorage["HKeeperID"]); //缁翠慨浜篒D
+ $("#HEmpName").val(sessionStorage["HKeeper"]); //缁翠慨浜�
$("#HManagerID").val(sessionStorage["HManagerID"]); //璐ｄ换浜篒D
$("#HManagerName").val(sessionStorage["HManagerName"]); //璐ｄ换浜�
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -484,12 +503,17 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
+ option.data = [{ "HRepairID": $("#HRepairID").val(), "HRepairCode": "", "HRepairName": "", "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": "", "HRepairExplanation": $("#HExplanation").val(), "HRemark": "", "HEmpID": $("#HEmpID").val(), "HSourceInterID": $("#HMainSourceInterID").val(), "HSourceEntryID": $("#HMainSourceEntryID").val(), "HSourceBillNo": $("#HMainSourceBillNo").val() }];
+ table.render(option);
//var tableData = data.field;
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var oMain = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = oMain + ';' + sSubStr;
+
if (AllowLoadData(sSubStr)) {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
@@ -503,7 +527,7 @@
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
- layer.close(index);
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
@@ -526,7 +550,7 @@
// 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
$("#formData")[0].reset();
layui.form.render();
- option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HExplanation": "", "HRemark": "" }];
+ option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": $("#HRemark").val(), "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
table.render(option);
$("#HBarCode").focus();
@@ -548,7 +572,7 @@
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
})
- //#region 閫�鍑烘寜閽�
+ //#region 閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
Pub_Close(2);
@@ -754,8 +778,12 @@
, { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
, { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
, { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
- , { field: 'HExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
+ , { field: 'HRepairExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+ , { field: 'HEmpID', title: 'HEmpID', edit: 'text', hide: true }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
];
option = {
@@ -772,7 +800,7 @@
}
};
- option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HExplanation": "", "HRemark": "" }];
+ option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
table.render(option);
}
//澧炲姞涓�琛�
@@ -864,6 +892,11 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
+ if ($("#HManagerID").val() == 0) {
+ 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;
@@ -901,10 +934,16 @@
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
- $("#HEquipID").val(data.HItemID);
+ $("#HEquipID").val(data.HInterID);
$("#HBarName").val(data.HName);
$("#HBarSpec").val(data.HModel);
$("#HBarModel").val(data.HModel2);
+ $("#HManagerID").val(data.HRepairEmpID);
+ $("#HManagerName").val(data.璐熻矗浜�);
+ $("#HMainSourceBillNo").val(data.鏁呴殰鐧昏鍗�);
+ $("#HMainSourceInterID").val(data.鏁呴殰鐧昏鍗旾D);
+ $("#HMainSourceEntryID").val(data.鏁呴殰鐧昏鍗曞瓙ID);
+
$("#HQty").val(1);
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
index 44ff79e..430291a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBill_PDA.html"
@@ -61,7 +61,7 @@
<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -88,6 +88,14 @@
<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>
+ </td>
+ </tr>
+ <tr>
+ <th>鏁呴殰鍘熷洜</th>
+ <td class="bz_td">
+ <input type="text" name="HConkReasonName" class="layui-input" id="HConkReasonName" placeholder="閫夋嫨鏁呴殰鍘熷洜" style="background-color:#efefef4d;">
+ <input type="hidden" name="HConkReasonID" id="HConkReasonID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ConkReason" id="ConkReason" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
@@ -124,7 +132,7 @@
<input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmp" id="HEmp" style="font-weight:bolder">...</button>
</td>
- </tr>
+ </tr>
<tr>
<th>璐熻矗浜�</th>
<td class="bz_td">
@@ -234,7 +242,7 @@
<!--闅愯棌瀛楁-->
<input type="hidden" name="lngBillKey" id="lngBillKey">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
-
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable" hidden></table>
</form>
</div>
</div>
@@ -252,14 +260,14 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- ,laydate = layui.laydate
+ , laydate = layui.laydate
, element = layui.element;
//#region 鏃ユ湡鏃堕棿閫夋嫨鍣�
laydate.render({
elem: '#HConkBeginDate'
, type: 'datetime'
- });
+ });
laydate.render({
elem: '#HDate'
, type: 'datetime'
@@ -293,13 +301,34 @@
$("#HBillNo").val(d.data[0].HBillNo);
}
});
+
+
+ var option = {
+ elem: '#mainTable'
+ , height: 500
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: false //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HConkReasonID', title: 'HConkReasonID', edit: 'text', hide: true }
+ , { field: 'HConkReasonCode', title: '鏁呴殰鍘熷洜浠ｇ爜', edit: 'text', event: "HConkReasonCode" }
+ , { field: 'HConkReasonName', title: '鏁呴殰鍘熷洜鍚嶇О', edit: 'text' }
+ , { field: 'HConkExplanation', title: '鏁呴殰鍘熷洜鎻忚堪', edit: 'text' }
+ , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
+ , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
+ , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
+ ]]
+ };
//#endregion
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": ""};
+ var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -398,12 +427,17 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ option.data = [{ "HConkReasonID": $("#HConkReasonID").val(), "HConkReasonCode": "", "HConkReasonName": $("#HConkReasonName").val(), "HConkExplanation": $("#HExplanation").val(), "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": $("#HManagerName").val(), "HRemark": " " }];
+ table.render(option);
+
+ //var tableData = data.field;
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var oMain = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = oMain + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + 1;
if (AllowLoadData(sSubStr)) {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpConkBookBillList",
@@ -417,7 +451,7 @@
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
- layer.close(index);
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
@@ -462,14 +496,14 @@
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
})
- //#region 閫�鍑烘寜閽�
+ //#region 閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
Pub_Close(2);
});
})
//#endregion
-
+
//鏁呴殰绫诲埆
form.on('submit(ConkType)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -492,6 +526,44 @@
}
$("#HConkTypeName").val(checkStatus.data[0].鏁呴殰绫诲埆);
$("#HConkTypeID").val(checkStatus.data[0].hitemid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鏁呴殰鍘熷洜
+ form.on('submit(ConkReason)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏁呴殰鍘熷洜鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../views/PublicPage/FaultReasonInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HConkReasonName").val(checkStatus.data[0].HName);
+ $("#HConkReasonID").val(checkStatus.data[0].HItemID);
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -815,6 +887,16 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
+ if ($("#HManagerID").val() == 0) {
+ layer.msg("璐熻矗浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ if ($("#HConkTypeID").val() == 0) {
+ 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;
@@ -856,6 +938,8 @@
$("#HBarName").val(data.HName);
$("#HBarSpec").val(data.HModel);
$("#HBarModel").val(data.HModel2);
+ $("#HManagerID").val(data.HRepairEmpID);
+ $("#HManagerName").val(data.璐熻矗浜�);
$("#HQty").val(1);
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index 3b3806c..feb7bf4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -70,7 +70,7 @@
}
/*鏄庣粏琛屽閫夋灞呬腑*/
.layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
- margin-left: 35%;
+ margin-left: 15%;
}
</style>
</head>
@@ -86,7 +86,7 @@
<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -165,8 +165,40 @@
<input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
</td>
</tr>
+ <tr>
+ <th>鐐规璁″垝</th>
+ <td class="bz_td">
+ <input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HPlanInterID" class="layui-input LineHeight" id="HPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HPlanEntryID" class="layui-input LineHeight" id="HPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ </td>
+ </tr>
</tbody>
</table>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline" style="margin-bottom:5px;">
+ <label class="layui-form-label" style="width:100px;">璁惧鐐规瑙勭▼</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;display:none;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
</div>
<div class="layui-tab-item">
<table style="width:80%;">
@@ -222,35 +254,11 @@
</tbody>
</table>
</div>
- <div class="layui-tab-item">
- <div class="layui-inline" style="margin-bottom:5px;">
- <label class="layui-form-label" style="width:100px;">璁惧鐐规瑙勭▼</label>
- <div class="layui-input-inline">
- <input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
- </div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
- <script type="text/html" id="barDemo">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
- </script>
- </div>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
- <li>鍏朵粬淇℃伅</li>
<li>鏄庣粏淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
</ul>
</div>
<!--闅愯棌瀛楁-->
@@ -328,13 +336,26 @@
$("#HBillNo").val(d.data[0].HBillNo);
}
});
+
+ //褰撳墠鎵�鍦ㄩ〉绛�
+ var cur_title = "鍩烘湰淇℃伅";
+ var HCheckNum = 0;
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(TabTest)', function (data) {
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "鏄庣粏淇℃伅") {
+ HCheckNum++;
+ }
+ })
+
//#endregion
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
+
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -406,7 +427,7 @@
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
});
- })
+ })
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
@@ -414,7 +435,10 @@
var oMain = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = oMain + ';' + sSubStr;
+
if (AllowLoadData(sSubStr)) {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/SaveGetEquipDotCheckBillList",
@@ -428,7 +452,7 @@
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
- layer.close(index);
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
@@ -451,7 +475,7 @@
// 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
$("#formData")[0].reset();
layui.form.render();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": ""}];
table.render(option);
$("#HBarCode").focus();
@@ -564,17 +588,18 @@
var BYData = result;//
var rowdate1 = layui.table.cache["mainTable"];
var data = result.data;
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
table.render(option);
if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
+
for (var i = 0; i < BYData.data.length; i++) {
var checkrow = {
"HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
"HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
- "HManagerName": data[i].HManagerName
+ "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -584,7 +609,7 @@
}
}
else {
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
table.render(option);
layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
}
@@ -598,9 +623,9 @@
function set_InitGrid() {
//琛ㄥご
columns = [
- { type: 'checkbox' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe", width: 80 }
- , { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult' }
+ //{ type: 'checkbox' }
+ { templet: '#xuhao', title: '搴忓彿', event: "qwe", width: 45 }
+ , { field: 'HDotCheckResult', title: '缁撴灉', templet: '#HDotCheckResult', width: 55 }
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
@@ -610,22 +635,26 @@
, { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
, { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true}
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true}
, { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
];
option = {
id: 'mainTable'
, elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , page: true
+ //, toolbar: '#toolbarDemo'
+ , page: false
, cellMinWidth: 100
- , height: 500
+ , limit: 100
+ , height: 'full-205'
, cols: [columns]
, done: function (res, curr, count) {
}
};
- option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
table.render(option);
}
//澧炲姞涓�琛�
@@ -663,13 +692,23 @@
}
//鏁版嵁楠岃瘉
function AllowLoadData(sSubStr) {
- if ($("#HEquipName").val() == '') {
+ if (HCheckNum < 1) {
+ layer.msg("璇峰埌 鏄庣粏淇℃伅 椤电涓牳瀵硅繃涓�娆′俊鎭悗鍐嶇偣鍑讳繚瀛樻寜閽�", { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+
+ if ($("#HBarName").val() == '') {
layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- //鍒ゆ柇鐗╂枡鏄庣粏椤�
+
+ if ($("#HEquipDotCheckRuleInterID").val() == 0 || $("#HEquipDotCheckRuleInterNo").val() == '') {
+ layer.msg("鐐规瑙勭▼涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ //鍒ゆ柇鏄庣粏椤�
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鐐规椤圭洰鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
@@ -733,23 +772,28 @@
$.ajax({
url: GetWEBURL() + "/Web/GetItemByEquipFile",
type: "GET",
- data: { "EquipProjectID": $("#HEquipID").val(), "Type": "DJ" },
+ data: { "EquipProjectID": $("#HEquipID").val(), "Type": "DJ", "HDate": $("#HBeginDate").val() },
success: function (result) {
- var data = result.data;
- $("#HEquipDotCheckRuleInterID").val(data[0].鐐规瑙勭▼ID);
- $("#HEquipDotCheckRuleInterNo").val(data[0].鐐规瑙勭▼鍗曞彿);
- var rowdata = [];
- for (let i = 0; i < data.length; i++) {
- rowdata.push(
- {
- "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
- "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
- "HManagerName": data[i].璐熻矗浜哄悕绉�
- }
- );
+ if (result.code == 1) {
+ var data = result.data;
+ $("#HEquipDotCheckRuleInterID").val(data[0].鐐规瑙勭▼ID);
+ $("#HEquipDotCheckRuleInterNo").val(data[0].鐐规瑙勭▼鍗曞彿);
+ $("#HPlanNo").val(data[0].鐐规璁″垝鍗�);
+ $("#HPlanInterID").val(data[0].鐐规璁″垝ID);
+ $("#HPlanEntryID").val(data[0].鐐规璁″垝瀛怚D);
+ var rowdata = [];
+ for (let i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
+ "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
}
- option.data = rowdata;
- table.render(option);
}
})
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
index 9035f99..ee9aa9e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
@@ -70,7 +70,7 @@
}
/*鏄庣粏琛屽閫夋灞呬腑*/
.layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
- margin-left: 35%;
+ margin-left: 15%;
}
</style>
</head>
@@ -86,7 +86,7 @@
<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -165,8 +165,40 @@
<input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
</td>
</tr>
+ <tr>
+ <th>淇濆吇璁″垝</th>
+ <td class="bz_td">
+ <input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HEquipMaintainPlanInterID" class="layui-input LineHeight" id="HEquipMaintainPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HEquipMaintainPlanEntryID" class="layui-input LineHeight" id="HEquipMaintainPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ </td>
+ </tr>
</tbody>
</table>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline" style="margin-bottom:5px;">
+ <label class="layui-form-label" style="width:100px;">璁惧淇濆吇瑙勭▼</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;display:none;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
</div>
<div class="layui-tab-item">
<table style="width:80%;">
@@ -222,35 +254,11 @@
</tbody>
</table>
</div>
- <div class="layui-tab-item">
- <div class="layui-inline" style="margin-bottom:5px;">
- <label class="layui-form-label" style="width:100px;">璁惧淇濆吇瑙勭▼</label>
- <div class="layui-input-inline">
- <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
- </div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
- <script type="text/html" id="barDemo">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
- </script>
- </div>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
- <li>鍏朵粬淇℃伅</li>
<li>鏄庣粏淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
</ul>
</div>
<!--闅愯棌瀛楁-->
@@ -328,13 +336,20 @@
$("#HBillNo").val(d.data[0].HBillNo);
}
});
+
+ //褰撳墠鎵�鍦ㄩ〉绛�
+ var cur_title = "鍩烘湰淇℃伅";
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(TabTest)', function (data) {
+ cur_title = data.elem.context.innerText;
+ })
//#endregion
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -409,12 +424,14 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var oMain = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = oMain + ';' + sSubStr;
if (AllowLoadData(sSubStr)) {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sb_PDA_EquipMaintainBill/SaveGetEquipMaintainBillList",
@@ -428,7 +445,7 @@
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
- layer.close(index);
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
@@ -451,7 +468,7 @@
// 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
$("#formData")[0].reset();
layui.form.render();
- option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
table.render(option);
$("#HBarCode").focus();
@@ -598,9 +615,9 @@
function set_InitGrid() {
//琛ㄥご
columns = [
- { type: 'checkbox' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe", width: 80 }
- , { field: 'HMaintainResult', title: '淇濆吇缁撴灉', templet: '#HMaintainResult' }
+ //{ type: 'checkbox' }
+ { templet: '#xuhao', title: '搴忓彿', event: "qwe", width: 45 }
+ , { field: 'HMaintainResult', title: '缁撴灉', templet: '#HMaintainResult', width:55 }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
, { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
, { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: "" }
@@ -610,22 +627,26 @@
, { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
, { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
, { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
];
option = {
id: 'mainTable'
, elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , page: true
+ //, toolbar: '#toolbarDemo'
+ , page: false
, cellMinWidth: 100
- , height: 500
+ , limit: 100
+ , height: 'full-205'
, cols: [columns]
, done: function (res, curr, count) {
}
};
- option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
table.render(option);
}
//澧炲姞涓�琛�
@@ -663,13 +684,24 @@
}
//鏁版嵁楠岃瘉
function AllowLoadData(sSubStr) {
- if ($("#HEquipName").val() == '') {
+ if (cur_title != '鏄庣粏淇℃伅') {
+ layer.msg("璇烽�夋嫨鍒� 鏄庣粏淇℃伅 椤电锛屾牳瀵逛繚鍏讳俊鎭悗锛屽湪鏄庣粏淇℃伅椤电涓偣鍑讳繚瀛樻寜閽�", { icon: 5, btn: ['纭'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+
+ if ($("#HBarName").val() == '') {
layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
+
+ if ($("#HEquipMaintainRuleInterID").val() == 0 || $("#HEquipMaintainRuleInterNo").val() == '') {
+ layer.msg("淇濆吇瑙勭▼涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+
//鍒ゆ柇鐗╂枡鏄庣粏椤�
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁淇濆吇椤圭洰鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
@@ -733,24 +765,29 @@
$.ajax({
url: GetWEBURL() + "/Web/GetItemByEquipFile",
type: "GET",
- data: { "EquipProjectID": $("#HEquipID").val(), "Type": "BY" },
+ data: { "EquipProjectID": $("#HEquipID").val(), "Type": "BY", "HDate": $("#HBeginDate").val() },
success: function (result) {
- var data = result.data;
- $("#HEquipMaintainRuleInterID").val(data[0].淇濆吇瑙勭▼ID);
- $("#HEquipMaintainRuleInterNo").val(data[0].淇濆吇瑙勭▼鍗曞彿);
- var rowdata = [];
- for (let i = 0; i < data.length; i++) {
- rowdata.push(
- {
- "HMaintainResult": data[i].榛樿缁撹, "HMaintainItemID": data[i].淇濆吇椤圭洰ID, "HMaintainNumber": data[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": data[i].淇濆吇椤圭洰鍚嶇О,
- "HMaintainPart": data[i].淇濆吇閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
- "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": ""
- }
- );
- }
+ if (result.count == 1) {
+ var data = result.data;
+ $("#HEquipMaintainRuleInterID").val(data[0].淇濆吇瑙勭▼ID);
+ $("#HEquipMaintainRuleInterNo").val(data[0].淇濆吇瑙勭▼鍗曞彿);
+ $("#HPlanNo").val(data[0].淇濆吇璁″垝鍗�);
+ $("#HEquipMaintainPlanInterID").val(data[0].淇濆吇璁″垝ID);
+ $("#HEquipMaintainPlanEntryID").val(data[0].淇濆吇璁″垝瀛怚D);
+ var rowdata = [];
+ for (let i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "HMaintainResult": data[i].榛樿缁撹, "HMaintainItemID": data[i].淇濆吇椤圭洰ID, "HMaintainNumber": data[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": data[i].淇濆吇椤圭洰鍚嶇О,
+ "HMaintainPart": data[i].淇濆吇閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": "", "HSourceInterID": data[i].淇濆吇璁″垝ID, "HSourceEntryID": data[i].淇濆吇璁″垝瀛怚D, "HSourceBillNo": data[i].淇濆吇璁″垝鍗�
+ }
+ );
+ }
- option.data = rowdata;
- table.render(option);
+ option.data = rowdata;
+ table.render(option);
+ }
}
})
}
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/MES_ColorRecordBillList_PDA.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/MES_ColorRecordBillList_PDA.html"
new file mode 100644
index 0000000..f70b993
--- /dev/null
+++ "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/MES_ColorRecordBillList_PDA.html"
@@ -0,0 +1,426 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>棣栦欢妫�楠屽崟鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 30px;">鏃ユ湡</label>
+ <input type="date" class="layui-input" id="HBeginDate" style="width:110px;" placeholder="yyyy-MM-dd">
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width:5px">-</label>
+ </div>
+ <div class="layui-inline">
+ <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 90px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:120px">
+ </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>
+ <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="btnDel"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></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
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "MES_ColorRecordBillList_PDA";
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btnCheck': btnCheck(1);
+ break;
+ //鍙嶅鏍�
+ case 'btnAdutCheck': btnCheck(2);
+ break;
+ //鍒犻櫎
+ case 'btnDel': btnDel();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ table.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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } 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;
+ }
+ });
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/ColorRecord/ColorRecordList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "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 ($.inArray(data[i].name, "") > -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 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , height: 'full-70'
+ , totalRow: false //寮�鍚悎璁�
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
+ }
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaterNumber").val("");
+ $("#HBillNo").val("");
+ $("#HProductName").val("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ ColFilter();
+ sWhere = "";
+ }
+
+ //鍒犻櫎
+ function btnDel() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/ColorRecord/DelColorRecordBill',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ 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 = ["hmainid","HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ 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 (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ 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
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
index 1674a30..f3581b9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
@@ -134,7 +134,7 @@
<input type="text" name="HICMOBillNo" class="layui-input set_height" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
<input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input set_height">
<input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0" autocomplete="off" class="layui-input set_height">
-</tr>
+ </tr>
<tr>
<th>鎸囧紩鍗�</th>
<td class="bz_td">
@@ -180,7 +180,7 @@
</tr>
</tbody>
</table>
- </div>
+ </div>
<div class="layui-tab-item">
<div class="layui-inline" style="margin-bottom:5px;">
<label class="layui-form-label" style="width:100px;">妫�楠屾柟妗�</label>
@@ -287,6 +287,9 @@
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
</form>
</div>
</div>
@@ -398,7 +401,7 @@
}
})
});
-
+
//閫夋嫨璁￠噺鍗曚綅
form.on('submit(BtnHUnit)', function () {//鐢熶骇璧勬簮
layer.open({
@@ -614,9 +617,9 @@
}
})
}
-
+
function txtHBarCode_KeyDown(HBarCode) {
- //妫�鏌ユ壂鎻忕殑鏉＄爜鏄惁涓虹函鏁板瓧锛屽鏋滄槸绾暟瀛楋紝鐩墠榛樿鍒ゆ柇涓� "宸ュ簭杩涚珯鎺ユ敹鍗曞彿"
+ //妫�鏌ユ壂鎻忕殑鏉＄爜鏄惁涓虹函鏁板瓧锛屽鏋滄槸绾暟瀛楋紝鐩墠榛樿鍒ゆ柇涓� "宸ュ簭杩涚珯鎺ユ敹鍗曞彿"
var result = /^\d+$/.test(HBarCode)
if (result == true) {
HBarCode = HBarCode.slice(0, 0) + 'GXJZ' + HBarCode.slice(0)
@@ -663,7 +666,10 @@
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -691,10 +697,14 @@
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": 0,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
+ HProcExchBillNoFlag = true;
break;
case "MO00":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -708,17 +718,21 @@
"HMaterName": data.浜у搧鍚嶇О,
"HMaterNumber": data.浜у搧浠ｇ爜,
"HMaterModel": data.瑙勬牸鍨嬪彿,
- "HPRDORGID": data.缁勭粐,
- "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HPRDORGID": 0,//data.缁勭粐,
+ "HPRDORGName": '',//data.缁勭粐鍚嶇О,
"HUnitID": data.hunitid,
"HUnitName": data.璁￠噺鍗曚綅,
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
+ HProcExchBillNoFlag = true;
break;
}
layer.close(index);
--
Gitblit v1.9.1