From 59dda9ae7decacd3f1c9f3d122d290ba3132c42a Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 22 四月 2024 12:42:05 +0800
Subject: [PATCH] 1
---
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 191 ++++++++++++++++++++++++++++++++---------------
1 files changed, 128 insertions(+), 63 deletions(-)
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 6da00da..0c86873 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"
@@ -68,6 +68,10 @@
.layui-form-label {
width: 25%;
}
+ /*鏄庣粏琛屽閫夋灞呬腑*/
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left: 15%;
+ }
</style>
</head>
@@ -82,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">
@@ -161,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%;">
@@ -218,35 +254,11 @@
</tbody>
</table>
</div>
- <div class="layui-tab-item">
- <div class="layui-inline">
- <label class="layui-form-label">璁惧鐐规瑙勭▼</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>
<!--闅愯棌瀛楁-->
@@ -257,11 +269,15 @@
</div>
</div>
<!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
- <script type="text/html" id="HDotCheckResult">
+ <!--<script type="text/html" id="HDotCheckResult">
<select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" style="height:30px;">
<option value="OK">OK</option>
<option value="NG">NG</option>
</select>
+ </script>-->
+ <!--澶嶉�夋锛堢偣妫�缁撴灉锛�-->
+ <script type="text/html" id="HDotCheckResult">
+ <input type="checkbox" value="{{d.HDotCheckResult}}" lay-skin="primary" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDotCheckResult" {{ d.HDotCheckResult == 1 ? 'checked' : '' }}>
</script>
<script>
layui.config({
@@ -320,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);
@@ -365,13 +394,25 @@
});
//琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
- form.on('select(HDotCheckResult)', function (data) {
+ //form.on('select(HDotCheckResult)', function (data) {
+ // //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ // var elem = data.othis.parents('tr');
+ // var dataindex = elem.attr("data-index");
+ // $.each(option.data, function (index, value) {
+ // if (value.LAY_TABLE_INDEX == dataindex) {
+ // value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ // }
+ // });
+ //});
+
+ //鏄惁鍚堟牸
+ form.on('checkbox(HDotCheckResult)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
var elem = data.othis.parents('tr');
var dataindex = elem.attr("data-index");
$.each(option.data, function (index, value) {
if (value.LAY_TABLE_INDEX == dataindex) {
- value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ value.HDotCheckResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
});
@@ -384,7 +425,7 @@
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+ parent.location.href = "../../../views/index_Mobile.html";
});
})
@@ -394,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",
@@ -408,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: "娓╅Θ鎻愮ず" });
}
},
@@ -431,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();
@@ -456,7 +500,7 @@
//#region 閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- Pub_Close(2);
+ parent.location.href = "../../../views/index_Mobile.html";
});
})
//#endregion
@@ -509,7 +553,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html', 'yes'],
+ content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList_PDA.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -543,17 +587,19 @@
if (result.count == 1) {
var BYData = result;//
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+ var data = result.data;
+ 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); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -563,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 });
}
@@ -577,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: "" }
@@ -589,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": "OK", "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);
}
//澧炲姞涓�琛�
@@ -642,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) != "") {
@@ -712,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": "OK", "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);
}
})
}
--
Gitblit v1.9.1