diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/controller/PrepaymentController.java b/src/main/java/com/bonus/boot/manager/ca/bm/controller/PrepaymentController.java index 3881a39..8f46d12 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/controller/PrepaymentController.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/controller/PrepaymentController.java @@ -233,6 +233,13 @@ public class PrepaymentController { return service.getType(); } + @LogAnnotation + @GetMapping("/getUnit") + @ApiOperation(value = "往来单位下拉选") + public List getUnit() { + return service.getUnit(); + } + @LogAnnotation @GetMapping("/getProId") @ApiOperation(value = "工程下拉选") diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/dao/PrepaymentDao.java b/src/main/java/com/bonus/boot/manager/ca/bm/dao/PrepaymentDao.java index 4301b4c..bcc9766 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/dao/PrepaymentDao.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/dao/PrepaymentDao.java @@ -80,4 +80,6 @@ public interface PrepaymentDao { List getType(); List getProId(); + + List getUnit(); } diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/service/PrepaymentService.java b/src/main/java/com/bonus/boot/manager/ca/bm/service/PrepaymentService.java index 9e9005d..bfb92aa 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/service/PrepaymentService.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/service/PrepaymentService.java @@ -125,4 +125,6 @@ public interface PrepaymentService { List getType(); List getProId(); + + List getUnit(); } diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java b/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java index d9e0401..558904d 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java @@ -500,4 +500,9 @@ public class PrepaymentServiceImpl implements PrepaymentService { public List getProId() { return dao.getProId(); } + + @Override + public List getUnit() { + return dao.getUnit(); + } } diff --git a/src/main/resources/mappers/ca/PrepaymentMapper.xml b/src/main/resources/mappers/ca/PrepaymentMapper.xml index 4115139..c969513 100644 --- a/src/main/resources/mappers/ca/PrepaymentMapper.xml +++ b/src/main/resources/mappers/ca/PrepaymentMapper.xml @@ -301,7 +301,7 @@ SELECT count(1) FROM bm_project_prepayment WHERE IS_ACTIVE = 1 - AND (type = #{id} or business_unit = #{id}) + AND (type = #{id} or business_unit = #{id} or contact_unit = #{id}) + \ No newline at end of file diff --git a/src/main/resources/static/js/prepayment/addPro.js b/src/main/resources/static/js/prepayment/addPro.js index df6f375..3961e3d 100644 --- a/src/main/resources/static/js/prepayment/addPro.js +++ b/src/main/resources/static/js/prepayment/addPro.js @@ -11,6 +11,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function(){ }); getBusinessUnit(""); getType(""); + getUnit("") getProId( "") initData(); form.render(); @@ -160,6 +161,31 @@ function getType(id){ }) } +//往来单位 +function getUnit(id){ + $("#contactUnit").empty(); + $.ajax({ + url: ctxPath + '/prepayment/getUnit', + method: 'get', + async: false, + success: function (data) { + var str = ''; + if (data.length > 0) { + str += ''; + for (var i = 0; i < data.length; i++) { + if (id == data[i].id) { + str += ''; + } else { + str += ''; + } + } + } + $("#contactUnit").append(str); + layui.form.render('select') + } + }) +} + //查询工程下拉选 function getProId(id){ $("#projectId").empty(); diff --git a/src/main/resources/static/js/prepayment/proList.js b/src/main/resources/static/js/prepayment/proList.js index 777da40..60de6d6 100644 --- a/src/main/resources/static/js/prepayment/proList.js +++ b/src/main/resources/static/js/prepayment/proList.js @@ -265,4 +265,60 @@ function getProId(id){ layui.form.render('select') } }) +} + +/** + * 字典功能 + */ +function addDict() { + var index = layer.open({ + title: ["字典管理", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: "./proDictList.html", + area: ["90%", "90%"], + maxmin: false, + btn: ['刷新关闭', '关闭'], + // 第一个按钮(关闭)的回调 + yes: function(index, layero) { + layer.close(index); // 先关闭 + window.location.reload(); // 刷新父页面(当前页面) + return false; // 阻止默认关闭行为(其实已手动关闭,这里 return false 更保险) + }, + // 第二个按钮(关闭-刷新)的回调 + btn2: function(index, layero) { + layer.close(index); // 直接关闭 + }, + }); +} + +/** + *工程功能 + */ +function addPro() { + var index = layer.open({ + title: ["工程管理", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: "./proManage.html", + area: ["90%", "90%"], + maxmin: false, + btn: ['刷新关闭', '关闭'], + // 第一个按钮(关闭)的回调 + yes: function(index, layero) { + layer.close(index); // 先关闭 + window.location.reload(); // 刷新父页面(当前页面) + return false; // 阻止默认关闭行为(其实已手动关闭,这里 return false 更保险) + }, + // 第二个按钮(关闭-刷新)的回调 + btn2: function(index, layero) { + layer.close(index); // 直接关闭 + }, + }); +} + +function refresh(){ + layer.confirm('确定要刷新吗?', { + btn : [ '确定', '取消' ] + }, function() { + window.location.reload(); + }); } \ No newline at end of file diff --git a/src/main/resources/static/pages/prepayment/addPro.html b/src/main/resources/static/pages/prepayment/addPro.html index 5dc1625..fd61143 100644 --- a/src/main/resources/static/pages/prepayment/addPro.html +++ b/src/main/resources/static/pages/prepayment/addPro.html @@ -60,7 +60,11 @@
- + + +
diff --git a/src/main/resources/static/pages/prepayment/proDictForm.html b/src/main/resources/static/pages/prepayment/proDictForm.html index 21b2d85..aef1ec3 100644 --- a/src/main/resources/static/pages/prepayment/proDictForm.html +++ b/src/main/resources/static/pages/prepayment/proDictForm.html @@ -10,7 +10,7 @@ /* CSS样式 */ #my-button { position: absolute; - top: 15px; + top: 300px; right: 450px; } @@ -31,6 +31,7 @@ +
diff --git a/src/main/resources/static/pages/prepayment/proDictList.html b/src/main/resources/static/pages/prepayment/proDictList.html index d399c99..83c1b2f 100644 --- a/src/main/resources/static/pages/prepayment/proDictList.html +++ b/src/main/resources/static/pages/prepayment/proDictList.html @@ -48,6 +48,7 @@ + + + + + + +