版本信息

modules/all_models/compilation.js

@@ -63,6 +63,8 @@ let modelSchema = {
     create_time: Number,
     // 创建者id
     creator: String,
+    //描述
+    description: String,
     // 发布时间
     release_time: {
         type: Number,

modules/ration_repository/controllers/repository_views_controller.js

@@ -10,32 +10,61 @@ class ViewsController extends BaseController{
                 userID: req.session.managerData.userID
             });
     }
+    //rationRepository/lmm rationRepository/coeList rationRepository/installation
     redirectRation(req, res){
+        const repId = req.query.repository;
+        const redirectGlj = `/rationRepository/lmm?repository=${repId}`;
+        const redirectCoe = `/rationRepository/coeList?repository=${repId}`;
+        const redirectInstallation = `/rationRepository/installation?repository=${repId}`;
         res.render('maintain/ration_repository/dinge.html',
             {
                 userAccount: req.session.managerData.username,
-                userID: req.session.managerData.userID
+                userID: req.session.managerData.userID,
+                redirectGlj: redirectGlj,
+                redirectCoe: redirectCoe,
+                redirectInstallation: redirectInstallation
             });
     }
     redirectGlj(req, res){
+        const repId = req.query.repository;
+        const redirectRation = `/rationRepository/ration?repository=${repId}`;
+        const redirectCoe = `/rationRepository/coeList?repository=${repId}`;
+        const redirectInstallation = `/rationRepository/installation?repository=${repId}`;
         res.render('maintain/ration_repository/gongliao.html',
             {
                 userAccount: req.session.managerData.username,
-                userID: req.session.managerData.userID
+                userID: req.session.managerData.userID,
+                redirectRation: redirectRation,
+                redirectCoe: redirectCoe,
+                redirectInstallation: redirectInstallation
             });
     }
     redirectCoeList(req, res){
+        const repId = req.query.repository;
+        const redirectGlj = `/rationRepository/lmm?repository=${repId}`;
+        const redirectRation = `/rationRepository/ration?repository=${repId}`;
+        const redirectInstallation = `/rationRepository/installation?repository=${repId}`;
         res.render('maintain/ration_repository/fuzhu.html',
             {
                 userAccount: req.session.managerData.username,
-                userID: req.session.managerData.userID
+                userID: req.session.managerData.userID,
+                redirectGlj: redirectGlj,
+                redirectRation: redirectRation,
+                redirectInstallation: redirectInstallation
             });
     }
     redirectInstallation(req, res){
+        const repId = req.query.repository;
+        const redirectGlj = `/rationRepository/lmm?repository=${repId}`;
+        const redirectCoe = `/rationRepository/coeList?repository=${repId}`;
+        const redirectRation = `/rationRepository/ration?repository=${repId}`;
         res.render('maintain/ration_repository/anzhuang.html',
             {
                 userAccount: req.session.managerData.username,
-                userID: req.session.managerData.userID
+                userID: req.session.managerData.userID,
+                redirectGlj: redirectGlj,
+                redirectCoe: redirectCoe,
+                redirectRation: redirectRation
             });
     }
 }

modules/users/controllers/compilation_controller.js

