From 63211c7592b9c7b814de2756d338ffd33ac0c58f Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期一, 19 一月 2026 16:37:38 +0800
Subject: [PATCH] 1、提交验收按钮新增判断是否关联附件 2、借阅暂存添加不可外借新增提醒 3、成果表单借阅管理修改为借阅记录 4、合格资料模块，导出文件按钮需要添加日志 5、装盒按钮调整：需要一个确认按钮并且可以更改盒号，调整盒号时能同步展示盒号容量 6、对接斑马打印机 7、利用用户修改
---
src/main/webapp/WEB-INF/view/scanPrint/scanInPrint.jsp | 132 ++++++++++++++++++++++++++++++++++---------
1 files changed, 104 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/WEB-INF/view/scanPrint/scanInPrint.jsp b/src/main/webapp/WEB-INF/view/scanPrint/scanInPrint.jsp
index 473f707..77f918e 100644
--- a/src/main/webapp/WEB-INF/view/scanPrint/scanInPrint.jsp
+++ b/src/main/webapp/WEB-INF/view/scanPrint/scanInPrint.jsp
@@ -270,38 +270,114 @@
//淇濆瓨鏁版嵁
- function saveScanPrintData(rows) {
- layer.confirm("宸叉壂鎻�" + rows.length + "鏉℃暟鎹紝纭鍏ュ簱锛�", {
- icon: 3,
- title: '鎻愮ず'
- }, function (index) {
- wcp.ui.setBusy("body", wcp.ajax({
- url: 'scanPrintController/saveScanPrintData?printType=' + '${printType}' + '&viewId=' + '${viewId}',
- data: JSON.stringify(rows),
- }).done(function (result) {
- params.callBack();
- //鍏抽棴绐楀彛
- closeWindow();
- }));
- })
- }
+ <%--function saveScanPrintData(rows) {--%>
+ <%-- layer.confirm("宸叉壂鎻�" + rows.length + "鏉℃暟鎹紝纭鍏ュ簱锛�", {--%>
+ <%-- icon: 3,--%>
+ <%-- title: '鎻愮ず'--%>
+ <%-- }, function (index) {--%>
+ <%-- wcp.ui.setBusy("body", wcp.ajax({--%>
+ <%-- url: 'scanPrintController/saveScanPrintData?printType=' + '${printType}' + '&viewId=' + '${viewId}',--%>
+ <%-- data: JSON.stringify(rows),--%>
+ <%-- }).done(function (result) {--%>
+ <%-- params.callBack();--%>
+ <%-- //鍏抽棴绐楀彛--%>
+ <%-- closeWindow();--%>
+ <%-- }));--%>
+ <%-- })--%>
+ <%--}--%>
+
+ <%--//淇濆瓨鏁版嵁--%>
+ <%--function saveScanPrintData(rows) {--%>
+ <%-- // getBoxNum(rows);--%>
+ <%-- layer.prompt({--%>
+ <%-- formType: 2,--%>
+ <%-- value: '',--%>
+ <%-- title: '璇锋坊鍔犵洅鍙�'--%>
+ <%-- }, function (value, index, elem) {--%>
+ <%-- wcp.ui.setBusy("body", wcp.ajax({--%>
+ <%-- url: 'scanPrintController/saveScanPrintData?printType=' + '${printType}' + '&viewId=' + '${viewId}' + '&boxNum=' + value,--%>
+ <%-- data: JSON.stringify(rows),--%>
+ <%-- }).done(function (result) {--%>
+ <%-- params.callBack();--%>
+ <%-- //鍏抽棴绐楀彛--%>
+ <%-- closeWindow();--%>
+ <%-- }));--%>
+ <%-- });--%>
+ <%--}--%>
//淇濆瓨鏁版嵁
function saveScanPrintData(rows) {
- layer.prompt({
- formType: 2,
- value: '',
- title: '璇锋坊鍔犵洅鍙�'
- }, function (value, index, elem) {
- wcp.ui.setBusy("body", wcp.ajax({
- url: 'scanPrintController/saveScanPrintData?printType=' + '${printType}' + '&viewId=' + '${viewId}' + '&boxNum=' + value,
- data: JSON.stringify(rows),
- }).done(function (result) {
- params.callBack();
- //鍏抽棴绐楀彛
- closeWindow();
- }));
+ // 棣栧厛鑾峰彇宸插瓨鍦ㄧ殑鐩掑彿
+ wcp.ui.setBusy("body", wcp.ajax({
+ url: 'scanPrintController/getBoxNum',
+ data: JSON.stringify(rows),
+ }).done(function (result) {
+ debugger;
+ var boxNumList = result || []; // 鍋囪AjaxResponse鐨刣ata瀛楁鍖呭惈瀹為檯鏁版嵁
+ var existingBoxNum = boxNumList.length > 0 ? boxNumList[0] : ''; // 鍙栫涓�涓洅鍙锋垨绌哄瓧绗︿覆
+
+
+ layer.prompt({
+ formType: 2,
+ title: '璇锋坊鍔犵洅鍙�'
+ }, function (inputBoxNum, index, elem) {
+ // 濡傛灉宸插瓨鍦ㄧ洅鍙蜂笖涓庤緭鍏ョ殑鐩掑彿涓嶅悓锛屽垯鎻愮ず鐢ㄦ埛纭
+ if (existingBoxNum && existingBoxNum !== inputBoxNum) {
+ layer.confirm('褰撳墠妗ｆ宸插瓨鍦ㄧ洅鍙� "' + existingBoxNum + '"锛屾偍杈撳叆鐨勬槸 "' + inputBoxNum + '"锛屾槸鍚﹁鏇存敼鐩掑彿锛�', {
+ icon: 3,
+ title: '纭鏇存敼鐩掑彿'
+ }, function (confirmIndex) {
+ // 纭鏇存敼锛屾墽琛屼繚瀛�
+ performSave(inputBoxNum, rows);
+ layer.close(confirmIndex);
+ }, function () {
+ // 鍙栨秷鏇存敼锛岄噸鏂版墦寮�杈撳叆妗�
+ layer.close(index);
+ });
+ } else {
+ // 鐩掑彿鐩稿悓鎴栦笉瀛樺湪宸插瓨鍦ㄧ殑鐩掑彿锛岀洿鎺ヤ繚瀛�
+ performSave(inputBoxNum, rows);
+ }
+ });
+ })).fail(function () {
+ // 鑾峰彇鐩掑彿澶辫触鏃讹紝鐩存帴璁╃敤鎴疯緭鍏�
+ layer.prompt({
+ formType: 2,
+ value: '',
+ title: '璇锋坊鍔犵洅鍙�'
+ }, function (value, index, elem) {
+ wcp.ui.setBusy("body", wcp.ajax({
+ url: 'scanPrintController/saveScanPrintData?printType=' + '${printType}' + '&viewId=' + '${viewId}' + '&boxNum=' + value,
+ data: JSON.stringify(rows),
+ }).done(function (result) {
+ params.callBack();
+ //鍏抽棴绐楀彛
+ closeWindow();
+ }));
+ });
});
}
+
+
+ // 鎵ц淇濆瓨鎿嶄綔鐨勮緟鍔╁嚱鏁�
+ function performSave(boxNum, rows) {
+ wcp.ui.setBusy("body", wcp.ajax({
+ url: 'scanPrintController/saveScanPrintData?printType=' + '${printType}' + '&viewId=' + '${viewId}' + '&boxNum=' + boxNum,
+ data: JSON.stringify(rows),
+ }).done(function (result) {
+ params.callBack();
+ //鍏抽棴绐楀彛
+ closeWindow();
+ }));
+ }
+
+ function getBoxNum(rows) {
+ wcp.ui.setBusy("body", wcp.ajax({
+ url: 'scanPrintController/getBoxNum',
+ data: JSON.stringify(rows),
+ }).done(function (result) {
+ console.log(result);
+ }));
+ }
</script>
</html>
--
Gitblit v1.9.1