From a77c15f625171114d99c5ba3b833f18451c7cf6f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 16:33:42 +0800
Subject: [PATCH] feat: 添加 设备工艺参数订单点检表 上下页 新增时禁用样式 添加选择工序和生产资源时向后端请求数据更新数据总数和当前数据偏移的函数
---
WebTM/layuiadmin/common.js | 12 +++++
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 62 ++++++++++++++++++++++++-------
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html | 7 +++
3 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/WebTM/layuiadmin/common.js b/WebTM/layuiadmin/common.js
index 9f2826b..1923f5c 100644
--- a/WebTM/layuiadmin/common.js
+++ b/WebTM/layuiadmin/common.js
@@ -27,10 +27,15 @@
}
// 鍒ょ┖鍑芥暟
-function isEmpty(val, zeroIsEmpty = false, falseIsEmpty = false){
+function isEmpty(value, zeroIsEmpty = false, falseIsEmpty = false){
+ let val = value
// 妫�鏌ユ槸鍚︿负null 鎴栬�� undefind
if(val === null || val === undefined){
return true;
+ }
+ //濡傛灉瀛楃涓插叏閮ㄦ槸鐢辨暟瀛楁瀯鎴愮殑锛屽垯杞寲涓烘暟瀛楀瀷
+ if(isAllDigits(val) === true){
+ val = Number(val)
}
// 鏄惁鏄瓧绗︿覆绫诲瀷
@@ -69,4 +74,9 @@
}
return false;
}
+}
+
+// 鍒ゆ柇鏄惁鍏ㄦ槸鏁板瓧
+function isAllDigits(str) {
+ return /^\d+$/.test(str);
}
\ No newline at end of file
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_Add_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_Add_MouldConkBookBillList.html"
index 9b0f195..fa845e6 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_Add_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_Add_MouldConkBookBillList.html"
@@ -29,6 +29,8 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Checker">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
lay-filter="Exit">閫�鍑�</button>
</div>
@@ -509,6 +511,11 @@
});
});
+ //瀹℃牳
+ form.on('submit(Checker)', function(){
+
+ })
+
//琛ㄥご淇℃伅璐熻矗浜哄脊绐�
form.on('submit(HManagerList)', function () {
//椤甸潰灞�-鑷畾涔�
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 b101084..99f2d15 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"
@@ -18,6 +18,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style type="text/css">
.layui-form-item .layui-inline {
margin-right: 0;
@@ -554,11 +555,11 @@
$("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿
$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
- $('#btn_PrevPage').addClass('layui-btn-disabled').attr('disabled', true)
- $('#btn_NextPage').addClass('layui-btn-disabled').attr('disabled', true)
+ $("#btn_PrevPage").addClass("layui-btn-disabled").attr('disabled', true)
+ $("#btn_NextPage").addClass("layui-btn-disabled").attr('disabled', true)
}
else if (OperationType == 2) { //澶嶅埗
-
+ $("#HInterID").val(HInterID);
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
//鏂囦欢閫夋嫨鍒濆鍖�
@@ -575,13 +576,14 @@
$("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿
$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ get_billWithProcAndSource()
OperationType = 1;
}
else if (OperationType == 3) { //缂栬緫
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
-
+ get_billWithProcAndSource()
//鏂囦欢閫夋嫨鍒濆鍖�
PicUpload();
getFile();
@@ -730,8 +732,7 @@
//琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
checkRefresh();
layer.close(ajaxLoad);
- sWhere = " and HProcID = " + data.HProcID + " and HSourceID = " + data.HSourceID
- GetBillLocation(HInterID, sWhere);
+
} else {
layer.close(ajaxLoad);
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -759,7 +760,12 @@
data: { "HInterID": HInterID, "HMaker": HMaker, "sWhere": sWhere },
success: function (data1) {
total = data1.count;
- current = data1.data[0].current;
+ if (data1.data.length > 0) {
+ current = data1.data[0].current;
+ }
+ else {
+ current = 0
+ }
pageJudgement();
layer.close(ajaxLoad);
},
@@ -892,7 +898,8 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
+ // , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -905,11 +912,26 @@
$("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
$("#HProcID").val(checkStatus.data[0].HItemID);
layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+
}
, btn2: function (index, layero) { }
+ , end: function () {
+ get_billWithProcAndSource()
+ }
})
}
//#endregion
+
+ function get_billWithProcAndSource() {
+ let interID = isEmpty($('#HInterID').val()) == true ? 0 : $('#HInterID').val()
+ let HProcID = $('#HProcID').val()
+ let HSourceID = $('#HSourceID').val()
+ if (isEmpty(HProcID, true, true) == false) {
+ // 宸ュ簭鏄繀濉」
+ sWhere = " and HProcID = " + HProcID + " and HSourceID = " + HSourceID
+ GetBillLocation(interID, sWhere);
+ }
+ }
//#region 閫夋嫨鐐规浜�
function get_checkEmp() {
@@ -965,6 +987,9 @@
layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function () {
+ get_billWithProcAndSource()
+ }
})
}
//#endregion
@@ -1642,7 +1667,7 @@
maxmin: true, //寮�鍚渶澶у寲鏈�灏忓寲鎸夐挳
area: ['90%', '80%'],
content: '../璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit_HistoryRecord.html?linterid=' + HInterID
- + '&HProcID='+ HProcID + '&HSourceID='+ HSourceID
+ + '&HProcID=' + HProcID + '&HSourceID=' + HSourceID
});
})
@@ -1805,6 +1830,7 @@
{
$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
set_CheckBill(1); //瀹℃牳
+ get_billWithProcAndSource() // 閲嶆柊鑾峰彇浣嶇疆
}
layer.close(index);
layer.close(index);
@@ -2099,22 +2125,30 @@
});
}
//#endregion
- function pageJudgement() {
- if (total == 1) {
+ function pageJudgement() { // 璇ョ敓浜ц祫婧愬拰宸ュ簭涓嬫病鏈夋暟鎹� 鎴栬�呬粎鏈変竴鏉℃暟鎹�
+ if (total <= 1) {
$('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
$('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
return
}
- if (total == current) {
+ if (total == current) { // 杈惧埌涓婇檺
$('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
$('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
- } else if (current == 1) {
+ } else if (current == 1) { // 杈惧埌涓嬮檺
$('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
$('#btn_NextPage').removeClass("layui-btn-disabled").attr("disabled", false);
- } else {
+ } else if (current == 0) { // 灞炰簬璇ョ敓浜ц祫婧愬拰宸ュ簭涓嬬殑鏂板
+ current = total + 1
+ $('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
+ } else if (current < total) {
$('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
$('#btn_NextPage').removeClass("layui-btn-disabled").attr("disabled", false);
}
+ else {
+ $('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
+ }
}
});
--
Gitblit v1.9.1