feat: 定额库编辑器，定额章节名称列后，新增“目录编码” (#GLY-3288)

modules/all_models/stdGlj_glj.js

@@ -44,3 +44,4 @@ const std_glj = new Schema({
 }, { versionKey: false });
 
 mongoose.model('std_glj_lib_gljList', std_glj, 'std_glj_lib_gljList');
+mongoose.model('std_glj_lib_gljList_backup', std_glj, 'std_glj_lib_gljList_backup');

modules/all_models/stdGlj_gljClass.js

@@ -11,6 +11,7 @@ const std_gljClass = new Schema({
     NextSiblingID: Number,
     Name: String,
     deleted: Boolean
-}, {versionKey: false});
+}, { versionKey: false });
 
-mongoose.model('std_glj_lib_gljClass', std_gljClass, 'std_glj_lib_gljClass');
+mongoose.model('std_glj_lib_gljClass', std_gljClass, 'std_glj_lib_gljClass');
+mongoose.model('std_glj_lib_gljClass_backup', std_gljClass, 'std_glj_lib_gljClass_backup');

modules/all_models/stdRation_section.js

@@ -10,6 +10,7 @@ const rationChapterTreeSchema = new Schema({//章节树  //生成唯一id改为s
     ParentID: Number,
     NextSiblingID: Number,
     name: String,
+    code: String, // 目录编码
     explanation: String,//说明
     erratumRecord: String, // 勘误记录
     ruleText: String,//计算规则,

modules/ration_repository/models/ration_item.js

@@ -24,6 +24,7 @@ const stdGljDao = new GljDao();
 import stdgljutil from "../../../public/cache/std_glj_type_util";
 //add
 const stdGLJItemModel = mongoose.model('std_glj_lib_gljList');
+const stdGLJItemModelBackup = mongoose.model('std_glj_lib_gljList_backup');
 // const _rationItemModelBackup = mongoose.model('std_ration_lib_ration_items_backup');
 
 var rationItemDAO = function () { };
@@ -78,7 +79,7 @@ rationItemDAO.prototype.copyLib = async function (sourceLibID, targetLibID, sour
     const rationIDMapping = await getIDMapping(counter.moduleName.rations, sourceRationData);
     const classIDMapping = await copyClassData(sourceLibID, targetLibID);
     const coeIDMapping = await copyCoeData(sourceLibID, targetLibID);
-    const sourceGLJData = await stdGLJItemModel.find({ repositoryId: sourceGLJLibID }, '-_id code ID').lean();
+    const sourceGLJData = await stdGLJItemModelBackup.find({ repositoryId: sourceGLJLibID }, '-_id code ID').lean();
     const sourceGLJCodeMapping = {};
     sourceGLJData.forEach(glj => sourceGLJCodeMapping[glj.code] = glj.ID);
     const targetGLJData = await stdGLJItemModel.find({ repositoryId: targetGLJLibID }, '-_id code ID').lean();

modules/std_glj_lib/models/gljModel.js

@@ -4,7 +4,9 @@
 const mongoose = require('mongoose');
 const gljMapModel = mongoose.model('std_glj_lib_map');
 const gljModel = mongoose.model('std_glj_lib_gljList');
+const gljModelBackup = mongoose.model('std_glj_lib_gljList_backup');
 const gljClassModel = mongoose.model('std_glj_lib_gljClass');
+const gljClassModelBackup = mongoose.model('std_glj_lib_gljClass_backup');
 const projectGLJModel = mongoose.model('glj_list');
 const projectModel = mongoose.model('projects');
 const userModel = mongoose.model('users');
@@ -14,13 +16,29 @@ const scMathUtil = require('../../../public/scMathUtil').getUtil();
 const rationMapModel = mongoose.model('std_ration_lib_map');
 const rationModel = mongoose.model('std_ration_lib_ration_items');
 const complementaryRationModel = mongoose.model('complementary_ration_items');
-import {OprDao} from  "./gljMapModel";
+import { OprDao } from "./gljMapModel";
 import moment from "moment";
 import counter from "../../../public/counter/counter";
 import async from "async";
 let _ = require("lodash");
 
-class GljDao  extends OprDao{
+class GljDao extends OprDao {
+
+    // 处理单价，将多单价的第一个价格字段，设置成定额价
+    async setBasePrice(libID) {
+        const gljs = await gljModel.find({ repositoryId: libID }).lean();
+        const bulks = [];
+        gljs.forEach(glj => {
+            const basePrice = glj.priceProperty && glj.priceProperty.price1 !== undefined && glj.priceProperty.price1 !== null ? glj.priceProperty.price1 : 0;
+            bulks.push({ updateOne: { filter: { ID: glj.ID }, update: { $set: { basePrice, priceProperty: {} } } } })
+        });
+        const chunks = _.chunk(bulks, 1000);
+        for (const chunk of chunks) {
+            if (chunk.length) {
+                await gljModel.bulkWrite(chunk);
+            }
+        }
+    }
 
     async copyLib(sourceLibID, targetLibID) {
         const task = [
@@ -33,7 +51,7 @@ class GljDao  extends OprDao{
     async copyClassData(sourceLibID, targetLibID) {
         const sourceClassData = await gljClassModel.find({ repositoryId: sourceLibID }, '-_id').lean();
         const insertData = sourceClassData.map(item => ({
-            ... item,
+            ...item,
             repositoryId: targetLibID
         }));
         if (insertData.length) {
@@ -70,14 +88,14 @@ class GljDao  extends OprDao{
     }
 
     async getReference(repositoryId, gljId) {
-        const gljLib = await gljMapModel.findOne({ID: repositoryId});
+        const gljLib = await gljMapModel.findOne({ ID: repositoryId });
         const rationLibIds = gljLib.rationLibs.map(lib => lib.ID);
-        const rationLibs = await rationMapModel.find({ID: {$in: rationLibIds}}, '-_id ID dispName');
+        const rationLibs = await rationMapModel.find({ ID: { $in: rationLibIds } }, '-_id ID dispName');
         const rationLibNameMapping = {};
         rationLibs.forEach(item => {
             rationLibNameMapping[item.ID] = item.dispName;
         });
-        const stdRations = await rationModel.find({rationRepId: {$in: rationLibIds}, 'rationGljList.gljId': gljId}, '-_id code rationRepId');
+        const stdRations = await rationModel.find({ rationRepId: { $in: rationLibIds }, 'rationGljList.gljId': gljId }, '-_id code rationRepId');
         const rst = {};
         const unknownLib = '未知定额库';
         const complementaryLib = '补充定额库';
@@ -88,35 +106,35 @@ class GljDao  extends OprDao{
             }
             rst[libName].push(ration);
         });
-        const complementaryRations = await complementaryRationModel.find({'rationGljList.gljId': gljId}, '-_id code');
+        const complementaryRations = await complementaryRationModel.find({ 'rationGljList.gljId': gljId }, '-_id code');
         if (complementaryRations.length) {
             rst[complementaryLib] = [];
         }
-        complementaryRations.forEach(ration => rst[complementaryLib].push({code: ration.code}));
+        complementaryRations.forEach(ration => rst[complementaryLib].push({ code: ration.code }));
         return rst;
     }
 
     async getUsedInfo(repositoryId, gljId) {
         let userMap = {};
         let userIDList = [];
-        let projectList = await projectGLJModel.find({"glj_id":gljId},'-_id project_id').lean();
-        if(projectList.length > 0){
-            let projectUserList =  await projectModel.find({'ID':{$in:_.map(projectList,"project_id")}},'-_id ID userID').lean();
-            for(let p of projectUserList){
-                if(!userMap[p.userID]){
+        let projectList = await projectGLJModel.find({ "glj_id": gljId }, '-_id project_id').lean();
+        if (projectList.length > 0) {
+            let projectUserList = await projectModel.find({ 'ID': { $in: _.map(projectList, "project_id") } }, '-_id ID userID').lean();
+            for (let p of projectUserList) {
+                if (!userMap[p.userID]) {
                     userMap[p.userID] = true;
                     userIDList.push(p.userID);
                 }
             }
-            let userList = await userModel.find({'_id':{$in:userIDList}},'_id username mobile').lean();
-            for(let u of userList){
+            let userList = await userModel.find({ '_id': { $in: userIDList } }, '_id username mobile').lean();
+            for (let u of userList) {
                 userMap[u._id.toString()] = u;
             }
-            for(let p of projectUserList){
+            for (let p of projectUserList) {
                 p.username = userMap[p.userID].username;
                 p.mobile = userMap[p.userID].mobile;
             }
-           return projectUserList
+            return projectUserList
         }
 
 
@@ -125,33 +143,33 @@ class GljDao  extends OprDao{
 
 
     async getGljTreeSync(gljLibId) {
-        return await gljClassModel.find({repositoryId: gljLibId});
+        return await gljClassModel.find({ repositoryId: gljLibId });
     }
 
-    getGljTypes (gljLibId, callback){
-        gljClassModel.find({"repositoryId": gljLibId, "$or": [{"isDeleted": null}, {"isDeleted": false}, {deleted: false} ]},
-            '-_id', {lean: true}, function(err,data){
-            if(err) callback("获取工料机类型错误！",false)
-            else {
-                callback(0, data);
-            }
-        })
+    getGljTypes(gljLibId, callback) {
+        gljClassModel.find({ "repositoryId": gljLibId, "$or": [{ "isDeleted": null }, { "isDeleted": false }, { deleted: false }] },
+            '-_id', { lean: true }, function (err, data) {
+                if (err) callback("获取工料机类型错误！", false)
+                else {
+                    callback(0, data);
+                }
+            })
     }
 
-    _exist(data, attr){
+    _exist(data, attr) {
         return data && data[attr] !== 'undefined' && data[attr];
     }
 
-     sortToNumber(datas){
-        for(let i = 0, len = datas.length; i < len; i++){
+    sortToNumber(datas) {
+        for (let i = 0, len = datas.length; i < len; i++) {
             let data = datas[i]._doc;
-            if(this._exist(data, 'basePrice')){
+            if (this._exist(data, 'basePrice')) {
                 data['basePrice'] = parseFloat(data['basePrice']);
             }
-            if(this._exist(data, 'component')){
-                for(let j = 0, jLen = data['component'].length; j < jLen; j++){
+            if (this._exist(data, 'component')) {
+                for (let j = 0, jLen = data['component'].length; j < jLen; j++) {
                     let comGljObj = data['component'][j]._doc;
-                    if(this._exist(comGljObj, 'consumeAmt')){
+                    if (this._exist(comGljObj, 'consumeAmt')) {
                         comGljObj['consumeAmt'] = parseFloat(comGljObj['consumeAmt']);
                     }
                 }
@@ -160,42 +178,42 @@ class GljDao  extends OprDao{
     }
 
     async getGljItemsSync(gljLibId) {
-        return await gljModel.find({repositoryId: gljLibId}, '-_id', {lean: true});
+        return await gljModel.find({ repositoryId: gljLibId }, '-_id', { lean: true });
     }
 
-    async getGljItemsByRep(repositoryId,callback = null){
-   /*     let me = this;
-        if (callback === null) {
-            return gljModel.find({"repositoryId": repositoryId});
-        } else {
-            gljModel.find({"repositoryId": repositoryId},function(err,data){
-                if(err) callback(true, "")
-                else {
-                    me.sortToNumber(data);
-                    callback(false,data);
-                }
-            })
-        }*/
+    async getGljItemsByRep(repositoryId, callback = null) {
+        /*     let me = this;
+             if (callback === null) {
+                 return gljModel.find({"repositoryId": repositoryId});
+             } else {
+                 gljModel.find({"repositoryId": repositoryId},function(err,data){
+                     if(err) callback(true, "")
+                     else {
+                         me.sortToNumber(data);
+                         callback(false,data);
+                     }
+                 })
+             }*/
 
         let me = this;
         let rst = [];
         //批量获取异步
         let functions = [];
-        let count = await gljModel.find({repositoryId: repositoryId, $or: [{deleted: null}, {deleted: false}]}).count();
-        let findCount = Math.ceil(count/500);
-        for(let i = 0, len = findCount; i < len; i++){
-            functions.push((function(flag) {
+        let count = await gljModel.find({ repositoryId: repositoryId, $or: [{ deleted: null }, { deleted: false }] }).count();
+        let findCount = Math.ceil(count / 500);
+        for (let i = 0, len = findCount; i < len; i++) {
+            functions.push((function (flag) {
                 return function (cb) {
-                    gljModel.find({repositoryId: repositoryId, deleted: null}, '-_id', {lean: true}, cb).skip(flag).sort({ID: 1}).limit(500);
+                    gljModel.find({ repositoryId: repositoryId, deleted: null }, '-_id', { lean: true }, cb).skip(flag).sort({ ID: 1 }).limit(500);
                 }
-            })(i*500));
+            })(i * 500));
         }
-        async.parallel(functions,  function (err, results) {
-            if(err){
+        async.parallel(functions, function (err, results) {
+            if (err) {
                 callback(err, null);
             }
-            else{
-                for(let stdGljs of results){
+            else {
+                for (let stdGljs of results) {
                     rst = rst.concat(stdGljs);
                 }
                 me.sortToNumber(rst);
@@ -204,10 +222,10 @@ class GljDao  extends OprDao{
         });
     }
 
-    getGljItemByType (repositoryId, type, callback){
+    getGljItemByType(repositoryId, type, callback) {
         let me = this;
-        gljModel.find({"repositoryId": repositoryId, "gljType": type},function(err,data){
-            if(err) callback(true, "");
+        gljModel.find({ "repositoryId": repositoryId, "gljType": type }, function (err, data) {
+            if (err) callback(true, "");
             else {
                 me.sortToNumber(data);
                 callback(false, data);
@@ -215,10 +233,10 @@ class GljDao  extends OprDao{
         })
     };
 
-    getGljItem (repositoryId, code, callback){
+    getGljItem(repositoryId, code, callback) {
         let me = this;
-        gljModel.find({"repositoryId": repositoryId, "code": code},function(err,data){
-            if(err) callback(true, "")
+        gljModel.find({ "repositoryId": repositoryId, "code": code }, function (err, data) {
+            if (err) callback(true, "")
             else {
                 me.sortToNumber(data);
                 callback(false, data);
@@ -226,10 +244,10 @@ class GljDao  extends OprDao{
         })
     };
 
-    getGljItems (gljIds, callback){
+    getGljItems(gljIds, callback) {
         let me = this;
-        gljModel.find({"ID": {"$in": gljIds}},function(err,data){
-            if(err) callback(true, "")
+        gljModel.find({ "ID": { "$in": gljIds } }, function (err, data) {
+            if (err) callback(true, "")
             else {
                 me.sortToNumber(data);
                 callback(false, data);
@@ -237,10 +255,10 @@ class GljDao  extends OprDao{
         })
     };
 
-    getGljItemsByCode (repositoryId, codes, callback){
+    getGljItemsByCode(repositoryId, codes, callback) {
         let me = this;
-        gljModel.find({"repositoryId": repositoryId,"code": {"$in": codes}},function(err,data){
-            if(err) callback(true, "");
+        gljModel.find({ "repositoryId": repositoryId, "code": { "$in": codes } }, function (err, data) {
+            if (err) callback(true, "");
             else {
                 me.sortToNumber(data);
                 callback(false, data);
@@ -248,19 +266,19 @@ class GljDao  extends OprDao{
         })
     };
 
-    updateComponent(libId, oprtor, updateArr, callback){
+    updateComponent(libId, oprtor, updateArr, callback) {
         let parallelFucs = [];
-        for(let i = 0; i < updateArr.length; i++){
-            parallelFucs.push((function(obj){
+        for (let i = 0; i < updateArr.length; i++) {
+            parallelFucs.push((function (obj) {
                 return function (cb) {
-                    if(typeof obj.component === 'undefined'){
+                    if (typeof obj.component === 'undefined') {
                         obj.component = [];
                     }
-                    gljModel.update({repositoryId: libId, ID: obj.ID}, obj, function (err, result) {
-                        if(err){
+                    gljModel.update({ repositoryId: libId, ID: obj.ID }, obj, function (err, result) {
+                        if (err) {
                             cb(err);
                         }
-                        else{
+                        else {
                             cb(null, obj);
                         }
                     })
@@ -269,31 +287,31 @@ class GljDao  extends OprDao{
         }
         parallelFucs.push((function () {
             return function (cb) {
-                GljDao.updateOprArr({ID: libId}, oprtor, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                    if(err){
+                GljDao.updateOprArr({ ID: libId }, oprtor, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                    if (err) {
                         cb(err);
                     }
-                    else{
+                    else {
                         cb(null);
                     }
                 })
             }
         })());
         async.parallel(parallelFucs, function (err, result) {
-            if(err){
+            if (err) {
                 callback(err, '更新组成物错误！', null);
             }
-            else{
+            else {
                 callback(null, '成功！', result);
             }
         });
     }
 
-    mixUpdateGljItems (repId, lastOpr, updateItems, addItems, rIds, callback) {
+    mixUpdateGljItems(repId, lastOpr, updateItems, addItems, rIds, callback) {
         if (updateItems.length == 0 && rIds.length == 0) {
             GljDao.addGljItems(repId, lastOpr, addItems, callback);
         }
-        else if(rIds.length > 0 && updateItems.length > 0){
+        else if (rIds.length > 0 && updateItems.length > 0) {
             async.parallel([
                 function (cb) {
                     GljDao.removeGljItems(repId, lastOpr, rIds, cb);
@@ -302,10 +320,10 @@ class GljDao  extends OprDao{
                     GljDao.updateGljItems(repId, lastOpr, updateItems, cb);
                 }
             ], function (err) {
-                if(err){
+                if (err) {
                     callback(true, "Fail to update and delete", false)
                 }
-                else{
+                else {
                     callback(false, "Save successfully", false);
                 }
             })
@@ -313,8 +331,8 @@ class GljDao  extends OprDao{
         else if (rIds.length > 0 && updateItems.length === 0) {
             GljDao.removeGljItems(repId, lastOpr, rIds, callback);
         }
-        else if(updateItems.length > 0 || addItems.length > 0){
-            GljDao.updateGljItems(repId, lastOpr, updateItems, function(err, results){
+        else if (updateItems.length > 0 || addItems.length > 0) {
+            GljDao.updateGljItems(repId, lastOpr, updateItems, function (err, results) {
                 if (err) {
                     callback(true, "Fail to update", false);
                 } else {
@@ -349,17 +367,17 @@ class GljDao  extends OprDao{
         }
     };*/
 
-    static removeGljItems (repId, lastOpr, rIds, callback) {
+    static removeGljItems(repId, lastOpr, rIds, callback) {
         if (rIds && rIds.length > 0) {
-            gljModel.collection.remove({ID: {$in: rIds}}, null, function(err, docs){
+            gljModel.collection.remove({ ID: { $in: rIds } }, null, function (err, docs) {
                 if (err) {
                     callback(true, "Fail to remove", false);
                 } else {
-                    GljDao.updateOprArr({ID: repId}, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                        if(err){
+                    GljDao.updateOprArr({ ID: repId }, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                        if (err) {
                             callback(true, "Fail to update operator", false);
                         }
-                        else{
+                        else {
                             callback(false, "Remove successfully", docs);
                         }
                     });
@@ -370,11 +388,11 @@ class GljDao  extends OprDao{
         }
     }
 
-    static addGljItems (repId, lastOpr, items, callback) {
+    static addGljItems(repId, lastOpr, items, callback) {
         if (items && items.length > 0) {
             const codes = [];
             items.forEach(item => codes.push(item.code));
-            gljModel.find({repositoryId: repId, code: {$in: codes}}, '-_id code', {lean: true}, (err, codeData) => {
+            gljModel.find({ repositoryId: repId, code: { $in: codes } }, '-_id code', { lean: true }, (err, codeData) => {
                 if (err) {
                     callback(true, '判断编码唯一性失败', false);
                     return;
@@ -390,7 +408,7 @@ class GljDao  extends OprDao{
                     }
                 });
                 if (!insertData.length) {
-                    callback(false, 'empty data', {insertData, failCode});
+                    callback(false, 'empty data', { insertData, failCode });
                     return;
                 }
                 counter.counterDAO.getIDAfterCount(counter.moduleName.GLJ, items.length, (counterErr, counterData) => {
@@ -406,7 +424,7 @@ class GljDao  extends OprDao{
                     const task = [];
                     insertData.forEach(item => {
                         task.push({
-                            insertOne: {document: item}
+                            insertOne: { document: item }
                         });
                     });
                     gljModel.bulkWrite(task, (insertErr, rst) => {
@@ -414,11 +432,11 @@ class GljDao  extends OprDao{
                             callback(true, '新增数据失败', false);
                             return;
                         }
-                        GljDao.updateOprArr({ID: repId}, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                            if(err){
+                        GljDao.updateOprArr({ ID: repId }, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                            if (err) {
                                 callback(true, "Fail to update Operator", false);
-                            } else{
-                                callback(false, "Add successfully", {insertData, failCode});
+                            } else {
+                                callback(false, "Add successfully", { insertData, failCode });
                             }
                         });
                     });
@@ -431,9 +449,9 @@ class GljDao  extends OprDao{
 
     static updateGljItems(repId, lastOpr, items, callback) {
         var functions = [];
-        for (var i=0; i < items.length; i++) {
-            functions.push((function(doc) {
-                return function(cb) {
+        for (var i = 0; i < items.length; i++) {
+            functions.push((function (doc) {
+                return function (cb) {
                     var filter = {};
                     if (doc.ID) {
                         filter.ID = doc.ID;
@@ -447,33 +465,33 @@ class GljDao  extends OprDao{
         }
         functions.push((function () {
             return function (cb) {
-                GljDao.updateOprArr({ID: repId}, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                    if(err){
+                GljDao.updateOprArr({ ID: repId }, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                    if (err) {
                         cb(err);
                     }
-                    else{
+                    else {
                         cb(null);
                     }
                 })
             }
         })());
-        async.parallel(functions, function(err, results) {
+        async.parallel(functions, function (err, results) {
             callback(err, results);
         });
     }
 
-    getRationGljIds(rationLibs, callback){
+    getRationGljIds(rationLibs, callback) {
 
     }
 
-    updateNodes (updateData, lastOpr, callback) {
+    updateNodes(updateData, lastOpr, callback) {
         let functions = [];
         for (let i = 0, len = updateData.length; i < len; i++) {
-            functions.push((function(doc) {
-                return function(cb) {
-                    if(doc.updateType === 'update' && !doc.updateData.deleted){
-                        gljClassModel.update({repositoryId: doc.updateData.repositoryId, ID: doc.updateData.ID}, doc.updateData, function (err) {
-                            if(err){
+            functions.push((function (doc) {
+                return function (cb) {
+                    if (doc.updateType === 'update' && !doc.updateData.deleted) {
+                        gljClassModel.update({ repositoryId: doc.updateData.repositoryId, ID: doc.updateData.ID }, doc.updateData, function (err) {
+                            if (err) {
                                 cb(err);
                             }
                             else {
@@ -481,26 +499,26 @@ class GljDao  extends OprDao{
                             }
                         });
                     }
-                    else if(doc.updateType === 'update' && doc.updateData.deleted){
-                        gljClassModel.remove({repositoryId: doc.updateData.repositoryId, ID: doc.updateData.ID}, function (err) {
-                            if(err){
+                    else if (doc.updateType === 'update' && doc.updateData.deleted) {
+                        gljClassModel.remove({ repositoryId: doc.updateData.repositoryId, ID: doc.updateData.ID }, function (err) {
+                            if (err) {
                                 cb(err);
                             }
                             else {
-                                gljModel.remove({repositoryId: doc.updateData.repositoryId, gljClass: doc.updateData.ID}, function (err) {
-                                    if(err){
+                                gljModel.remove({ repositoryId: doc.updateData.repositoryId, gljClass: doc.updateData.ID }, function (err) {
+                                    if (err) {
                                         cb(err);
                                     }
-                                    else{
+                                    else {
                                         cb(null);
                                     }
                                 });
                             }
                         });
                     }
-                    else if(doc.updateType === 'new'){
+                    else if (doc.updateType === 'new') {
                         gljClassModel.create(doc.updateData, function (err) {
-                            if(err){
+                            if (err) {
                                 cb(err);
                             }
                             else {
@@ -511,88 +529,88 @@ class GljDao  extends OprDao{
                 };
             })(updateData[i]));
         }
-        if(updateData.length > 0){
+        if (updateData.length > 0) {
             functions.push((function () {
                 return function (cb) {
-                    GljDao.updateOprArr({ID: updateData[0].updateData.rationRepId}, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                        if(err){
+                    GljDao.updateOprArr({ ID: updateData[0].updateData.rationRepId }, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                        if (err) {
                             cb(err);
                         }
-                        else{
+                        else {
                             cb(null);
                         }
                     })
                 }
             })());
         }
-        async.parallel(functions, function(err, results) {
-            if(!err){
+        async.parallel(functions, function (err, results) {
+            if (!err) {
                 err = 0;
             }
             callback(err, results);
         });
     }
 
-  /*  updateNodes (repId, lastOpr, nodes, callback) {
-        var functions = [];
-        for (var i=0; i < nodes.length; i++) {
-            functions.push((function(doc) {
-                return function(cb) {
-                    gljClassModel.update({ID: doc.ID}, doc, cb);
-                };
-            })(nodes[i]));
-        }
-        functions.push((function () {
-            return function (cb) {
-                GljDao.updateOprArr({ID: repId}, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                    if(err){
-                        cb(err);
-                    }
-                    else{
-                        cb(null);
-                    }
-                })
-            }
-        })());
-        async.parallel(functions, function(err, results) {
-            callback(err, results);
-        });
-    }*/
-    removeNodes (repId, lastOpr, nodeIds, preNodeId, preNodeNextId, callback){
+    /*  updateNodes (repId, lastOpr, nodes, callback) {
+          var functions = [];
+          for (var i=0; i < nodes.length; i++) {
+              functions.push((function(doc) {
+                  return function(cb) {
+                      gljClassModel.update({ID: doc.ID}, doc, cb);
+                  };
+              })(nodes[i]));
+          }
+          functions.push((function () {
+              return function (cb) {
+                  GljDao.updateOprArr({ID: repId}, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                      if(err){
+                          cb(err);
+                      }
+                      else{
+                          cb(null);
+                      }
+                  })
+              }
+          })());
+          async.parallel(functions, function(err, results) {
+              callback(err, results);
+          });
+      }*/
+    removeNodes(repId, lastOpr, nodeIds, preNodeId, preNodeNextId, callback) {
         var functions = [];
         if (preNodeId != -1) {
-            functions.push((function(nodeId, nextId) {
-                return function(cb) {
-                    gljClassModel.update({ID: nodeId}, {"NextSiblingID": nextId}, cb);
+            functions.push((function (nodeId, nextId) {
+                return function (cb) {
+                    gljClassModel.update({ ID: nodeId }, { "NextSiblingID": nextId }, cb);
                 };
             })(preNodeId, preNodeNextId));
         }
-        for (var i=0; i < nodeIds.length; i++) {
-            functions.push((function(nodeId) {
-                return function(cb) {
-                    gljClassModel.update({ID: nodeId}, {"isDeleted": true}, cb);
+        for (var i = 0; i < nodeIds.length; i++) {
+            functions.push((function (nodeId) {
+                return function (cb) {
+                    gljClassModel.update({ ID: nodeId }, { "isDeleted": true }, cb);
                 };
             })(nodeIds[i]));
         }
         functions.push((function () {
             return function (cb) {
-                GljDao.updateOprArr({ID: repId}, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                    if(err){
+                GljDao.updateOprArr({ ID: repId }, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                    if (err) {
                         cb(err);
                     }
-                    else{
+                    else {
                         cb(null);
                     }
                 })
             }
         })());
-        async.parallel(functions, function(err, results) {
+        async.parallel(functions, function (err, results) {
             callback(err, results);
         });
     }
 
     createNewNode(repId, lastOpr, lastNodeId, nodeData, callback) {
-        return counter.counterDAO.getIDAfterCount(counter.moduleName.GLJ, 1, function(err, result){
+        return counter.counterDAO.getIDAfterCount(counter.moduleName.GLJ, 1, function (err, result) {
             nodeData.repositoryId = repId;
             nodeData.ID = result.sequence_value;
             var node = new gljModel(nodeData);
@@ -603,7 +621,7 @@ class GljDao  extends OprDao{
                             cb("章节树ID错误！", false);
                         } else {
                             if (lastNodeId > 0) {
-                                gljClassModel.update({ID: lastNodeId}, {"NextSiblingID": nodeData.ID}, function(err, rst){
+                                gljClassModel.update({ ID: lastNodeId }, { "NextSiblingID": nodeData.ID }, function (err, rst) {
                                     if (err) {
                                         cb("章节树ID错误！", false);
                                     } else {
@@ -615,64 +633,64 @@ class GljDao  extends OprDao{
                     });
                 },
                 function (cb) {
-                    GljDao.updateOprArr({ID: repId}, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                        if(err){
+                    GljDao.updateOprArr({ ID: repId }, lastOpr, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                        if (err) {
                             cb(err);
                         }
-                        else{
+                        else {
                             cb(null);
                         }
                     })
                 }
             ], function (err, result) {
-                if(err){
+                if (err) {
                     callback(true, "章节树错误！", false);
                 }
-                else{
+                else {
                     callback(false, '', result[0]);
                 }
             })
         });
     }
 
-    getGljItemsOccupied(repId, occupation, callback){
-        gljModel.find({repositoryId: repId}, occupation, function (err, result) {
-            if(err) callback(true, 'fail', null);
+    getGljItemsOccupied(repId, occupation, callback) {
+        gljModel.find({ repositoryId: repId }, occupation, function (err, result) {
+            if (err) callback(true, 'fail', null);
             else callback(false, 'sc', result);
         });
     }
 
-    async getGljItemsByRepId(repositoryId, returnFields = ''){
-         return gljModel.find({"repositoryId": repositoryId}, returnFields);
+    async getGljItemsByRepId(repositoryId, returnFields = '') {
+        return gljModel.find({ "repositoryId": repositoryId }, returnFields);
     }
 
-    async batchUpdateGljPrice(gljLibId, sheetData){
-        let gljLib = await gljMapModel.findOne({ID: gljLibId});
-        if(!gljLib){
+    async batchUpdateGljPrice(gljLibId, sheetData) {
+        let gljLib = await gljMapModel.findOne({ ID: gljLibId });
+        if (!gljLib) {
             throw '不存在此人材机库';
         }
-        let compilation = await compilationModel.findOne({_id: mongoose.Types.ObjectId(gljLib.compilationId)});
-        if(!compilation){
+        let compilation = await compilationModel.findOne({ _id: mongoose.Types.ObjectId(gljLib.compilationId) });
+        if (!compilation) {
             throw '不存在此费用定额';
         }
         let priceProperties = compilation.priceProperties ? compilation.priceProperties : [];
         //根据第一行数据，获取列下标与字段名映射
         let colMapping = {};
-        for(let col = 0; col < sheetData[0].length; col++){
+        for (let col = 0; col < sheetData[0].length; col++) {
             let cData = sheetData[0][col];
-            if(cData === '编码'){
+            if (cData === '编码') {
                 colMapping['code'] = col;
             }
             else {
-                if(priceProperties.length === 0){
-                    if(cData === '定额价'){
+                if (priceProperties.length === 0) {
+                    if (cData === '定额价') {
                         colMapping['basePrice'] = col;
                         break;
                     }
                 }
                 else {
-                    for(let priceProp of priceProperties){
-                        if(priceProp.price.dataName === cData){
+                    for (let priceProp of priceProperties) {
+                        if (priceProp.price.dataName === cData) {
                             colMapping[priceProp.price.dataCode] = col;
                             break;
                         }
@@ -681,7 +699,7 @@ class GljDao  extends OprDao{
             }
         }
         let colMappingKeys = Object.keys(colMapping);
-        if(colMappingKeys.length < 2){
+        if (colMappingKeys.length < 2) {
             throw 'excel数据不正确'
         }
         let updateBulk = [];
@@ -689,21 +707,21 @@ class GljDao  extends OprDao{
         let updateCodes = [];
         //库中存在的人材机
         let dateA = Date.now();
-        let existGljs = await gljModel.find({repositoryId: gljLibId}, '-_id code ID');
+        let existGljs = await gljModel.find({ repositoryId: gljLibId }, '-_id code ID');
         let existMapping = {};
         for (let glj of existGljs) {
             existMapping[glj.code] = glj;
         }
-        for(let row = 0; row < sheetData.length; row++){
-            if(row === 0){
+        for (let row = 0; row < sheetData.length; row++) {
+            if (row === 0) {
                 continue;
             }
             let gljCode = sheetData[row][colMapping.code],
                 existGlj = existMapping[gljCode];
             //更新多单价、不覆盖priceProperty字段，覆盖priceProperty下的子字段'priceProperty.x'
-            if(gljCode && gljCode !== '' && !updateCodes.includes(gljCode) && existGlj){
-                if(priceProperties.length > 0){
-                    for(let priceProp of priceProperties){
+            if (gljCode && gljCode !== '' && !updateCodes.includes(gljCode) && existGlj) {
+                if (priceProperties.length > 0) {
+                    for (let priceProp of priceProperties) {
                         let dataCode = priceProp.price.dataCode;
                         let priceCellData = sheetData[row][colMapping[dataCode]];
                         //Excel中没有这个单价则跳过
@@ -714,25 +732,25 @@ class GljDao  extends OprDao{
                         updateSet['priceProperty.' + dataCode] = priceCellData && !isNaN(priceCellData) ?
                             scMathUtil.roundTo(parseFloat(priceCellData), -2) : 0;
                         updateBulk.push({
-                            updateOne: {filter: {ID: existGlj.ID}, update: {$set: updateSet}}
+                            updateOne: { filter: { ID: existGlj.ID }, update: { $set: updateSet } }
                         });
                     }
                     updateCodes.push(gljCode);
                 }
                 else {
-                    if(colMapping.basePrice){
+                    if (colMapping.basePrice) {
                         let priceCellData = sheetData[row][colMapping.basePrice];
-                        let basePrice = priceCellData  && !isNaN(priceCellData) ?
+                        let basePrice = priceCellData && !isNaN(priceCellData) ?
                             scMathUtil.roundTo(priceCellData, -2) : 0;
                         updateCodes.push(gljCode);
                         updateBulk.push({
-                            updateOne: {filter: {ID: existGlj.ID}, update: {$set: {basePrice: basePrice}}}
+                            updateOne: { filter: { ID: existGlj.ID }, update: { $set: { basePrice: basePrice } } }
                         });
                     }
                 }
             }
         }
-        if(updateBulk.length > 0){
+        if (updateBulk.length > 0) {
             while (updateBulk.length > 0) {
                 let sliceBulk = updateBulk.splice(0, 1000);
                 await gljModel.bulkWrite(sliceBulk);
@@ -742,16 +760,16 @@ class GljDao  extends OprDao{
     }
 
     async importComponents(gljLibId, sheetData) {
-        const gljLib = await gljMapModel.findOne({ID: gljLibId});
+        const gljLib = await gljMapModel.findOne({ ID: gljLibId });
         if (!gljLib) {
             throw '不存在此人材机库';
         }
-        const compilation = await compilationModel.findOne({_id: mongoose.Types.ObjectId(gljLib.compilationId)});
+        const compilation = await compilationModel.findOne({ _id: mongoose.Types.ObjectId(gljLib.compilationId) });
         if (!compilation) {
             throw '不存在此费用定额';
         }
         // 将所有人材机进行编码映射
-        const allGLJs = await gljModel.find({repositoryId: gljLibId}, {ID: true, code: true}).lean();
+        const allGLJs = await gljModel.find({ repositoryId: gljLibId }, { ID: true, code: true }).lean();
         const codeMapping = {};
         allGLJs.forEach(glj => codeMapping[glj.code] = glj);
         // excel表格列号与字段的映射
@@ -790,7 +808,7 @@ class GljDao  extends OprDao{
                     filter: {
                         ID: glj.ID
                     },
-                    update: {$set: {component: glj.component}}
+                    update: { $set: { component: glj.component } }
                 }
             });
         });

web/maintain/ration_repository/js/section_tree.js

@@ -80,6 +80,23 @@ let sectionTreeObj = {
                         font: 'Arial'
                     },
                     width: 370
+                },
+                {
+                    head: {
+                        titleNames: ['目录编码'],
+                        spanCols: [1],
+                        spanRows: [2],
+                        vAlign: [1, 1],
+                        hAlign: [1, 1],
+                        font: 'Arial'
+                    },
+                    data: {
+                        field: 'code',
+                        vAlign: 1,
+                        hAlign: 0,
+                        font: 'Arial'
+                    },
+                    width: 80
                 }
             ],
             headRows: 1,
@@ -167,16 +184,17 @@ let sectionTreeObj = {
         let me = sectionTreeObj;
         let postData = [];
         let v = me.isDef(args.editingText) ? args.editingText.toString().trim() : '';
+        const prop = sectionTreeObj.setting.sheet.cols[args.col].data.field;
         let node = me.cache[args.row];
-        if (me.isDef(node) && node.data.name !== v) {
-            let updateObj = me.getUpdateObj(me.updateType.update, node.getID(), null, null, v, null);
+        if (me.isDef(node) && node.data[prop] !== v) {
+            let updateObj = prop === 'name' ? me.getUpdateObj(me.updateType.update, node.getID(), null, null, v, null) : me.getUpdateObj(me.updateType.update, node.getID(), null, null, null, null, v);
             postData.push(updateObj);
             //ajax
             //update
             me.sectionTreeAjax(postData, function (rstData) {
-                node.data.name = v;
+                node.data[prop] = v;
             }, function () {
-                args.sheet.setValue(args.row, args.col, node.data.name ? node.data.name : '');
+                args.sheet.setValue(args.row, args.col, node.data[prop] ? node.data[prop] : '');
             });
         }
     },
@@ -190,17 +208,29 @@ let sectionTreeObj = {
 
     onClipboardPasted: function (sender, info) {
         let me = sectionTreeObj;
-        let items = sheetCommonObj.analyzePasteData({ header: [{ dataCode: 'ID' }, { dataCode: 'name' }] }, info);
+        let items = sheetCommonObj.analyzePasteData({ header: [{ dataCode: 'ID' }, { dataCode: 'name' }, { dataCode: 'code' }] }, info);
         let postData = [];
         let frontData = [];
         for (let i = 0, len = items.length; i < len; i++) {
             let row = info.cellRange.row + i;
             let node = me.cache[row];
+            const updateParams = [me.updateType.update, node.getID(), null, null, null, null, null];
             if (me.isDef(node) && me.isDef(items[i].name) && node.data.name !== items[i].name) {
-                let updateObj = me.getUpdateObj(me.updateType.update, node.getID(), null, null, items[i].name, null);
+                updateParams[4] = items[i].name;
+            }
+            if (me.isDef(node) && me.isDef(items[i].code) && node.data.code !== items[i].code) {
+                updateParams[6] = items[i].code;
+            }
+            if (me.isDef(updateParams[4]) || me.isDef(updateParams[6])) {
+                let updateObj = me.getUpdateObj(...updateParams);
                 postData.push(updateObj);
-                frontData.push({ row: row, name: items[i].name });
-                node.data.name = items[i].name;
+                frontData.push({ row: row, name: me.isDef(items[i].name) ? items[i].name : node.data.name, code: me.isDef(items[i].code) ? items[i].code : node.data.code });
+                if (me.isDef(items[i].name)) {
+                    node.data.name = items[i].name;
+                }
+                if (me.isDef(items[i].code)) {
+                    node.data.code = items[i].code;
+                }
             }
         }
         if (postData.length > 0) {
@@ -210,24 +240,26 @@ let sectionTreeObj = {
                     let node = me.cache[frontData[i]['row']];
                     if (me.isDef(node)) {
                         node.data.name = frontData[i]['name'];
+                        node.data.code = frontData[i]['code'];
                     }
                 }
             }, function () {
                 for (let i = 0, len = frontData.length; i < len; i++) {
                     let node = me.cache[frontData[i]['row']];
                     me.sheet.setValue(frontData[i]['row'], 1, me.isDef(node) ? node.data.name : '');
+                    me.sheet.setValue(frontData[i]['row'], 2, me.isDef(node) ? node.data.code : '');
                 }
             });
         }
     },
     loadRateWidth: function () {
-        if (this.workBook) {
+        /* if (this.workBook) {
             //ID列固定40宽度
             let spreadWidth = $('#sectionSpread').width() - 65; //65: 列头宽度和垂直滚动条宽度和
             let IDRate = 40 / spreadWidth,
                 nameRate = 1 - IDRate;
             sheetCommonObj.setColumnWidthByRate($('#sectionSpread').width() - 65, this.workBook, [{ rateWidth: IDRate }, { rateWidth: nameRate }]);
-        }
+        } */
     },
     initSectionTree: function (sectionTree) {
         //init
@@ -567,7 +599,7 @@ let sectionTreeObj = {
             });
         }
     },
-    getUpdateObj: function (updateType, id, nid, pid, name, deleted) {
+    getUpdateObj: function (updateType, id, nid, pid, name, deleted, code) {
         let updateObj = Object.create(null);
         updateObj.updateType = '';
         updateObj.updateData = Object.create(null);
@@ -590,6 +622,9 @@ let sectionTreeObj = {
         if (this.isDef(deleted)) {
             updateObj.updateData.isDeleted = true;
         }
+        if (this.isDef(code)) {
+            updateObj.updateData.code = code;
+        }
         return updateObj;
     },
     sectionTreeAjax: function (postData, scFunc, errFunc) {