Explorar o código

计算程序管理链接式换成嵌入式。

Chenshilong %!s(int64=7) %!d(string=hai) anos
pai
achega
2181276ce9

+ 0 - 224
web/building_saas/main/html/calc_program.html

@@ -1,224 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>计算程序管理-Smartcost</title>
-    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/web/building_saas/css/main.css">
-    <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
-    <script src="/lib/jquery/jquery.min.js"></script>
-    <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.excel2013lightGray.10.0.1.css" type="text/css">
-    <script type="text/javascript" src="/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
-    <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
-    <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
-    <script type="text/javascript" src="/web/building_saas/main/js/models/ration_program.js"></script>
-    <script type="text/javascript" src="/web/building_saas/main/js/views/ration_programs_manage.js"></script>
-</head>
-
-<body>
-    <div class="header">
-        <!-- <div class="top-msg clearfix">
-            <div class="alert alert-warning mb-0 py-0" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                  <span aria-hidden="true">&times;</span>
-                </button>
-                <strong>注意!</strong> 这是一条消息通知 <a href="#">链接</a>
-            </div>
-        </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
-            <span class="header-logo px-2">Smartcost</span>
-            <div class="navbar-text"><a href="project-management.html">项目管理</a><i class="fa fa-angle-right fa-fw"></i>文件夹<i class="fa fa-angle-right fa-fw"></i>建设项目<i class="fa fa-angle-right fa-fw"></i>单项工程<i class="fa fa-angle-right fa-fw"></i>单位工程</div>
-            <div class="float-lg-right navbar-text pt-0">
-                <div class="dropdown d-inline-block">
-                    <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
-                    <div class="dropdown-menu dropdown-menu-right">
-                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
-                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
-                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
-                    </div>
-                </div>
-                <span class="btn btn-link btn-sm new-msg">
-                  <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
-                </span>
-                <button class="btn btn-link btn-sm">注销</button>
-            </div>
-        </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
-            <ul class="nav navbar-nav px-1">
-                <li class="nav-item">
-                    <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
-                </li>
-                <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench"></i> 工具</a>
-                    <div class="dropdown-menu">
-                        <a class="dropdown-item" href="#">定额库编辑器</a>
-                        <a class="dropdown-item" href="#">工料机库编辑器</a>
-                    </div>
-                </li>
-                <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle-o"></i> 帮助</a>
-                    <div class="dropdown-menu">
-                        <a class="dropdown-item" href="#">帮助</a>
-                        <a class="dropdown-item" href="#">升级说明</a>
-                        <a class="dropdown-item" href="#">重庆市2008定额说明</a>
-                        <a class="dropdown-item" href="#">纵横官网</a>
-                        <a class="dropdown-item" href="#">动画教程</a>
-                        <a class="dropdown-item" href="#">联系客服</a>
-                        <a class="dropdown-item" href="#">关于</a>
-                    </div>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false"><i class="fa fa-history"></i> 历史记录</a>
-                </li>
-            </ul>
-            <form class="form-inline">
-                <input class="form-control form-control-sm mr-1" type="text" placeholder="告诉我你想做什么">
-            </form>
-        </nav>
-    </div>
-    <div class="main">
-        <div class="main-nav">
-            <ul class="nav flex-column">
-                <li><a href="zaojiashu.html">造价书</a></li>
-                <li><a href="gongliaoji.html">工料机</a></li>
-                <li><a href="feilv.html">费率</a></li>
-                <li><a href="jisuanchengxu.html" class="active">计算程序</a></li>
-                <li><a href="baobiao.html">报表</a></li>
-            </ul>
-        </div>
-        <div class="content">
-            <div class="toolsbar">
-
-            </div>
-            <div class="container-fluid">
-                <div class="row">
-                  <div class="col-lg-3 p-0">
-                    <div class="main-data-full" id="mainSpread">
-<!--                       <table class="table table-sm table-bordered m-0">
-                         <thead>
-                           <tr><th>序号</th><th>专业名称</th></tr>
-                         </thead>
-                         <tbody>
-                           <tr><td>1</td><td>重庆计价规则(2013)</td></tr>
-                           <tr><td>2</td><td>-建筑工程</td></tr>
-                         </tbody>
-                       </table>-->
-                     </div>
-                   </div>
-                  <div class="col-lg-9 p-0">
-                    <div class="main-data-full" id="detailSpread">
-                       <!-- <table class="table table-sm table-bordered m-0">
-                            <thead>
-                                <th>序号</th>
-                                <th>编号</th>
-                                <th>费用名称</th>
-                                <th>计算基数</th>
-                                <th>计算说明</th>
-                                <th>费率(%)</th>
-                                <th>备注</th>
-                            </thead>
-                            <tbody>
-                              <tr>
-                                <td>1</td>
-                                <td>1</td>
-                                <td>基价直接工程费</td>
-                                <td>F2+F5+F6+F10 <a href="javacript:void(0);" class="btn btn-secondary btn-sm" data-toggle="modal" data-target="#jsjs">基数选择</a></td>
-                                <td>基价人工费+基价材料费+基价机械费+未计价材料费</td>
-                                <td></td>
-                                <td></td>
-                              </tr>
-                            </tobdy>
-                        </table>-->
-                    </div>
-                  </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!--弹出 计算基数-->
-    <div class="modal fade" id="jsjs" data-backdrop="static">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title">计算基础选择</h5>
-                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                  </button>
-                </div>
-                <div class="modal-body">
-                  <div class="form-group">
-                    <input class="form-control" value="分部分项工程费+100">
-                    <p class="form-text">
-                      <button class="btn btn-secondary btn-sm">+</button>
-                      <button class="btn btn-secondary btn-sm">-</button>
-                      <button class="btn btn-secondary btn-sm">*</button>
-                      <button class="btn btn-secondary btn-sm">/</button>
-                      <button class="btn btn-secondary btn-sm">(</button>
-                      <button class="btn btn-secondary btn-sm">)</button>
-                    </p>
-                  </div>
-                  <div class=" modal-auto-height">
-                    <table class="table table-sm table-bordered">
-                      <thead>
-                        <tr><th></th><th>计算基础名称</th><th>金额</th></tr>
-                      </thead>
-                      <tbody>
-                        <tr>
-                          <td>1</td><td><button class="btn btn-secondary btn-sm">分部分项工程费</button></td><td>1000.16</td>
-                        </tr>
-                        <tr>
-                          <td>2</td><td><button class="btn btn-secondary btn-sm">分部分项基价直接工程费</button></td><td>600.16</td>
-                        </tr>
-                        <tr>
-                          <td>3</td><td><button class="btn btn-secondary btn-sm">分部分项基价人工费</button></td><td>100.16</td>
-                        </tr>
-                        <tr>
-                          <td>4</td><td><button class="btn btn-secondary btn-sm">分部分项基价材料费</button></td><td>200.16</td>
-                        </tr>
-                        <tr>
-                          <td>5</td><td><button class="btn btn-secondary btn-sm">分部分项基价机械费</button></td><td>300.16</td>
-                        </tr>
-                        <tr>
-                          <td>6</td><td><button class="btn btn-secondary btn-sm">分部分项调整人工费</button></td><td>100.16</td>
-                        </tr>
-                        <tr>
-                          <td>7</td><td><button class="btn btn-secondary btn-sm">分部分项调整机人工费</button></td><td>50.16</td>
-                        </tr>
-                      </tbody>
-                    </table>
-                    <p></p>
-                      <p></p>
-                  </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <a href="" class="btn btn-primary">确定</a>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- JS. -->
-    <script src="/lib/tether/tether.min.js"></script>
-    <script src="/lib/bootstrap/bootstrap.min.js"></script>
-    <script src="/web/building_saas/js/global.js"></script>
-</body>
-<script type="text/javascript">
-    autoFlashHeight();
-</script>
-<script type="text/javascript">
-    $('#pop-lv').popover({
-      placement:"bottom",
-      html:true,
-      trigger:"hover | focus",
-      content:"A单位工程<br>B单位工程<br>C单位工程"
-    }
-    );
-</script>
-<script type="text/javascript">
-    $('#myModal').modal('show')
-</script>
-
-</html>

