From ad16dd7770453fa11aa9a664417f6515a16007a7 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 24 Apr 2023 15:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=BA=93=E5=AD=98=E5=8F=AF=E8=A7=86=E5=8C=96?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/stockTaking/stockTakingForLocation_mobile.js | 2 +- src/main/resources/templates/pages/self/message.html | 5 ++--- .../pages/stockTaking/stockTaking_mobile.html | 4 ++++ .../com/dreamchaser/depository_manage/OtherTest.java | 11 ++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/resources/static/js/stockTaking/stockTakingForLocation_mobile.js b/src/main/resources/static/js/stockTaking/stockTakingForLocation_mobile.js index 67309633..4d672fe7 100644 --- a/src/main/resources/static/js/stockTaking/stockTakingForLocation_mobile.js +++ b/src/main/resources/static/js/stockTaking/stockTakingForLocation_mobile.js @@ -195,7 +195,7 @@ layui.use(['form', 'step', 'flow', 'inputTag'], function () { area: ['70%', '70%'], move: '.layui-layer-title', fixed: false, - content: '/selectDepository?type=2', + content: '/selectDepository?type=1', success: function (layero, index) { var children = layero.children(); var content = $(children[1]); diff --git a/src/main/resources/templates/pages/self/message.html b/src/main/resources/templates/pages/self/message.html index a8530ac9..9291be37 100644 --- a/src/main/resources/templates/pages/self/message.html +++ b/src/main/resources/templates/pages/self/message.html @@ -229,11 +229,10 @@ } - layui.use(['layer', 'miniTab', 'echarts'], function () { + layui.use(['layer', 'miniTab'], function () { var $ = layui.jquery, layer = layui.layer, - miniTab = layui.miniTab, - echarts = layui.echarts; + miniTab = layui.miniTab; miniTab.listen(); diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking_mobile.html b/src/main/resources/templates/pages/stockTaking/stockTaking_mobile.html index 2159af1c..bdce3f29 100644 --- a/src/main/resources/templates/pages/stockTaking/stockTaking_mobile.html +++ b/src/main/resources/templates/pages/stockTaking/stockTaking_mobile.html @@ -43,6 +43,10 @@ .lay-step { display: none; } + + .layui-card-header{ + height: 100%; + } diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java index 2edfe6b7..366a72b9 100644 --- a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java @@ -5,10 +5,7 @@ import com.dreamchaser.depository_manage.config.QyWx_approval_template.Approval_ import com.dreamchaser.depository_manage.entity.UserByPort; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver; -import com.dreamchaser.depository_manage.service.DepositoryRecordService; -import com.dreamchaser.depository_manage.service.DepositoryService; -import com.dreamchaser.depository_manage.service.MaterialService; -import com.dreamchaser.depository_manage.service.MaterialTypeService; +import com.dreamchaser.depository_manage.service.*; import com.dreamchaser.depository_manage.utils.DateUtil; import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil; import lombok.Data; @@ -29,6 +26,9 @@ public class OtherTest { @Autowired DepositoryRecordService depositoryRecordService; + @Autowired + StockTakingService stockTakingService; + @Test @@ -38,7 +38,8 @@ public class OtherTest { ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); approver.setUserId("PangFuZhen"); approvalInfo.setApprover(approver); - depositoryRecordService.reviewByQyWxApprovalIn("[8]",approvalInfo,"42156e781cdc727e7d5deac872be45a9","2","202304240010"); +// depositoryRecordService.reviewByQyWxApprovalIn("[10, 11]",approvalInfo,"42156e781cdc727e7d5deac872be45a9","2","202304240015"); + stockTakingService.reviewByQyWxApproval("4",approvalInfo,"42156e781cdc727e7d5deac872be45a9","2","202304240042"); } }