Browse Source

页面间距调整

lwx_dev
erdanergou 3 years ago
parent
commit
7f789ef593
  1. 4
      src/main/java/com/dreamchaser/depository_manage/config/QyWxConfig.java
  2. 4
      src/main/java/com/dreamchaser/depository_manage/config/WebMvcConfig.java
  3. 16
      src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
  4. 2
      src/main/resources/static/lib/layui-v2.6.3/css/layui.css
  5. 2
      src/main/resources/templates/pages/application/application-in.html
  6. 2
      src/main/resources/templates/pages/application/application-in_scanQrCode.html
  7. 24
      src/main/resources/templates/pages/application/application-out.html
  8. 5
      src/main/resources/templates/pages/application/application-transfer.html
  9. 8
      src/main/resources/templates/pages/material/material-add.html
  10. 5
      src/main/resources/templates/pages/material/selectDepositoryByCard.html
  11. 7
      src/test/java/com/dreamchaser/depository_manage/Test.java

4
src/main/java/com/dreamchaser/depository_manage/config/QyWxConfig.java

@ -41,6 +41,10 @@ public class QyWxConfig {
public static String sEncodingAESKey = "10cruMoq3ixrQQngJcMN6CzOYrHWmHMpxp2Xn5iYrsk";
//企业微信出库审批模板ID
public static String out_template_id = "3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF";
// 用于jsapi的url
public static String jsApiUrl = "https://jy.hxgk.group/";

4
src/main/java/com/dreamchaser/depository_manage/config/WebMvcConfig.java

@ -16,8 +16,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
registry.addInterceptor(new UserInterceptor())
.addPathPatterns("/**")
.excludePathPatterns("/login", "/register", "/sendCode", "/error","/QyWxLogin","/callback")
.excludePathPatterns("/static/**")
.excludePathPatterns("/static/js/**");
.excludePathPatterns("classpath:/static/**")
.excludePathPatterns("/static/**");
}

16
src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java

@ -1330,4 +1330,20 @@ public class QyWxOperationService {
}
/**
* 获取审批模板详细
* @return
*/
public JSONObject getApprovalTemplateInfo(String userAgent,String template_id){
String url = String.format("https://qyapi.weixin.qq.com/cgi-bin/oa/gettemplatedetail?access_token="+QyWxConfig.GetQYWXToken(userAgent));
Map<String,String> param = new HashMap<>();
param.put("template_id",template_id);
String jsonString = JSONObject.toJSONString(param);
String s = HttpUtils.doPost(url, jsonString);
JSONObject jsonObject = JSON.parseObject(s);
return jsonObject;
}
}

2
src/main/resources/static/lib/layui-v2.6.3/css/layui.css

File diff suppressed because one or more lines are too long

2
src/main/resources/templates/pages/application/application-in.html

@ -753,7 +753,7 @@
};
// 用于打开仓库树形菜单
openDepositoryTree = function (obj) {
var parent = obj.parentNode.parentNode.parentNode;
var parent = obj.parentNode.parentNode.parentNode.parentNode;
var parentId = parent.id;
layer.open({
type: 2,

2
src/main/resources/templates/pages/application/application-in_scanQrCode.html

@ -793,7 +793,7 @@
// 用于打开仓库树形菜单
openDepositoryTree = function (obj) {
var parent = obj.parentNode.parentNode.parentNode;
var parent = obj.parentNode.parentNode.parentNode.parentNode;
var parentId = parent.id;
layer.open({
type: 2,

24
src/main/resources/templates/pages/application/application-out.html

@ -27,6 +27,9 @@
width: 100%;
border-style: none;
}
.layui-card-body{
padding: 10px 5px;
}
</style>
<div class="layuimini-container">
@ -215,6 +218,27 @@
}, function () {
step.next('#stepForm');
});
parent.wx.invoke('thirdPartyOpenPage', {
"oaType": "10001",// String
"templateId": "3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF",// String
"thirdNo": "123456123456",// String
"extData": {
'fieldList': [{
'title': '采购类型',
'type': 'text',
'value': '市场活动',
},
{
'title': '订单链接',
'type': 'link',
'value': 'https://work.weixin.qq.com',
}],
}
},
function(res) {
// 输出接口的回调信息
console.log(res);
});
}
},
complete: function () {

5
src/main/resources/templates/pages/application/application-transfer.html

@ -26,6 +26,9 @@
.layui-form-select{
width: 100%;
}
.layui-card-body{
padding: 10px 5px;
}
</style>
<div class="layuimini-container">
<div class="layuimini-main">
@ -710,7 +713,7 @@
// 用于打开仓库树形菜单
openDepositoryTree = function (obj) {
var parent = obj.parentNode.parentNode.parentNode;
var parent = obj.parentNode.parentNode.parentNode.parentNode;
var parentId = parent.id;
layer.open({
type: 2,

8
src/main/resources/templates/pages/material/material-add.html

@ -23,14 +23,18 @@
margin-left: 80px;
}
.layui-fluid{
padding-left: 0px;
padding-right: 0px;
}
</style>
<div class="layuimini-container">
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<fieldset class="table-search-fieldset" style="padding: 10px 2px 5px;">
<legend>物料创建</legend>
<div class="layui-fluid">
<div class="layui-card">
<div class="layui-card-body" style="padding-top: 40px;">
<div class="layui-card-body" style="padding-top: 40px;padding-left:0px;padding-right:0px">
<div>
<form class="layui-form"
style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px" lay-filter="form1">

5
src/main/resources/templates/pages/material/selectDepositoryByCard.html

@ -41,14 +41,15 @@
var windowParent = $("#" + clickObj, window.parent.document)[0];
var depositoryChildren = null;
if (windowParent.childNodes.length === 17) {
depositoryChildren = windowParent.childNodes[13];
depositoryChildren = windowParent.childNodes[15];
} else {
depositoryChildren = windowParent.childNodes[15];
}
var depositoryItem = depositoryChildren.childNodes[3].childNodes;
var depositoryItem = depositoryChildren.childNodes[3].childNodes[1].childNodes;
var depositoryName = depositoryItem[1];
var depositoryId = depositoryItem[3];
var placeId = depositoryItem[5];
if(!flag) {
depositoryName.value = obj.data.title;
depositoryId.value = obj.data.id;

7
src/test/java/com/dreamchaser/depository_manage/Test.java

@ -72,10 +72,15 @@ public class Test {
@Autowired
QyWxOperationService qyWxOperationService;
@org.junit.Test
public void test1() throws AesException, IOException, ParserConfigurationException, SAXException {
System.out.println(DateUtil.TimeStampToDateTime(Long.valueOf("1667962474000")));
String agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.35";
String crypt = Md5.crypt(agent);
JSONObject approvalTemplateInfo = qyWxOperationService.getApprovalTemplateInfo(crypt, QyWxConfig.out_template_id);
System.out.println(approvalTemplateInfo);
}

Loading…
Cancel
Save