+ 97 - 0
web/building_saas/main/html/calc_program_manage.html

@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+</head>
+
+<body>
+    <div class="main">
+        <div class="content">
+            <div class="toolsbar">
+            </div>
+            <div class="container-fluid">
+                <div class="row">
+                  <div class="col-lg-3 p-0">
+                    <div class="main-data-full" id="mainSpread">
+                     </div>
+                   </div>
+                  <div class="col-lg-9 p-0">
+                    <div class="main-data-full" id="detailSpread">
+                    </div>
+                  </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出 计算基数-->
+    <div class="modal fade" id="jsjs" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">计算基础选择</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="form-group">
+                    <input class="form-control" value="分部分项工程费+100">
+                    <p class="form-text">
+                      <button class="btn btn-secondary btn-sm">+</button>
+                      <button class="btn btn-secondary btn-sm">-</button>
+                      <button class="btn btn-secondary btn-sm">*</button>
+                      <button class="btn btn-secondary btn-sm">/</button>
+                      <button class="btn btn-secondary btn-sm">(</button>
+                      <button class="btn btn-secondary btn-sm">)</button>
+                    </p>
+                  </div>
+                  <div class=" modal-auto-height">
+                    <table class="table table-sm table-bordered">
+                      <thead>
+                        <tr><th></th><th>计算基础名称</th><th>金额</th></tr>
+                      </thead>
+                      <tbody>
+                        <tr>
+                          <td>1</td><td><button class="btn btn-secondary btn-sm">分部分项工程费</button></td><td>1000.16</td>
+                        </tr>
+                        <tr>
+                          <td>2</td><td><button class="btn btn-secondary btn-sm">分部分项基价直接工程费</button></td><td>600.16</td>
+                        </tr>
+                        <tr>
+                          <td>3</td><td><button class="btn btn-secondary btn-sm">分部分项基价人工费</button></td><td>100.16</td>
+                        </tr>
+                        <tr>
+                          <td>4</td><td><button class="btn btn-secondary btn-sm">分部分项基价材料费</button></td><td>200.16</td>
+                        </tr>
+                        <tr>
+                          <td>5</td><td><button class="btn btn-secondary btn-sm">分部分项基价机械费</button></td><td>300.16</td>
+                        </tr>
+                        <tr>
+                          <td>6</td><td><button class="btn btn-secondary btn-sm">分部分项调整人工费</button></td><td>100.16</td>
+                        </tr>
+                        <tr>
+                          <td>7</td><td><button class="btn btn-secondary btn-sm">分部分项调整机人工费</button></td><td>50.16</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <p></p>
+                      <p></p>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <a href="" class="btn btn-primary">确定</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+
+<script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
+<script type="text/javascript" src="/web/building_saas/main/js/models/ration_program.js"></script>
+<script type="text/javascript" src="/web/building_saas/main/js/views/ration_programs_manage.js"></script>
+
+</html>

