bugs

modules/main/facade/ration_facade.js

@@ -339,7 +339,7 @@ function getCustomerCoeData() {
         { amount:1, operator:'*', gljCode:null, coeType:'人工'},
         { amount:1, operator:'*', gljCode:null, coeType:'材料'},
         { amount:1, operator:'*', gljCode:null, coeType:'机械'},
-        { amount:1, operator:'*', gljCode:null, coeType:'主材'},
+       /* { amount:1, operator:'*', gljCode:null, coeType:'主材'},*/
         { amount:1, operator:'*', gljCode:null, coeType:'设备'}
     ];
     return coeList;
@@ -351,7 +351,7 @@ async function getCustomerCoe(projectID,rationID,seq,compilation){//取自定义
     let lastCoe ={
         coeID:-1,
         name : '自定义系数',
-        content:'人工×1，材料×1，机械×1，主材×1，设备×1',
+        content:'人工×1，材料×1，机械×1，设备×1',//主材×1，
         isAdjust:1,
         seq:seq,
         rationID : rationID,

web/building_saas/complementary_ration_lib/html/gongliao.html

@@ -43,7 +43,7 @@
                       <a class="nav-link px-3" id="drirect-dinge" href="<%= redirectRation %>">定额</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link active px-3">人材机</a>
+                      <a class="nav-link active px-3">工料机</a>
                   </li>
                 <!--  <li class="nav-item">
                       <a class="nav-link px-3" id="fuzhu" href="<%= redirectCoe %>">子目换算</a>

web/building_saas/complementary_ration_lib/js/coe.js

@@ -515,7 +515,7 @@ let gljAdjOprObj = {
         ],
         comboItems: {
             //调整类型下拉菜单
-            coeType: ['定额', '人工', '材料', '机械', '主材', '设备', '单个工料机'],
+            coeType: ['定额', '人工', '材料', '机械',  '设备', '单个工料机'],
             //操作符下拉菜单
             operator: ['+', '-', '*', '/', '=']
         }

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-bg.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/glj/html/project_glj.html

@@ -8,7 +8,14 @@
         <label class="mx-2">使用单价文件：<span id="current-name"></span>（<label class="a_color" id="pop-used-list" data-original-title="" title="">与<span id="used-project-count">0</span>个单位工程同步</label>）
             <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-unitFile"><i class="fa fa-exchange"></i> 选择其他</a>
             <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#unitFile-save-as"><i class="fa fa-files-o"></i> 另存单独用</a></label>
+        <div class="input-group input-group-sm mr-2">
+            <select class="form-control form-control-sm">
+                <option>车船税标准</option>
+                <option>福建车船税标准（2012）</option>
+            </select>
+        </div>
     </div>
+
 </div>
 
 <div class="container-fluid">

web/building_saas/js/global.js

@@ -63,7 +63,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/models/ration_coe.js

@@ -89,7 +89,7 @@ var ration_coe = {
                 if(i==dataLength){
                     newCoe.coeID=-1;
                     newCoe.name = '自定义系数';
-                    newCoe.content='人工×1，材料×1，机械×1，主材×1，设备×1';
+                    newCoe.content='人工×1，材料×1，机械×1，设备×1';
                     newCoe.isAdjust=0;
                     newCoe.coes = this.getCustomerCoeData();
                 }else {
@@ -98,7 +98,7 @@ var ration_coe = {
                 criteria.ration_coe_list.push(newCoe);
             }
             criteria.updateType = 'ut_create';
-            console.log('enterrrrrrrrrrrrrrrrrrrrrr');
+            console.log('enter');
             console.log(criteria);
             return criteria;
         };
@@ -108,7 +108,6 @@ var ration_coe = {
             coeList.push({ amount:1, operator:'*', gljCode:null, coeType:'人工'});
             coeList.push({ amount:1, operator:'*', gljCode:null, coeType:'材料'});
             coeList.push({ amount:1, operator:'*', gljCode:null, coeType:'机械'});
-            coeList.push({ amount:1, operator:'*', gljCode:null, coeType:'主材'});
             coeList.push({ amount:1, operator:'*', gljCode:null, coeType:'设备'});
             return coeList;
         };

web/building_saas/main/js/views/main_tree_col.js

@@ -334,17 +334,17 @@ let MainTreeCol = {
                 let VPType = sheetCommonObj.getDynamicCombo();
                 if(node.sourceType == projectObj.project.Ration.getSourceType()){//是定额类型
                     if(node.data.type == rationType.volumePrice){
-                        VPType.itemHeight(5).items(["人工", "材料", "机械", "主材", "设备"])
+                        VPType.itemHeight(5).items(["人工", "材料", "机械", "设备"])
                         return VPType;
                     }else if(node.data.type == rationType.gljRation){
                         if(!MainTreeCol.readOnly.non_editSubType(node)&&gljOprObj.hasComposition(node.data,true)==false){
-                            VPType.itemHeight(3).items(["材料", "主材", "设备"]);
+                            VPType.itemHeight(3).items(["材料", "设备"]);
                             return VPType;
                         }
                     }
                 }else if(node.sourceType === projectObj.project.ration_glj.getSourceType()){//是工料机类型
                     if(!MainTreeCol.readOnly.non_editSubType(node)&&gljOprObj.hasComposition(node.data)==false){
-                        VPType.itemHeight(3).items(["材料", "主材", "设备"]);
+                        VPType.itemHeight(3).items(["材料",  "设备"]);
                         return VPType;
                     }
                 }

web/common/html/header.html

@@ -32,7 +32,7 @@
                 <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench" data-placement="bottom"></i> 工具</a>
                 <div class="dropdown-menu dropdown-menu-right">
                     <a id="compleRationLib" class="dropdown-item compleRationLib" href="/complementaryRation/ration" target="_blank">定额库编辑器</a>
-                    <a id="compleGljLib" class="dropdown-item compleGljLib" href="/complementaryGlj" target="_">人材机库编辑器</a>
+                    <a id="compleGljLib" class="dropdown-item compleGljLib" href="/complementaryGlj" target="_">工料机库编辑器</a>
                 </div>
             </li>
             <% } %>
@@ -76,7 +76,7 @@
                         <button class="dropdown-item dropdown-toggle" type="button" data-toggle="dropdown">工具</button>
                         <div class="dropdown-menu">
                             <a  class="dropdown-item compleRationLib" href="/complementaryRation/ration" target="_blank">定额库编辑器</a>
-                            <a  class="dropdown-item compleGljLib" href="/complementaryGlj" target="_">人材机库编辑器</a>
+                            <a  class="dropdown-item compleGljLib" href="/complementaryGlj" target="_">工料机库编辑器</a>
                         </div>
                     </div>
                     <% } %>

web/users/html/login.html

@@ -13,10 +13,14 @@
     <link rel="shortcut icon" href="/web/building_saas/css/favicon.ico">
     <link rel="icon" type="image/gif" href="/web/building_saas/css/animated_favicon1.gif">
 </head>
-<body>
-    <div class="container">
+<body class="login-body">
+    <div class="login-bg"></div>
+    <div class="container login-panel">
         <form class="form-signin" method="post" onsubmit="return false">
-            <h1 class="d-flex justify-content-center mb-5">纵横公路养护云版</h1>
+            <h1 class="d-flex justify-content-center mb-5">
+                <img src="/web/building_saas/img/building.png" width="40" height="40" class="mt-2 mr-3">
+                纵横云计价
+            </h1>
             <div class="form-group">
                 <input id="inputEmail" class="form-control " name="inputEmail" placeholder="通行账号 邮箱/手机" autofocus="" />
             </div>
@@ -36,7 +40,7 @@
                 <a href="http://sso.smartcost.com.cn/reg" target="_blank">免费注册</a>
             </div>
         </form>
-
+        <div class="text-white fixed-bottom"><p class="text-center mb-1">Copyright © 2018 <a href="https://smartcost.com.cn" target="_blank" class="text-white">珠海纵横造价软件有限公司</a>.All Rights Reserved.<a class="text-white ml-2" href="http://www.miitbeian.gov.cn" target="_blank">粤ICP备14032472号</a></p></div>
     </div>
     <!--弹出信息-->
     <div class="modal fade" id="ver" data-backdrop="static">