From a18afff297281276e65db83e5a8411661faa6618 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 21 十一月 2022 13:42:26 +0800
Subject: [PATCH] #
---
src/main/webapp/views/planType/planType.html | 2
src/main/java/com/zy/crm/manager/controller/PlanController.java | 2
src/main/webapp/static/js/plan/plan.js | 47 +++++++++++++----------
src/main/java/com/zy/crm/manager/controller/PlanTypeController.java | 11 ++++-
src/main/webapp/views/plan/plan.html | 27 +++++++++----
src/main/resources/application.yml | 10 ++--
6 files changed, 61 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 53e3926..27ce18e 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -39,7 +39,7 @@
@Autowired
private PlanService planService;
- @RequestMapping(value = "/plan/{id}/auth")
+ @GetMapping(value = "/plan/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
return R.ok(planService.selectById(String.valueOf(id)));
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java b/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java
index 5608d40..822f846 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java
@@ -24,15 +24,20 @@
@Autowired
private PlanTypeService planTypeService;
- @RequestMapping(value = "/planType/{id}/auth")
+ @GetMapping(value = "/planType/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
return R.ok(planTypeService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/planType/list/auth")
+ @PostMapping(value = "/planType/list/auth")
+ public R list() {
+ return R.ok().add(planTypeService.selectList(new EntityWrapper<PlanType>().orderBy("id")));
+ }
+
+ @RequestMapping(value = "/planType/page/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
+ public R page(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8e07da0..212dcdc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,12 +9,12 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
-# username: sa
-# password: Zoneyung@zy56$
- url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
+ url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
username: sa
- password: sa@123
+ password: Zoneyung@zy56$
+# url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
+# username: sa
+# password: sa@123
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 31bfe0e..f3c86f9 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -19,6 +19,7 @@
var cascader = layui.cascader;
var tree = layui.tree;
var dropdown = layui.dropdown;
+ var element = layui.element;
$('#organization').html(localStorage.getItem('nickname') + ' <i class="layui-icon"></i>');
@@ -193,7 +194,32 @@
// 娣诲姞
$("#planAddBtn").click(function () {
- showEditModel();
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/planType/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ admin.open({
+ type: 1,
+ area: '300px',
+ title: '鏂板缓鍞墠瑙勫垝鐢宠鍗�',
+ content: $('#addDialogPre').html(),
+ success: function (layero, dIndex) {
+ element.init();
+ form.render();
+ layer.close(loadIndex);
+ console.log(res.data);
+ }
+ })
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
});
// 鍒犻櫎
@@ -220,25 +246,6 @@
where: searchData,
page: {curr: 1}
});
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(plan)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
- case 'addData':
- showEditModel();
- break;
- case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
- }
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 586a83b..61cc78a 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -52,6 +52,10 @@
#detail .layui-input-block {
margin-left: 150px;
}
+
+ .layui-form-radio {
+ display: block;
+ }
</style>
</head>
<body>
@@ -102,14 +106,6 @@
</div>
</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
- </div>
-</script>
-
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
@@ -122,6 +118,21 @@
<script type="text/javascript" src="../../static/layui/lay/modules/cascader/citys-data.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/plan/plan.js" charset="utf-8"></script>
</body>
+<script type="text/html" id="addDialogPre">
+ <div class="layui-form admin-form">
+ <div class="layui-input-block" style="margin: 20px 0px 20px 30px">
+ <input type="radio" name="gk" value="0" title="鍏紑" checked>
+ <input type="radio" name="gk" value="1" title="閮ㄥ垎鍏紑">
+ <input type="radio" name="gk" value="2" title="涓嶅叕寮�">
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right" style="margin-right: 20px">
+ <button class="layui-btn" lay-filter="planTypeSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </div>
+</script>
+
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
<form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
diff --git a/src/main/webapp/views/planType/planType.html b/src/main/webapp/views/planType/planType.html
index d25526c..d48f46a 100644
--- a/src/main/webapp/views/planType/planType.html
+++ b/src/main/webapp/views/planType/planType.html
@@ -156,7 +156,7 @@
var insTb = table.render({
elem: '#planTypeTable',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/planType/list/auth',
+ url: baseUrl+'/planType/page/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
--
Gitblit v1.9.1