+ 4 - 3
web/building_saas/main/html/main.html

@@ -94,7 +94,7 @@
                 <li class="nav-item"><a class="active" data-toggle="tab" href="#zaojiashu" role="tab">造价书</a></li>
                 <li class="nav-item"><a href="#" id="glj-link">工料机</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#fee_rates" id="tab_fee_rate" role="tab" onclick="">费率</a></li>
-                <li class="nav-item"><a data-toggle="tab" href="#" id="tab_calc_program" role="tab" onclick="">计算程序管理</a></li>
+                <li class="nav-item"><a data-toggle="tab" href="#calc_program_manage" id="tab_calc_program_manage" role="tab" onclick="">计算程序管理</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#baobiao" role="tab" onclick="">报表</a></li>
             </ul>
         </div>
@@ -457,6 +457,9 @@
             <div class="tab-pane" id="fee_rates" role="tabpanel">
                 <%include ../../fee_rates/fee_rate.html %>
             </div>
+            <div class="tab-pane" id="calc_program_manage" role="tabpanel">
+                <%include calc_program_manage.html %>
+            </div>
           </div>
 
         </div>
@@ -515,7 +518,6 @@
     <script type="text/javascript" src="/web/building_saas/main/js/calc/ration_calc.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/calc/bills_calc.js"></script>
     <script type="text/javascript" src="/public/calc_util.js"></script>
-    <script type="text/javascript" src="/web/building_saas/main/js/models/ration_program.js"></script>
     <!-- Controller -->
     <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_controller.js"></script>
     <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
@@ -548,7 +550,6 @@
     <script type="text/javascript" src="/web/building_saas/main/js/views/glj_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/ration_calc_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/sub_view.js"></script>
-    <script type="text/javascript" src="/web/building_saas/main/js/views/ration_programs_manage.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/fee_rate_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/sub_fee_rate_views.js"></script>
 

+ 3 - 1
web/building_saas/main/js/views/ration_programs_manage.js

@@ -71,7 +71,9 @@ let rationPM = {
 };
 
 $(document).ready(function(){
-    rationPM.buildSheet();
+    $('#tab_calc_program_manage').on('shown.bs.tab', function (e) {
+        rationPM.buildSheet();
+    });
 });