1.工料机页面顶部菜单

2.修复项目管理页面bug
3.项目管理页面加入单价文件

modules/glj/controllers/glj_controller.js

@@ -60,7 +60,8 @@ class GLJController extends BaseController {
                 ownCompositionTypes: gljListModel.ownCompositionTypes,
                 hostname: request.hostname,
                 roomId: unitPriceFileId,
-                GLJTypeConst: JSON.stringify(GLJTypeConst)
+                GLJTypeConst: JSON.stringify(GLJTypeConst),
+                userID: request.session.sessionUser.ssoId,
             };
             response.render('glj/html/glj_index', renderData);
         } catch (error) {

modules/glj/models/unit_price_file_model.js

@@ -107,6 +107,24 @@ class UnitPriceFileModel extends BaseModel {
         let result = await this.db.create(data);
         return result;
     }
+
+    /**
+     * 根据单位工程获取对应单价文件
+     *
+     * @param {Array} idList
+     * @return {Promise|Array}
+     */
+    async getDataByTenderId(idList) {
+        let result = [];
+        if (idList.length <= 0) {
+            return result;
+        }
+
+        let condition = {project_id: {$in: idList}};
+        result = await this.findDataByCondition(condition, null, false);
+
+        return result;
+    }
 }
 
 export default UnitPriceFileModel;

modules/pm/controllers/pm_controller.js

@@ -1,6 +1,7 @@
 /**
  * Created by Mai on 2017/1/18.
  */
+import UnitPriceFileModel from "../../glj/models/unit_price_file_model";
 let ProjectsData = require('../models/project_model').project;
 let projType = require('../models/project_model').projType;
 const engineering = require("../../common/const/engineering");
@@ -128,24 +129,43 @@ module.exports = {
 
         response.render('building_saas/pm/html/project-management.html', renderData);
     },
