zhangweicheng 7 سال پیش
والد
کامیت
9b01c644c8
3فایلهای تغییر یافته به همراه54 افزوده شده و 2 حذف شده
  1. 9 1
      web/building_saas/js/global.js
  2. 38 1
      web/building_saas/main/html/main.html
  3. 7 0
      web/building_saas/main/js/models/main_consts.js

+ 9 - 1
web/building_saas/js/global.js

@@ -82,4 +82,12 @@ function getLocalCache(key) {
     }
 
     return storage.getItem(key);
-}
+}
+
+function removeLocalCache(key) {
+    const storage = window.localStorage;
+    if (!storage || key === '') {
+        return null;
+    }
+    return storage.removeItem(key);
+}

+ 38 - 1
web/building_saas/main/html/main.html

@@ -83,7 +83,6 @@
                       <% } else { %>
                       <a href="javascript:void(0)" class="btn btn-sm" name="lockBills"  title="锁定清单"> <i class="fa fa-lock" aria-hidden="true"></i> 锁定清单</a>
                       <% } %>
-
                   </div>
                   <div class="tools-btn">
                       <a href="javacript:void(0);" data-toggle="modal" data-target="#column" class="btn btn-sm"><i class="fa fa-table" aria-hidden="true"></i> 列设置</a>
@@ -1050,6 +1049,43 @@
             </div>
         </div>
     </div>
+
+    <!--弹出 粘帖位置选择-->
+    <div class="modal fade" id="pastePosition" 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">
+                        <label >插入为选定节点的:</label>
+                        <div>
+                            <div class="form-check form-check-inline">
+                                <input class="form-check-input" type="radio" name="pastePositionRadio" id="next_node" value="next">
+                                <label class="form-check-label" for="next_node">后项</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                                <input class="form-check-input" type="radio" name="pastePositionRadio" id="pre_node" value="pre">
+                                <label class="form-check-label" for="pre_node">前项</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                                <input class="form-check-input" type="radio" name="pastePositionRadio" id="sub_node" value="sub">
+                                <label class="form-check-label" for="sub_node">子项</label>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button class="btn btn-primary" id="paste_confirm">确定</button>
+                </div>
+            </div>
+        </div>
+    </div>
         <!-- JS. -->
         <script type="text/javascript" src="/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
 
@@ -1150,6 +1186,7 @@
         <script type="text/javascript" src="/web/building_saas/main/js/main_ajax.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/main.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/controllers/project_controller.js"></script>
+        <script type="text/javascript" src="/web/building_saas/main/js/controllers/block_controller.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/views/side_tools.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/views/std_bills_lib.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/views/std_ration_lib.js"></script>

+ 7 - 0
web/building_saas/main/js/models/main_consts.js

@@ -316,6 +316,13 @@ const engineeringType = {
     // 安装修缮工程
     BUILD_IN_REPAIR: 14
 };
+const blockType ={
+    RATION:1,//定额
+    FB:2,//分部
+    FX:3,//分项
+    BILL:4,//清单
+    BX:5//补项
+};
 
 const installFeeType = ['子目费用','分项费用','措施费用'];
 const installSectionBase = ['分别按人材机乘系数','人工','材料','机械'];