debug

modules/pm/controllers/pm_controller.js

@@ -79,7 +79,7 @@ module.exports = {
     },
     updateProjects: async function (req, res) {
         let data = JSON.parse(req.body.data);
-        await ProjectsData.updateUserProjects(req.session.sessionUser.id, req.session.sessionCompilation._id, data.updateData, function (err, message, data) {
+        await ProjectsData.updateUserProjects(req.session.sessionUser.id, req.session.sessionCompilation._id, req.session.sessionCompilation.name, data.updateData, function (err, message, data) {
             if (err === 0) {
                 callback(req, res, err, message, data);
             } else {

modules/pm/models/project_model.js

@@ -105,7 +105,7 @@ ProjectsDAO.prototype.getUserProject = function (userId, ProjId, callback) {
     });
 };
 
-ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId, datas, callback) {
+ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId, compilationName, datas, callback) {
     let data, project, updateLength = 0, hasError = false, deleteInfo = null, i, newProject;
     let updateAll = function (err) {
         if (!err) {
@@ -169,7 +169,8 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
                     //data.updateData.property.basicInformation = basicInformation;
                     //工程特征
                     if(data.updateData.property.featureLibID){
-                        data.updateData.property.projectFeature = await pmFacade.getProjectFeature(data.updateData.property.featureLibID, data.updateData.property.engineeringName);
+                        //工程专业显示费用定额的名称
+                        data.updateData.property.projectFeature = await pmFacade.getProjectFeature(data.updateData.property.featureLibID, compilationName);
                     }
                     /*projectFeature[0]['value'] = data.updateData.property.engineeringName || '';
                     data.updateData.property.projectFeature = projectFeature;*/

web/building_saas/css/main.css

@@ -309,6 +309,18 @@ a{
 .bottom-content .tab-content .ovf-hidden{
     overflow: hidden;
 }
+.tn-nav{
+    width:30px;
+    height: 100%;
+    border-left:1px solid #dee2e6 ;
+}
+.tn-nav > span{
+    width:20px;
+}
+.tn-nav:hover{
+    background:#f7f7f9;
+    cursor: pointer;
+}
 .form-signin {
     max-width: 500px;
     margin: 150px auto;
@@ -399,9 +411,6 @@ a{
 .custom-file-input:lang(zh) ~ .custom-file-label::after {
     content: "浏览";
 }
-.custom-file-input{
-    cursor: pointer;
-}
 
 .message-box {
     position:absolute;

web/building_saas/main/html/main.html

@@ -168,174 +168,117 @@
                                       <div class="main-data-bottom ovf-hidden" style="display: none" id="comments">
                                           <textarea class="form-control" rows="8" readonly=""></textarea>
                                       </div>
-                                      <div id="tzjnrCon" class="main-data-bottom" style="background: #F1F1F1">
-                                          <div class="col-4" style="width: 33%; float: left; margin: 0; padding:0;">
-                                              <div class="main-data-bottom ovf-hidden" id="jobSpread">
-                                              </div>
-                                              <!--工具栏-->
-                                              <div class="bottom-tools btn-group position-absolute">
-                                                  <a href="javascript:void(0);" id="jobInsert" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
-                                                  <a href="javascript:void(0);" id="jobAdd" 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="jobDel" class="btn btn-sm disabled" 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="jobDown" 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="jobUp" 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>
-                                          <div class="col-4" style="width: 33%; float: left; margin: 0; padding:0;">
-                                              <div class="main-data-bottom ovf-hidden"  id="itemSpread">
+                                      <div id="tzjnrCon" class="container-fluid main-data-bottom" style="background: #F1F1F1">
+                                          <div class="row" style="overflow: hidden">
+                                              <div class="col-4 p-0">
+                                                  <div class="main-data-bottom ovf-hidden" id="jobSpread">
+                                                  </div>
+                                                  <!--工具栏-->
+                                                  <div class="bottom-tools btn-group position-absolute">
+                                                      <a href="javascript:void(0);" id="jobInsert" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
+                                                      <a href="javascript:void(0);" id="jobAdd" 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="jobDel" class="btn btn-sm disabled" 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="jobDown" 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="jobUp" 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>
-                                              <!--工具栏-->
-                                              <div class="bottom-tools btn-group position-absolute">
-                                                  <a href="javascript:void(0);" id="itemInsert" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
-                                                  <a href="javascript:void(0);" id="itemAdd" 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="itemDel" class="btn btn-sm disabled" 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="itemDown" 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="itemUp" 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 class="col-4 p-0">
+                                                  <div class="main-data-bottom ovf-hidden"  id="itemSpread">
+                                                  </div>
+                                                  <!--工具栏-->
+                                                  <div class="bottom-tools btn-group position-absolute">
+                                                      <a href="javascript:void(0);" id="itemInsert" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
+                                                      <a href="javascript:void(0);" id="itemAdd" 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="itemDel" class="btn btn-sm disabled" 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="itemDown" 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="itemUp" 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>
-                                          </div>
-                                          <div class="col-4" style="width: 33%; float: left; margin: 0; padding:0;">
-                                              <div class="main-data-bottom" id="add-rule" style="display: none;">
-                                                  <div class="container-fluid my-2">
-                                                      <p style="text-align: center">
-                                                          <% if (projectData.property.lockBills == true) { %>
-                                                          <button class="btn btn-primary btn-sm disabled" type="button" id="use-to-current">应用到选中清单</button>
-                                                          <button class="btn btn-primary btn-sm disabled" type="button" id="use-to-all">应用到所有清单</button>
-                                                          <% } else { %>
-                                                          <button class="btn btn-primary btn-sm" type="button" id="use-to-current">应用到选中清单</button>
-                                                          <button class="btn btn-primary btn-sm" type="button" id="use-to-all">应用到所有清单</button>
-                                                          <% } %>
-                                                      </p>
-                                                      <div class="mb-1 row">
-                                                          <label class="col-5 px-0 col-form-label text-right">添加位置：</label>
-                                                          <div class="col-7">
-                                                              <select id="add-position" class="form-control form-control-sm">
-                                                                  <option value="1" selected="selected">添加到项目特征列</option>
-                                                                  <option value="2">添加到清单名称列</option>
-                                                                  <option value="3">添加到工作内容列</option>
-                                                                  <option value="4">分别添加到对应列</option>
-                                                              </select>
+                                              <!-- <div class="col-auto p-0">
+                                                   <div class="tn-nav d-flex align-items-start flex-column" data-toggle="tooltip" data-placement="left" title="" data-original-title="打开排版规则">
+                                                       <span class="mt-3 ml-2 text-primary">排版规则</span>
+                                                       <i class="fa fa-arrow-left mt-auto mb-3 text-primary ml-2"></i>
+                                                   </div>
+                                               </div>-->
+                                              <div class="col-4 p-0">
+                                                  <div class="main-data-bottom" id="add-rule" style="display: none;">
+                                                      <div class="container-fluid my-2">
+                                                          <p style="text-align: center">
+                                                              <% if (projectData.property.lockBills == true) { %>
+                                                              <button class="btn btn-primary btn-sm disabled" type="button" id="use-to-current">应用到选中清单</button>
+                                                              <button class="btn btn-primary btn-sm disabled" type="button" id="use-to-all">应用到所有清单</button>
+                                                              <% } else { %>
+                                                              <button class="btn btn-primary btn-sm" type="button" id="use-to-current">应用到选中清单</button>
+                                                              <button class="btn btn-primary btn-sm" type="button" id="use-to-all">应用到所有清单</button>
+                                                              <% } %>
+                                                          </p>
+                                                          <div class="mb-1 row">
+                                                              <label class="col-5 px-0 col-form-label text-right">添加位置：</label>
+                                                              <div class="col-7">
+                                                                  <select id="add-position" class="form-control form-control-sm">
+                                                                      <option value="1" selected="selected">添加到项目特征列</option>
+                                                                      <option value="2">添加到清单名称列</option>
+                                                                      <option value="3">添加到工作内容列</option>
+                                                                      <option value="4">分别添加到对应列</option>
+                                                                  </select>
+                                                              </div>
                                                           </div>
-                                                      </div>
-                                                      <div class="mb-1 row">
-                                                          <label class="col-sm-5 px-0 col-form-label text-right">添加内容：</label>
-                                                          <div class="col-sm-7">
-                                                              <select id="add-content" class="form-control form-control-sm">
-                                                                  <option value="">无</option>
-                                                                  <option value="1" selected="selected">项目特征+工作内容</option>
-                                                                  <option value="2">工作内容+项目特征</option>
-                                                                  <option value="3">项目特征</option>
-                                                                  <option value="4">工作内容</option>
-                                                                  <option value="5">定额子目</option>
-                                                              </select>
+                                                          <div class="mb-1 row">
+                                                              <label class="col-sm-5 px-0 col-form-label text-right">添加内容：</label>
+                                                              <div class="col-sm-7">
+                                                                  <select id="add-content" class="form-control form-control-sm">
+                                                                      <option value="">无</option>
+                                                                      <option value="1" selected="selected">项目特征+工作内容</option>
+                                                                      <option value="2">工作内容+项目特征</option>
+                                                                      <option value="3">项目特征</option>
+                                                                      <option value="4">工作内容</option>
+                                                                      <option value="5">定额子目</option>
+                                                                  </select>
+                                                              </div>
                                                           </div>
-                                                      </div>
-                                                      <div class="mb-1 row">
-                                                          <label class="col-5 px-0 col-form-label text-right">显示格式：</label>
-                                                          <div class="col-7">
-                                                              <select id="display-format" class="form-control form-control-sm">
-                                                                  <option value="1" selected="selected">换行分隔</option>
-                                                                  <option value="2">逗号分隔</option>
-                                                                  <option value="3">括号分隔</option>
-                                                              </select>
+                                                          <div class="mb-1 row">
+                                                              <label class="col-5 px-0 col-form-label text-right">显示格式：</label>
+                                                              <div class="col-7">
+                                                                  <select id="display-format" class="form-control form-control-sm">
+                                                                      <option value="1" selected="selected">换行分隔</option>
+                                                                      <option value="2">逗号分隔</option>
+                                                                      <option value="3">括号分隔</option>
+                                                                  </select>
+                                                              </div>
                                                           </div>
-                                                      </div>
-                                                      <div class="mb-1 row">
-                                                          <label class="col-5 px-0 col-form-label text-right">特征生成方式：</label>
-                                                          <div class="col-7">
-                                                              <select id="character-format" class="form-control form-control-sm">
-                                                                  <option value="1">特征值</option>
-                                                                  <option value="2" selected="selected">特征：特征值</option>
-                                                              </select>
+                                                          <div class="mb-1 row">
+                                                              <label class="col-5 px-0 col-form-label text-right">特征生成方式：</label>
+                                                              <div class="col-7">
+                                                                  <select id="character-format" class="form-control form-control-sm">
+                                                                      <option value="1">特征值</option>
+                                                                      <option value="2" selected="selected">特征：特征值</option>
+                                                                  </select>
+                                                              </div>
                                                           </div>
-                                                      </div>
-                                                      <div class="mb-1 row">
-                                                          <label class="col-5 px-0 col-form-label text-right">子目生成方式：</label>
-                                                          <div class="col-7">
-                                                              <select id="child-display-format" disabled="disabled" class="form-control form-control-sm">
-                                                                  <option value="1" selected="selected">编号+定额名称</option>
-                                                                  <option value="2">序号+定额名称</option>
-                                                              </select>
+                                                          <div class="mb-1 row">
+                                                              <label class="col-5 px-0 col-form-label text-right">子目生成方式：</label>
+                                                              <div class="col-7">
+                                                                  <select id="child-display-format" disabled="disabled" class="form-control form-control-sm">
+                                                                      <option value="1" selected="selected">编号+定额名称</option>
+                                                                      <option value="2">序号+定额名称</option>
+                                                                  </select>
+                                                              </div>
                                                           </div>
-                                                      </div>
-                                                      <div class="mb-1 row">
-                                                          <label class="col-5 px-0 col-form-label text-right">序号格式：</label>
-                                                          <div class="col-7">
-                                                              <select id="serial-type" class="form-control form-control-sm">
-                                                                  <option value="">无</option>
-                                                                  <option value="1" selected="selected">1.</option>
-                                                                  <option value="2">a.</option>
-                                                                  <option value="3">A.</option>
-                                                              </select>
+                                                          <div class="mb-1 row">
+                                                              <label class="col-5 px-0 col-form-label text-right">序号格式：</label>
+                                                              <div class="col-7">
+                                                                  <select id="serial-type" class="form-control form-control-sm">
+                                                                      <option value="">无</option>
+                                                                      <option value="1" selected="selected">1.</option>
+                                                                      <option value="2">a.</option>
+                                                                      <option value="3">A.</option>
+                                                                  </select>
+                                                              </div>
                                                           </div>
                                                       </div>
                                                   </div>
                                               </div>
                                           </div>
-                                          <!--<div id="add-rule" style="width: 34%;float: left;background: #EFEFEF; height: 100%;display: none; padding-left: 8px;">
-                                              <p style="text-align: center">添加规则</p>
-                                              <p>
-                                                  <label class="title">添加位置:</label>
-                                                  <select id="add-position">
-                                                      <option value="1" selected="selected">添加到项目特征列</option>
-                                                      <option value="2">添加到清单名称列</option>
-                                                      <option value="3">添加到工作内容列</option>
-                                                      <option value="4">分别添加到对应列</option>
-                                                  </select>
-                                              </p>
-                                              <p>
-                                                  <label class="title">添加内容:</label>
-                                                  <select id="add-content">
-                                                      <option value="">无</option>
-                                                      <option value="1" selected="selected">项目特征+工作内容</option>
-                                                      <option value="2">工作内容+项目特征</option>
-                                                      <option value="3">项目特征</option>
-                                                      <option value="4">工作内容</option>
-                                                      <option value="5">定额子目</option>
-                                                  </select>
-                                              </p>
-                                              <p>
-                                                  <label class="title">显示格式:</label>
-                                                  <select id="display-format">
-                                                      <option value="1" selected="selected">换行分隔</option>
-                                                      <option value="2">逗号分隔</option>
-                                                      <option value="3">括号分隔</option>
-                                                  </select>
-                                              </p>
-                                              <p>
-                                                  <label class="title">特征生成方式:</label>
-                                                  <select id="character-format">
-                                                      <option value="1">特征值</option>
-                                                      <option value="2" selected="selected">特征：特征值</option>
-                                                  </select>
-                                              </p>
-                                              <p>
-                                                  <label class="title">子目生成方式:</label>
-                                                  <select id="child-display-format" disabled="disabled">
-                                                      <option value="1" selected="selected">编号+定额名称</option>
-                                                      <option value="2">序号+定额名称</option>
-                                                  </select>
-                                              </p>
-                                              <p>
-                                                  <label class="title">序号格式:</label>
-                                                  <select id="serial-type">
-                                                      <option value="">无</option>
-                                                      <option value="1" selected="selected">1.</option>
-                                                      <option value="2">a.</option>
-                                                      <option value="3">A.</option>
-                                                  </select>
-                                              </p>
-                                              <p style="text-align: center">
-                                                  <% if (projectData.property.lockBills == true) { %>
-                                                  <button class="btn btn-primary btn-sm disabled" type="button" id="use-to-current">应用到选中清单</button>
-                                                  <button class="btn btn-primary btn-sm disabled" type="button" id="use-to-all">应用到所有清单</button>
-                                                  <% } else { %>
-                                                  <button class="btn btn-primary btn-sm" type="button" id="use-to-current">应用到选中清单</button>
-                                                  <button class="btn btn-primary btn-sm" type="button" id="use-to-all">应用到所有清单</button>
-                                                  <% } %>
-                                                  &lt;!&ndash;<button class="btn btn-primary btn-sm" type="button" id="use-to-current">应用到选中清单</button>
-                                                  <button class="btn btn-primary btn-sm" type="button" id="use-to-all">应用到所有清单</button>&ndash;&gt;
-                                              </p>
-                                          </div>-->
                                       </div>
                                   </div>
                               </div>

web/building_saas/main/js/views/calc_base_view.js

@@ -130,6 +130,7 @@ let calcBaseView = {
                 me.inputExpr.val(insertStr);
             }
         }
+        me.workBook.focus(false);
         me.inputExpr.focus();
     },
     isDef: function (v) {

web/building_saas/pm/html/project-management-Recycle.html

@@ -20,7 +20,7 @@
                 </button>
             </div>
             <div class="modal-body">
-                <p><i class="fa fa-cubes"></i> 汽车生产车间 下的单位工程都将恢复都将恢复，恢复后将重命名为</p>
+                <p><i class="fa fa-cubes"></i> 汽车生产车间 下的单位工程都将恢复，恢复后将重命名为</p>
                 <p><b>建筑工程2（10-25 14:33:15恢复）</b>、<b>建筑工程3（10-25 14:33:15恢复）</b></p>
                 <p> 点“确定”按钮，确认从回收站中恢复。</p>
             </div>

web/building_saas/pm/html/project-management.html

@@ -73,12 +73,12 @@
                         <li class="nav-item" data-original-title="分享" data-placement="right" data-toggle="tooltip">
                             <a class="nav-link" href="#pm_share" id="tab_pm_share" data-toggle="tab"><i class="fa fa-share-alt"></i></a>
                         </li>
-                        <li class="nav-item" data-original-title="协同工作" data-placement="right" data-toggle="tooltip">
+                        <!--<li class="nav-item" data-original-title="协同工作" data-placement="right" data-toggle="tooltip">
                             <a class="nav-link" href="javascript:void(0);"><i class="fa fa-users"></i></a>
                         </li>
                         <li class="nav-item" data-original-title="归档" data-placement="right" data-toggle="tooltip">
                             <a class="nav-link" href="javascript:void(0);"><i class="fa fa-book"></i></a>
-                        </li>
+                        </li>-->
                         <li class="nav-item" data-original-title="回收站" data-placement="right" data-toggle="tooltip">
                             <a class="nav-link" href="#pm_gc" id="tab_pm_gc" data-toggle="tab"><i class="fa fa-trash"></i></a>
                         </li>

web/building_saas/pm/js/pm_gc.js

@@ -615,10 +615,10 @@ function v_getMoBody(type, oprNode, nodes){
         }
         else {
             if(oprNode.data.projType === projectType.project){
-                html += '<p><i class="fa fa-cubes"></i> ' + oprNode.data.name + '下的单位工程都将恢复都将恢复，恢复后将重命名为</p>';
+                html += '<p><i class="fa fa-cubes"></i> ' + oprNode.data.name + '下的单位工程都将恢复，恢复后将重命名为</p>';
             }
             else if(oprNode.data.projType === projectType.engineering){
-                html += '<p><i class="fa fa-cube"></i> ' + oprNode.data.name + '下的单位工程都将恢复都将恢复，恢复后将重命名为</p>';
+                html += '<p><i class="fa fa-cube"></i> ' + oprNode.data.name + '下的单位工程都将恢复，恢复后将重命名为</p>';
             }
             html += ('<p>');
             for(let i = 0, len = nodes.length; i < len; i++){
@@ -650,7 +650,7 @@ function v_getFiles(type, files, tenders, opr = null){
         return false;
     }
     for(let i = 0, len = files.length; i < len; i ++){
-        let recName = type === fileType.unitPriceFile ?  files[i].name + '单价文件' : files[i].name + '费率文件';
+        let recName = type === fileType.unitPriceFile ?  files[i].name : files[i].name;
         let fileId = type === fileType.unitPriceFile ? files[i].id : files[i].ID;
         let recTimeA = formatDate(new Date(files[i].deleteInfo.deleteDateTime), 'yyyy-MM-dd');
         let recTimeB = formatDate(new Date(files[i].deleteInfo.deleteDateTime), 'HH:mm:ss');

web/users/html/login.html

@@ -14,7 +14,7 @@
 <body>
     <div class="container">
         <form class="form-signin" method="post" onsubmit="return false">
-            <h1 class="d-flex justify-content-center">Smartcost</h1>
+            <h1 class="d-flex justify-content-center">纵横云计价</h1>
             <h4 class="d-flex justify-content-center mb-2">用户登录</h4>
             <div class="form-group">
                 <input id="inputEmail" class="form-control " name="inputEmail" placeholder="通行账号 邮箱/手机" autofocus="" />