背景图

web/building_saas/css/main.css

@@ -26,6 +26,28 @@ a{
     text-indent:26px;
 }
 /*自定义css*/
+.login-body,.login-html{
+    height:100%;
+}
+.login-bg{
+    width: 100%;
+    height: 100%;
+    background: #f2f6f5 url("login-bgp.jpg") bottom center no-repeat;
+    background-size: 100% auto;
+    display: inline-block;
+    position: absolute;
+}
+.login-panel {
+    width: 500px;
+    margin: 0 auto;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 20%;
+    padding:30px;
+    background:#fff;
+    box-shadow:#333 1px 1px 5px
+}
 .header {
     border-bottom: 1px solid #ccc
 }
@@ -48,6 +70,10 @@ a{
     font-size:16px;
     color:#ff6501;
 }
+.header-logo div.b-title{
+    font-size:24px;
+    color:#ff6501;
+}
 .top-msg{
     position: fixed;
     top:10px;
@@ -366,10 +392,6 @@ a{
 .rn-nav .nav-tabs .nav-link.active span{
     display: inline-block;
 }
-.form-signin {
-    max-width: 500px;
-    margin: 150px auto;
-}
 .poj-list, .side-content ,.form-view{
     overflow: auto;
 }

web/building_saas/js/global.js

@@ -64,7 +64,7 @@ $(function () {
     /*工具提示*/
     $(function () {
         $('[data-toggle="tooltip"]').tooltip();
-        $('[data-submenu]').submenupicker();
+        if( $('[data-submenu]').submenupicker) $('[data-submenu]').submenupicker();
         $('[data-toggle="tooltip"]').click(function () {
             $(this).tooltip('hide');
         })

web/building_saas/main/js/views/mbzm_view.js

@@ -167,6 +167,33 @@ let mbzm_obj={
         console.log(data);
         $.bootstrapLoading.start();
         CommonAjax.post('/ration/applyTemplate',data,function (result) {
+            let parentsNodes = [];
+            //先删除旧的定额
+            if(data.rations.delete.length > 0){
+                for(let d of data.rations.delete){
+                    let dRaNode =  projectObj.project.mainTree.getNodeByID(d.ID);
+                    if(dRaNode){
+                        parentsNodes.push(dRaNode.parent);
+                        projectObj.project.Ration.deleteSubListOfRation({ID:d.ID});
+                        //_.remove(projectObj.project.Ration.datas)
+//project.Ration.datas
+                    }
+                }
+
+
+            }
+
+           /* if(updateData['ration']){
+                for(let r_key in updateData['ration']){//定额只有删除，没有更新
+                    _.remove(ration_datas,{'ID':r_key});
+                    project.Ration.deleteSubListOfRation({ID:r_key});
+                }
+            }
+            for(let r of refNodes){
+                controller.m_delete([r],r.serialNo())//这里删除关联子目生成的定额因为是离散的树节点，所以要这样分开处理
+            }
+            */
+
             let refreshNodes = projectObj.project.updateNodesCache(result.updateDatas);//更新要update的前端缓存，并返回要刷新的树节点
             let nodeDatas = {ration:{add:[]}, bills:{add:[]}};
             if(result.rationResult){