Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

modules/all_models/stdRation_lib.js

@@ -7,11 +7,13 @@ const Schema = mongoose.Schema;
 const oprSchema = require('../all_schemas/opr_schema');
 const RepositoryMapSchema = new Schema({
     "ID": Number,
-    "dispName" : String,
-    "appType" : String, //如："建筑" / "公路"
+    "dispName": String,
+    "appType": String, //如："建筑" / "公路"
     "localeType": String, //如 各个省份 / 部颁
-    "descr" : String,
+    "descr": String,
     "deleted": Boolean,
+    code: String,
+    shortName: String,
     compilationId: String,
     compilationName: String,
     gljLib: Number,

modules/ration_repository/models/repository_map.js

@@ -15,88 +15,90 @@ const rationInstallFeeItem = mongoose.model('std_ration_lib_installation');
 const rationInstallSection = mongoose.model('std_ration_lib_installationSection');
 const engLibModel = mongoose.model('engineering_lib');
 
-function createNewLibModel(rationLibObj){
+function createNewLibModel(rationLibObj) {
     var rst = {};
     rst.dispName = rationLibObj.dispName;
-    rst.appType = rationLibObj.appType?rationLibObj.appType:'construct';
+    rst.code = rationLibObj.code;
+    rst.shortName = rationLibObj.shortName;
+    rst.appType = rationLibObj.appType ? rationLibObj.appType : 'construct';
     rst.compilationId = rationLibObj.compilationId;
     rst.compilationName = rationLibObj.compilationName;
     rst.gljLib = rationLibObj.gljLib;
     rst.creator = rationLibObj.creator;
     rst.createDate = moment(Date.now()).format('YYYY-MM-DD HH:mm:ss');
-    rst.recentOpr = [{operator: rationLibObj.creator, operateDate: rst.createDate}],
-    rst.deleted = false;
+    rst.recentOpr = [{ operator: rationLibObj.creator, operateDate: rst.createDate }],
+        rst.deleted = false;
     return rst;
 }
 
-var rationRepositoryDao = function(){};
+var rationRepositoryDao = function () { };
 
 rationRepositoryDao.prototype.getRationLibsByCompilation = async function (compilationId) {
-    return await rationRepository.find({compilationId: compilationId, deleted: false});
+    return await rationRepository.find({ compilationId: compilationId, deleted: false });
 };
 
 rationRepositoryDao.prototype.updateGljLib = function (gljLibId, callback) {
-    rationRepository.update({gljLib: gljLibId}, {$set: {gljLib: -1}}, {multi: true}, function (err) {
-        if(err){
+    rationRepository.update({ gljLib: gljLibId }, { $set: { gljLib: -1 } }, { multi: true }, function (err) {
+        if (err) {
             callback(err);
         }
-        else{
+        else {
             callback(null);
         }
     })
 };
 
-rationRepositoryDao.prototype.updateOprArr= function(findSet, oprtor, oprDate, cb){
+rationRepositoryDao.prototype.updateOprArr = function (findSet, oprtor, oprDate, cb) {
     rationRepository.find(findSet, function (err, result) {
-        if(err){
+        if (err) {
             cb(err);
         }
-        else{
-            if(result.length === 1){
+        else {
+            if (result.length === 1) {
                 let recentOprArr = result[0].recentOpr;
                 let isExist = false;
-                for(let i =0 ; i<recentOprArr.length; i++){
-                    if(recentOprArr[i].operator === oprtor){
+                for (let i = 0; i < recentOprArr.length; i++) {
+                    if (recentOprArr[i].operator === oprtor) {
                         recentOprArr[i].operateDate = oprDate;
                         isExist = true;
                     }
                 }
-                if(!isExist){
-                    if(recentOprArr.length < 5){
-                        recentOprArr.push({operator: oprtor, operateDate: oprDate});
+                if (!isExist) {
+                    if (recentOprArr.length < 5) {
+                        recentOprArr.push({ operator: oprtor, operateDate: oprDate });
                     }
-                    else if(recentOprArr.length === 5){
+                    else if (recentOprArr.length === 5) {
                         recentOprArr.sort(function (a, b) {
-                            if(a.operateDate > b.operateDate){
+                            if (a.operateDate > b.operateDate) {
                                 return -1;
-                            }else {
+                            } else {
                                 return 1;
                             }
                             return 0;
                         });
-                        recentOprArr.splice(recentOprArr.length -1, 1);
-                        recentOprArr.splice(0, 1, {operator: oprtor, operateDate: oprDate});
+                        recentOprArr.splice(recentOprArr.length - 1, 1);
+                        recentOprArr.splice(0, 1, { operator: oprtor, operateDate: oprDate });
                     }
                 }
-                rationRepository.update(findSet, {$set: {recentOpr: recentOprArr}}, function (err) {
-                    if(err){
+                rationRepository.update(findSet, { $set: { recentOpr: recentOprArr } }, function (err) {
+                    if (err) {
                         cb(err);
                     }
-                    else{
+                    else {
                         cb(null);
                     }
                 });
             }
-            else{
+            else {
                 cb(err);
             }
         }
     })
 };
 
-rationRepositoryDao.prototype.getRealLibName = function(dispName,callback){
+rationRepositoryDao.prototype.getRealLibName = function (dispName, callback) {
     if (callback) {
-        rationRepository.find({"dispName": dispName}, function(err,data){
+        rationRepository.find({ "dispName": dispName }, function (err, data) {
             if (err) {
                 callback('Error', null);
             } else {
@@ -104,13 +106,13 @@ rationRepositoryDao.prototype.getRealLibName = function(dispName,callback){
             }
         });
     } else {
-        var rst = rationRepository.find({"dispName": dispName}).exec();
+        var rst = rationRepository.find({ "dispName": dispName }).exec();
         return rst;
     }
 };
 
-rationRepositoryDao.prototype.getLibIDByName = function(dispName, callback){
-    rationRepository.findOne({"dispName": dispName}, function(err,data){
+rationRepositoryDao.prototype.getLibIDByName = function (dispName, callback) {
+    rationRepository.findOne({ "dispName": dispName }, function (err, data) {
         if (err) {
             callback('Error', null);
         } else {
@@ -119,9 +121,9 @@ rationRepositoryDao.prototype.getLibIDByName = function(dispName, callback){
     });
 };
 
-rationRepositoryDao.prototype.getRepositoryById = function(repId,callback = null){
+rationRepositoryDao.prototype.getRepositoryById = function (repId, callback = null) {
     if (callback) {
-        rationRepository.find({"ID": repId}, function(err,data){
+        rationRepository.find({ "ID": repId }, function (err, data) {
             if (err) {
                 callback('Error', null);
             } else {
@@ -129,31 +131,31 @@ rationRepositoryDao.prototype.getRepositoryById = function(repId,callback = null
             }
         });
     } else {
-        var rst = rationRepository.find({"ID": repId}).exec();
+        var rst = rationRepository.find({ "ID": repId }).exec();
         return rst;
     }
 };
 
-rationRepositoryDao.prototype.addRationRepository = function( rationLibObj,callback){
-    counter.counterDAO.getIDAfterCount(counter.moduleName.rationMap, 1, function(err, result){
+rationRepositoryDao.prototype.addRationRepository = function (rationLibObj, callback) {
+    counter.counterDAO.getIDAfterCount(counter.moduleName.rationMap, 1, function (err, result) {
         var rMap = createNewLibModel(rationLibObj);
         rMap.ID = result.sequence_value;
-        new rationRepository(rMap).save(function(err, result) {
+        new rationRepository(rMap).save(function (err, result) {
             if (err) callback("Error", null);
-            else{
+            else {
                 //向引用工料机库的添加标记
-                gljMapModel.update({ID: rMap.gljLib, deleted: false}, {$addToSet: {rationLibs: {ID: rMap.ID, dispName: rMap.dispName}}}, function (err, data) {
-                    if(err){
-                        rationRepository.remove({ID: rMap.ID}, function (err) {
-                            if(err){
+                gljMapModel.update({ ID: rMap.gljLib, deleted: false }, { $addToSet: { rationLibs: { ID: rMap.ID, dispName: rMap.dispName } } }, function (err, data) {
+                    if (err) {
+                        rationRepository.remove({ ID: rMap.ID }, function (err) {
+                            if (err) {
                                 callback("创建失败且回滚失败！", null);
                             }
-                            else{
+                            else {
                                 callback("创建失败，已回滚！", null);
                             }
                         });
                     }
-                    else{
+                    else {
                         callback(false, result);
                     }
                 });
@@ -162,38 +164,38 @@ rationRepositoryDao.prototype.addRationRepository = function( rationLibObj,callb
     });
 };
 
-rationRepositoryDao.prototype.getRationLib = function(libId, callback) {
-    rationRepository.find({ID: libId, "deleted": false}, function(err, data){
+rationRepositoryDao.prototype.getRationLib = function (libId, callback) {
+    rationRepository.find({ ID: libId, "deleted": false }, function (err, data) {
         if (err) {
-            callback( 'Error', null);
+            callback('Error', null);
         } else {
             callback(0, data);
         }
     });
 };
 
-rationRepositoryDao.prototype.getDisplayRationLibs = function(callback) {
-    rationRepository.find({"deleted": false}, function(err, data){
+rationRepositoryDao.prototype.getDisplayRationLibs = function (callback) {
+    rationRepository.find({ "deleted": false }, function (err, data) {
         if (err) {
-            callback( 'Error', null);
+            callback('Error', null);
         } else {
-            callback( false, data);
+            callback(false, data);
         }
     });
 };
 
-rationRepositoryDao.prototype.updateName = function(oprtor, renameObj, callback){
-    rationRepository.update({ID: renameObj.ID, deleted: false}, {$set: {dispName: renameObj.newName}}, function (err) {
-        if(err){
+rationRepositoryDao.prototype.updateName = function (oprtor, renameObj, callback) {
+    rationRepository.update({ ID: renameObj.ID, deleted: false }, { $set: { dispName: renameObj.newName, code: renameObj.code, shortName: renameObj.shortName } }, function (err) {
+        if (err) {
             callback(err, '重命名失败！');
-        } else{
-            new rationRepositoryDao().updateOprArr({ID: renameObj.ID, deleted: false}, oprtor, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-                if(err){
+        } else {
+            new rationRepositoryDao().updateOprArr({ ID: renameObj.ID, deleted: false }, oprtor, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+                if (err) {
                     callback(err, '更新最近操作者失败！');
                 }
-                else{
-                    engLibModel.update({'ration_lib.id': {$in: [String(renameObj.ID), +renameObj.ID]}}, {$set: {'ration_lib.$.name': renameObj.newName}}, {multi: true}, function (err) {
-                        if(err){
+                else {
+                    engLibModel.update({ 'ration_lib.id': { $in: [String(renameObj.ID), +renameObj.ID] } }, { $set: { 'ration_lib.$.name': renameObj.newName } }, { multi: true }, function (err) {
+                        if (err) {
                             callback(err, '更新工程专业引用失败！');
                         }
                         else {
@@ -206,80 +208,80 @@ rationRepositoryDao.prototype.updateName = function(oprtor, renameObj, callback)
     });
 }
 
-rationRepositoryDao.prototype.deleteRationLib = function(oprtor, libId, callback){
-    new rationRepositoryDao().updateOprArr({ID: libId, deleted: false}, oprtor, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
-        if(err){
+rationRepositoryDao.prototype.deleteRationLib = function (oprtor, libId, callback) {
+    new rationRepositoryDao().updateOprArr({ ID: libId, deleted: false }, oprtor, moment(Date.now()).format('YYYY-MM-DD HH:mm:ss'), function (err) {
+        if (err) {
             callback(err, '失败!')
         }
-        else{
-            rationRepository.find({ID: libId, deleted: false}, function (err, result) {
-               if(err){
-                   callback(err, "没有数据！");
-               }
-                else{
-                   rationRepository.remove({ID: libId}, function (err) {
-                       if(err){
-                           callback(err, '移除定额库失败！');
-                       }
-                       else{
-                           async.parallel([
-                               function (cb) {
-                                   //移除工料机库内被引用标记
-                                   gljMapModel.update({ID: result[0].gljLib, deleted: false}, {$pull: {rationLibs: {ID: libId}}}, function (err) {
-                                       if(err){
-                                           cb(err);
-                                       }
-                                       else{
-                                           cb(null);
-                                       }
-                                   });
-                               },
-                               //删除库下定额
-                               function (cb) {
-                                   rationItemModel.remove({rationRepId: libId}, function (err) {
-                                       if(err)cb(err);
-                                       else cb(null);
-                                   });
-                               },
-                               //删除库下章节树
-                               function (cb) {
-                                   rationChapterTreeModel.remove({rationRepId: libId}, function (err) {
-                                       if(err)cb(err);
-                                       else cb(null);
-                                   })
-                               },
-                               //删除子目换算
-                               function (cb) {
-                                   rationCoeModel.remove({libID: libId}, function (err) {
-                                       if(err)cb(err);
-                                       else cb(null);
-                                   });
-                               },
-                               //删除安装
-                               async function (cb) {
-                                    try{
-                                        let feeItems = await rationInstallFeeItem.find({rationRepId: libId});
+        else {
+            rationRepository.find({ ID: libId, deleted: false }, function (err, result) {
+                if (err) {
+                    callback(err, "没有数据！");
+                }
+                else {
+                    rationRepository.remove({ ID: libId }, function (err) {
+                        if (err) {
+                            callback(err, '移除定额库失败！');
+                        }
+                        else {
+                            async.parallel([
+                                function (cb) {
+                                    //移除工料机库内被引用标记
+                                    gljMapModel.update({ ID: result[0].gljLib, deleted: false }, { $pull: { rationLibs: { ID: libId } } }, function (err) {
+                                        if (err) {
+                                            cb(err);
+                                        }
+                                        else {
+                                            cb(null);
+                                        }
+                                    });
+                                },
+                                //删除库下定额
+                                function (cb) {
+                                    rationItemModel.remove({ rationRepId: libId }, function (err) {
+                                        if (err) cb(err);
+                                        else cb(null);
+                                    });
+                                },
+                                //删除库下章节树
+                                function (cb) {
+                                    rationChapterTreeModel.remove({ rationRepId: libId }, function (err) {
+                                        if (err) cb(err);
+                                        else cb(null);
+                                    })
+                                },
+                                //删除子目换算
+                                function (cb) {
+                                    rationCoeModel.remove({ libID: libId }, function (err) {
+                                        if (err) cb(err);
+                                        else cb(null);
+                                    });
+                                },
+                                //删除安装
+                                async function (cb) {
+                                    try {
+                                        let feeItems = await rationInstallFeeItem.find({ rationRepId: libId });
                                         let sectionIDs = [];
-                                        for(let item of feeItems){
-                                            for(let section of item.section){
+                                        for (let item of feeItems) {
+                                            for (let section of item.section) {
                                                 sectionIDs.push(section.ID);
                                             }
                                         }
-                                        await rationInstallFeeItem.remove({rationRepId: libId});
-                                        await rationInstallSection.remove({ID: {$in: sectionIDs}});
+                                        await rationInstallFeeItem.remove({ rationRepId: libId });
+                                        await rationInstallSection.remove({ ID: { $in: sectionIDs } });
                                         cb(null);
                                     }
-                                    catch (err){
+                                    catch (err) {
                                         cb(err);
                                     }
-                               }
-                           ], function (err) {
-                               if(err) callback(err, 'fail');
-                               else callback(null, 'sc')
-                           });
-                       }
-                   });
-               }
+                                }
+                            ], function (err) {
+                                if (err) callback(err, 'fail');
+                                else callback(null, 'sc')
+                            });
+                        }
+                    });
+                }
             });
         }
     });

web/maintain/ration_repository/js/main.js

@@ -17,53 +17,62 @@ $(function () {
         let gljLibName = $('#gljLibSels option:selected').text();
         let gljLibId = $('#gljLibSels option:selected').val();
         let libName = $('#libNameTxt').val();
-        if(libName.trim().length === 0){
+        if (libName.trim().length === 0) {
             alert('名称不可为空！');
             $('#libNameTxt').val('')
         }
-        else if(allNames.indexOf(libName) !== -1){
+        else if (allNames.indexOf(libName) !== -1) {
             alert('此定额库已存在！');
             $('#libNameTxt').val('')
         }
-        else if(compilationName.trim().length === 0){
+        else if (compilationName.trim().length === 0) {
             alert('编办不可为空！');
         }
-        else if(gljLibName.trim().length === 0){
+        else if (gljLibName.trim().length === 0) {
             alert("请选择工料机库！");
         }
-        else{
+        else {
             let newRationLib = {};
             newRationLib.dispName = libName;
+            newRationLib.code = $('#libCodeTxt').val() || '';
+            newRationLib.shortName = $('#libShortNameTxt').val() || '';
             newRationLib.compilationId = compilationId;
             newRationLib.compilationName = compilationName;
             newRationLib.gljLib = gljLibId;
             newRationLib.creator = userAccount;
             newRationLib.appType = "建筑";
             $('#libNameTxt').val('');
+            $('#libCodeTxt').val('');
+            $('#libShortNameTxt').val('');
             createRationLib(newRationLib);
         }
     });
     //重命名
-    $("#showArea").on("click", "[data-target = '#edit']", function(){
-        let renameId = $(this).parent().parent().attr("id");
-        $('#renameText').val($(this).parent().parent().find('td:first-child').text());
+    $("#showArea").on("click", "[data-target = '#edit']", function () {
+        const $tr = $(this).parent().parent();
+        let renameId = $tr.attr("id");
+        $('#renameText').val($tr.find('td:first-child').text());
+        $('#reCodeText').val($tr.find('td:nth-child(2)').text());
+        $('#reShortNameText').val($tr.find('td:nth-child(3)').text());
         $("#renameA").attr("renameId", renameId);
     });
-    $("#renameA").click(function(){
+    $("#renameA").click(function () {
         let newName = $("#renameText").val();
         let libId = $(this).attr("renameId");
         let jqSel = "#" + libId + " td:first" + " a";
         let orgName = $(jqSel).text();
-        if(newName.trim().length === 0){
+        if (newName.trim().length === 0) {
             alert("名称不可为空！");
             $("#renameText").val('');
         }
-        else if(allNames.indexOf(newName) !== -1){
+        else if (allNames.indexOf(newName) !== -1 && orgName !== newName) {
             alert("该定额库已存在！");
             $("#renameText").val('');
         }
-        else{
-            renameRationLib({ID: libId, newName: newName, orgName: orgName});
+        else {
+            const code = $('#reCodeText').val();
+            const shortName = $('#reShortNameText').val();
+            renameRationLib({ ID: libId, newName: newName, orgName: orgName, code, shortName });
         }
     });
     $('#edit').on('shown.bs.modal', function () {
@@ -79,39 +88,41 @@ $(function () {
     });
     $('#add').on('hidden.bs.modal', function () {
         $('#libNameTxt').val('');
+        $('#libCodeTxt').val('');
+        $('#libShortNameTxt').val('');
     });
     //删除
-    $("#showArea").on("click", "[data-target = '#del']", function(){
+    $("#showArea").on("click", "[data-target = '#del']", function () {
         let deleteId = $(this).parent().parent().attr("id");
         $("#deleteA").attr("deleteId", deleteId);
         let delLibName = $(`#${deleteId}`).find('td:first').text();
         $('#del').find('.modal-body h5').text(`准备删除 “${delLibName}”，会导致已引用此库的地方出错，确定要删除吗？`);
     });
-    $("#deleteA").click(function(){
+    $("#deleteA").click(function () {
         let deleteId = $(this).attr("deleteId");
-        if(preDeleteId && preDeleteId !== deleteId){
+        if (preDeleteId && preDeleteId !== deleteId) {
             deleteCount = 0;
         }
         preDeleteId = deleteId;
         deleteCount++;
         let jqSel = "#" + deleteId + " td:first" + " a";
         let libName = $(jqSel).text();
-        if(deleteCount === 3){
+        if (deleteCount === 3) {
             deleteCount = 0;
-            removeRationLib({libId: deleteId, libName: libName});
+            removeRationLib({ libId: deleteId, libName: libName });
             $('#del').modal('hide');
         }
     });
     //全部计算
-    $("#showArea").on("click", "[data-target = '#reCalcAll']", function(){
+    $("#showArea").on("click", "[data-target = '#reCalcAll']", function () {
         let recalcId = $(this).parent().parent().attr("id");
         $("#reCalcConfirm").attr("recalcId", recalcId);
     });
-    $("#reCalcConfirm").click(function(){
+    $("#reCalcConfirm").click(function () {
         $('#reCalcConfirm').addClass('disabled');
         $.bootstrapLoading.start();
         let recalcId = $(this).attr("recalcId");
-        CommonAjax.post('/rationRepository/api/reCalcAll', {rationRepId: recalcId}, function (rstData) {
+        CommonAjax.post('/rationRepository/api/reCalcAll', { rationRepId: recalcId }, function (rstData) {
             $.bootstrapLoading.end();
             $('#reCalcAll').modal('hide');
             $('#reCalcConfirm').removeClass('disabled');
@@ -152,14 +163,14 @@ $(function () {
     });
 
     // 导入原始数据确认
-    $("#source-import,#data-import").click(function() {
+    $("#source-import,#data-import").click(function () {
         $.bootstrapLoading.start();
         const self = $(this);
         const type = self.is("#source-import") ? 'source_file' : 'import_data';
         const dialog = type === 'source_file' ? $("#import") : $("#import2");
         try {
             let formData = new FormData();
-            let file = $("input[name='"+ type +"']")[0];
+            let file = $("input[name='" + type + "']")[0];
             if (file.files.length <= 0) {
                 throw '请选择文件!';
             }
@@ -177,11 +188,11 @@ $(function () {
                 cache: false,
                 contentType: false,
                 processData: false,
-                beforeSend: function() {
+                beforeSend: function () {
                     self.attr('disabled', 'disabled');
                     self.text('上传中...');
                 },
-                success: function(response){
+                success: function (response) {
                     self.removeAttr('disabled');
                     self.text('确定导入');
                     if (response.err === 0) {
@@ -198,14 +209,14 @@ $(function () {
                         alert(message);
                     }
                 },
-                error: function(){
+                error: function () {
                     $.bootstrapLoading.end();
                     alert("与服务器通信发生错误");
                     self.removeAttr('disabled');
                     self.text('确定导入');
                 }
             });
-        } catch(error) {
+        } catch (error) {
             alert(error);
         }
     });
@@ -251,7 +262,7 @@ $(function () {
             return false;
         }
         $.bootstrapLoading.start();
-        CommonAjax.post('/rationRepository/api/initSectionTemplate', {rationLibId: rationRepId, compilationId: selCompilationId}, function () {
+        CommonAjax.post('/rationRepository/api/initSectionTemplate', { rationLibId: rationRepId, compilationId: selCompilationId }, function () {
             $.bootstrapLoading.end();
             $('#template').modal('hide');
         }, function () {
@@ -261,25 +272,25 @@ $(function () {
     });
 });
 
-function getCompilationList(callback){
+function getCompilationList(callback) {
     $.ajax({
         type: 'post',
         url: '/rationRepository/api/getCompilationList',
         dataType: 'json',
         success: function (result) {
             //addoptions
-            for(let i = 0; i < result.data.compilation.length; i++){
-                let $option =  $("<option >"+ result.data.compilation[i].name +"</option>");
-                $option.val( result.data.compilation[i]._id);
+            for (let i = 0; i < result.data.compilation.length; i++) {
+                let $option = $("<option >" + result.data.compilation[i].name + "</option>");
+                $option.val(result.data.compilation[i]._id);
                 $('#compilationSels').append($option);
             }
             //初始工料机库选项
-            if(result.data.compilation.length > 0 && result.data.gljLibs.length > 0){
+            if (result.data.compilation.length > 0 && result.data.gljLibs.length > 0) {
                 let compilationId = result.data.compilation[0]._id;
                 //console.log(compilationId);
                 let gljLibOps = getGljLibOps(compilationId, result.data.gljLibs);
-                for(let i = 0; i < gljLibOps.length; i++){
-                    let $option =  $("<option >"+ gljLibOps[i].dispName +"</option>");
+                for (let i = 0; i < gljLibOps.length; i++) {
+                    let $option = $("<option >" + gljLibOps[i].dispName + "</option>");
                     $option.val(gljLibOps[i].ID);
                     $('#gljLibSels').append($option);
                 }
@@ -289,8 +300,8 @@ function getCompilationList(callback){
                 //刷新工料机库选项
                 $('#gljLibSels').children().remove();
                 let newGljLibOps = getGljLibOps(this.selectedOptions[0].value, result.data.gljLibs);
-                for(let i = 0; i < newGljLibOps.length; i++){
-                    let $option =  $("<option >"+ newGljLibOps[i].dispName +"</option>");
+                for (let i = 0; i < newGljLibOps.length; i++) {
+                    let $option = $("<option >" + newGljLibOps[i].dispName + "</option>");
                     $option.val(newGljLibOps[i].ID);
                     $('#gljLibSels').append($option);
                 }
@@ -299,11 +310,11 @@ function getCompilationList(callback){
         }
     });
 }
-function getGljLibOps(compilationId, gljLibs){
+function getGljLibOps(compilationId, gljLibs) {
     let rst = [];
-    for(let i = 0; i < gljLibs.length; i++){
-        if(gljLibs[i]){
-            if(compilationId === gljLibs[i].compilationId){
+    for (let i = 0; i < gljLibs.length; i++) {
+        if (gljLibs[i]) {
+            if (compilationId === gljLibs[i].compilationId) {
                 rst.push(gljLibs[i]);
             }
         }
@@ -311,27 +322,31 @@ function getGljLibOps(compilationId, gljLibs){
     return rst;
 }
 
-function createRationLib(rationObj){
+function createRationLib(rationObj) {
     $.ajax({
         type: 'post',
         url: '/rationRepository/api/addRationRepository',
-        data: {rationRepObj: JSON.stringify(rationObj)},
+        data: { rationRepObj: JSON.stringify(rationObj) },
         dataType: 'json',
         success: function (result) {
             window.location.href = location.href;
         }
     })
 }
-function renameRationLib(renameObj){
+function renameRationLib(renameObj) {
     $.ajax({
         type: 'post',
         url: '/rationRepository/api/editRationLibs',
-        data: {oprtor: userAccount, renameObj: JSON.stringify(renameObj)},
+        data: { oprtor: userAccount, renameObj: JSON.stringify(renameObj) },
         dataType: 'json',
         success: function (result) {
-            if(!result.error){
+            if (!result.error) {
                 let jqSel = "#" + renameObj.ID + " td:first" + " a";
                 $(jqSel).text(renameObj.newName);
+                const $code = $(`#${renameObj.ID} td:nth-child(2)`);
+                $code.text(renameObj.code);
+                const $shortName = $(`#${renameObj.ID} td:nth-child(3)`);
+                $shortName.text(renameObj.shortName);
                 let index = allNames.indexOf(renameObj.orgName);
                 allNames.splice(index, 1);
                 allNames.splice(index, 0, renameObj.newName);
@@ -341,16 +356,16 @@ function renameRationLib(renameObj){
         }
     })
 }
-function removeRationLib(delObj){
+function removeRationLib(delObj) {
     $.bootstrapLoading.start();
     $.ajax({
         type: 'post',
         url: '/rationRepository/api/deleteRationLibs',
-        data: {oprtor: userAccount, libId: delObj.libId},
+        data: { oprtor: userAccount, libId: delObj.libId },
         dataType: 'json',
         success: function (result) {
-            if(!result.error){
-                var jqSel = "#"+ delObj.libId;
+            if (!result.error) {
+                var jqSel = "#" + delObj.libId;
                 $(jqSel).remove();
                 let index = allNames.indexOf(delObj.libName);
                 allNames.splice(index, 1);

web/maintain/ration_repository/main.html

@@ -53,6 +53,8 @@
                             <thead>
                                 <tr>
                                     <th>定额库名称</th>
+                                    <th width="120">编码</th>
+                                    <th width="100">简称</th>
                                     <th width="160">费用定额</th>
                                     <th width="160">添加时间</th>
                                     <th width="90">操作</th>
@@ -65,6 +67,8 @@
                             <% for(let lib of rationLibs){ %>
                             <tr id="<%= lib.ID %>">
                                 <td><a href="/rationRepository/ration?repository=<%= lib.ID%>&locked=true"><%= lib.dispName%></a></td>
+                                <td><%= lib.code%></td>
+                                <td><%= lib.shortName%></td>
                                 <td><%= lib.compilationName%></td>
                                 <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
                                 <td>
@@ -134,6 +138,14 @@
                         <input id="libNameTxt" class="form-control" placeholder="输入定额库名称" type="text">
                     </div>
                     <div class="form-group">
+                        <label>定额库编码</label>
+                        <input id="libCodeTxt" class="form-control" placeholder="输入定额库编码" type="text">
+                    </div>
+                    <div class="form-group">
+                        <label>定额库简称</label>
+                        <input id="libShortNameTxt" class="form-control" placeholder="输入定额库简称" type="text">
+                    </div>
+                    <div class="form-group">
                         <label>费用定额名称</label>
                         <select id="compilationSels" class="form-control"></select>
                     </div>
@@ -166,6 +178,14 @@
                         <label>定额库名称</label>
                         <input class="form-control" id="renameText" placeholder="输入定额库名称" type="text" value="">
                     </div>
+                    <div class="form-group">
+                        <label>定额库编码</label>
+                        <input class="form-control" id="reCodeText" placeholder="输入定额库编码" type="text" value="">
+                    </div>
+                    <div class="form-group">
+                        <label>定额库简称</label>
+                        <input class="form-control" id="reShortNameText" placeholder="输入定额库简称" type="text" value="">
+                    </div>
                 </form>
             </div>
             <div class="modal-footer">