-    // 获取项目的属性
-    getProjectProperty: async function(request, response) {
+    // 获取单价文件列表
+    getUnitFileList: async function(request, response) {
         let data = request.body.data;
         try {
             data = JSON.parse(data);
-            let id = data.id !== undefined ? data.id : 0;
-            if (isNaN(id) && id <= 0) {
-                throw 'id数据有误!';
+            let projectId = data.parentID !== undefined ? data.parentID : 0;
+            if (isNaN(projectId) && projectId <= 0) {
+                throw {msg: 'id数据有误!', err: 1};
+            }
+            // 获取对应建设项目下所有的单位工程id
+            let idList = await ProjectsData.getTenderByProjectId(projectId);
+            if (idList.length <= 0) {
+                throw {msg: '不存在对应单位工程', err: 0};
+            }
+            // 获取对应的单价文件
+            let unitPriceFileModel = new UnitPriceFileModel();
+            let unitPriceFileData = await unitPriceFileModel.getDataByTenderId(idList);
+            console.log(unitPriceFileData);
+            if (unitPriceFileData === null) {
+                throw {msg: '不存在对应单价文件', err: 0};
             }
-            let property = await ProjectsData.getProjectProperty(id);
 
-            if (Object.keys(property).length <= 0) {
-                throw '操作失败';
+            // 整理数据
+            let unitPriceFileList = [];
+            for (let unitPriceFile of unitPriceFileData) {
+                let tmp = {
+                    name: unitPriceFile.name,
+                    id: unitPriceFile.id
+                };
+                unitPriceFileList.push(tmp);
             }
-            callback(request, response, 0, '', property);
+
+            callback(request, response, 0, '', unitPriceFileList);
         } catch (error) {
-            callback(request, response, 1, error, null);
+            console.log(error);
+            let responseData = error.err === 1 ? null : [];
+            callback(request, response, error.err, error.msg, responseData);
         }
-
     }
 };

modules/pm/models/project_model.js

@@ -74,17 +74,20 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, datas, callbac
                 newProject.save(async function (err, result) {
                     if (!err && result._doc.projType === projectType.tender) {
                         newProjController.copyTemplateData(data.updateData.property, newProject.ID, updateAll);
-                        // 新增单价文件
-                        let unitPriceFileModel = new UnitPriceFileModel();
-                        let insertData = {
-                            name: data.updateData.name,
-                            project_id: data.updateData.ID
-                        };
-                        let addResult = await unitPriceFileModel.add(insertData);
-                        if (!addResult) {
-                            callback(1, '新增单价文件失败.', null);
-                            return;
+                        // 如果没有选中单价文件则新增单价文件
+                        if (data.updateData.property !== null && data.updateData.property.unitPriceFile === '') {
+                            let unitPriceFileModel = new UnitPriceFileModel();
+                            let insertData = {
+                                name: data.updateData.name,
+                                project_id: data.updateData.ID
+                            };
+                            let addResult = await unitPriceFileModel.add(insertData);
+                            if (!addResult) {
+                                callback(1, '新增单价文件失败.', null);
+                                return;
+                            }
                         }
+
                     } else {
                         updateAll(err);
                     }
@@ -219,6 +222,38 @@ ProjectsDAO.prototype.isExist = async function(name, parentID) {
     return count > 0;
 };
 
+/**
+ * 获取对应建设项目下所有的单位工程id
+ *
+ * @param {Number} projectId
+ * @return {Promise}
+ */
+ProjectsDAO.prototype.getTenderByProjectId = async function(projectId) {
+    let result = [];
+    // 首先获取对应的单位工程id
+    let engineeringData = await Projects.find({ParentID: projectId});
+    if (engineeringData.length <= 0) {
+        return result;
+    }
+
+    let engineeringIdList = [];
+    for(let tmp of engineeringData) {
+        engineeringIdList.push(tmp.ID);
+    }
+
+    // 查找对应的单位工程id
+    let tenderData = await Projects.find({ParentID: {$in: engineeringIdList}});
+    if (tenderData.length <= 0) {
+        return result;
+    }
+
+    for(let tmp of tenderData) {
+        result.push(tmp.ID);
+    }
+
+    return result;
+};
+
 module.exports ={
     project: new ProjectsDAO(),
     projType: projectType

modules/pm/routes/pm_route.js

@@ -40,6 +40,7 @@ module.exports = function (app) {
     pmRouter.post('/beforeOpenProject', pmController.beforeOpenProject);
     pmRouter.post('/getProject', pmController.getProject);
     pmRouter.post('/getNewProjectID', pmController.getNewProjectID);
+    pmRouter.post('/getUnitFile', pmController.getUnitFileList);
 
     app.use('/pm/api', pmRouter);
 };

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

@@ -157,70 +157,140 @@
     </div>
     <div class="slide-sidebar">
         <div class="side-content">
+            <!--建设项目汇总-->
             <div class="p-3">
-                <legend>1号生产车间 汇总</legend>
+                <legend>船体生产车间 汇总</legend>
                 <table class="table table-bordered table-hover table-sm">
                     <thead>
                     <tr>
                         <th rowspan="2"></th>
                         <th rowspan="2">序号</th>
-                        <th rowspan="2">名称</th>
-                        <th rowspan="2">金额</th>
-                        <th colspan="6">其中</th>
-                        <th rowspan="2">占造价比例（%）</th>
-                        <th rowspan="2">建筑面积</th>
-                        <th rowspan="2">单方造价</th>
+                        <th rowspan="2">单位工程名称</th>
+                        <th rowspan="2">金额（元）</th>
+                        <th colspan="3">其中</th>
                     </tr>
                     <tr>
-                        <th>分部分项合计</th>
-                        <th>措施项目合计</th>
-                        <th>其他项目合计</th>
-                        <th>安全文明施工费</th>
-                        <th>规费</th>
-                        <th>税金</th>
+                        <th>暂估价（元）</th>
+                        <th>安全文明施工费（元）</th>
+                        <th>规费（元）</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr>
                         <td>1</td>
-                        <td>一</td>
-                        <td>建筑工程</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
+                        <td>1</td>
+                        <td>6号生产车间</td>
+                        <td>12345.67</td>
+                        <td>5436.87</td>
+                        <td>54345.68</td>
+                        <td>514.54</td>
                     </tr>
                     <tr>
                         <td>2</td>
-                        <td>二</td>
-                        <td>建筑工程</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
+                        <td>2</td>
+                        <td>7号生产车间</td>
+                        <td>12345.67</td>
+                        <td>5436.87</td>
+                        <td>54345.68</td>
+                        <td>514.54</td>
                     </tr>
                     <tr>
                         <td>3</td>
+                        <td>3</td>
+                        <td>8号生产车间</td>
                         <td> </td>
                         <td> </td>
                         <td> </td>
                         <td> </td>
+                    </tr>
+                    <tr>
+                        <td>4</td>
+                        <td>4</td>
+                        <td>9号生产车间</td>
                         <td> </td>
                         <td> </td>
                         <td> </td>
                         <td> </td>
+                    </tr>
+                    <tr>
+                        <td>4</td>
+                        <td> </td>
+                        <td>合计</td>
+                        <td>110789.36</td>
+                        <td>5971.32</td>
+                        <td>58900.46</td>
+                        <td>1049.41
+
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+                <div class="row">
+                    <div class="col-md-6">
+                        <legend>单价文件</legend>
+                        <table class="table table-bordered table-hover table-sm">
+                            <thead><th></th><th>名称</th></thead>
+                            <tbody>
+                            <tr><td>1</td><td>A单价文件</td></tr>
+                            <tr><td>2</td><td>B单价文件</td></tr>
+                            <tr><td>3</td><td>C单价文件</td></tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="col-md-6">
+                        <legend>费率文件</legend>
+                        <table class="table table-bordered table-hover table-sm">
+                            <thead><th></th><th>名称</th></thead>
+                            <tbody>
+                            <tr><td>1</td><td>A费率文件</td></tr>
+                            <tr><td>2</td><td>B费率文件</td></tr>
+                            <tr><td>3</td><td>C费率文件</td></tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+            <!--单项工程汇总-->
+            <div class="p-3">
+                <legend>6号生产车间 汇总</legend>
+                <table class="table table-bordered table-hover table-sm">
+                    <thead>
+                    <tr>
+                        <th rowspan="2"></th>
+                        <th rowspan="2">序号</th>
+                        <th rowspan="2">单位工程名称</th>
+                        <th rowspan="2">金额（元）</th>
+                        <th colspan="3">其中</th>
+                    </tr>
+                    <tr>
+                        <th>暂估价（元）</th>
+                        <th>安全文明施工费（元）</th>
+                        <th>规费（元）</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>1</td>
+                        <td>1</td>
+                        <td>建筑工程3</td>
+                        <td>12345.67</td>
+                        <td>5436.87</td>
+                        <td>54345.68</td>
+                        <td>514.54</td>
+                    </tr>
+                    <tr>
+                        <td>2</td>
+                        <td>2</td>
+                        <td>建筑工程4</td>
+                        <td>12345.67</td>
+                        <td>5436.87</td>
+                        <td>54345.68</td>
+                        <td>514.54</td>
+                    </tr>
+                    <tr>
+                        <td>3</td>
+                        <td>3</td>
+                        <td>建筑工程5</td>
                         <td> </td>
                         <td> </td>
                         <td> </td>
@@ -228,18 +298,14 @@
                     </tr>
                     <tr>
                         <td>4</td>
-                        <td>一</td>
-                        <td>合计</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td>0</td>
-                        <td> </td>
-                        <td> </td>
                         <td> </td>
+                        <td>合计</td>
+                        <td>110789.36</td>
+                        <td>5971.32</td>
+                        <td>58900.46</td>
+                        <td>1049.41
+
+                        </td>
                     </tr>
                     </tbody>
                 </table>
@@ -281,7 +347,7 @@
                     </div>
                     <div class="form-group">
                         <label>计价规则</label>
-                        <select class="form-control" id="valuation"><option value="">请选择计划规则</option></select>
+                        <select class="form-control" id="valuation"><option value="">请选择计价规则</option></select>
                     </div>
                 </form>
             </div>
@@ -341,11 +407,11 @@
                     </div>
                     <div class="form-group hidden-area">
                         <label>单价文件</label>
-                        <select class="form-control"><option>新建单价文件</option></select>
+                        <select class="form-control" id="unit-price"><option value="">新建单价文件</option></select>
                     </div>
                     <div class="form-group hidden-area">
                         <label>费率文件</label>
-                        <select class="form-control" id="tender-fee-rate"><option>请选择费率文件</option></select>
+                        <select class="form-control" id="tender-fee-rate"><option value="">请选择费率文件</option></select>
                     </div>
                     <div class="form-group">
                         <label>计价方式</label>

web/building_saas/pm/js/pm_main.js

@@ -235,6 +235,9 @@ $(document).ready(function() {
             getProperty(projectInfo.data);
         }
 
+        // 获取单价文件数据
+        getUnitFile(projectInfo.data.ID);
+
     });
 
     // 新增单位工程
@@ -676,56 +679,74 @@ function AddEngineering() {
  * @return {boolean}
  */
 function AddTender() {
-    let name = $('#tender-name').val();
-    if (name === '') {
-        alert('请填写单位工程名称');
-        return false;
-    }
+    try {
+        let name = $('#tender-name').val();
+        if (name === '') {
+            throw '请填写单位工程名称';
+        }
 
-    let valuation = $("#tender-valuation").val();
-    let valuationName = $("#tender-valuation").children("option:selected").text();
-    let valuationType = $("input[name='tender_valuation_type']:checked").val();
-    let engineering = $("#tender-engineering").val();
+        let engineering = $("#tender-engineering").val();
+        if (engineering === '') {
+            throw '请选择工程专业';
+        }
 
-    let engineering_id = undefined;
-    let valuationData = valuationType === 'bill' ? JSON.parse(billValuation) : JSON.parse(rationValuation);
-    let engineeringList = [];
-    for(let tmp of valuationData) {
-        if (tmp._id === valuation) {
-            engineeringList = tmp.engineering_list;
-            break;
+        let unitPriceFile = $("#unit-price").val();
+
+        let feeFile = $("#tender-fee-rate").val();
+        if (feeFile === '') {
+            throw '请选择费率文件';
         }
-    }
-    for(let tmp of engineeringList) {
-        if (tmp.engineering == engineering) {
-            engineering_id = tmp.engineering_id;
-            break;
+
+        let valuation = $("#tender-valuation").val();
+        let valuationName = $("#tender-valuation").children("option:selected").text();
+        let valuationType = $("input[name='tender_valuation_type']:checked").val();
+
+        let engineering_id = undefined;
+        let valuationData = valuationType === 'bill' ? JSON.parse(billValuation) : JSON.parse(rationValuation);
+        let engineeringList = [];
+        for(let tmp of valuationData) {
+            if (tmp._id === valuation) {
+                engineeringList = tmp.engineering_list;
+                break;
+            }
         }
-    }
-    let engineeringName = $('#tender-engineering').children("option:selected").text();
+        for(let tmp of engineeringList) {
+            if (tmp.engineering == engineering) {
+                engineering_id = tmp.engineering_id;
+                break;
+            }
+        }
+        let engineeringName = $('#tender-engineering').children("option:selected").text();
 
-    let callback = function() {
-        $("#add-tender-dialog").modal("hide");
-        $('#tender-name').val('');
-        $("#tender-fee-rate").children("option").removeAttr("selected");
-        $("#tender-engineering").children("option").removeAttr("selected");
-        $(".hidden-area").hide();
-    };
-    let selectedItem = Tree.selected();
-    let tenderInfo = {
-        valuation: valuation,
-        valuationType: valuationType,
-        valuationName: valuationName,
-        engineering: engineering,
-        engineering_id: engineering_id,
-        engineeringName: engineeringName
-    };
-    // 如果选择的是单项工程则新增同级数据
-    if (selectedItem !== null && selectedItem.data.projType === projectType.tender) {
-        AddSiblingsItem(name, tenderInfo, projectType.tender, callback);
-    } else {
-        AddChildrenItem(name, tenderInfo, projectType.tender, callback);
+        let callback = function() {
+            $("#add-tender-dialog").modal("hide");
+            $('#tender-name').val('');
+            $("#tender-fee-rate").children("option").removeAttr("selected");
+            $("#tender-engineering").children("option").removeAttr("selected");
+            $(".hidden-area").hide();
+        };
+        let selectedItem = Tree.selected();
+        let tenderInfo = {
+            valuation: valuation,
+            valuationType: valuationType,
+            valuationName: valuationName,
+            engineering: engineering,
+            engineering_id: engineering_id,
+            engineeringName: engineeringName,
+            unitPriceFile: unitPriceFile,
+            feeFile: feeFile
+        };
+        // 如果选择的是单项工程则新增同级数据
+        if (selectedItem !== null && selectedItem.data.projType === projectType.tender) {
+            AddSiblingsItem(name, tenderInfo, projectType.tender, callback);
+        } else {
+            AddChildrenItem(name, tenderInfo, projectType.tender, callback);
+        }
+
+    } catch (error) {
+        alert(error);
     }
+
 }
 
 /**
@@ -1003,4 +1024,45 @@ function getProperty(projectInfo) {
     $("input[name='tender_valuation_type']").attr('disabled', 'disabled').removeAttr('checked', 'checked');
     $("input[name='tender_valuation_type'][value='"+ projectProperty.valuationType +"']")
         .attr("checked", "checked").removeAttr('disabled', 'disabled');
+}
+
+/**
+ * 获取单价文件
+ *
+ * @param {Number} parentID
+ * @return {void}
+ */
+function getUnitFile(parentID) {
+    parentID = parseInt(parentID);
+    if (isNaN(parentID) && parentID <= 0) {
+        return;
+    }
+
+    $.ajax({
+        url: '/pm/api/getUnitFile',
+        type: 'post',
+        data: {'data': JSON.stringify({"user_id": userID, "parentID": parentID})},
+        dataType: 'json',
+        error: function() {
+            alert('数据传输错误!');
+        },
+        beforeSend: function() {
+
+        },
+        success: function(response) {
+            if (response.error === 1) {
+                alert('获取失败!');
+            } else {
+                if (response.data.length <= 0) {
+                    return false;
+                }
+                let unitFileHtml = '';
+                for(let tmp of response.data) {
+                    unitFileHtml += '<option value="'+ tmp.id +'">'+ tmp.name +'</option>';
+                }
+                $("#unit-price").children("option").first().after(unitFileHtml);
+            }
+        }
+    });
+
 }

web/glj/html/glj_index.html

@@ -78,6 +78,7 @@
     // 混凝土、砂浆、配合比、机械 市场单价不能修改
     let canNotChangeTypeId = '<%- ownCompositionTypes %>';
     canNotChangeTypeId = canNotChangeTypeId !== '' ? canNotChangeTypeId.split(",") : '';
+    let userID = '<%=userID %>';
 </script>
 <%include footer.html %>
 <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.js"></script>
@@ -90,9 +91,12 @@
 <script type="text/javascript" src="/web/glj/js/project_glj.js"></script>
 <script type="text/javascript" src="/web/glj/js/composition.js"></script>
 <script type="text/javascript" src="/web/building_saas/js/global.js"></script>
+<script type="text/javascript" src="/public/web/common_ajax.js"></script>
+<script type="text/javascript" src="/public/web/url_util.js"></script>
+<script type="text/javascript" src="/web/building_saas/main/js/views/project_info.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-//    let projectId = getQueryString("project");
-//    $(".main-nav .nav li > a").not(".active").attr("href", "/main?project=" + projectId);
+    let projectId = getQueryString("project");
+    $(".main-nav .nav li > a").not(".active").attr("href", "/main?project=" + projectId);
 });
 </script>

web/glj/html/header.html

@@ -33,7 +33,7 @@
     </div>
     <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
         <span class="header-logo px-2">Smartcost</span>
-        <div class="navbar-text"><a href="project-management.html">项目管理</a><i class="fa fa-angle-right fa-fw"></i>文件夹<i
+        <div class="navbar-text" id="fullpath"><a href="project-management.html">项目管理</a><i class="fa fa-angle-right fa-fw"></i>文件夹<i
                 class="fa fa-angle-right fa-fw"></i>建设项目<i class="fa fa-angle-right fa-fw"></i>单项工程<i
                 class="fa fa-angle-right fa-fw"></i>单位工程
         </div>

web/glj/js/project_glj.js

@@ -11,6 +11,8 @@ let currentTag = '';
 let isChanging = false;
 $(document).ready(function () {
 
+    projectInfoObj.showProjectInfo();
+
     projectGLJSpread = new ProjectGLJSpread();
     projectGLJSpread.successCallback = successTrigger;
     projectGLJSheet = projectGLJSpread.init();