Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

modules/all_models/ration.js

@@ -55,6 +55,7 @@ let rationSchema = new Schema({
     rationAssList: [rationAssItemSchema],
     content: String,                            // 工作内容
     ruleText: String,                            // 计算规则
+    prefix: {type: Number, default: 0},                              //定额是补充、借用时用 1 complementary 2 borrow
 
     //工料机特有属性
     projectGLJID:Number,  //项目工料机ID

modules/complementary_ration_lib/controllers/searchController.js

@@ -13,7 +13,7 @@ let callback = function (req, res, err, message, data) {
 class SearchController extends BaseController{
     getRationItem(req, res){
         let data = JSON.parse(req.body.data);
-        searchDao.getRationItem(req.session.sessionUser.id, data.rationRepId, data.code, function (err, data) {
+        searchDao.getRationItem(req.session.sessionUser.id, data.rationRepIds, data.code, function (err, data) {
             callback(req, res, err, '', data);
         });
     }

modules/complementary_ration_lib/models/searchModel.js

@@ -10,16 +10,16 @@ let stdSectionTreeModel = require ('../../ration_repository/models/ration_sectio
 let stdRationModel = require ('../../ration_repository/models/ration_item').Model;
 
 class SearchDao{
-    async getRationItem(userId, rationRepId, code, callback){
+    async getRationItem(userId, rationRepIds, code, callback){
         let ration = null;
         try{
-            let stdRation = await stdRationModel.findOne({rationRepId: rationRepId, code: code, $or: [{isDeleted: null}, {isDeleted: false}]});
+            let stdRation = await stdRationModel.findOne({rationRepId: {$in: rationRepIds}, code: code, $or: [{isDeleted: null}, {isDeleted: false}]});
             if(isDef(stdRation)){
                 ration = stdRation._doc;
                 ration.type = 'std';
             }
             else{
-                let compleRation = await compleRationModel.findOne({userId: userId, rationRepId: rationRepId, code: code, deleteInfo: null});
+                let compleRation = await compleRationModel.findOne({userId: userId, rationRepId: {$in: rationRepIds}, code: code, deleteInfo: null});
                 if(isDef(compleRation)){
                     ration = compleRation._doc;
                     ration.type = 'complementary';

modules/main/facade/ration_facade.js

@@ -30,7 +30,7 @@ async function addNewRation(data) {
     let startTime = +new Date();
     if(query){
         let searchDao = new SearchDao();
-        stdRation = await searchDao.getRationItem(query.userID,query.rationRepId,query.code);
+        stdRation = await searchDao.getRationItem(query.userID,[query.rationRepId],query.code);
         data.newData.code = query.code;
     }
     let stdRationTime = +new Date();
@@ -38,7 +38,7 @@ async function addNewRation(data) {
     if(data.brUpdate.length>0){
         await updateSerialNo(data.brUpdate);
     }
-    let newRation =await insertNewRation(data.newData,stdRation,data.calQuantity);
+    let newRation =await insertNewRation(data.newData,data.firstLibID,stdRation,data.calQuantity);
     let addRationGLJTime = +new Date();
     console.log("插入新定额时间-------------------------------"+(addRationGLJTime - stdRationTime));
     if(stdRation){
@@ -68,7 +68,7 @@ async function  updateSerialNo(serialNoUpdate){
 
 }
 
-async function insertNewRation(newData,std,calQuantity) {//插入新的定额
+async function insertNewRation(newData,firstLibID,std,calQuantity) {//插入新的定额
     let startTime = +new Date();
     if(std){
         newData.name = std.name;
@@ -80,7 +80,14 @@ async function insertNewRation(newData,std,calQuantity) {//插入新的定额
             newData.comments = std.chapter.explanation;
             newData.ruleText = std.chapter.ruleText;
         }
+        newData.prefix = 0;
         newData.from = std.type === 'complementary' ? 'cpt' : 'std';
+        if(firstLibID !== std.rationRepId){//借
+            newData.prefix = 2;
+        }
+        else if(std.rationRepId === firstLibID && newData.from === 'cpt') {
+            newData.prefix = 1;
+        }
         newData.programID = std.feeType;
         newData.rationAssList =  createRationAss(std);
         // calculate ration Quantity
@@ -101,8 +108,8 @@ async function replaceRations(userID,data) {
     let searchDao = new SearchDao();
     let recodes = [];
     for(let recode of data.nodeInfo){
-        let stdRation = await searchDao.getRationItem(userID,data.libID,recode.newCode);
-        let newRecode = await replaceRation(recode,stdRation,data.projectID,data.calQuantity);
+        let stdRation = await searchDao.getRationItem(userID,data.libIDs,recode.newCode);
+        let newRecode = await replaceRation(recode,stdRation,data.firstLibID,data.projectID,data.calQuantity);
         if(newRecode){
             recodes.push(newRecode);
         }else {
@@ -112,10 +119,10 @@ async function replaceRations(userID,data) {
     return recodes;
 }
 
-async function replaceRation(nodeInfo,stdRation,projectID,calQuantity) {
+async function replaceRation(nodeInfo,stdRation,firstLibID,projectID,calQuantity) {
     if(stdRation){
         await deleRationSubRecode(projectID,nodeInfo.ID);
-        let newRation = await updateRation(stdRation,nodeInfo.ID,nodeInfo.billsItemID,projectID,calQuantity);//生成并插入新的定额
+        let newRation = await updateRation(stdRation,firstLibID,nodeInfo.ID,nodeInfo.billsItemID,projectID,calQuantity);//生成并插入新的定额
         return await addRationSubList(stdRation,newRation,nodeInfo.needInstall);
     }else {
         return null;
@@ -291,7 +298,7 @@ async function deleRationSubRecode(projectID,rationID) {//删除挂在定额下
     await rationInstallationModel.deleteMany(delete_query);//删除安装增加费
 }
 
-async function  updateRation(std,rationID,billsItemID,projectID,calQuantity) {
+async function  updateRation(std,firstLibID,rationID,billsItemID,projectID,calQuantity) {
     // insertNewRation
     let ration ={};
     ration.code = std.code;
@@ -309,6 +316,15 @@ async function  updateRation(std,rationID,billsItemID,projectID,calQuantity) {
         ration.ruleText = std.chapter.ruleText;
     }
     ration.from = std.type === 'complementary' ? 'cpt' : 'std';
+    //定额前缀 none:0, complementary:1, borrow: 2
+    ration.prefix = 0;
+    //借用优先级比补充高
+    if(std.rationRepId !== parseInt(firstLibID)){//借用
+        ration.prefix = 2;
+    }
+    else if(std.rationRepId === firstLibID && ration.from === 'cpt') {
+        ration.prefix = 1;
+    }
     ration.programID = std.feeType;
     ration.rationAssList = createRationAss(std);//生成辅助定额
     if(calQuantity){

public/web/tree_sheet/tree_sheet_controller.js

@@ -40,7 +40,9 @@ var TREE_SHEET_CONTROLLER = {
                         that.setTreeSelected(newNode);
                         that.sheet.setSelection(newNode.serialNo(), sels[0].col, 1, 1);
                         that.sheet.showRow(newNode.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
-                        cbTools.refreshFormulaNodes();
+                        if(typeof cbTools !== 'undefined'){
+                            cbTools.refreshFormulaNodes();
+                        }
                     });
                 }
             }
@@ -53,7 +55,9 @@ var TREE_SHEET_CONTROLLER = {
                         that.sheet.deleteRows(sels[0].row, that.tree.selected.posterityCount() + 1);
                         that.setTreeSelected(that.tree.items[sels[0].row]);
                     });
-                    cbTools.refreshFormulaNodes();
+                    if(typeof cbTools !== 'undefined'){
+                        cbTools.refreshFormulaNodes();
+                    }
                 }
             }
         };
@@ -73,7 +77,9 @@ var TREE_SHEET_CONTROLLER = {
                         that.setTreeSelected(that.tree.items[sels[0].row]);
                         that.sheet.setSelection(sels[0].row,sels[0].col,1,sels[0].colCount);
                     });
-                    cbTools.refreshFormulaNodes();
+                    if(typeof cbTools !== 'undefined'){
+                        cbTools.refreshFormulaNodes();
+                    }
                 }
             }
         };
@@ -98,7 +104,9 @@ var TREE_SHEET_CONTROLLER = {
                         that.sheet.deleteRows(row,1);
                         next?that.setTreeSelected(that.tree.items[row]):"";
                     });
-                    cbTools.refreshFormulaNodes();
+                    if(typeof cbTools !== 'undefined'){
+                        cbTools.refreshFormulaNodes();
+                    }
                 }
             }
         };

public/web/tree_sheet/tree_sheet_helper.js

@@ -310,10 +310,7 @@ var TREE_SHEET_HELPER = {
             if (!node || node.children.length === 0) { return; }
             let centerX = hitinfo.cellRect.x + offset + node.depth() * indent + node.depth() * levelIndent + indent / 2;
             let centerY = (hitinfo.cellRect.y + offset + (hitinfo.cellRect.y + offset + hitinfo.cellRect.height)) / 2;
-            console.log(hitinfo.x);
             if (hitinfo.x > centerX - halfBoxLength && hitinfo.x < centerX + halfBoxLength && hitinfo.y > centerY - halfBoxLength && hitinfo.y < centerY + halfBoxLength) {
-                console.log(centerX - halfBoxLength);
-                console.log(centerX + halfBoxLength);
                 node.setExpanded(!node.expanded);
                 TREE_SHEET_HELPER.massOperationSheet(hitinfo.sheet, function () {
                     let iCount = node.posterityCount(), i, child;

web/building_saas/complementary_ration_lib/js/ration.js

@@ -500,9 +500,9 @@ let rationOprObj = {
                 if(jobContentOprObj ){
                     jobContentOprObj.currentRationItems = cacheSection;
                     jobContentOprObj.setRadiosDisabled(cacheSection.length > 0 ? false : true, jobContentOprObj.radios);
-                    if(cacheSection.length === 0){
+                  /*  if(cacheSection.length === 0){
                         jobContentOprObj.updateSituation(pageOprObj.rationLibId, me.currentSectionId, 'NONE');
-                    }
+                    }*/
                     jobContentOprObj.setRadiosChecked(jobContentOprObj.currentSituation, jobContentOprObj.radios);
                     if(jobContentOprObj.currentSituation === jobContentOprObj.situations.PARTIAL){
                         jobContentOprObj.buildTablePartial(jobContentOprObj.tablePartial, jobContentOprObj.getGroup(cacheSection));

web/building_saas/complementary_ration_lib/js/ration_coe.js

@@ -242,7 +242,7 @@ var rationCoeOprObj = {
         /*if (ration == undefined || ration.rationCoeList == undefined ||
             ration.rationCoeList.length == 0){return;};*/
 
-        var coeList = ration.rationCoeList;
+        var coeList = ration.rationCoeList ? ration.rationCoeList : [];
         let coeIDs = [];
         for(let i = 0, len = coeList.length; i < len; i++){
             coeIDs.push(coeList[i].ID);

web/building_saas/main/html/main.html

@@ -210,6 +210,7 @@
                           </div>
                       </div>
                       <div class="main-side col-lg-0 p-0">
+                          <div class="resize col-lg-0 p-0"></div>
                           <div class="tab-content">
                               <!--清单规则-->
                               <div class="tab-pane" id="qd">
@@ -266,6 +267,7 @@
                                   </div>
                                   <div class="main-data-side-d" id="stdRationChapter">
                                   </div>
+                                  <div class="resize" style="background: #F1F1F1"></div>
                                   <div class="sidebar-bottom container-fluid">
                                       <div class="row">
                                           <div class="col-lg-12 p-0" id="stdSectionRations"></div>

web/building_saas/main/js/models/calc_base.js

@@ -986,6 +986,8 @@ let cbAnalyzer = {
         exp = exp.replace(/（/g, '(');
         //）to )
         exp = exp.replace(/）/g, ')');
+        //f to F
+        exp = exp.replace(new RegExp('f', 'g'), 'F');
         return exp;
     },
     //输入合法性

web/building_saas/main/js/models/calc_program.js

@@ -251,12 +251,12 @@ let calcTools = {
                     if (md.type == gljType.MACHINE_LABOUR) {
                         let q = md["consumption"] ? md["consumption"] : 0;
                         let p = md["basePrice"] ? md["basePrice"] : 0;
-                        mdSum = mdSum + (q * p).toDecimal(decimalObj.process);
-                        mdSum = (mdSum).toDecimal(decimalObj.process);
+                        mdSum = mdSum + (q * p).toDecimal(decimalObj.ration.unitFee);
+                        mdSum = (mdSum).toDecimal(decimalObj.ration.unitFee);
                     }
                 }
-                result = result + (glj["quantity"] * mdSum).toDecimal(decimalObj.process);
-                result = (result).toDecimal(decimalObj.process);
+                result = result + (glj["quantity"] * mdSum).toDecimal(decimalObj.ration.unitFee);
+                result = (result).toDecimal(decimalObj.ration.unitFee);
             }
         }
         return result;

web/building_saas/main/js/models/main_consts.js

@@ -158,6 +158,11 @@ const rationType = {
     gljRation: 3,
     install:4
 };
+const rationPrefix = { //定额前缀，补/借
+    none: 0,
+    complementary: 1,
+    borrow: 2
+};
 const leafBillGetFeeType = {
     rationContent: 0,
     rationPriceConverse: 1,

web/building_saas/main/js/models/ration.js

@@ -375,13 +375,15 @@ var Ration = {
         };
         ration.prototype.updateRationCodes = function (recodes) {
             let libID =  rationLibObj.getCurrentStdRationLibID();
+            let libIDs = rationLibObj.getStdRationLibIDs();
+            let firstLibID = rationLibObj.getFirstStdRationLibID();
             let engineering = projectInfoObj.projectInfo.property.engineering;
             let projectID = projectInfoObj.projectInfo.ID;
             let project = projectObj.project;
             let mainTree = project.mainTree;
             let nodeInfo =[];
             let refershNodes = [];
-            if(libID == null){
+            if(libIDs == null){
                 return;
             }
             for(let r of recodes){
@@ -395,7 +397,7 @@ var Ration = {
             }
             let calQuantity = optionsOprObj.getOption(optionsOprObj.optionsTypes.GENERALOPTS, 'rationQuanACToBillsQuan');
             $.bootstrapLoading.start();
-            CommonAjax.post("/ration/replaceRations",{nodeInfo:nodeInfo,libID:libID,projectID:projectID,calQuantity:calQuantity},function (data) {
+            CommonAjax.post("/ration/replaceRations",{nodeInfo:nodeInfo,libIDs:libIDs,firstLibID: firstLibID,projectID:projectID,calQuantity:calQuantity},function (data) {
                 for(let recode of data){
                    let node =  mainTree.getNodeByID(recode.ration.ID);
                    if(node) {
@@ -473,7 +475,7 @@ var Ration = {
                     needInstall = project.Bills.isFBFX(billsNode);//在分部分项插入的定额才需要定额安装增加费
                 }
                 $.bootstrapLoading.start();
-                CommonAjax.post("/ration/addNewRation",{itemQuery:itemQuery,newData:newData,calQuantity:calQuantity,brUpdate:brUpdate,needInstall:needInstall},function (data) {
+                CommonAjax.post("/ration/addNewRation",{itemQuery:itemQuery,newData:newData,firstLibID: rationLibObj.getFirstStdRationLibID(),calQuantity:calQuantity,brUpdate:brUpdate,needInstall:needInstall},function (data) {
                     //更新缓存
                     me.datas.push(data.ration);
                     project.ration_glj.addDatasToList(data.ration_gljs);

web/building_saas/main/js/views/main_tree_col.js

@@ -42,12 +42,17 @@ let MainTreeCol = {
             }
         },
         code: function (node) {
-            if(node.sourceType === projectObj.project.Ration.getSourceType() && node.data.type === rationType.ration && isDef(node.data.code) && isDef(node.data.from) && node.data.from === 'cpt'){
-                return '补' +  node.data.code.replace(new RegExp('补'), '');
-            }
-            else {
-                return isDef(node.data.code) ? node.data.code : '';
+            if(node.sourceType === projectObj.project.Ration.getSourceType() && node.data.type === rationType.ration
+                && isDef(node.data.code) && isDef(node.data.prefix)){
+                if(node.data.prefix === rationPrefix.complementary){
+                    return '补' +  node.data.code.replace(new RegExp('补'), '');
+                }
+                if(node.data.prefix === rationPrefix.borrow){
+                    return '借' +  node.data.code.replace(new RegExp('借'), '');
+                }
             }
+
+            return isDef(node.data.code) ? node.data.code : '';
         },
         marketPrice:function (node) {
             if((node.sourceType === projectObj.project.Ration.getSourceType()&&node.data.type!=rationType.ration)||node.sourceType==projectObj.project.ration_glj.getSourceType()){

web/building_saas/main/js/views/project_view.js

@@ -429,7 +429,7 @@ var projectObj = {
                     project.calcBase.calculate(node);
                     if(!project.calcBase.success){
                         let activeCell = projectObj.mainSpread.getActiveSheet().getSelections()[0];
-                        projectObj.mainSpread.getActiveSheet().setValue(activeCell.row, activeCell.col, node.data.calcBase? node.data.calcBase: '');
+                        projectObj.mainController.refreshTreeNode([node]);
                         return;
                     }
                     // if (value) {value = parseFloat(value).toDecimal(decimalObj.decimal("totalPrice", node))};
@@ -487,9 +487,17 @@ var projectObj = {
     mainSpreadEditStarting: function (sender, info) {
         let project = projectObj.project;
         let node = project.mainTree.items[info.row];
-        if(isDef(node) && node.sourceType === project.Ration.getSourceType() && isDef(node.data.code) && isDef(node.data.from) && node.data.from === 'cpt'&&info.col ==0){
-            let orgV = info.sheet.getValue(info.row, info.col);
-            let newV = orgV.replace(new RegExp('补'), '');
+        let fieldName = projectObj.mainController.setting.cols[info.col].data.field;
+        let orgV = info.sheet.getValue(info.row, info.col);
+        let newV;
+        if(node && node.sourceType === projectObj.project.Ration.getSourceType() && node.data.type === rationType.ration
+            && isDef(node.data.code) && isDef(node.data.prefix) && node.data.prefix !== rationPrefix.none && fieldName === 'code'){
+            if(node.data.prefix === rationPrefix.complementary){
+                newV = orgV.replace(new RegExp('补'), '');
+            }
+            if(node.data.prefix === rationPrefix.borrow){
+                newV = orgV.replace(new RegExp('借'), '');
+            }
             info.sheet.setValue(info.row, info.col, newV);
         }
     },
@@ -1071,7 +1079,7 @@ var projectObj = {
     },
 
     //根据节点获取行style(颜色、字体加粗)
-    getNodeColorStyle: function (sheet, node, colSetting) {
+    getNodeColorStyle: function (sheet, node, colSetting = null) {
         let colorSetting = optionsOprObj.getOption(optionsOprObj.optionsTypes.COLOROPTS);
         let mapping = {DEFAULT: 'DEFAULT', SELECTED: 'SELECTED', DXFY: 'DXFY', FB: 'FB', UNLEAFBILL: 'UNLEAFBILL',
             FX: 'FX', BX: 'BX', UNCBBILL: 'UNCBBILL', CBBILL: 'CBBILL', ZCSB: 'ZCSB'};
@@ -1204,7 +1212,9 @@ var projectObj = {
         TREE_SHEET_HELPER.massOperationSheet(sheet, function () {
             for(let node of nodes){
                 if(node && node.serialNo()!= -1){
-                    sheet.setStyle(node.serialNo(), -1, me.getNodeColorStyle(sheet, node));
+                    //console.log(me.getNodeColorStyle(sheet, node).backColor);
+                    sheet.getRange(node.serialNo(), -1, 1, -1).backColor(me.getNodeColorStyle(sheet, node).backColor);
+                    //sheet.setStyle(node.serialNo(), -1, me.getNodeColorStyle(sheet, node));
                 }
             }
         });

web/building_saas/main/js/views/std_ration_lib.js

@@ -263,6 +263,17 @@ var rationLibObj = {
             }
         }]
     },
+    getStdRationLibIDs: function () {
+        let ids = [];
+        if(projectInfoObj.projectInfo.engineeringInfo.ration_lib.length === 0){
+            alert('当前项目无定额库，请添加定额库。');
+            return null;
+        }
+        for(let rationLib of projectInfoObj.projectInfo.engineeringInfo.ration_lib){
+            ids.push(rationLib.id);
+        }
+        return ids;
+    },
     getCurrentStdRationLibID:function () {
         if(projectInfoObj.projectInfo.engineeringInfo.ration_lib.length === 0){
             alert('当前项目无定额库，请添加定额库。');
@@ -273,6 +284,13 @@ var rationLibObj = {
         }else {
             return projectInfoObj.projectInfo.engineeringInfo.ration_lib[0].id;
         }
+    },
+    getFirstStdRationLibID: function () {
+        if(projectInfoObj.projectInfo.engineeringInfo.ration_lib.length === 0){
+            alert('当前项目无定额库，请添加定额库。');
+            return null;
+        }
+        return parseInt(projectInfoObj.projectInfo.engineeringInfo.ration_lib[0].id);
     }
 
 };

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

@@ -63,8 +63,8 @@
             <div class="modal-body modal-fixed-height">
                 <p>勾选需要恢复的文件，点“确定”按钮，确认从回收站中恢复。</p>
                 <table class="table table-hover table-sm mb-5">
-                    <thead><tr><th>名称</th><th>删除时间</th><th>勾选</th></tr></thead>
-                    <tbody>
+                    <thead><tr style="display: block;"><th width="266px">名称</th><th width="136px">删除时间</th><th width="64px">勾选</th></tr></thead>
+                    <tbody style="display:block; height: 300px; overflow: auto">
                     <tr><td>XX单价文件</td><td>2017-11-01<br>12:11:43</td><td><input type="checkbox"></td></tr>
                     </tbody>
                 </table>
@@ -89,8 +89,8 @@
             <div class="modal-body modal-fixed-height">
                 <p>勾选需要彻底删除的文件，点“确定”按钮，确认从回收站中删除。</p>
                 <table class="table table-hover table-sm mb-5">
-                    <thead><tr><th>名称</th><th>删除时间</th><th>勾选</th></tr></thead>
-                    <tbody>
+                    <thead><tr style="display: block;"><th width="266px">名称</th><th width="136px">删除时间</th><th width="64px">勾选</th></tr></thead>
+                    <tbody style="display:block; height: 300px; overflow: auto">
                     <tr><td>XX单价文件</td><td>2017-11-01<br>12:11:43</td><td><input type="checkbox"></td></tr>
                     </tbody>
                 </table>

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

@@ -124,7 +124,7 @@
 
                         <legend>单价文件</legend>
                         <table class="table table-bordered table-hover table-sm" id="summary-project-unit-price-table">
-                            <thead><th style="width: 25px;"></th><th style="width: 330px;">名称</th><th style="width:40px;">使用</th></thead>
+                            <thead><th style="width: 40px;"></th><th style="width: 500px;">名称</th><th style="width:50px;">使用</th></thead>
                             <tbody>
                             <tr><td>1</td><td>A单价文件</td></tr>
                             <tr><td>2</td><td>B单价文件</td></tr>
@@ -135,7 +135,7 @@
 
                         <legend>费率文件</legend>
                         <table class="table table-bordered table-hover table-sm" id="summary-project-fee-table">
-                            <thead><th style="width: 25px;"></th><th style="width: 330px;">名称</th><th style="width:40px;">使用</th></thead>
+                            <thead><th style="width: 40px;"></th><th style="width: 500px;">名称</th><th style="width:50px;">使用</th></thead>
                             <tbody>
                             <tr><td>1</td><td>A费率文件</td></tr>
                             <tr><td>2</td><td>B费率文件</td></tr>

web/building_saas/pm/js/pm_gc.js

@@ -658,14 +658,14 @@ function v_getFiles(type, files, tenders, opr = null){
         if(opr && opr === 'delete'){
             //还被引用，不可删除
             if(hasTheFile(tenders, fileId, type)){
-                html += '<tr><td>'+ recName +'</td><td>' + recTimeA + '<br>' + recTimeB + '</td><td><input disabled name="fileItems" type="checkbox" fileId = "' + fileId + '" fileType = "' + type + '"></td></tr>';
+                html += '<tr><td width="266px">'+ recName +'</td><td width="136px">' + recTimeA + '<br>' + recTimeB + '</td><td width="64px"><input disabled name="fileItems" type="checkbox" fileId = "' + fileId + '" fileType = "' + type + '"></td></tr>';
             }
             else {
-                html += '<tr><td>'+ recName +'</td><td>' + recTimeA + '<br>' + recTimeB + '</td><td><input name="fileItems" type="checkbox" fileId = "' + fileId + '" fileType = "' + type + '"></td></tr>';
+                html += '<tr><td width="266px">'+ recName +'</td><td width="136px">' + recTimeA + '<br>' + recTimeB + '</td><td width="64px"><input name="fileItems" type="checkbox" fileId = "' + fileId + '" fileType = "' + type + '"></td></tr>';
             }
         }
         else{
-            html += '<tr><td>'+ recName +'</td><td>' + recTimeA + '<br>' + recTimeB + '</td><td><input name="fileItems" type="checkbox" fileId = "' + fileId + '" fileType = "' + type + '"></td></tr>';
+            html += '<tr><td width="266px">'+ recName +'</td><td width="136px">' + recTimeA + '<br>' + recTimeB + '</td><td width="64px"><input name="fileItems" type="checkbox" fileId = "' + fileId + '" fileType = "' + type + '"></td></tr>';
         }
     }
     return html;

web/building_saas/pm/js/pm_newMain.js

@@ -553,7 +553,7 @@ const projTreeObj = {
                 //建设项目，侧滑汇总
                 if(node.data.projType === projectType.project && withingClickArea()){
                     setDataToSideBar();
-                    $(".slide-sidebar").animate({width:"450"}).addClass("open");
+                    $(".slide-sidebar").animate({width:"650"}).addClass("open");
                     $('body').unbind('click');
                     setTimeout(function () {
                         $("body").bind('click', function (event) {
@@ -2490,7 +2490,7 @@ function set_file_table(target, poj_tenders, fileList, type){
         let fileId = type === fileType.unitPriceFile ? fileList[i].id : fileList[i].ID;
         let usedObj = getUsedObj(poj_tenders, fileId, type);
         let usedHtml = usedObj.usedCount > 0 ?  '<td class="text-center"><a href="javascript:void(0);">' + usedObj.usedCount + '</a></td>' : '<td class="text-center">' + usedObj.usedCount + '</td>';
-        let hoverHtml = '<p style="display: none"><a class="btn btn-sm" href="javascript:void(0);" data-toggle="modal" data-target="#del-wj">删除</a><a class="btn btn-sm" href="javascript:void(0);">重命名</a></p></div>';
+        let hoverHtml = '<p style="display: none; height: 14px;"><a class="btn btn-sm" href="javascript:void(0);" data-toggle="modal" data-target="#del-wj">删除</a><a class="btn btn-sm" href="javascript:void(0);">重命名</a></p></div>';
         let renHtml = '<div class="input-group" style="display: none;">'
             + '<input class="form-control form-control-sm" value="">'
             + '<span class="input-group-btn">'