Browse Source

添加卡片修改功能(无用)

lwx_dev
erdanergou 3 years ago
parent
commit
d5ef53f7ce
  1. 1
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  2. 2
      src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
  3. 5
      src/main/resources/templates/pages/user/table-user.html
  4. 2
      src/main/resources/templates/pages/user/userRoleForIn.html
  5. 4
      src/test/java/com/dreamchaser/depository_manage/TestForOther.java
  6. 2
      target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

1
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@ -1945,7 +1945,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
ApplicationOutRecord recordP = depositoryRecordMapper.findApplicationOutRecordPById(outId); ApplicationOutRecord recordP = depositoryRecordMapper.findApplicationOutRecordPById(outId);
// 获取当前审批所在部门 // 获取当前审批所在部门
// Integer maindeparment = userByPort.getMaindeparment();
if (!flagForFirst) { if (!flagForFirst) {

2
src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

@ -63,7 +63,7 @@
} else { } else {
wxScan = wxScan.parent.wx; wxScan = wxScan.parent.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
desc: 'scanQRCode desc', desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有 scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有

5
src/main/resources/templates/pages/user/table-user.html

@ -63,9 +63,10 @@
<table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table> <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
<script type="text/html" id="currentTableBar"> <script type="text/html" id="currentTableBar">
<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="add_role">设置权限</a> <a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn">设置权限</a>
<!-- <a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn">设置权限</a>-->
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a> <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="addRoleForIn">入库审核权</a> <!-- <a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="addRoleForIn">入库审核权</a>-->
</script> </script>
</div> </div>

2
src/main/resources/templates/pages/user/userRoleForIn.html

@ -36,7 +36,7 @@
//第一个实例 //第一个实例
table.render({ table.render({
elem: '#demo' elem: '#demo'
, url: '/findUserInRole?userId=' + userId+'&classes=1', //数据接口 , url: '/findUserInRole?uid=' + userId+'&classes=1', //数据接口
parseData: function (res) { //res 即为原始返回的数据 parseData: function (res) { //res 即为原始返回的数据
return { return {
"status": res.status, //解析接口状态 "status": res.status, //解析接口状态

4
src/test/java/com/dreamchaser/depository_manage/TestForOther.java

@ -36,6 +36,7 @@ import org.springframework.web.jsf.FacesContextUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.lang.reflect.Array;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.*; import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
@ -67,7 +68,8 @@ public class TestForOther {
// ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); // ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
// approver.setUserId("PangFuZhen"); // approver.setUserId("PangFuZhen");
// approvalInfo.setApprover(approver); // approvalInfo.setApprover(approver);
// depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"8ffd487e6b203bffa21142d383b70f47","2","202303240030", false,2); List<String> a = new ArrayList<String>(Collections.singleton("1"));
// depositoryRecordService.reviewByQyWxApprovalOut("5",approvalInfo,"7a0ab47a150869808b24d2f4dbe1bb74","2","202303280016", false,2);
// depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009"); // depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009");
// UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null); // UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null);
// List<String> s = excelService.writeExcelForPrint(2, 4,userByPort); // List<String> s = excelService.writeExcelForPrint(2, 4,userByPort);

2
target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

@ -63,7 +63,7 @@
} else { } else {
wxScan = wxScan.parent.wx; wxScan = wxScan.parent.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
desc: 'scanQRCode desc', desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有 scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有

Loading…
Cancel
Save