zhongzewei 7 years ago
parent
commit
69e434dafe

+ 19 - 8
public/web/sheet/sheet_common.js

@@ -419,7 +419,8 @@ var sheetCommonObj = {
         document.body.removeChild(textArea);
     },
     //获取选中区域的表格类型数据(可粘贴到excel)
-    getTableData: function (sheet) {
+    getTableData: function (sheet, colSettings) {
+        console.log(colSettings);
         let rst = '';
         let sel = sheet.getSelections()[0];
         let vRows = [];
@@ -432,14 +433,24 @@ var sheetCommonObj = {
             rst += '\n';
             for(let j = 0, jLen = sel.colCount; j <jLen; j++){
                 let col = sel.col + j;
-                let v = '';
-                if(j === jLen -1){
-                    v += sheet.getValue(row, col) ? sheet.getValue(row, col).replace('\n', '') : '';
-                }
-                else {
-                    v += sheet.getValue(row, col) ? sheet.getValue(row, col).replace('\n', '') + '\t' : '\t';
+                if(sheet.getCell(-1, col).visible()){
+                    let v = '';
+                    if(colSettings && (colSettings[col]['data']['field'] === 'itemCharacterText' || colSettings[col]['data']['field'] === 'jobContentText')){
+                        v += sheet.getText(row, col) ? sheet.getText(row, col).replace(new RegExp('\n', 'g'), '\v') : '';
+                        if(j !== jLen - 1){
+                            v += '\t';
+                        }
+                    }
+                    else {
+                        if(j === jLen - 1){
+                            v += sheet.getText(row, col) ? sheet.getText(row, col).replace('\n', '') : '';
+                        }
+                        else {
+                            v += sheet.getText(row, col) ? sheet.getText(row, col).replace('\n', '') + '\t' : '\t';
+                        }
+                    }
+                    rst += v;
                 }
-                rst += v;
             }
         }
         rst = rst.replace('\n', '');

+ 7 - 7
web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -22,7 +22,7 @@
 <body>
     <div class="header">
         <%include ../../../common/html/header.html %>
-        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
+    <!--    <nav class="navbar navbar-expand-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-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
@@ -53,26 +53,26 @@
             <form class="form-inline">
                 <input class="form-control form-control-sm mr-1" type="text" placeholder="告诉我你想做什么">
             </form>
-        </nav>
+        </nav>-->
     </div>
     <div class="main">
-        <div class="main-nav">
+     <!--   <div class="main-nav">
             <ul class="nav flex-column">
               <li><a href="#">定额库编辑器</a></li>
               <li><a href="/complementaryGlj" class="active">工料机库编辑器</a></li>
             </ul>
-        </div>
-        <div class="content">
+        </div>-->
+        <div class="content" style="margin-left: 0px;">
             <div class="container-fluid">
                 <div class="row">
-                    <div class="col-lg-2 p-0">
+                    <div class="col-lg-3 p-0">
                         <div class="print-list">
                             <div class="form-list">
                                 <div id="gljClassSpread" style="height: 100%; width: 100%;"></div>
                             </div>
                         </div>
                     </div>
-                    <div id="GLJListSheet" class="col-lg-7 p-0">
+                    <div id="GLJListSheet" class="col-lg-6 p-0">
 
                     </div>
                     <div id="gljComponentSheet" class="col-lg-3 p-0">

+ 7 - 7
web/building_saas/complementary_glj_lib/js/glj.js

@@ -44,13 +44,13 @@ let repositoryGljObj = {
     setting: {
 
         header:[
-            {headerName:"编码",headerWidth:140,dataCode:"code", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
-            {headerName:"名称",headerWidth:280,dataCode:"name", dataType: "String", hAlign: "left", vAlign: "center"},
-            {headerName:"规格型号",headerWidth:180,dataCode:"specs", dataType: "String", hAlign: "left", vAlign: "center"},
-            {headerName:"单位",headerWidth:120,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
-            {headerName:"定额价",headerWidth:120,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
-            {headerName:"类型",headerWidth:120,dataCode:"gljType", dataType: "String", hAlign: "center", vAlign: "center"},
-            {headerName:"是否新增",headerWidth:80,dataCode:"isComplementary", hAlign: "center", vAlign: "center"}
+            {headerName:"编码",headerWidth:80,dataCode:"code", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
+            {headerName:"名称",headerWidth:160,dataCode:"name", dataType: "String", hAlign: "left", vAlign: "center"},
+            {headerName:"规格型号",headerWidth:120,dataCode:"specs", dataType: "String", hAlign: "left", vAlign: "center"},
+            {headerName:"单位",headerWidth:45,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName:"定额价",headerWidth:80,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
+            {headerName:"类型",headerWidth:90,dataCode:"gljType", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName:"是否新增",headerWidth:60,dataCode:"isComplementary", hAlign: "center", vAlign: "center"}
         ],
         view:{
             comboBox:[

+ 4 - 4
web/building_saas/complementary_glj_lib/js/gljComponent.js

@@ -8,10 +8,10 @@ let gljComponentOprObj = {
         owner: "gljComponent",
         header:[
             {headerName:"编码",headerWidth:80,dataCode:"code", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
-            {headerName:"名称",headerWidth:110,dataCode:"name", dataType: "String", hAlign: "left", vAlign: "center"},
-            {headerName:"单位",headerWidth:80,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
-            {headerName:"单价",headerWidth:80,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
-            {headerName:"消耗量",headerWidth:80,dataCode:"consumeAmt", dataType: "Number", formatter: "0.000", hAlign: "right", vAlign: "center"}
+            {headerName:"名称",headerWidth:90,dataCode:"name", dataType: "String", hAlign: "left", vAlign: "center"},
+            {headerName:"单位",headerWidth:45,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName:"单价",headerWidth:60,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
+            {headerName:"消耗量",headerWidth:70,dataCode:"consumeAmt", dataType: "Number", formatter: "0.000", hAlign: "right", vAlign: "center"}
         ],
         view: {
             lockedCols:[0, 1, 2, 3]

+ 4 - 3
web/building_saas/complementary_ration_lib/html/anzhuang.html

@@ -17,10 +17,11 @@
 
 <body>
     <div class="header">
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
+        <%include ../../../common/html/header.html %>
+        <!--<nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text" id="rationname"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
-        </nav>
+        </nav>-->
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
               <ul class="nav nav-tabs" role="tablist">
                   <li class="nav-item">
@@ -39,7 +40,7 @@
         </nav>
     </div>
     <div class="main">
-        <div class="content">
+        <div class="content" style="margin-left: 0px;">
             <div class="container-fluid">
               <div class="row">
                 <div class="main-content col-lg-12 p-0">

+ 464 - 445
web/building_saas/complementary_ration_lib/html/dinge.html

@@ -5,506 +5,525 @@
     <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>定额库编辑器</title>'
+    <title>定额库编辑器</title>
     <!--inject:css-->
-    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
-   <!-- <link rel="stylesheet" href="/lib/css/bootstrap/themes.css">-->
-    <link rel="stylesheet" href="/web/building_saas/css/main.css">
-    <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
-    <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css">
+    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css" type="text/css">
+    <link rel="stylesheet" href="/web/building_saas/css/main.css" type="text/css">
+    <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css" type="text/css">
+    <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.excel2013lightGray.10.0.1.css" type="text/css">
     <!--endinject-->
 </head>
-
 <body>
-    <div class="header">
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
-            <span class="header-logo px-2">Smartcost</span>
-            <div id="rationname" class="navbar-text"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
-        </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
-              <ul class="nav nav-tabs" role="tablist">
-                  <li class="nav-item">
-                      <a class="nav-link active px-3" id ="dinge" >定额</a>
-                  </li>
-                  <li class="nav-item">
-                      <a class="nav-link px-3" id="gongliao" href="#">工料机</a>
-                  </li>
-                  <li class="nav-item">
-                      <a class="nav-link px-3" id="fuzhu" href="#">附注条件</a>
-                  </li>
-                  <li class="nav-item">
-                      <a class="nav-link px-3" id="anzhuang" href="#">安装增加费</a>
-                  </li>
-              </ul>
-        </nav>
-    </div>
-    <div class="main" style="overflow: hidden">
-        <div class="content">
-            <div class="container-fluid">
-                <div class="row">
-                  <div class="main-side col-lg-3 p-0" style="width: 100%; height: 100%; overflow: hidden">
-                      <div class="tab-bar">
-                          <a href="javascript:void(0);" id="tree_Insert" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-plus" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_remove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_upLevel" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_downLevel" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_downMove" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_upMove" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                      </div>
+<div class="header">
+    <%include ../../../common/html/header.html %>
+    <!--<nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
+        <span class="header-logo px-2">Smartcost</span>
+        <div id="rationname" class="navbar-text"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
+    </nav>-->
+    <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <ul class="nav nav-tabs" role="tablist">
+            <li class="nav-item">
+                <a class="nav-link active px-3" id ="dinge" >定额</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link px-3" id="gongliao" href="#">工料机</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link px-3" id="fuzhu" href="#">附注条件</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link px-3" id="anzhuang" href="#">安装增加费</a>
+            </li>
+        </ul>
+    </nav>
+</div>
+<div class="main" style="overflow: hidden">
+    <div class="content" style="margin-left: 0px">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="main-side col-lg-3 p-0" style="width: 100%; height: 100%; overflow: hidden">
+                    <div class="tab-bar">
+                        <a href="javascript:void(0);" id="tree_Insert" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-plus" aria-hidden="true"></i></a>
+                        <a href="javascript:void(0);" id="tree_remove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                        <a href="javascript:void(0);" id="tree_upLevel" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
+                        <a href="javascript:void(0);" id="tree_downLevel" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
+                        <a href="javascript:void(0);" id="tree_downMove" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                        <a href="javascript:void(0);" id="tree_upMove" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                    </div>
                     <div class="tab-content" id="sectionSpread" style="overflow: hidden">
-                      <!--<ul id="rationChapterTree" class="ztree"></ul>-->
+                        <!--<ul id="rationChapterTree" class="ztree"></ul>-->
                     </div>
-                  </div>
-                  <div class="main-content col-lg-9 p-0">
-                      <!-- 右标签 -->
-                      <ul class="nav nav-tabs tools-bar" role="tablist">
-                          <li class="nav-item">
-                              <a class="nav-link active" data-toggle="tab" href="#tde" role="tab">定额</a>
-                          </li>
-                          <li class="nav-item">
-                              <a class="nav-link" data-toggle="tab" href="#tsm" role="tab" id="explanationLink">说明</a>
-                          </li>
-                          <li class="nav-item">
-                              <a class="nav-link" data-toggle="tab" href="#tjs" role="tab">计算规则</a>
-                          </li>
-                          <li class="nav-item">
-                              <a class="nav-link" data-toggle="tab" href="#tgz" role="tab">工作内容</a>
-                          </li>
-                          <li class="nav-item">
-                              <a class="nav-link" data-toggle="tab" href="#tfz" role="tab">附注</a>
-                          </li>
-                      </ul>
-                      <div class="tab-content">
-                          <!--定额-->
-                          <div class="tab-pane active" id="tde" role="tabpanel">
-                              <!--定额top-->
-                              <div id="rationItemsSheet" class="main-data-top"></div>
-                              <!--定额bottom-->
-                              <div class="bottom-content">
-                                  <!-- 标签 -->
-                                  <ul class="nav nav-tabs" role="tablist">
-                                      <li class="nav-item">
-                                          <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">工料机</a>
-                                      </li>
-                                      <li class="nav-item">
-                                          <a class="nav-link" id="linkFZDE" data-toggle="tab" href="#rDetail" role="tab">辅助定额调整</a>
-                                      </li>
-                                      <li class="nav-item">
-                                          <a class="nav-link" id="linkFZTJ" data-toggle="tab" href="#rDetail" role="tab">附注条件调整</a>
-                                      </li>
-                                      <li class="nav-item">
-                                          <a class="nav-link px-3" id="linkAZZJ" data-toggle="tab" href="#rDetail" role="tab">安装增加费</a>
-                                      </li>
-                                  </ul>
-                                  <!-- 内容 -->
-                                  <div class="tab-content">
-                                      <div class="tab-pane active" id="rDetail" role="tabpanel">
-                                          <div id="rdSpread" class="main-data-bottom" style="overflow: hidden"></div>
-                                      </div>
-                                  </div>
-                              </div>
-                          </div>
-                          <!--说明-->
-                          <div class="tab-pane" id="tsm" role="tabpanel">
-                              <div class="main-data">
-                                  <div class="main-content m-2">
-                                      <h5>说明</h5>
-                                      <textarea id="explanationShow" class="form-control" disabled="disabled" rows="35" style="background: white;"></textarea>
-                                  </div>
-                              </div>
-                          </div>
-                          <!--计算规则-->
-                          <div class="tab-pane" id="tjs" role="tabpanel">
-                              <div class="main-data">
-                                  <div class="main-content m-2">
-                                      <h5>计算规则</h5>
-                                      <textarea id="ruleTextShow" class="form-control" disabled="disabled"  rows="35" style="background: white;"></textarea>
-                                  </div>
-                              </div>
-                          </div>
-                          <!--工作内容-->
-                          <div class="tab-pane" id="tgz" role="tabpanel">
-                              <div class="main-data">
-                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio"  class="form-check-input" name="optionsRadios" value="ALL" disabled="true"> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input disabled" name="optionsRadios" value="PARTIAL" disabled="true"> 适合本项部分定额</label></div>
-                                  <!-- <p class="m-2">适合本项所有定额</p> -->
-                                  <table class="table table-sm table-bordered m-0" id="tableAll">
-                                      <tr>
-                                          <td><textarea class="form-control" rows="30" id="txtareaAll" disabled="disabled" style="background: white;"></textarea></td>
-                                      </tr>
-                                  </table>
-                                  <table class="table table-sm table-bordered m-0" id="tablePartial">
-                                  </table>
-                              </div>
-                          </div>
-                          <!--附注-->
-                          <div class="tab-pane" id="tfz" role="tabpanel">
-                              <div class="main-data">
-                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="fzRadios" value="ALL" disabled=""> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="fzRadios" value="PARTIAL" disabled> 适合本项部分定额</label></div>
-                                  <!-- <p class="m-2">适合本项所有定额</p> -->
-                                  <table class="table table-sm table-bordered m-0" id="fzTableAll">
-                                      <tr>
-                                          <td><textarea class="form-control" rows="30" id="fzTxtareaAll" disabled="disabled" style="background: white;"></textarea></td>
-                                      </tr>
-                                  </table>
-                                  <table class="table table-sm table-bordered m-0" id="fzTablePartial">
-                                  </table>
-                              </div>
-                          </div>
-                  </div>
                 </div>
-            </div>
-        </div>
-    </div>
-        <!--弹出添加-->
-        <button id="gznrBtn" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#addNewgznr" style="display: none"></button>
-        <div class="modal fade" id="addNewgznr" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <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">×</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <form>
-                            <div class="form-group">
-                                <label>内容</label>
-                                <textarea class="form-control" rows="5"></textarea>
-                            </div>
-                        </form>
-                        <form>
-                            <div class="form-group">
-                                <label>编码</label>
-                                <div class="form-control">
-                                    <div class="row code">
-                                        <div class="col">
-                                            <label class="form-check-label">
-                                                <input class="form-check-input" type="checkbox" value="option1" checked> AA0017
-                                            </label>
-                                        </div>
-                                        <div class="col">
-                                            <label class="form-check-label">
-                                                <input class="form-check-input" type="checkbox" value="option1" checked> AA0018
-                                            </label>
-                                        </div>
-                                        <div class="col">
-                                            <label class="form-check-label">
-                                                <input class="form-check-input" type="checkbox" value="option1" checked> AA0019
-                                            </label>
-                                        </div>
-                                        <div class="w-100"></div>
-                                        <div class="col">
-                                            <label class="form-check-label">
-                                                <input class="form-check-input" type="checkbox" value="option1"> AA0020
-                                            </label>
-                                        </div>
-                                        <div class="col">
-                                            <label class="form-check-label">
-                                                <input class="form-check-input" type="checkbox" value="option1"> AA0021
-                                            </label>
-                                        </div>
-                                        <div class="col">
-                                            <label class="form-check-label">
-                                                <input class="form-check-input" type="checkbox" value="option1"> AA0022
-                                            </label>
-                                        </div>
+                <div class="main-content col-lg-9 p-0">
+                    <!-- 右标签 -->
+                    <ul class="nav nav-tabs tools-bar" role="tablist">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="tab" href="#tde" role="tab">定额</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#tsm" role="tab" id="explanationLink">说明</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#tjs" role="tab">计算规则</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#tgz" role="tab">工作内容</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#tfz" role="tab">附注</a>
+                        </li>
+                    </ul>
+                    <div class="tab-content">
+                        <!--定额-->
+                        <div class="tab-pane active" id="tde" role="tabpanel">
+                            <!--定额top-->
+                            <div id="rationItemsSheet" class="main-data-top"></div>
+                            <!--定额bottom-->
+                            <div class="bottom-content">
+                                <!-- 标签 -->
+                                <ul class="nav nav-tabs" role="tablist">
+                                    <li class="nav-item">
+                                        <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">工料机</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link" id="linkFZDE" data-toggle="tab" href="#rDetail" role="tab">辅助定额调整</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link" id="linkFZTJ" data-toggle="tab" href="#rDetail" role="tab">附注条件调整</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link px-3" id="linkAZZJ" data-toggle="tab" href="#rDetail" role="tab">安装增加费</a>
+                                    </li>
+                                </ul>
+                                <!-- 内容 -->
+                                <div class="tab-content">
+                                    <div class="tab-pane active" id="rDetail" role="tabpanel">
+                                        <div id="rdSpread" class="main-data-bottom" style="overflow: hidden"></div>
                                     </div>
                                 </div>
                             </div>
-
-                            <div class="form-group">
-                                <label>内容</label>
-                                <textarea class="form-control" rows="5"></textarea>
+                        </div>
+                        <!--说明-->
+                        <div class="tab-pane" id="tsm" role="tabpanel">
+                            <div class="main-data">
+                                <div class="main-content m-2">
+                                    <h5>说明</h5>
+                                    <textarea id="explanationShow" class="form-control" disabled="disabled" rows="35" style="background: white;"></textarea>
+                                </div>
                             </div>
-                        </form>
-                    </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 class="tab-pane" id="tjs" role="tabpanel">
+                            <div class="main-data">
+                                <div class="main-content m-2">
+                                    <h5>计算规则</h5>
+                                    <textarea id="ruleTextShow" class="form-control" disabled="disabled"  rows="35" style="background: white;"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                        <!--工作内容-->
+                        <div class="tab-pane" id="tgz" role="tabpanel">
+                            <div class="main-data">
+                                <div class="form-check m-2"><label class="form-check-label"><input type="radio"  class="form-check-input" name="optionsRadios" value="ALL" disabled="true"> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input disabled" name="optionsRadios" value="PARTIAL" disabled="true"> 适合本项部分定额</label></div>
+                                <!-- <p class="m-2">适合本项所有定额</p> -->
+                                <table class="table table-sm table-bordered m-0" id="tableAll">
+                                    <tr>
+                                        <td><textarea class="form-control" rows="30" id="txtareaAll" disabled="disabled" style="background: white;"></textarea></td>
+                                    </tr>
+                                </table>
+                                <table class="table table-sm table-bordered m-0" id="tablePartial">
+                                </table>
+                            </div>
+                        </div>
+                        <!--附注-->
+                        <div class="tab-pane" id="tfz" role="tabpanel">
+                            <div class="main-data">
+                                <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="fzRadios" value="ALL" disabled=""> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="fzRadios" value="PARTIAL" disabled> 适合本项部分定额</label></div>
+                                <!-- <p class="m-2">适合本项所有定额</p> -->
+                                <table class="table table-sm table-bordered m-0" id="fzTableAll">
+                                    <tr>
+                                        <td><textarea class="form-control" rows="30" id="fzTxtareaAll" disabled="disabled" style="background: white;"></textarea></td>
+                                    </tr>
+                                </table>
+                                <table class="table table-sm table-bordered m-0" id="fzTablePartial">
+                                </table>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-        <!--弹出编辑-->
-        <div class="modal fade" id="editTsm" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <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">×</span>
-                        </button>
+    </div>
+</div>
+<!--弹出添加-->
+<button id="gznrBtn" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#addNewgznr" style="display: none"></button>
+<div class="modal fade" id="addNewgznr" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <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">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>内容</label>
+                        <textarea class="form-control" rows="5"></textarea>
                     </div>
-                    <div class="modal-body">
-                        <form>
-                            <div class="form-group">
-                                <label>内容</label>
-                                <textarea class="form-control" rows="5" id="explanationAdd"></textarea>
+                </form>
+                <form>
+                    <div class="form-group">
+                        <label>编码</label>
+                        <div class="form-control">
+                            <div class="row code">
+                                <div class="col">
+                                    <label class="form-check-label">
+                                        <input class="form-check-input" type="checkbox" value="option1" checked> AA0017
+                                    </label>
+                                </div>
+                                <div class="col">
+                                    <label class="form-check-label">
+                                        <input class="form-check-input" type="checkbox" value="option1" checked> AA0018
+                                    </label>
+                                </div>
+                                <div class="col">
+                                    <label class="form-check-label">
+                                        <input class="form-check-input" type="checkbox" value="option1" checked> AA0019
+                                    </label>
+                                </div>
+                                <div class="w-100"></div>
+                                <div class="col">
+                                    <label class="form-check-label">
+                                        <input class="form-check-input" type="checkbox" value="option1"> AA0020
+                                    </label>
+                                </div>
+                                <div class="col">
+                                    <label class="form-check-label">
+                                        <input class="form-check-input" type="checkbox" value="option1"> AA0021
+                                    </label>
+                                </div>
+                                <div class="col">
+                                    <label class="form-check-label">
+                                        <input class="form-check-input" type="checkbox" value="option1"> AA0022
+                                    </label>
+                                </div>
                             </div>
-                        </form>
+                        </div>
                     </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                        <a href="javascript:void(0);" class="btn btn-primary" id="explanationBtn" data-dismiss="modal">确定</a>
+
+                    <div class="form-group">
+                        <label>内容</label>
+                        <textarea class="form-control" rows="5"></textarea>
                     </div>
-                </div>
+                </form>
+            </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 class="modal fade" id="editTjs" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <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">×</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <form>
-                            <div class="form-group">
-                                <label>内容</label>
-                                <textarea class="form-control" rows="5"></textarea>
-                            </div>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                        <a href="javascript:void(0);" class="btn btn-primary" data-dismiss="modal" id="ruleTextAdd">确定</a>
+    </div>
+</div>
+<!--弹出编辑-->
+<div class="modal fade" id="editTsm" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <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">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>内容</label>
+                        <textarea class="form-control" rows="5" id="explanationAdd"></textarea>
                     </div>
-                </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a href="javascript:void(0);" class="btn btn-primary" id="explanationBtn" data-dismiss="modal">确定</a>
             </div>
         </div>
-        <div class="modal fade" id="editBianmaQ" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <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">×</span>
-                        </button>
+    </div>
+</div>
+<div class="modal fade" id="editTjs" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <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">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>内容</label>
+                        <textarea class="form-control" rows="5"></textarea>
                     </div>
-                    <div class="modal-body">
-                        <form>
-                            <div class="form-group">
-                                <label>编码</label>
-                                <div class="form-control">
-                                    <div class="row code" id="updateCon">
-                                    </div>
-                                </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a href="javascript:void(0);" class="btn btn-primary" data-dismiss="modal" id="ruleTextAdd">确定</a>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="editBianmaQ" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <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">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>编码</label>
+                        <div class="form-control">
+                            <div class="row code" id="updateCon">
                             </div>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                        <a href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" id="updateConBtn">确定</a>
+                        </div>
                     </div>
-                </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" id="updateConBtn">确定</a>
             </div>
         </div>
-        <div class="modal fade" id="editBianma" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <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">×</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <form>
-                            <div class="form-group">
-                                <label>编码</label>
-                                <div class="form-control">
-                                    <div class="row code" id="addCon">
-                                    </div>
-                                </div>
+    </div>
+</div>
+<div class="modal fade" id="editBianma" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <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">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>编码</label>
+                        <div class="form-control">
+                            <div class="row code" id="addCon">
                             </div>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                        <a href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" id="addConBtn">确定</a>
+                        </div>
                     </div>
-                </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" id="addConBtn">确定</a>
             </div>
         </div>
-        <!--弹出附注-->
-        <div class="modal fade" id="fzEditBianmaQ" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <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">×</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <form>
-                            <div class="form-group">
-                                <label>编码</label>
-                                <div class="form-control">
-                                    <div class="row code" id="fzUpdateCon">
-                                    </div>
-                                </div>
+    </div>
+</div>
+<!--弹出附注-->
+<div class="modal fade" id="fzEditBianmaQ" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <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">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>编码</label>
+                        <div class="form-control">
+                            <div class="row code" id="fzUpdateCon">
                             </div>
-                        </form>
+                        </div>
                     </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                        <a href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" id="fzUpdateConBtn">确定</a>
-                    </div>
-                </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" id="fzUpdateConBtn">确定</a>
             </div>
         </div>
-        <div class="modal fade" id="fzEditBianma" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <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">×</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <form>
-                            <div class="form-group">
-                                <label>编码</label>
-                                <div class="form-control">
-                                    <div class="row code" id="fzAddCon">
-                                    </div>
-                                </div>
+    </div>
+</div>
+<div class="modal fade" id="fzEditBianma" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <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">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>编码</label>
+                        <div class="form-control">
+                            <div class="row code" id="fzAddCon">
                             </div>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                        <a href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" id="fzAddConBtn">确定</a>
+                        </div>
                     </div>
-                </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" id="fzAddConBtn">确定</a>
             </div>
         </div>
-        <!--弹出警告窗-->
-        <button id="rationAlertBtn" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#rationAlert" style="display: none"></button>
-        <div class="modal fade" id="rationAlert" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <input type="hidden" id="gdid" value="123">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">取消确认</h5>
-                        <button type="button" id="rationAlertCls" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">×</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <h5 class="text-danger" id="alertRationTxt">编码不可为空,继续新增定额?</h5>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" id="rationAlertCac" data-dismiss="modal">取消</button>
-                        <a href="javascript: void(0);" id="rationAlertCof" class="btn btn-danger" data-dismiss="modal">确认</a>
-                    </div>
-                </div>
+    </div>
+</div>
+<!--弹出警告窗-->
+<button id="rationAlertBtn" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#rationAlert" style="display: none"></button>
+<div class="modal fade" id="rationAlert" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <input type="hidden" id="gdid" value="123">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">取消确认</h5>
+                <button type="button" id="rationAlertCls" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-danger" id="alertRationTxt">编码不可为空,继续新增定额?</h5>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" id="rationAlertCac" data-dismiss="modal">取消</button>
+                <a href="javascript: void(0);" id="rationAlertCof" class="btn btn-danger" data-dismiss="modal">确认</a>
             </div>
         </div>
-        <button id="alertModalBtn" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#alertModal" style="display: none"></button>
-        <div class="modal fade" id="alertModal" data-backdrop="static" style="display: none;" aria-hidden="true">
-            <input type="hidden" id="codedid" value="123">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">警告</h5>
-                        <button type="button" id="alertModalCls" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">×</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <h5 class="text-danger" id="alertText">输入的编号已存在,请重新输入!</h5>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-danger" id="alertModalCof" data-dismiss="modal">确认</button>
-                    </div>
-                </div>
+    </div>
+</div>
+<button id="alertModalBtn" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#alertModal" style="display: none"></button>
+<div class="modal fade" id="alertModal" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <input type="hidden" id="codedid" value="123">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">警告</h5>
+                <button type="button" id="alertModalCls" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-danger" id="alertText">输入的编号已存在,请重新输入!</h5>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" id="alertModalCof" data-dismiss="modal">确认</button>
             </div>
         </div>
-        <!-- JS. -->
-        <script type="text/javascript" src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
-        <script type="text/javascript" src="/lib/jquery/jquery-3.2.1.min.js"></script>
-        <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.min.js"></script>
-        <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
-        <!--inject:js-->
-        <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
-        <script type="text/javascript" src="/lib/popper/popper.min.js"></script>
-        <script type="text/javascript" src="/lib/bootstrap/bootstrap.min.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/global.js"></script>
-        <script type="text/javascript" src="/public/web/id_tree.js"></script>
-        <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>
-        <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
-        <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/sheetsOpr.js"></script>
-        <script type="text/javascript" src="/public/web/QueryParam.js"></script>
-        <script type="text/javascript" src="/public/web/storageUtil.js"></script>
+    </div>
+</div>
+<!--弹出定额库-->
+<div class="modal fade" id="comple-ration" data-backdrop="static">
+    <div class="modal-dialog modal-lg" 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-auto-height">
+                <table class="table table-hover table-bordered">
+                    <thead><tr><th>定额库名称</th></tr></thead>
+                    <tbody id="comple_ration_table">
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- JS. -->
+<script type="text/javascript" src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
+<script type="text/javascript" src="/lib/jquery/jquery-3.2.1.min.js"></script>
+<script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.min.js"></script>
+<script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
+<!--inject:js-->
+<script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
+<script type="text/javascript" src="/lib/popper/popper.min.js"></script>
+<script type="text/javascript" src="/lib/bootstrap/bootstrap.min.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/global.js"></script>
+<script type="text/javascript" src="/public/web/id_tree.js"></script>
+<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>
+<script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
+<script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/sheetsOpr.js"></script>
+<script type="text/javascript" src="/public/web/QueryParam.js"></script>
+<script type="text/javascript" src="/public/web/storageUtil.js"></script>
 
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/section_tree.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/explanatory.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/jobContent.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/annotation.js"></script>
-        <script type="text/javascript" src="/public/web/scMathUtil.js"></script>
-        <script type="text/javascript" src="/public/web/common_ajax.js"></script>
-        <script type="text/javascript" src="/public/web/ztree_common.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/rationUnits.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration_glj.js"></script>
-   <!--     <script type="text/javascript" src="/public/web/sheet/sheet_creater.js"></script>-->
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration_coe.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration_assist.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration_installation.js"></script>
-        <!--endinject-->
-        <script type="text/javascript">
-            let userID = '<%=userID %>';
-            $(document).ready(function(){
-                pageOprObj.initPage();
-                rationOprObj.buildSheet($("#rationItemsSheet")[0]);
-               // sheetCommonObj.shieldAllCells(rationOprObj.workBook.getSheet(0), rationOprObj.setting);
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/section_tree.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/explanatory.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/jobContent.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/annotation.js"></script>
+<!--  <script type="text/javascript" src="/public/web/scMathUtil.js"></script>-->
+<script type="text/javascript" src="/public/web/common_ajax.js"></script>
+<script type="text/javascript" src="/public/web/ztree_common.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/rationUnits.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration_glj.js"></script>
+<!--     <script type="text/javascript" src="/public/web/sheet/sheet_creater.js"></script>-->
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration_coe.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration_assist.js"></script>
+<script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/ration_installation.js"></script>
+<!--endinject-->
+<script type="text/javascript">
+    let userID = '<%=userID %>';
+    $(document).ready(function(){
+        pageOprObj.initPage();
+        rationOprObj.buildSheet($("#rationItemsSheet")[0]);
+        // sheetCommonObj.shieldAllCells(rationOprObj.workBook.getSheet(0), rationOprObj.setting);
 
-               // tabPanel 下有多个Spread时,相互之间不能正确显示。改成一个Spread下多个Sheet。
-                var rdSpread = sheetCommonObj.createSpread($("#rdSpread")[0], 4);
-                rationGLJOprObj.buildSheet(rdSpread.getSheet(0));
-               // sheetCommonObj.shieldAllCells(rdSpread.getSheet(0), rationGLJOprObj.setting);
+        // tabPanel 下有多个Spread时,相互之间不能正确显示。改成一个Spread下多个Sheet。
+        var rdSpread = sheetCommonObj.createSpread($("#rdSpread")[0], 4);
+        rationGLJOprObj.buildSheet(rdSpread.getSheet(0));
+        // sheetCommonObj.shieldAllCells(rdSpread.getSheet(0), rationGLJOprObj.setting);
 
-                rationAssistOprObj.buildSheet(rdSpread.getSheet(1));
-             //   sheetCommonObj.shieldAllCells(rdSpread.getSheet(1), rationAssistOprObj.setting);
+        rationAssistOprObj.buildSheet(rdSpread.getSheet(1));
+        //   sheetCommonObj.shieldAllCells(rdSpread.getSheet(1), rationAssistOprObj.setting);
 
-                rationCoeOprObj.buildSheet(rdSpread.getSheet(2));
-              //  sheetCommonObj.shieldAllCells(rdSpread.getSheet(2), rationCoeOprObj.setting);
+        rationCoeOprObj.buildSheet(rdSpread.getSheet(2));
+        //  sheetCommonObj.shieldAllCells(rdSpread.getSheet(2), rationCoeOprObj.setting);
 
-                rationInstObj.getInstallation(parseInt(getQueryString("repository")), function () {
-                    rationInstObj.buildSheet(rdSpread.getSheet(3));
-                });
+        rationInstObj.getInstallation(parseInt(getQueryString("repository")), function () {
+            rationInstObj.buildSheet(rdSpread.getSheet(3));
+        });
 
-                $("#linkGLJ").click(function(){
-                    rationGLJOprObj.bindRationGljDelOpr();
-                    rdSpread.setActiveSheetIndex(0);
-                });
+        $("#linkGLJ").click(function(){
+            rationGLJOprObj.bindRationGljDelOpr();
+            rdSpread.setActiveSheetIndex(0);
+        });
 
-                $("#linkFZDE").click(function(){
-                    rationAssistOprObj.bindRationAssDel();
-                    rdSpread.setActiveSheetIndex(1);
-                });
+        $("#linkFZDE").click(function(){
+            rationAssistOprObj.bindRationAssDel();
+            rdSpread.setActiveSheetIndex(1);
+        });
 
-                $("#linkFZTJ").click(function(){
-                    rationCoeOprObj.bindRationCoeDel();
-                    rdSpread.setActiveSheetIndex(2);
-                });
+        $("#linkFZTJ").click(function(){
+            rationCoeOprObj.bindRationCoeDel();
+            rdSpread.setActiveSheetIndex(2);
+        });
 
-                $("#linkAZZJ").click(function(){
-                    rationInstObj.bindRationInstDel();
-                    rdSpread.setActiveSheetIndex(3);
-                });
-            });
-        </script>
-    </div>
+        $("#linkAZZJ").click(function(){
+            rationInstObj.bindRationInstDel();
+            rdSpread.setActiveSheetIndex(3);
+        });
+    });
+</script>
 </body>
 <script type="text/javascript">
     autoFlashHeight();

+ 4 - 3
web/building_saas/complementary_ration_lib/html/fuzhu.html

@@ -16,10 +16,11 @@
 
 <body>
     <div class="header">
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
+        <%include ../../../common/html/header.html %>
+       <!-- <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text" id="rationname"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
-        </nav>
+        </nav>-->
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
               <ul class="nav nav-tabs" role="tablist">
                   <li class="nav-item">
@@ -41,7 +42,7 @@
         </nav>
     </div>
     <div class="main">
-        <div class="content">
+        <div class="content" style="margin-left: 0px;">
             <div class="container-fluid">
                 <div class="row">
                     <div class="main-content col-lg-7 p-0">

+ 5 - 4
web/building_saas/complementary_ration_lib/html/gongliao.html

@@ -21,10 +21,11 @@
 
 <body>
     <div class="header">
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
+        <%include ../../../common/html/header.html %>
+        <!--<nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
             <span class="header-logo px-2">Smartcost</span>
             <div id="rationname" class="navbar-text"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
-        </nav>
+        </nav>-->
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
               <ul class="nav nav-tabs" role="tablist">
                   <li class="nav-item">
@@ -43,7 +44,7 @@
         </nav>
     </div>
     <div class="main">
-        <div class="content">
+        <div class="content" style="margin-left: 0px;">
             <div class="container-fluid">
                 <div class="row">
                     <div class="main-side col-lg-3 p-0" style="width: 100%; height: 100%; overflow-y: auto">
@@ -214,12 +215,12 @@
         </div>
     </div>
     <!-- JS. -->
+    <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
     <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
     <!--inject:js-->
-    <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
     <script type="text/javascript" src="/lib/popper/popper.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/global.js"></script>

+ 2 - 3
web/building_saas/complementary_ration_lib/js/coe.js

@@ -22,9 +22,8 @@ var pageObj = {
         var libID = getQueryString("repository");
         var libName = storageUtil.getSessionCache("RationGrp","repositoryID_" + libID);
         if (libName) {
-            var html = $("#rationname")[0].outerHTML;
-            html = html.replace("XXX定额库", libName);
-            $("#rationname")[0].outerHTML = html;
+            let $rationName = $(`<div id='rationname' class='navbar-text'>${libName}</div>`);
+            $('.header-logo').after($rationName);
         };
         this.gljLibID = storageUtil.getSessionCache("gljLib", "repositoryID_" + libID);
         this.libID = libID;

+ 2 - 3
web/building_saas/complementary_ration_lib/js/installation.js

@@ -58,9 +58,8 @@ let feeItemObj = {
             this.rationRepId = parseInt(getQueryString("repository"));
             let libName = storageUtil.getSessionCache("RationGrp","repositoryID_" + this.rationRepId);
             if (libName) {
-                let html = $("#rationname")[0].outerHTML;
-                html = html.replace("XXX定额库", libName);
-                $("#rationname")[0].outerHTML = html;
+                let $rationName = $(`<div id='rationname' class='navbar-text'>${libName}</div>`);
+                $('.header-logo').after($rationName);
             }
             //init sectionSpread
             se.buildSheet();

+ 2 - 3
web/building_saas/complementary_ration_lib/js/repository_glj.js

@@ -22,10 +22,9 @@ var pageOprObj = {
             rationLibName = storageUtil.getSessionCache("RationGrp","repositoryID_" + rationLibId);
         me.rationLibId = rationLibId;
         if (rationLibName) {
-            var html = $("#rationname")[0].outerHTML;
-            html = html.replace("XXX定额库", rationLibName);
-            $("#rationname")[0].outerHTML = html;
             me.rationLibName = rationLibName;
+            let $rationName = $(`<div id='rationname' class='navbar-text'>${me.rationLibName}</div>`);
+            $('.header-logo').after($rationName);
             repositoryGljObj.buildSheet(container);
             //repositoryGljObj.getRationGljIds(rationLibId);
             repositoryGljObj.getGljDistType(function () {

+ 31 - 4
web/building_saas/complementary_ration_lib/js/section_tree.js

@@ -10,10 +10,10 @@ let pageOprObj = {
         me.getRationLibInfo(rationLibId, function (rstData) {
             if(rstData.length > 0){
                 me.rationLibName = rstData[0].dispName;
+                //let $rationName = $(`<div id='rationname' class='navbar-text'><a id='rationLibBtn' href='javascript:void(0);'>定额库</a><i class='fa fa-angle-right fa-fw'></i>${me.rationLibName}</div>`);
+                let $rationName = $(`<div id='rationname' class='navbar-text'>${me.rationLibName}</div>`);
+                $('.header-logo').after($rationName);
                 me.gljLibId = rstData[0].gljLib;
-                let html = $("#rationname")[0].outerHTML;
-                html = html.replace("XXX定额库", me.rationLibName);
-                $("#rationname")[0].outerHTML = html;
                 me.rationLibId = rationLibId;
                 sectionTreeObj.getSectionTree(rationLibId);
                 //job
@@ -31,7 +31,34 @@ let pageOprObj = {
     },
     getRationLibInfo: function (rationLibId, callback) {
         CommonAjax.post('api/getRationLib', {rationRepId: rationLibId}, callback);
-    }
+    },
+    //获取定额库列表
+    /*getRationLibs: function () {
+        let scFunc = function (rstData) {
+            $("#comple_ration_table").empty();
+            for(let i = 0; i < rstData.length; i++){
+                storageUtil.setSessionCache("RationGrp","repositoryID_" + rstData[i].ID, rstData[i].dispName);
+                if(rstData[i].gljLib !== undefined && rstData[i].gljLib && rstData[i].gljLib != -1){
+                    storageUtil.setSessionCache("gljLib","repositoryID_" + rstData[i].ID, rstData[i].gljLib);
+                    let id = rstData[i].ID;
+                    let libName = rstData[i].dispName;
+                    $("#comple_ration_table").append(
+                        "<tr id='tempId'>" +
+                        "<td><a href='/stdGljRepository/glj'>"+libName+"</a></td></tr>"
+                    );
+                    var newHref = "/complementaryRation/ration?repository="+id;
+                    $("#tempId td:first a").attr("href", newHref);
+                    $("#tempId").attr("id", id);
+                }
+            }
+        };
+        let ration_lib = projectInfoObj.projectInfo.engineeringInfo.ration_lib;
+        let ids = [];
+        for(lib of ration_lib){
+            ids.push(parseInt(lib.id));
+        }
+        CommonAjax.post('/complementaryRation/api/getRationLibs', {user_id: userID, ids: ids}, scFunc);
+    }*/
 };
 
 let sectionTreeObj = {

+ 1 - 1
web/building_saas/main/js/views/glj_view.js

@@ -463,7 +463,7 @@ var gljOprObj = {
         }
     },
     onClipboardChanged: function (sender, info) {
-        let cDatas = sheetCommonObj.getTableData(info.sheet);
+        let cDatas = sheetCommonObj.getTableData(info.sheet, null);
         sheetCommonObj.copyTextToClipboard(cDatas);
         return;
     },

+ 4 - 1
web/building_saas/main/js/views/project_view.js

@@ -442,7 +442,10 @@ var projectObj = {
         }
     },
     msClipboardChanged: function (sender, info) {
-        let cDatas = sheetCommonObj.getTableData(info.sheet);
+        console.log('enterCC');
+        let colSettings = projectObj.mainController.setting.cols;
+        let cDatas = sheetCommonObj.getTableData(info.sheet, colSettings);
+        console.log(cDatas);
         sheetCommonObj.copyTextToClipboard(cDatas);
         return;
     },