From 17a008a34eec248d4504d36fc49424941217c851 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 10 Apr 2023 17:00:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B7=E6=96=B0=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/css/public.css | 7 ++ .../pages/application/application-in.html | 115 +++++++++--------- .../application/application-in_back.html | 6 + .../application-in_temporaryValue.html | 7 ++ .../pages/application/application-out.html | 5 + .../application/application-out_back.html | 7 ++ .../application-out_min-mobile.html | 8 +- .../application/application-out_min.html | 7 +- .../application-out_temporaryValue.html | 8 ++ .../pages/application/application-review.html | 9 +- .../application/application-transfer.html | 6 + .../application-transfer_back.html | 8 +- .../application/application_in_multi.html | 7 ++ .../pages/application/application_multi.html | 7 ++ .../pages/application/form-step-look.html | 6 + .../application/form-step-look_back.html | 8 +- .../application/form-step-look_group.html | 9 ++ .../form-step-look_group_review.html | 7 ++ .../application/form-step-look_in_review.html | 6 + .../form-step-look_minRecordOut.html | 8 +- .../templates/pages/application/my-apply.html | 7 ++ .../pages/application/my-apply_back.html | 7 ++ .../templates/pages/application/my-task.html | 7 ++ .../pages/application/my-task_back.html | 7 ++ .../application-out.html | 6 + .../application-out_back.html | 8 +- .../application-out_temporaryValue.html | 7 ++ .../applicationOutForGroup.html | 9 +- .../templates/pages/chart/chart-in_back.html | 6 + .../templates/pages/chart/chart-out.html | 5 +- .../templates/pages/chart/chart-out_back.html | 5 + .../pages/chart/chart-stock_back.html | 4 + .../templates/pages/company/company-out.html | 9 ++ .../pages/company/company-out_back.html | 6 + .../pages/company/companyByParentId.html | 7 ++ .../templates/pages/company/company_add.html | 7 ++ .../templates/pages/company/company_edit.html | 7 ++ .../constructionunit_add.html | 7 ++ .../constructionunit_edit.html | 7 ++ .../constructionunit_out.html | 8 ++ .../pages/depository/Inventory-view.html | 6 + .../depository/Inventory-view_mobile.html | 7 +- .../templates/pages/depository/table-in.html | 9 +- .../pages/depository/table-in_mobile.html | 5 +- .../templates/pages/depository/table-out.html | 7 ++ .../pages/depository/table-out_mobile.html | 7 ++ .../pages/depository/table-stock.html | 5 + .../pages/depository/table-stock_mobile.html | 5 + .../pages/group/applicationInForGroup.html | 9 ++ .../pages/group/applicationOutForGroup.html | 9 ++ .../pages/group/application_multi.html | 7 ++ .../templates/pages/group/group-add.html | 7 +- .../templates/pages/group/group-add_back.html | 9 ++ .../templates/pages/group/group-out.html | 7 ++ .../pages/group/group-out_mobile.html | 8 ++ .../templates/pages/group/group_edit.html | 8 ++ .../pages/group/group_edit_mobile.html | 7 +- .../pages/group/group_material_edit.html | 7 +- .../templates/pages/group/selectGroup.html | 2 + .../pages/material/material-add.html | 7 ++ .../pages/material/material-add_back.html | 7 ++ .../pages/material/material-out.html | 6 + .../pages/material/material-out_mobile.html | 5 + .../pages/material/material-view.html | 8 ++ .../materialBarCode/materialBarCode_out.html | 8 ++ .../materialtype/materialTypeByParentId.html | 8 ++ .../pages/materialtype/materialType_add.html | 8 ++ .../pages/materialtype/materialType_edit.html | 8 ++ .../pages/materialtype/materialType_view.html | 6 + .../templates/pages/notice/notice-add.html | 8 +- .../templates/pages/notice/notice-edit.html | 8 +- .../templates/pages/notice/notice-out.html | 7 ++ .../pages/notice/notice-out_user.html | 7 ++ .../templates/pages/notice/notice-view.html | 7 ++ .../templates/pages/other/welcome.html | 5 + .../templates/pages/other/welcome_mobile.html | 6 +- .../pages/place/materialForPlace.html | 12 ++ .../templates/pages/place/place_add.html | 8 ++ .../templates/pages/place/place_edit.html | 7 ++ .../pages/place/place_editForTray.html | 8 ++ .../templates/pages/place/place_list_add.html | 8 +- .../templates/pages/post/post-out.html | 8 +- .../templates/pages/post/post-view.html | 7 ++ .../templates/pages/post/postRole.html | 9 ++ .../templates/pages/post/postRole_add.html | 9 ++ .../templates/pages/post/postRole_edit.html | 9 +- .../pages/post/selectConstructionUnit.html | 2 + .../templates/pages/self/message.html | 6 + .../pages/self/userAuthorityMenus.html | 6 + .../showInventoryForLocation.html | 8 +- .../showInventoryForMaterial.html | 8 +- .../templates/pages/split/split-out.html | 8 ++ .../pages/split/split-out_mobile.html | 8 ++ .../templates/pages/split/split_add.html | 8 +- .../templates/pages/split/split_edit.html | 8 +- .../pages/stockTaking/stockTaking.html | 7 ++ .../stockTaking/stockTakingComplete.html | 8 +- .../pages/stockTaking/stockTakingDetail.html | 7 ++ .../stockTaking/stockTakingForTable.html | 7 ++ .../stockTakingInfoForInventory.html | 8 ++ .../pages/stockTaking/stockTakingReview.html | 8 +- .../pages/stockTaking/stockTakingView.html | 10 ++ .../pages/stockTaking/stockTaking_back.html | 7 ++ .../pages/stockTaking/stockTaking_mobile.html | 7 ++ .../pages/stockTaking/stockTransfer.html | 8 +- .../templates/pages/user/account-look.html | 9 ++ .../resources/templates/pages/user/login.html | 8 ++ .../templates/pages/user/table-user.html | 7 ++ .../templates/pages/user/user-add.html | 9 +- .../templates/pages/user/user-addForIn.html | 8 ++ .../templates/pages/user/user-edit.html | 8 +- .../templates/pages/user/user-role-edit.html | 8 +- .../pages/user/user-role-editForIn.html | 8 +- .../templates/pages/user/userInfo.html | 8 +- .../templates/pages/user/userRole.html | 10 +- .../templates/pages/user/userRoleForIn.html | 10 +- .../pages/warehouse/depository-out.html | 8 ++ .../pages/warehouse/depository_add.html | 8 +- .../templates/pages/warehouse/manager.html | 8 ++ .../pages/warehouse/warehouseByParentId.html | 7 ++ .../pages/warehouse/warehouse_view.html | 7 ++ target/classes/static/css/public.css | 7 ++ .../pages/application/application-review.html | 9 +- .../application/form-step-look_back.html | 8 +- .../form-step-look_minRecordOut.html | 8 +- .../templates/pages/chart/chart-in_back.html | 10 +- .../templates/pages/chart/chart-out_back.html | 9 +- .../pages/depository/table-in_mobile.html | 5 +- .../templates/pages/depository/table-out.html | 7 ++ 129 files changed, 948 insertions(+), 107 deletions(-) diff --git a/src/main/resources/static/css/public.css b/src/main/resources/static/css/public.css index afa8533a..974e0593 100644 --- a/src/main/resources/static/css/public.css +++ b/src/main/resources/static/css/public.css @@ -283,3 +283,10 @@ body { font-size: larger; } +#refresh{ + position: fixed; + right: 5px; + top: 15px; + z-index: 999; +} + diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html index 893b1576..ad236c4e 100644 --- a/src/main/resources/templates/pages/application/application-in.html +++ b/src/main/resources/templates/pages/application/application-in.html @@ -7,6 +7,7 @@ + @@ -41,11 +42,11 @@ -
+
  • 物料入库
    • @@ -60,7 +61,6 @@
    -
    @@ -218,7 +218,7 @@
    - +
    - -
    + +
    - +
    = 300) { var d = data.data; if (d === "") { - layer.msg(data.statusInfo.detail,{icon:0,time:500},function () { + layer.msg(data.statusInfo.detail, {icon: 0, time: 500}, function () { flagForForm = false; }); } else { @@ -516,7 +516,7 @@ }); // 用于提交操作(组合) form.on('submit(formStep2)', function (data) { - if(!GroupflagForForm){ + if (!GroupflagForForm) { GroupflagForForm = true; data = data.field; data.type = 1; @@ -533,7 +533,7 @@ success: function (d) { layer.close(this.layerIndex); if (d.status >= 300) { - layer.msg(d.statusInfo.detail,{icon:5,time:1000},function() { + layer.msg(d.statusInfo.detail, {icon: 5, time: 1000}, function () { GroupflagForForm = false; });//失败的表情 @@ -716,9 +716,9 @@ var req = {}; req.code = code; req.type = "in"; - if(code !== ""){ + if (code !== "") { // 展示遮盖层 - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/findMatrialByCode", type: "get", @@ -729,10 +729,10 @@ var d = d.data; var idNumber = materialId.name.split("mid")[1]; if (d == null) { - layer.msg("没有该编码，请确认是否输入正确",{ - icon:0, - time:500 - },function () { + layer.msg("没有该编码，请确认是否输入正确", { + icon: 0, + time: 500 + }, function () { layer.close(loading2) materialName.value = ""; materialId.value = ""; @@ -786,8 +786,7 @@ if (shelfLife !== null && shelfLife !== undefined) { $("#" + "producedDateItem" + idNumber).show(); $("#" + "producedDate" + idNumber).attr("lay-verify", "required"); - } - else { + } else { $("#" + "producedDateItem" + idNumber).hide(); } layer.close(loading2) @@ -837,7 +836,7 @@ end: function () { var mid = materialId.value; if (mid !== '') { - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/findMatrialById?mid=" + mid, type: "get", @@ -911,8 +910,8 @@ var materialId = materialName.parentNode.parentNode.childNodes[3]; var req = {}; data = data.split(",")[0]; - if(data !== ""){ - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + if (data !== "") { + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); req.mname = data; $.ajax({ url: "/material/findMaterialByCondition", @@ -922,20 +921,20 @@ contentType: "application/json;charset=utf-8", success: function (d) { if (d.count > 1) { - layer.msg("请点击右侧搜索确定物品",{ - icon:0, - time:500 - },function () { + layer.msg("请点击右侧搜索确定物品", { + icon: 0, + time: 500 + }, function () { materialId.value = ""; codeValue.value = ""; layer.close(loading2) }); return false; } else if (d.count === 0) { - layer.msg("没有该物品，请确认输入是否正确",{ - icon:5, - time:500 - },function() { + layer.msg("没有该物品，请确认输入是否正确", { + icon: 5, + time: 500 + }, function () { materialId.value = ""; codeValue.value = ""; materialName.value = ""; @@ -976,10 +975,9 @@ scanCodeInStorage = function (obj) { let wxScan = parent; - if(wxScan.wx === undefined){ + if (wxScan.wx === undefined) { wxScan = wxScan.parent.wx; - } - else{ + } else { wxScan = wxScan.wx; } wxScan.scanQRCode({ @@ -993,7 +991,7 @@ req.qrCode = result; req.codeFlag = 2; $("#qrCode" + obj.id.split("qrCodeImg")[1]).val(result); - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/qywxApplicationInScanQrCode", type: "post", @@ -1089,10 +1087,9 @@ scanBarCode = function (obj) { let wxScan = parent; - if(wxScan.wx === undefined){ + if (wxScan.wx === undefined) { wxScan = wxScan.parent.wx; - } - else{ + } else { wxScan = wxScan.wx; } wxScan.scanQRCode({ @@ -1105,7 +1102,7 @@ var req = {}; req.qrCode = result; req.codeFlag = 1; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/qywxApplicationInScanBarCode", type: "post", @@ -1161,8 +1158,7 @@ layer.close(loading2) form.render(); - } - else { + } else { // 如果没有对应关系 layer.msg("对于编码：" + result + ",并未发现对应的物料", { icon: 0, @@ -1236,22 +1232,21 @@ scanLocationByQrCode = function (obj) { let wxScan = parent; - if(wxScan.wx === undefined){ + if (wxScan.wx === undefined) { wxScan = wxScan.parent.wx; - } - else{ + } else { wxScan = wxScan.wx; } wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 var req = {}; req.qrCode = result; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/place/qywxApplicationInScanQrCode", type: "post", @@ -1267,10 +1262,10 @@ var placeId = parent.childNodes[5]; if (flag === 0) { // 如果没有获取到位置 - layer.msg("并未查询到对应位置，请重新扫描",{ - icon:0, - time:1000 - },function () { + layer.msg("并未查询到对应位置，请重新扫描", { + icon: 0, + time: 1000 + }, function () { layer.close(loading2) }); } else if (flag === 1) { @@ -1311,9 +1306,9 @@ // gname let gnameItem = gnameParent.childNodes[1].childNodes[1]; let req = {}; - if(code !== ""){ + if (code !== "") { req.code = code; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/group/findGroupByCodeForIn", type: "post", @@ -1405,7 +1400,7 @@ end: function () { let gid = gidItem.value; if (gid !== '') { - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); let req = {}; req.gid = gid; @@ -1477,7 +1472,7 @@ if (gname !== '') { - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); var req = {}; req.gname = gname; @@ -1562,22 +1557,21 @@ scanCodeByOut = function (obj) { let wxScan = parent; - if(wxScan.wx === undefined){ + if (wxScan.wx === undefined) { wxScan = wxScan.parent.wx; - } - else{ + } else { wxScan = wxScan.wx; } wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 var req = {}; req.qrCode = result; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/qywxApplicationOutScanQrCode", @@ -1819,6 +1813,9 @@ }; + $('body').on('click', '[data-refresh]', function () { + location.reload(); + }) }) diff --git a/src/main/resources/templates/pages/application/application-in_back.html b/src/main/resources/templates/pages/application/application-in_back.html index 3e38710d..ce63e17c 100644 --- a/src/main/resources/templates/pages/application/application-in_back.html +++ b/src/main/resources/templates/pages/application/application-in_back.html @@ -7,8 +7,10 @@ + +
    +
      @@ -1612,6 +1614,9 @@ } }); + $('body').on('click', '[data-refresh]', function () { + location.reload(); + }) }) diff --git a/src/main/resources/templates/pages/application/application-out_back.html b/src/main/resources/templates/pages/application/application-out_back.html index cbae4bc3..9800dbcf 100644 --- a/src/main/resources/templates/pages/application/application-out_back.html +++ b/src/main/resources/templates/pages/application/application-out_back.html @@ -9,6 +9,7 @@ +
      + +
      @@ -415,6 +418,10 @@ } }; + $('body').on('click', '[data-refresh]', function () { + location.reload(); + }) + }) diff --git a/src/main/resources/templates/pages/application/application-out_min-mobile.html b/src/main/resources/templates/pages/application/application-out_min-mobile.html index 9a7db4a6..7c543c29 100644 --- a/src/main/resources/templates/pages/application/application-out_min-mobile.html +++ b/src/main/resources/templates/pages/application/application-out_min-mobile.html @@ -9,8 +9,10 @@ + +
      @@ -132,7 +134,11 @@ } }) - } + }; + + $('body').on('click', '[data-refresh]', function () { + location.reload(); + }) }); diff --git a/src/main/resources/templates/pages/application/application-out_min.html b/src/main/resources/templates/pages/application/application-out_min.html index c310f18d..e1d80eb6 100644 --- a/src/main/resources/templates/pages/application/application-out_min.html +++ b/src/main/resources/templates/pages/application/application-out_min.html @@ -9,9 +9,10 @@ + - +
      @@ -119,6 +120,10 @@ } }) } + }); + + $('body').on('click', '[data-refresh]', function () { + location.reload(); }) }); diff --git a/src/main/resources/templates/pages/application/application-out_temporaryValue.html b/src/main/resources/templates/pages/application/application-out_temporaryValue.html index bef1f380..9855ffdd 100644 --- a/src/main/resources/templates/pages/application/application-out_temporaryValue.html +++ b/src/main/resources/templates/pages/application/application-out_temporaryValue.html @@ -9,6 +9,8 @@ + + + +
      @@ -1064,6 +1068,10 @@ }); + $('body').on('click', '[data-refresh]', function () { + location.reload(); + }) + }) diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html index 67c9f845..ab8e01b6 100644 --- a/src/main/resources/templates/pages/application/application-review.html +++ b/src/main/resources/templates/pages/application/application-review.html @@ -9,10 +9,13 @@ +
      + +
      @@ -314,7 +317,11 @@ fixed:false, content: '/form_step_lookByminRecordOut?id='+minId, }); - } + }; + + $('body').on('click', '[data-refresh]', function () { + location.reload(); + }) }) diff --git a/src/main/resources/templates/pages/application/application-transfer.html b/src/main/resources/templates/pages/application/application-transfer.html index 19a42598..850c40cf 100644 --- a/src/main/resources/templates/pages/application/application-transfer.html +++ b/src/main/resources/templates/pages/application/application-transfer.html @@ -9,6 +9,7 @@ +
      +