@@ -227,8 +227,6 @@ class CompilationController extends BaseController {
             // 获取对应专业工程下的标准库数据
             let engineeringLibModel = new EngineeringLibModel();
             libData = await engineeringLibModel.getLib(valuationData.engineering_list, engineering);
-            console.log(`libData`);
-            console.log(libData);
 
             // 获取清单模板数据
             let billsTemplateModel = new BillsTemplateModel();
@@ -450,6 +448,19 @@ class CompilationController extends BaseController {
         response.json(responseData);
     }
 
+    async setDescription(request, response){
+        let compilationId = request.body.id;
+        let description = request.body.description;
+        try{
+            let compilationModel = new CompilationModel();
+            await compilationModel.setDescription(compilationId, description);
+            response.json({err: 0, msg: '', data: null});
+        }
+        catch (err){
+            response.json({err: 1, msg: err, data: null});
+        }
+    }
+
     /**
      * 模板设置页面
      *

modules/users/models/compilation_model.js

@@ -35,7 +35,7 @@ class CompilationModel extends BaseModel {
      */
     async getCompilationList() {
         // 筛选字段
-        let field = {_id: 1, name: 1, is_release: 1, "ration_valuation._id": 1, "ration_valuation.name": 1, "ration_valuation.enable": 1,
+        let field = {_id: 1, name: 1, is_release: 1, description: 1, "ration_valuation._id": 1, "ration_valuation.name": 1, "ration_valuation.enable": 1,
             "bill_valuation._id": 1, "bill_valuation.name": 1, "bill_valuation.enable": 1};
         let compilationData = await this.findDataByCondition({name: {$ne: ''}}, field, false);
 
@@ -77,6 +77,18 @@ class CompilationModel extends BaseModel {
         return result;
     }
 
+    /*
+    * 设置版本描述
+    *
+    * @param {String} compilationId
+    * @param {String} description
+    * @return {Promise}
+    * */
+    async setDescription(compilationId, description){
+        return await this.updateById(compilationId, {description: description});
+    }
+
+
     /**
      * 新增计价规则
      *

modules/users/routes/compilation_route.js

@@ -21,6 +21,7 @@ module.exports = function (app) {
 
     router.post('/release', compilationController.auth, compilationController.init, compilationController.release);
     router.post('/add', compilationController.auth, compilationController.init, compilationController.addCompilation);
+    router.post('/setDescription', compilationController.auth, compilationController.init, compilationController.setDescription);
     router.post('/add-valuation', compilationController.auth, compilationController.init, compilationController.addValuation);
     router.post('/save-valuation', compilationController.auth, compilationController.init, compilationController.saveValuation);
     router.post('/save-lib', compilationController.auth, compilationController.init, compilationController.saveEngineering);

public/web/tree_sheet/tree_sheet_helper.js

@@ -266,6 +266,7 @@ var TREE_SHEET_HELPER = {
             };
             // Draw Text
             x = x + (node.depth() + 1) * indent;
+            w = w - (node.depth() + 1) * indent;
             GC.Spread.Sheets.CellTypes.Text.prototype.paint.apply(this, arguments);
         };
         TreeNodeCellType.prototype.getHitInfo = function (x, y, cellStyle, cellRect, context) {

web/maintain/ration_repository/anzhuang.html

@@ -22,13 +22,13 @@
         <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 px-3" id="dinge" href="dinge.html">定额</a>
+                      <a class="nav-link px-3" id="dinge" href="<%= redirectRation %>">定额</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="gongliao" href="gongliao.html">人材机</a>
+                      <a class="nav-link px-3" id="gongliao" href="<%= redirectGlj %>">人材机</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="fuzhu" href="fuzhu.html">子目换算</a>
+                      <a class="nav-link px-3" id="fuzhu" href="<%= redirectCoe %>">子目换算</a>
                   </li>
                   <li class="nav-item">
                       <a class="nav-link active px-3" >安装增加费</a>

web/maintain/ration_repository/dinge.html

@@ -32,13 +32,13 @@
                       <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>
+                      <a class="nav-link px-3" id="gongliao" href="<%= redirectGlj %>">人材机</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="fuzhu" href="#">子目换算</a>
+                      <a class="nav-link px-3" id="fuzhu" href="<%= redirectCoe %>">子目换算</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="anzhuang" href="anzhuang.html">安装增加费</a>
+                      <a class="nav-link px-3" id="anzhuang" href="<%= redirectInstallation %>">安装增加费</a>
                   </li>
               </ul>
         </nav>

web/maintain/ration_repository/fuzhu.html

@@ -23,16 +23,16 @@
         <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 px-3" id="drirect-dinge" href="javascript:void(0);">定额</a>
+                      <a class="nav-link px-3" id="drirect-dinge" href="<%= redirectRation %>">定额</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="gongliao" href="javascript:void(0);">人材机</a>
+                      <a class="nav-link px-3" id="gongliao" href="<%= redirectGlj %>">人材机</a>
                   </li>
                   <li class="nav-item">
                       <a class="nav-link active px-3">子目换算</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="anzhuang" href="javascript:void(0);">安装增加费</a>
+                      <a class="nav-link px-3" id="anzhuang" href="<%= redirectInstallation %>">安装增加费</a>
                   </li>
 
                   <li class="nav-item">

web/maintain/ration_repository/gongliao.html

@@ -26,16 +26,16 @@
         <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 px-3" id="drirect-dinge" href="/rationRepository/ration">定额</a>
+                      <a class="nav-link px-3" id="drirect-dinge" href="<%= redirectRation %>">定额</a>
                   </li>
                   <li class="nav-item">
                       <a class="nav-link active px-3">人材机</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="fuzhu" href="javascript:void(0);">子目换算</a>
+                      <a class="nav-link px-3" id="fuzhu" href="<%= redirectCoe %>">子目换算</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="anzhuang" href="javascript:void(0);">安装增加费</a>
+                      <a class="nav-link px-3" id="anzhuang" href="<%= redirectInstallation %>">安装增加费</a>
                   </li>
               </ul>
         </nav>

web/maintain/ration_repository/js/coe.js

@@ -8,18 +8,6 @@ var pageObj = {
     libID: null,
     gljLibID: null,
     initPage: function (){
-        $("#drirect-dinge").click(function(){
-            $(this).attr('href', "/rationRepository/ration" + "?repository=" + getQueryString("repository"))
-        });
-
-        $("#gongliao").click(function(){
-            $(this).attr('href', "/rationRepository/lmm" + "?repository=" + getQueryString("repository"))
-        });
-
-        $("#anzhuang").click(function(){
-            $(this).attr('href', "/rationRepository/installation" + "?repository=" + getQueryString("repository"))
-        });
-
         var libID = getQueryString("repository");
         var libName = storageUtil.getSessionCache("RationGrp","repositoryID_" + libID);
         if (libName) {

web/maintain/ration_repository/js/installation.js

@@ -1,17 +1,6 @@
 /**
  * Created by Zhong on 2018/1/19.
  **/
-$("#gongliao").click(function(){
-    $(this).attr('href', "/rationRepository/lmm" + "?repository=" + getQueryString("repository"))
-});
-
-$("#fuzhu").click(function(){
-    $(this).attr('href', "/rationRepository/coeList" + "?repository=" + getQueryString("repository"))
-});
-
-$("#dinge").click(function(){
-    $(this).attr('href', "/rationRepository/ration" + "?repository=" + getQueryString("repository"))
-});
 
 $(document).ready(function () {
     feeItemObj.buildSheet();

web/maintain/ration_repository/js/ration.js

@@ -2,18 +2,6 @@
  * Created by Tony on 2017/4/28.
  */
 
-$("#gongliao").click(function(){
-    $(this).attr('href', "/rationRepository/lmm" + "?repository=" + getQueryString("repository"))
-});
-
-$("#fuzhu").click(function(){
-    $(this).attr('href', "/rationRepository/coeList" + "?repository=" + getQueryString("repository"))
-});
-
-$("#anzhuang").click(function(){
-    $(this).attr('href', "/rationRepository/installation" + "?repository=" + getQueryString("repository"))
-});
-
 const digital = {
     gljPrc: -3,//计算定额基价时单个工料机价格取三位
     rationBasePrc: -2,

web/maintain/ration_repository/js/ration_glj.js

@@ -656,6 +656,16 @@ var rationGLJOprObj = {
         var me = this;
         if (me.cache["_GLJ_" + rationID]) {
             sheetCommonObj.cleanData(me.sheet, me.setting, -1);
+            me.cache["_GLJ_" + rationID].sort(function (a, b) {
+                let rst = 0;
+                if(a.code > b.code){
+                    rst = 1;
+                }
+                else if(a.code < b.code){
+                    rst = -1;
+                }
+                return rst;
+            });
             sheetsOprObj.showData(me.sheet, me.setting, me.cache["_GLJ_" + rationID], me.distTypeTree);
         }
     }

web/maintain/ration_repository/js/repository_glj.js

@@ -2,18 +2,6 @@
  * Created by Tony on 2017/5/5.
  */
 
-$("#drirect-dinge").click(function(){
-    $(this).attr('href', "/rationRepository/ration" + "?repository=" + getQueryString("repository"))
-});
-
-$("#fuzhu").click(function(){
-    $(this).attr('href', "/rationRepository/coeList" + "?repository=" + getQueryString("repository"))
-});
-
-$("#anzhuang").click(function(){
-    $(this).attr('href', "/rationRepository/installation" + "?repository=" + getQueryString("repository"))
-});
-
 var pageOprObj = {
     rationLibName : null,
     rationLibId: null,

web/users/js/compilation.js

@@ -168,6 +168,22 @@ $(document).ready(function() {
         $(this).parent().remove();
     });
 
+    //更改描述
+    $('#description').change(function () {
+        let description = $(this).val();
+        $.ajax({
+            url: '/compilation/setDescription',
+            type: 'post',
+            dataType: "json",
+            data: {id: id, description: description},
+            success: function(response) {
+                if (response.err !== 0) {
+                    alert('更改失败');
+                }
+            }
+        });
+    });
+
     // 计价规则启用/禁止
     $(".enable").click(function() {
         let goingChangeStatus = switchChange($(this));

web/users/views/compilation/index.html

@@ -97,6 +97,9 @@
                     </tbody>
                 </table>
             </div>
+            <table class="table">
+                <tr><td><p>软件版本介绍</p><textarea id="description" class="form-control" placeholder="请简要描述改版本"><%= selectedCompilation.description%></textarea></td></tr>
+            </table>
         </div>
         <input type="hidden" name="id" value="<%= selectedCompilation._id %>" id="compilation-id">
         <% } %>