Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation into 1.0.0_online

modules/all_models/project_feature_lib.js

@@ -0,0 +1,22 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+
+//工程特征库
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+const oprSchema = require('../all_schemas/opr_schema');
+const project_feature_lib = new Schema({
+        ID:{type:String,index:true},
+        creator: String,
+        createDate: Number,
+        recentOpr: [oprSchema],
+        name: String,
+        feature:{
+            type: [Schema.Types.Mixed],
+            default: []
+        }
+    }, {versionKey: false}
+);
+
+mongoose.model("std_project_feature_lib", project_feature_lib,"std_project_feature_lib");

modules/bills_template_lib/controllers/bills_template_controller.js

@@ -47,6 +47,7 @@ class BillsTemplateController extends BaseController {
 
         }catch (err){
             console.log(err);
+            result.message = err.message;
         }
         response.json(result);
     }

modules/material_replace_lib/controllers/material_replace_controller.js

@@ -24,7 +24,6 @@ class ReplaceController extends BaseController{
         };
         response.render("maintain/material_replace_lib/html/main", randerData);
     }
-
     async edit(request,response){
         //先取出替换库信息：
         let libID = request.params.libID;
@@ -54,7 +53,6 @@ class ReplaceController extends BaseController{
             response.redirect(request.headers.referer);
         }
     }
