2019_09_10

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -609,18 +609,22 @@ public class SettementUtil {
      * @return 数据库匹配后返回  集合
      */
     public static List<Settlement> getSelectBdzSettlement(List<Settlement> settlementList){
+        boolean flag= false;
         boolean[] booleans =getJgforJoint(settlementList);
         String key="";
         String reason="";
         for(Settlement settlement:settlementList){
             key = settlement.getEntryName();
             if (key.equals(BashInfo.JS_CBRF)){
+                flag=true;
                 key = BDZ_TBRNAME;
             }
             if (key.equals(BashInfo.JS_FBRF)){
+                flag=true;
                 key=BDZ_ZBRNAME;
             }
             if (key.equals(BashInfo.JS_JGJS)){
+                flag=true;
                 key = BDZ_TBNAME;
             }
             switch (key){
@@ -629,6 +633,9 @@ public class SettementUtil {
                     settlement.setReason(reason);
                     break;
                 case  BDZ_TBRNAME:
+                    if(flag){
+                        settlement.setEntryName(BashInfo.JS_CBRF);
+                    }
                     reason = getJoint(BDZ_TBRCG,BDZ_TBRCG1,settlement);
                     settlement.setReason(reason);
                     break;
@@ -649,10 +656,16 @@ public class SettementUtil {
                     settlement.setReason(reason);
                     break;
                 case SettementUtil.BDZ_ZBRNAME:
+                    if(flag){
+                        settlement.setEntryName(BashInfo.JS_FBRF);
+                    }
                     reason=getDlJoint(BDZ_FBRF,settlement);
                     settlement.setReason(reason);
                     break;
                 case SettementUtil.BDZ_TBNAME:
+                    if(flag){
+                        settlement.setEntryName(BashInfo.JS_JGJS);
+                    }
                     reason = getBDZJoint(settlement,booleans);
                     settlement.setReason(reason);
                     break;

src/main/webapp/webpage/modules/sg/project/management.js

@@ -121,7 +121,8 @@ layui.config({
                 layer.open({
                     type: 2,
                     title: '添加项目',
-                    area: ['50%', '70%'],
+                    offset:['7%','20%'],
+                    area: ['60%', '90%'],
                     shade: 0.8,
                     shadeClose: true,
                     content: '${ctxp}/webpage/modules/sg/project/addItemForm.jsp'
@@ -153,7 +154,7 @@ layui.config({
     });
 });
 function refresh(){
-    window.location.reload();
+    $("#fromSumbit").submit();
 }
 function addProject(){
     layer.prompt({title: '请输入工程名称', formType: 3}, function(text, index){
@@ -179,6 +180,7 @@ function look(url) {
         type: 2,
         title: '查看',
         area: ['70%', '90%'],
+        offset:['7%','14%'],
         shade: 0.8,
 
         shadeClose: true,
@@ -193,6 +195,7 @@ function update(url) {
         type: 2,
         title: '修改工程',
         area: ['70%', '90%'],
+        offset:['6%','14%'],
         shade: 0.8,
         shadeClose: true,
         fixed: false, //不固定
@@ -213,6 +216,7 @@ function deleteItem(id) {
     layer.msg('你确定要删除吗？', {
          icon: 3
         , time: 0 //不自动关闭
+        ,offset:['40%','40%']
         , btn: ['确定', '取消']
         , yes: function (index) {
             $.ajax({
@@ -222,10 +226,11 @@ function deleteItem(id) {
                 dataType: "json",
                 success: function (data) {
                     if (data.success) {
-                        layer.msg(data.msg, {icon: 6});
-                        window.location.reload();
+                        layer.msg(data.msg, {icon: 6,offset:['40%','40%']},function () {
+                            window.location.reload();
+                        });
                     } else {
-                        layer.msg(data.msg, {icon: 5});
+                        layer.msg(data.msg, {icon: 5,offset:['40%','40%']});
                     }
                 }
             })
@@ -238,6 +243,7 @@ function deleteProject(id) {
         icon: 3
         , time: 0 //不自动关闭
         , btn: ['确定', '取消']
+        ,offset:['40%','40%']
         , yes: function (index) {
             $.ajax({
                 type: "post",
@@ -246,10 +252,11 @@ function deleteProject(id) {
                 dataType: "json",
                 success: function (data) {
                     if (data.success) {
-                        layer.msg(data.msg, {icon: 6});
-                        window.location.reload();
+                        layer.msg(data.msg, {icon: 6,offset:['40%','40%']},function () {
+                            window.location.reload();
+                        })
                     } else {
-                        layer.msg(data.msg, {icon: 5});
+                        layer.msg(data.msg, {icon: 5,offset:['40%','40%']});
                     }
                 }
             })

src/main/webapp/webpage/modules/sg/project/management.jsp

@@ -122,7 +122,7 @@
                             <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="noneBtn"><img class="layui-meself-img" src="${ctxp}/icon/solr.png" alt=""></button>
                         </div>
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
-                        <div id="page1"><div>
+                        <div id="page"><div>
                 </div>
             </div>
         </div>
@@ -136,7 +136,7 @@
             ,layer = layui.layer;
         //自定义排版
         laypage.render({
-            elem: 'page1'
+            elem: 'page'
             ,count: ${page.count}
             ,limit:${page.pageSize}
             ,curr:${page.pageNo}

src/main/webapp/webpage/modules/sg/projecttem/manageList.js

@@ -100,7 +100,8 @@
         layer.open({
         type: 2,
         title: '添加项目',
-        area: ['50%', '70%'],
+        area: ['60%', '90%'],
+        offset:['7%','20%'],
         shade: 0.8,
         shadeClose: true,
         content: '${ctxp}/webpage/modules/sg/projecttem/addItem.jsp'
@@ -169,6 +170,7 @@ function look(url) {
         type: 2,
         title: '查看',
         area: ['70%', '90%'],
+        offset:['7%','14%'],
         shade: 0.8,
 
         shadeClose: true,
@@ -183,6 +185,7 @@ function update(url) {
         type: 2,
         title: '修改工程',
         area: ['70%', '90%'],
+        offset:['7%','14%'],
         shade: 0.8,
         shadeClose: true,
         fixed: false, //不固定