-
     async findLib(request, response){
         let result={
             error:0
@@ -131,6 +129,38 @@ class ReplaceController extends BaseController{
         }
         response.json(result);
     }
+    async saveMaterial(request,response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let resultData= await materialFacade.saveMaterial(data);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async findMaterial (request,response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let resultData = await materialFacade.getMaterialByBillsID(data.billsItemID);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
 }
 
 export default ReplaceController;

modules/material_replace_lib/facade/material_replace_facade.js

@@ -11,6 +11,7 @@ let replaceBillModel = mongoose.model("std_replace_bills");
 let replaceMaterialModel = mongoose.model("std_replace_material");
 let StdBillsLib = mongoose.model('std_bills_lib_list');
 let stdBillsModel = mongoose.model('std_bills_lib_bills');
+let stdGLJMode = mongoose.model('std_glj_lib_gljList');
 
 const stdGljLibModel = mongoose.model('std_glj_lib_map');
 
@@ -64,17 +65,79 @@ let materialReplaceLib = {
         return await replaceBillModel.find({libID:libID});
     },
     saveBills:async function(data){
-        let addList = [],updateList =[],deleteList=[];
-        for(let d of data){
-            if(d.type == 'add') addList.push(d);
-            if(d.type == 'update') updateList.push(d);
-            if(d.type == 'delete') deleteList.push(d);
-        }
+        let [addList,updateList,deleteList]  = prepareDatas(data);
         let p = await Promise.all([addBills(addList),updateBills(updateList),deleteBills(deleteList)]);
         return p;
+    },
+    saveMaterial:async function(data){
+        let [addList,updateList,deleteList]  = prepareDatas(data);
+        let p = await Promise.all([addMaterial(addList),replaceMaterial(updateList),deleteMaterial(deleteList)]);
+        return p;
+    },
+    getMaterialByBillsID : async function(billsID){
+       return  await replaceMaterialModel.find({billsItemID:billsID});
     }
 };
-
+function prepareDatas(data) {//整理数据
+    let addList = [],updateList =[],deleteList=[];
+    for(let d of data){
+        if(d.type == 'add') addList.push(d);
+        if(d.type == 'update') updateList.push(d);
+        if(d.type == 'delete') deleteList.push(d);
+    }
+    return [addList,updateList,deleteList]
+}
+async function addMaterial(datas) {
+    let newMaterial = [],missCodes=[];
+    for(let d of datas){
+        let stdGLJ = await stdGLJMode.findOne({repositoryId:d.gljLibID,code:d.code});
+        if(stdGLJ){
+            let temM = {
+                libID:d.libID,
+                billsItemID:d.billsItemID,
+                code:d.code,
+                name:stdGLJ.name,
+                specs:stdGLJ.specs,
+                type:stdGLJ.gljType,
+                unit:stdGLJ.unit
+            };
+            temM.ID = uuidV1();
+            newMaterial.push(temM);
+        }else {
+            missCodes.push(d.code);
+        }
+    }
+    if(newMaterial.length>0){
+        await replaceMaterialModel.create(newMaterial);
+    }
+    return {type:'add',list:newMaterial,missCodes:missCodes};
+}
+async function replaceMaterial(datas) {
+    let tasks = [],list=[],missCodes = [];
+    for(let d of datas){
+        let stdGLJ = await stdGLJMode.findOne({repositoryId:d.gljLibID,code:d.code});
+        if(stdGLJ){
+            let updateData =  {code:d.code, name:stdGLJ.name, specs:stdGLJ.specs, type:stdGLJ.gljType, unit:stdGLJ.unit};
+            let task = {
+                updateOne:{filter:{ID:d.ID}, update :updateData}
+            };
+            tasks.push(task);
+            list.push({ID:d.ID,updateData:updateData})
+        }else {
+            missCodes.push(d.code)
+        }
+    }
+    if(tasks.length > 0) await replaceMaterialModel.bulkWrite(tasks);
+    return {type:'update',list:list,missCodes:missCodes};
+}
+async function deleteMaterial(datas) {
+    let IDList = [];
+    for(let d of datas){
+        if(d.ID) IDList.push(d.ID);
+    }
+    await replaceMaterialModel.deleteMany({ID:{"$in": IDList}});
+    return {type:'delete',list:IDList};
+}
 async function addBills(datas) {
     let newBills = [],missCodes=[];
     for(let d of datas){
@@ -97,7 +160,6 @@ async function addBills(datas) {
     }
     return {type:'add',list:newBills,missCodes:missCodes};
 }
-
 async function updateBills(datas) {
     let tasks = [],list=[],missCodes = [];
     for(let d of datas){
@@ -124,15 +186,14 @@ async function updateBills(datas) {
     if(tasks.length > 0) await replaceBillModel.bulkWrite(tasks);
     return {type:'update',list:list,missCodes:missCodes};
 }
-
 async function deleteBills(datas) {
     let IDList = [];
     for(let d of datas){
         if(d.ID) IDList.push(d.ID)
     }
+    await replaceMaterialModel.deleteMany({billsItemID:{"$in": IDList}});//删除清单时要把对应的材料也删除了
     await replaceBillModel.deleteMany({ID:{"$in": IDList}});
     return {type:'delete',list:IDList};
-
 }
 
 

modules/material_replace_lib/routes/material_replace_router.js

@@ -16,6 +16,8 @@ module.exports =function (app){
     repRouter.post("/saveLib", replaceController.auth, replaceController.init, replaceController.saveLib);
     repRouter.post("/deleteLibByID", replaceController.auth, replaceController.init, replaceController.deleteLibByID);
     repRouter.post("/saveBills", replaceController.auth, replaceController.init, replaceController.saveBills);
+    repRouter.post("/saveMaterial", replaceController.auth, replaceController.init, replaceController.saveMaterial);
+    repRouter.post("/findMaterial", replaceController.auth, replaceController.init, replaceController.findMaterial);
     app.use("/materialReplace", repRouter);
 };
 

modules/project_feature_lib/controllers/project_feature_controller.js

@@ -0,0 +1,99 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+import BaseController from "../../common/base/base_controller";
+import featureFacade from "../facade/project_feature_facade";
+let config = require("../../../config/config.js");
+
+class FeatureController extends BaseController{
+    async main(request, response) {
+        let featureLibs = await featureFacade.findByCondition({},{feature:0},false);
+        let randerData = {
+            title:'工程特征库',
+            userAccount: request.session.managerData.username,
+            userID: request.session.managerData.userID,
+            featureLibs:featureLibs,
+            layout: 'maintain/common/html/layout'
+        };
+        response.render("maintain/project_feature_lib/html/main", randerData);
+    }
+    async addLib(request, response){
+        try {
+            await featureFacade.addLib(request.body);
+        }catch (error) {
+            console.log(error);
+        }
+        response.redirect(request.headers.referer);
+    }
+    async findLib(request, response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let conditions={'ID' : data.ID};
+            let resultData = await featureFacade.findByCondition(conditions);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async saveLib(request, response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let resultData= await featureFacade.saveLib(data);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async deleteLibByID(request,response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let resultData= await featureFacade.deleteLibByID(data.ID);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async edit(request,response){
+        //先取出替换库信息：
+        let libID = request.params.libID;
+        let featureLib = await featureFacade.findByCondition({'ID':libID});
+        if(featureLib){
+            let randerData = {
+                title:'工程特征库',
+                mainURL:'/projectFeature/main',
+                libName:featureLib.name,
+                userAccount: request.session.managerData.username,
+                userID: request.session.managerData.userID,
+                featureList:JSON.stringify(featureLib.feature),
+                libID:libID,
+                LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                layout: 'maintain/common/html/edit_layout'
+            };
+            response.render("maintain/project_feature_lib/html/edit", randerData);
+        }else {
+            response.redirect(request.headers.referer);
+        }
+    }
+}
+export default FeatureController;

modules/project_feature_lib/facade/project_feature_facade.js

@@ -0,0 +1,38 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+import mongoose from "mongoose";
+const uuidV1 = require('uuid/v1');
+let moment = require("moment");
+let projectFeatureModel = mongoose.model('std_project_feature_lib');
+
+
+let projectFeatureLib = {
+    findByCondition:async function(conditions,options,single=true){
+        if(single == true){
+            return await projectFeatureModel.findOne(conditions,options);
+        }else {
+            return await  projectFeatureModel.find(conditions,options);
+        }
+    },
+    addLib : async function (data){
+        let now = new Date().getTime();
+        let dateStr = moment(now).format('YYYY-MM-DD HH:mm:ss');
+        let newLib = {
+            creator: data.userAccount,
+            createDate: now,
+            recentOpr: [{operator: data.userAccount, operateDate: dateStr}],
+            name: data.name,
+        };
+        newLib.ID = uuidV1();
+        return await projectFeatureModel.create(newLib);
+    },
+    saveLib:async function(param) {
+        return await projectFeatureModel.findOneAndUpdate(param.query,param.data,{new:true});
+    },
+    deleteLibByID:async function(ID){
+        return await projectFeatureModel.deleteOne({ID:ID});
+    },
+};
+
+export default projectFeatureLib

modules/project_feature_lib/routes/project_feature_router.js

@@ -0,0 +1,29 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+
+let express = require("express");
+let featureRouter =express.Router();
+import FeatureController from "../controllers/project_feature_controller";
+let featureController = new FeatureController();
+
+module.exports =function (app){
+
+    featureRouter.get("/main", featureController.auth, featureController.init, featureController.main);
+    featureRouter.post("/addLib", featureController.auth, featureController.init, featureController.addLib);
+    featureRouter.post("/findLib", featureController.auth, featureController.init, featureController.findLib);
+    featureRouter.post("/saveLib", featureController.auth, featureController.init, featureController.saveLib);
+    featureRouter.post("/deleteLibByID", featureController.auth, featureController.init, featureController.deleteLibByID);
+    featureRouter.get("/edit/:libID", featureController.auth, featureController.init, featureController.edit);
+/*    repRouter.get("/edit/:libID", replaceController.auth, replaceController.init, replaceController.edit);
+    repRouter.post("/findLib", replaceController.auth, replaceController.init, replaceController.findLib);
+    repRouter.post("/addLib", replaceController.auth, replaceController.init, replaceController.addLib);
+    repRouter.post("/saveLib", replaceController.auth, replaceController.init, replaceController.saveLib);
+    repRouter.post("/deleteLibByID", replaceController.auth, replaceController.init, replaceController.deleteLibByID);
+    repRouter.post("/saveBills", replaceController.auth, replaceController.init, replaceController.saveBills);
+    repRouter.post("/saveMaterial", replaceController.auth, replaceController.init, replaceController.saveMaterial);
+    repRouter.post("/findMaterial", replaceController.auth, replaceController.init, replaceController.findMaterial);*/
+    app.use("/projectFeature", featureRouter);
+};
+
+

public/web/id_tree.js

@@ -519,6 +519,33 @@ var idTree = {
             }
             return node;
         };
+        Tree.prototype.m_insert = function (datas,parentID, nextSiblingID) {
+           // var newID = this.newNodeID(), node = null, data = {};
+            var parent = parentID == -1 ? null : this.nodes[this.prefix + parentID];
+            var nextSibling = nextSiblingID == -1 ? null: this.nodes[this.prefix + nextSiblingID];
+            let preInsertNode = null,nodes = [];
+            for(let d of datas){
+                let node = new Node(this,d.data);
+                if(preInsertNode == null){
+                    if (nextSibling) {
+                        tools.addNodes(this, parent, [node], nextSibling.siblingIndex());
+                    } else {
+                        tools.addNodes(this, parent, [node]);
+                    }
+                }else {
+                    tools.addNodes(this, parent, [node], preInsertNode.siblingIndex());
+                }
+                this.nodes[this.prefix + d.data.ID] = node;
+                if(preInsertNode) node.setNextSibling(preInsertNode);
+                preInsertNode = node;
+                nodes.push(node);
+            }
+            tools.sortTreeItems(this);
+            return nodes;
+        };
+
+
+
         Tree.prototype.insertByID = function (newID, parentID, nextSiblingID) {
             var node = null, data = {};
             var parent = parentID == -1 ? null : this.nodes[this.prefix + parentID];
@@ -557,6 +584,33 @@ var idTree = {
             }
             return data;
         };
+        //插入多行
+        Tree.prototype.getInsertDatas = function (rowCount,parentID, nextSiblingID) {
+            let data = [],preInsertID = null,lastID;
+            let parent = parentID == -1 ? null : this.nodes[this.prefix + parentID];
+            let nextSibling = nextSiblingID == -1 ? null: this.nodes[this.prefix + nextSiblingID];
+            for(let i=0;i<rowCount ;i++){//先插入的在最后，后插的在最前
+                let newID = this.newNodeID();
+                if(newID !== -1){
+                    if(preInsertID == null){//说明是第一个插入的
+                        data.push({type: 'new', data: this.getDataTemplate(newID, parent ? parent.getID() : this.setting.rootId, nextSibling ? nextSibling.getID() : this.setting.rootId)});
+                    }else {//其它的下一节点ID取上一个插入的节点
+                        data.push({type: 'new', data: this.getDataTemplate(newID, parent ? parent.getID() : this.setting.rootId, preInsertID)});
+                    }
+                    this.maxNodeID(newID);
+                    preInsertID = newID;
+                }
+            }
+            if (nextSibling && nextSibling.preSibling) {
+                tools.addUpdateDataForNextSibling(data, nextSibling.preSibling, preInsertID);
+            } else if (parent && parent.children.length !== 0) {
+                tools.addUpdateDataForNextSibling(data, parent.lastChild(), preInsertID);
+            } else if (!parent && this.roots.length !== 0) {
+                tools.addUpdateDataForNextSibling(data, this.roots[this.roots.length - 1], preInsertID);
+            }
+            return data;
+
+        };
         Tree.prototype.insertByData = function (data, parentID, nextSiblingID) {
             var parent = parentID == -1 ? null : this.nodes[this.prefix + parentID];
             var nextSibling = nextSiblingID == -1 ? null : this.nodes[this.prefix + nextSiblingID];

public/web/tree_sheet/tree_sheet_controller.js

@@ -42,6 +42,28 @@ var TREE_SHEET_CONTROLLER = {
                 }
             }
         };
+        controller.prototype.m_insert = function (datas) {
+            let nodes = [], that = this,  sels = this.sheet.getSelections();
+            if(this.tree){
+                if (this.tree.selected) {
+                    nodes = this.tree.m_insert(datas,this.tree.selected.getParentID(), this.tree.selected.getNextSiblingID());
+                } else {
+                    nodes = this.tree.m_insert(datas);
+                }
+            }
+            let length = nodes.length;
+            if (nodes.length > 0) {
+                TREE_SHEET_HELPER.massOperationSheet(this.sheet, function () {
+                    that.sheet.addRows(nodes[length - 1].serialNo(), length);
+                    TREE_SHEET_HELPER.refreshTreeNodeData(that.setting, that.sheet, nodes, false);
+                    that.setTreeSelected(nodes[length - 1]);
+                    that.sheet.setSelection(nodes[length - 1].serialNo(), sels[0].col, 1, 1);
+                    //that.sheet.showRow(newNode.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
+                });
+            }
+        };
+
+
         controller.prototype.insertByID = function (ID) {
             var newNode = null, that = this,  sels = this.sheet.getSelections();
             if (this.tree) {

web/maintain/bill_template_lib/html/edit.html

@@ -16,6 +16,7 @@
                         <a href="" class="btn btn-sm"><i class="fa fa-scissors" aria-hidden="true"></i> 剪切</a>
                         <a href="" class="btn btn-sm"><i class="fa fa-clipboard" aria-hidden="true"></i> 粘贴</a>
                         <a href="javascript:void(0)" class="btn btn-sm" id="insert"><i class="fa fa-sign-in" aria-hidden="true"></i> 插入</a>
+                        <a href="javascript:void(0)" class="btn btn-sm" id="m_insert" data-toggle="modal" data-target="#insertInputDiv"><i class="fa fa-sign-in" aria-hidden="true"></i> 插入多行</a>
                         <a href="javascript:void(0)" class="btn btn-sm" id="delete"><i class="fa fa-remove" aria-hidden="true"></i> 删除</a>
                         <a href="javascript:void(0)" class="btn btn-sm" id="upLevel"><i class="fa fa-arrow-left" aria-hidden="true"></i> 升级</a>
                         <a href="javascript:void(0)" class="btn btn-sm" id="downLevel"><i class="fa fa-arrow-right" aria-hidden="true"></i> 降级</a>
@@ -30,6 +31,35 @@
     </div>
 </div>
 
+<!--弹出插入多行对话框-->
+<div class="modal fade" id="insertInputDiv" 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>
+                        <input id="insertCount" class="form-control" placeholder="行数" type="number" min="1" value="1" step="1">
+                        <small class="form-text text-danger" id="insertError" style="display: none">请输入正确的行数。</small>
+                        <input id="libID" type="hidden">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <a id="m_insert_confirm" href="javascript: void(0);" class="btn btn-primary" >确定</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
 <script>
     let billsTemplateData = '<%- billsTemplateData %>';
     let billsFixedFlagList = '<%- billsFixedFlagList %>';

web/maintain/bill_template_lib/js/bills_template_edit.js

@@ -229,6 +229,7 @@ $(document).ready(function () {
         datas.forEach(function (data) {
             let node = tree.findNode(data.data.ID);
             if (node) {
+                setFlagsIndex(data.data,node.data.flagsIndex);
                 $.extend(true, node.data, data.data);
             }
         });
@@ -301,16 +302,26 @@ $(document).ready(function () {
             setFee(data.data, fieldName, value);
         }
     };
+    let setFlagsIndex = function (data,flagsIndex) {
+        if (data.flags) {
+            flagsIndex?data.flagsIndex = flagsIndex:data.flagsIndex={};
+            for (let flag of data.flags) {
+                data.flagsIndex[flag.fieldName] = flag;
+            }
+        }
+    };
+
 
     billsTemplateData = billsTemplateData.replace(/\n/g, '\\n');
     let templateData = JSON.parse(billsTemplateData);
     for (let data of templateData) {
-        if (data.flags) {
+        setFlagsIndex(data);
+       /* if (data.flags) {
             data.flagsIndex = {};
             for (let flag of data.flags) {
                 data.flagsIndex[flag.fieldName] = flag;
             }
-        }
+        }*/
     }
 
     for (col of TEMPLATE_BILLS_SETTING.cols) {
@@ -429,6 +440,56 @@ $(document).ready(function () {
             $(me).removeClass('disabled');
         }
     });
+
+    $('#m_insert_confirm').click(function () {
+        let me = this;
+        let insertCount = $("#insertCount").val();
+        if(isNaN(insertCount)||insertCount<1){
+            $("#insertError").show();
+            return;
+        }
+        $(me).addClass('disabled');
+        let selected = controller.tree.selected, updateData;
+        if (selected) {
+            updateData = controller.tree.getInsertDatas(insertCount,selected.getParentID(), selected.getNextSiblingID());
+        } else {
+            updateData = controller.tree.getInsertDatas(insertCount);
+        }
+        if (updateData.length > 0) {
+            CommonAjax.post(updateUrl, updateData, function (data) {
+                data = _.filter(data,{'type':'new'});
+                console.log(data);
+                controller.m_insert(data);
+                controller.showTreeData();
+                $("#insertInputDiv").modal('hide');
+                $("#insertError").hide();
+                $(me).removeClass('disabled');
+            });
+        } else {
+            alert('新增节点失败, 请重试.');
+            $(me).removeClass('disabled');
+        }
+
+      /*  var selected = controller.tree.selected, updateData;
+        if (selected) {
+            updateData = controller.tree.getInsertData(selected.getParentID(), selected.getNextSiblingID());
+        } else {
+            updateData = controller.tree.getInsertData();
+        }
+        if (updateData.length > 0) {
+            CommonAjax.post(updateUrl, updateData, function (data) {
+                controller.insert();
+                controller.showTreeData();
+                $(me).removeClass('disabled');
+            });
+        } else {
+            alert('新增节点失败, 请重试.');
+            $(me).removeClass('disabled');
+        }*/
+    });
+
+
+
     $('#delete').click(function () {
         let me = this;
         $(me).addClass('disabled');

web/maintain/material_replace_lib/html/edit.html

@@ -12,7 +12,7 @@
             <div class="row">
                 <div class="tools-bar p-1 d-flex justify-content-between col-lg-12" style="background: #f7f7f7;">
                     <div class="input-group input-group-sm col-lg-4">
-                        <input class="form-control" placeholder="搜索定位" type="text">
+                        <input class="form-control" placeholder="搜索定位" type="text" id = 'keyword'>
                         <span class="input-group-btn">
                               <button class="btn btn-secondary" type="button"><i class="fa fa-search"></i></button>
                             </span>

web/maintain/material_replace_lib/js/material_replace_edit.js

@@ -5,6 +5,7 @@
 let materialOjb = {
     billsSpread:null,
     materialSpread:null,
+    allBills:JSON.parse(billsList),
     billsList:JSON.parse(billsList),
     materialList:[],
     billsSetting:{
@@ -49,6 +50,9 @@ let materialOjb = {
         this.materialSheet = this.materialSpread .getSheet(0);
         sheetCommonObj.initSheet(this.materialSheet,this.materialSetting, 30);
         this.materialSheet.name('materialSheet');
+        this.materialSheet.bind(GC.Spread.Sheets.Events.ValueChanged, this.onMaterialValueChange);
+        this.materialSheet.bind(GC.Spread.Sheets.Events.EditStarting, this.onMaterialEditStarting);
+        this.materialSheet.bind(GC.Spread.Sheets.Events.RangeChanged, this.onMaterialRangeChange);
         this.initRightClick("materialSpread",this.materialSpread);
         this.refreshSheet();
 
@@ -68,14 +72,19 @@ let materialOjb = {
             if(me.billsList[sel.row + i]) deleteList.push(getDeleteDatas(me.billsList[sel.row + i]));
         }
         if(deleteList.length > 0) await me.saveBills(deleteList);
-
-
         function getDeleteDatas(tem) {
             return {type:'delete', ID:tem.ID}
         }
 
     },
-
+    deleteMaterial:async function(sheet){
+        let me = this,deleteList = [];
+        let sel = sheet.getSelections()[0];
+        for(let i = 0; i<sel.rowCount;i++){
+            if(me.materialList[sel.row + i]) deleteList.push(me.getMaterialUpdateData(null,me.materialList[sel.row + i].ID,true));
+        }
+        if(deleteList.length > 0) await me.saveMaterial(deleteList);
+    },
     initRightClick : function(id,spread) {
         let me = this;
         let sheet = spread.getActiveSheet();
@@ -94,20 +103,53 @@ let materialOjb = {
                         return !me.canDelete(sheet);
                     },
                     callback: function (key, opt) {
-                        sheet.name() == 'billsSheet' ? me.deleteBills(sheet):"";
+                        sheet.name() == 'billsSheet' ? me.deleteBills(sheet):me.deleteMaterial(sheet);
                        console.log( me.rightClickTarget);
                     }
                 }
             }
         });
     },
-    refreshSheet:function(){
+    refreshSheet:async function(){
+        this.getBillsList();
         sheetCommonObj.showData(this.billsSheet,this.billsSetting,this.billsList);
         this.billsSheet.setRowCount(this.billsList.length + 30);
-
-
+        this.showMaterialList();
+    },
+    getBillsList:function () {
+        let keyword = $("#keyword").val();
+        if(isDef(keyword)&&keyword!==''){
+            this.billsList = _.filter(this.allBills,function (item) {
+                return item.code.indexOf(keyword)!=-1 || item.name.indexOf(keyword)!=-1;
+            })
+        }else {
+            this.billsList = this.allBills;
+        }
+    },
+    getMateriaList:async function () {
+        let billsItemID =  this.getCurrentBillsID();
+        if(billsItemID){
+            this.materialList = await this.getMaterialByBillsID(billsItemID)//getMaterialByBills
+        }else {
+            this.materialList = [];
+        }
+    },
+    showMaterialList:async function () {
+        await this.getMateriaList();
+        this.refreshMaterialSheet();
+    },
+    refreshMaterialSheet:function () {
+        sheetCommonObj.showData(this.materialSheet,this.materialSetting,this.materialList);
+        this.materialSheet.setRowCount(this.materialList.length + 30);
     },
     onBillsSelectionChange:function (sender,args) {
+        let me = materialOjb;
+        let nsel = args.newSelections?args.newSelections[0]:null;
+        let osel = args.oldSelections?args.oldSelections[0]:null;
+        if(nsel && osel && nsel.row != osel.row){
+            me.showMaterialList();
+            me.materialSheet.showRow(0, GC.Spread.Sheets.VerticalPosition.top);
+        }
         args.sheet.repaint();
     },
     onBillsRangeChange:function (sender,args) {
@@ -117,14 +159,14 @@ let materialOjb = {
             for(let c of args.changedCells){
                 let field = me.billsSetting.header[c.col].dataCode;
                 let newValue =  args.sheet.getCell(c.row,c.col).value();
+                let data = null;
                 if(me.validateBills(field,newValue)){
                     if(c.row < me.billsList.length){
-                        let data = me.getUpdateData(field,newValue,me.billsList[c.row].code);
-                        if(data) updateDatas.push(data);
+                         data = me.getUpdateData(field,newValue,me.billsList[c.row].code);
                     }else if(field == 'code'){//如果是在空白行粘贴，并且是编码列，则是新增，其它的忽略;
-                        let data = me.getUpdateData(field,newValue,null);
-                        if(data) updateDatas.push(data);
+                         data = me.getUpdateData(field,newValue,null);
                     }
+                    if(data) updateDatas.push(data);
                 }else {
                     break;
                 }
@@ -136,8 +178,33 @@ let materialOjb = {
         }
          me.refreshSheet();
     },
+    onMaterialRangeChange:function(sender,args){
+        let me = materialOjb;
+        let updateDatas = [];
+        if(args.action == GC.Spread.Sheets.RangeChangedAction.paste){
+            for(let c of args.changedCells){
+                let code =  args.sheet.getCell(c.row,c.col).value(),data = null;
+                if(me.validateMaterial(code)){
+                    if(c.row < me.materialList.length){
+                         data = me.getMaterialUpdateData(code,me.materialList[c.row].ID);
+                    }else {//如果是在空白行粘贴，并且是编码列，则是新增，其它的忽略;
+                         data = me.getMaterialUpdateData(code,null);
+                    }
+                    if(data) updateDatas.push(data);
+                }else {
+                    break;
+                }
+            }
+            if(updateDatas.length > 0){
+                me.saveMaterial(updateDatas);
+                return;
+            }
+        }
+        me.showMaterialList();
+    },
+
 
-    onBillsValueChange: function(sander,args){
+    onBillsValueChange: function(sender,args){
         let me = materialOjb;
         let field = me.billsSetting.header[args.col].dataCode;
         let code = null;
@@ -153,7 +220,35 @@ let materialOjb = {
         }
         me.refreshSheet();
     },
+    onMaterialEditStarting : function (sender,args) {
+        let me = materialOjb;
+        if(!me.getCurrentBillsID()) args.cancel = true; //如果没选中清单则不能编辑
+    },
 
+    onMaterialValueChange:function(sender,args){
+        let me = materialOjb;
+        let ID = null;
+        if(args.row < me.materialList.length){
+            ID = me.materialList[args.row].ID;
+        }
+        if(me.validateMaterial(args.newValue)){
+            let data = me.getMaterialUpdateData(args.newValue,ID);
+            if(data){
+                me.saveMaterial([data]);
+                return
+            }
+        }
+        me.showMaterialList();
+
+    },
+    validateMaterial:function (value) {
+        value = value.toString().replace(/[\s\r\n]/g, "");//去除空格换行等字符;
+        if(_.find(this.materialList,{code:value})){
+            alert("人材机:"+value+" 已存在");
+            return false;
+        }
+        return true;
+    },
     validateBills:function (field,value) {
         if(field == 'code'){
             value = value.toString().replace(/[\s\r\n]/g, "");//去除空格换行等字符;
@@ -168,10 +263,40 @@ let materialOjb = {
         }
         return true;
     },
+    getCurrentBillsID:function(){
+      let sel = this.billsSheet.getSelections()[0];
+      if(sel.row < this.billsList.length){
+           return this.billsList[sel.row].ID;
+      }
+      return null;
+    },
+    getMaterialUpdateData:function(code,ID,isDelete){
+        if(isDelete == true){
+            return {type:'delete', ID:ID}
+        }
+        code = code.toString().replace(/[\s\r\n]/g, "");//去除空格换行等字符;
+        if((!isDef(ID)||ID=='')&& code != null){//新增
+            let billsItemID = this.getCurrentBillsID();
+            return {
+                type:'add',
+                code:code,
+                billsItemID:billsItemID,
+                libID:$('#libID').val(),
+                gljLibID:parseInt($('#gljLibID').val())
+            }
+        }else { //替换材料
+            return {
+                type:'update',
+                ID:ID,
+                code:code,
+                gljLibID:parseInt($('#gljLibID').val())
+            }
+        }
+    },
     getUpdateData:function (field,newValue,code) {
         if(field == 'code'){
             newValue = newValue.toString().replace(/[\s\r\n]/g, "");//去除空格换行等字符;
-            if(!isDef(code) || code ==''&&newValue!=null){//说明是新增
+            if((!isDef(code) || code =='')&&newValue!=null){//说明是新增
                 return {
                     type:'add',
                     code:newValue,
@@ -198,6 +323,19 @@ let materialOjb = {
             }
         }
     },
+    saveMaterial:async function(datas){
+        try {
+            let result = await ajaxPost("/materialReplace/saveMaterial",datas);
+            let missCodes = [];
+            for(let r of result){
+                if(r.missCodes && r.missCodes.length >0) missCodes =missCodes.concat(r.missCodes);
+            }
+            if(missCodes.length > 0) alert(`没有找到人材机：${missCodes.join("、")}`);
+        }catch (err){
+            console.log(err);
+        }
+        this.showMaterialList();
+    },
     saveBills:async function (datas) {
         try {
             let result = await ajaxPost("/materialReplace/saveBills",datas);
@@ -205,30 +343,87 @@ let materialOjb = {
             for(let r of result){
                 if(r.missCodes && r.missCodes.length >0) missCodes =missCodes.concat(r.missCodes);
                 if(r.type == 'add'){
-                    this.billsList = this.billsList.concat(r.list);
+                    this.allBills = this.allBills.concat(r.list);
                 }if(r.type == 'update'){
                     for(let l of r.list){
-                        this.updateCache(l.code,l.updateData)
+                       this.updateBillsCache(l.code,l.updateData);
                     }
                 }if(r.type == 'delete'){
-                     _.remove(this.billsList,function (item) {
+                    _.remove(this.allBills,function (item) {
                         return _.includes(r.list,item.ID)
                     })
                 }
             }
             if(missCodes.length > 0) alert(`没有找到清单：${missCodes.join("、")}`);
-            this.refreshSheet();
         }catch (err){
             console.log(err);
         }
+        this.refreshSheet();
+    },
+    saveDatas:async function (datas,type ='bills') {
+        try {
+            let currentList = type =='bills'?this.billsList:this.materialList;
+            let url = type =='bills'?"/materialReplace/saveBills":"/materialReplace/saveMaterial";
+            let text = type =='bills'?"清单":"人材机";
+            let result = await ajaxPost(url,datas);
+            let missCodes = [];
+            for(let r of result){
+                if(r.missCodes && r.missCodes.length >0) missCodes =missCodes.concat(r.missCodes);
+                if(r.type == 'add'){
+                    currentList = currentList.concat(r.list);
+                }if(r.type == 'update'){
+                    for(let l of r.list){
+                        type =='bills'?this.updateBillsCache(l.code,l.updateData):this.updateMaterialCache(l.ID,l.updateData);
+                    }
+                }if(r.type == 'delete'){
+                    _.remove(currentList,function (item) {
+                        return _.includes(r.list,item.ID)
+                    })
+                }
+            }
+            if(missCodes.length > 0) alert(`没有找到${text}：${missCodes.join("、")}`);
+        }catch (err){
+            console.log(err);
+        }
+
     },
-    updateCache:function (code,updateData) {
-        let bill = _.find(this.billsList,{'code':code});
+    getMaterialByBillsID:async function(billsItemID){
+        try {
+            let result = await ajaxPost("/materialReplace/findMaterial",{billsItemID:billsItemID});
+            return result;
+        }catch (err){
+            console.log(err);
+            return [];
+        }
+    },
+    updateMaterialCache:function (ID,updateData) {
+        this.updateCache(this.materialList,{'ID':ID},updateData)
+    },
+
+    updateBillsCache:function (code,updateData) {
+         this.updateCache(this.allBills,{'code':code},updateData)
+    },
+
+    updateCache:function (list,condition,updateData) {
+        let item = _.find(list,condition);
         for(let key in updateData){
-            bill[key] = updateData[key]
+            item[key] = updateData[key]
         }
     }
 };
+let last = 0;
+
+$(document).ready(function () {
+    $("#keyword").on('input propertychange', function(event) {
+        last = event.timeStamp;//利用event的timeStamp来标记时间，这样每次事件都会修改last的值，注意last必需为全局变量
+        setTimeout(function () {    //设时延迟0.5s执行
+            if (last - event.timeStamp == 0) { //如果时间差为0（也就是你停止输入0.5s之内都没有其它的keyup事件发生）则做你想要做的事
+               materialOjb.refreshSheet();
+            }
+
+        }, 500);
+    })
+});
 
 function isDef(obj) {
     return obj!==undefined && obj!==null;

web/maintain/project_feature_lib/html/edit.html

@@ -0,0 +1,40 @@
+<nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0 second_header">
+    <ul class="nav nav-tabs" role="tablist">
+        <li class="nav-item">
+            <a class="nav-link active px-3" href="javascript: void(0);">工程特征</a>
+        </li>
+    </ul>
+</nav>
+
+<div class="main">
+    <div class="content" >
+        <div class="container-fluid" >
+        <div class=" col-lg-12 p-0">
+            <!--<nav class="navbar sticky-top navbar-toggleable-md navbar-light bg-faded tools-bar">
+                <div class="collapse navbar-collapse" id="navbarNav">
+                    <div class="tools-btn btn-group align-top">
+                        <a href="javascript:void(0)" class="btn btn-sm" id="insert"><i class="fa fa-sign-in" aria-hidden="true"></i> 插入</a>
+                        <a href="javascript:void(0)" class="btn btn-sm" id="delete"><i class="fa fa-remove" aria-hidden="true"></i> 删除</a>
+                    </div>
+                </div>
+            </nav>-->
+            <div class="main-data" id="featureSpread"></div>
+        </div>
+        </div>
+        <input type="hidden" id="libID" value="<%= libID %>">
+    </div>
+</div>
+
+
+
+<script type="text/javascript">
+    //自适应高度
+    $(".main-data").height($(window).height()-$(".header").height()-$(".navbar").height());//-$(".tools-bar").height()
+    let billsList = '<%- featureList %>';
+
+</script>
+<script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.js"></script>
+<script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
+<script type="text/javascript" src="/public/web/sheet/sheet_data_helper.js"></script>
+
+<script type="text/javascript" src="/web/maintain/project_feature_lib/js/project_feature_edit.js"></script>

web/maintain/project_feature_lib/html/main.html

@@ -0,0 +1,108 @@
+<div class="main">
+    <div class="content">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-5">
+                    <div class="warp-p2 mt-3">
+                        <table class="table table-hover table-bordered">
+                            <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="120">操作</th></tr></thead>
+                            <tbody id="showArea">
+                            <% for(let lib of featureLibs){ %>
+                            <tr class="libTr">
+                                <td id="<%= lib.ID%>"><a href="/projectFeature/edit/<%= lib.ID%>"><%= lib.name%></a></td>
+                                <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                <td>
+                                    <a style="color: #0275d8" onclick='getFeatureLib("<%= lib.ID%>")' title="编辑"><i class="fa fa-pencil-square-o"></i></a>
+                                    <a style="color: #0275d8" onclick='showDeleteModal("<%= lib.ID%>")' class="text-danger" title="删除"><i class="fa fa-remove"></i></a>
+                                </td>
+                            </tr>
+                            <% } %>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出添加-->
+<div class="modal fade" id="add" 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 id="addLibForm" method="post" action="/projectFeature/addLib" enctype="application/x-www-form-urlencoded21">
+                    <div class="form-group">
+                        <label>库名称</label>
+                        <input id="name" name="name" class="form-control" placeholder="请输入特征库名称" type="text">
+                        <small class="form-text text-danger" id="nameError" style="display: none">请输入特征库名称。</small>
+                    </div>
+                    <input type="hidden" name = "userAccount" value="<%= userAccount%>">
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button id="addLibs"  class="btn btn-primary">新建</button>
+                <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出编辑-->
+<div class="modal fade" id="edit" 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>
+                        <input id="renameText" class="form-control" placeholder="输入名称" type="text" value="">
+                        <small class="form-text text-danger" id="renameError" style="display: none">请输入名称。</small>
+                        <input id="libID" type="hidden">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <a id="rename" href="javascript: void(0);" class="btn btn-primary" >确定</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出删除-->
+<div class="modal fade" id="del" 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">
+                <h5 class="text-danger">删除后无法恢复，确认是否删除？</h5>
+                <input type="hidden" id="libID_del">
+                <input type="hidden" id="delCount">
+            </div>
+            <div class="modal-footer">
+                <a id="delete" href="javascript:void(0);" class="btn btn-danger" >确认</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript" src="/web/maintain/project_feature_lib/js/project_feature.js"></script>

web/maintain/project_feature_lib/js/project_feature.js

@@ -0,0 +1,76 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+$(document).ready(function() {
+    // 保存按钮
+    $("#addLibs").click(async function() {
+        let name = $('#name').val();
+        if(name==''){
+            $("#nameError").show();
+            return;
+        }else {
+            $("#addLibs").attr("disabled",true);//防止重复提交
+            $("#addLibForm").submit();
+        }
+    });
+
+    $("#rename").click(async function() {
+        let libID = $("#libID").val();
+        let name = $('#renameText').val();
+        if(libID!=''){
+            if(name ==''){
+                $("#renameError").show();
+                return;
+            }else {
+                try {
+                    let newFeature = await ajaxPost("/projectFeature/saveLib",{query:{ID:libID},data:{name:name}});
+                    $("#"+libID).children("a").text(newFeature.name);
+                    $("#edit").modal('hide');
+                }catch(err) {
+                    console.log(err);
+                }
+            }
+        }
+    });
+
+    $("#delete").click(async function() {
+        let libID = $("#libID_del").val();
+        let delCount = parseInt($("#delCount").val());
+        delCount = delCount+1;
+        $("#delCount").val(delCount);
+        if(delCount == 3){
+            if(libID!=""){
+                try {
+                    let result = await ajaxPost("/projectFeature/deleteLibByID",{ID:libID});
+                    if(result.ok){
+                        $("#"+libID).parent(".libTr").remove();
+                    }
+                    $("#del").modal('hide');
+                }catch (err){
+                    console.log(err);
+                }
+            }
+        }
+    });
+});
+
+async function getFeatureLib (ID) {
+    try {
+        let lib = await ajaxPost("/projectFeature/findLib",{ID:ID});
+        if(lib){
+            $("#renameText").val(lib.name);
+            $("#libID").val(ID);
+            $("#edit").modal({show:true});
+        }else {
+            alert("没有找到材料库");
+        }
+    }catch (err){
+        console.log(err);
+    }
+}
+
+function showDeleteModal(ID){
+    $("#libID_del").val(ID);
+    $("#delCount").val(0);
+    $("#del").modal({show:true});
+}

web/maintain/project_feature_lib/js/project_feature_edit.js

@@ -0,0 +1,37 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+featureObj = {
+    featureSpread:null,
+    featureSheet:null,
+    setting:{
+        header: [
+            {headerName: "显示名称", headerWidth: 180, dataCode: "dispName", dataType: "String",formatter: "@"},
+            {headerName: "取值属性", headerWidth: 240, dataCode: "key", dataType: "String"},
+            {headerName: "单元格类型", headerWidth: 240, dataCode: "type", dataType: "String"}
+            //{headerName: "规则", headerWidth: 150, dataCode: "rule", hAlign: "left", dataType: "String",cellType:'comboBox',editorValueType:true,options:[{text:"规则1",value:1},{text:"规则2",value:2}]}
+        ],
+        view: {
+            lockColumns: []
+        },
+        headerHeight:45
+    },
+    initSpread:function () {
+        if(!this.featureSpread){
+            this.featureSpread = SheetDataHelper.createNewSpread($("#featureSpread")[0]);
+        }
+        this.featureSheet = this.featureSpread .getSheet(0);
+        sheetCommonObj.initSheet(this.featureSheet,this.setting, 30);
+        this.billsSheet.name('billsSheet');
+        this.billsSheet.bind(GC.Spread.Sheets.Events.ValueChanged, this.onBillsValueChange);
+        this.billsSheet.bind(GC.Spread.Sheets.Events.SelectionChanged,this.onBillsSelectionChange);
+        this.billsSheet.bind(GC.Spread.Sheets.Events.RangeChanged, this.onBillsRangeChange);
+
+        //this.initRightClick("billsSpread",this.billsSpread);
+
+
+
+    }
+};
+
+featureObj.initSpread();

web/users/css/custom.css

@@ -6,6 +6,16 @@
 .engineeringInput {
   -moz-appearance: textfield;
 }
+
+.none_number_step::-webkit-outer-spin-button,
+.none_number_step::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+.none_number_step {
+  -moz-appearance: textfield;
+}
+
+
 .btn-link:focus, .btn-link:hover{
   text-decoration: none
 }

web/users/views/tool/index.html

@@ -69,6 +69,13 @@
                     </h2>
                 </div>
             </div>
+            <div class="col-xs-6 mb-30 ">
+                <div class="c-body">
+                    <h2>工程特征库
+                        <a id="projectFeature" href="/projectFeature/main" target="_blank" class="btn btn-primary pull-right">进入</a>
+                    </h2>
+                </div>
+            </div>
         </div>
     </div>
 </div>