Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/tender_list_base.js

@@ -362,6 +362,17 @@ $(document).ready(() => {
     bindTenderUrl();
     localHideList();
     tenderTreeShowLevel.initShowLevel();
+    if ($("#progress-table").length > 0) {
+        $("#progress-table").colResizable({
+            liveDrag: true,
+            gripInnerHtml:"<div class='grip'></div>",
+            draggingClass:"dragging",
+            resizeMode:'fit',
+            postbackSafe:true,
+            partialRefresh:true,
+            // headerOnly: true,
+        });
+    }
     // 分类
     $('#cate-set').on('show.bs.modal', function () {
         createTree('treeLevel');

app/public/js/tender_list_progress.js

@@ -29,7 +29,7 @@ const tenderListSpec = (function(){
         const html = [];
         html.push('<tr pid="' + pid + '">');
         // 名称
-        html.push('<td width="25%" class="in-' + node.level + '">');
+        html.push('<td width="30%" style="min-width: 300px;" class="in-' + node.level + '">');
         if (node.cid) {
             html.push('<span onselectstart="return false" style="{-moz-user-select:none}" class="fold-switch mr-1" title="收起" cid="'+ node.sort_id +'"><i class="fa fa-minus-square-o"></i></span> <i class="fa fa-folder-o"></i> ');
             html.push((node.level === 1 ? '<b>' : ''), node.name, (node.level === 1 ? '</b>' : ''));
@@ -42,7 +42,7 @@ const tenderListSpec = (function(){
         }
         html.push('</td>');
         // 计量进度
-        html.push('<td style="width: 8%">');
+        html.push('<td style="width: 120px">');
         if (!node.cid && node.cur_flow) {
             if (node.progress) {
                 html.push(node.progress.title + ' (' + '<span class="' + node.progress.status_class +'">' + node.progress.status + '</span>' + ')');
@@ -52,7 +52,7 @@ const tenderListSpec = (function(){
         }
         html.push('</td>');
         // 当前流程
-        html.push('<td style="width: 8%">');
+        html.push('<td style="width: 230px">');
         if (!node.cid && node.cur_flow) {
             const curUser = node.cur_flow instanceof Array && node.cur_flow[0].audit_type && node.cur_flow[0].audit_type !== auditType.key.common
                 ? transFormToChinese(node.cur_flow[0].audit_order) + '审'
@@ -79,7 +79,7 @@ const tenderListSpec = (function(){
         }
         html.push('</td>');
         // 上一流程审批时间
-        html.push('<td style="width: 8%">');
+        html.push('<td style="width: 150px">');
         if (!node.cid && node.pre_flow) {
             if (node.pre_flow instanceof Array) {
                 if (node.pre_flow.length > 1) {
@@ -93,15 +93,15 @@ const tenderListSpec = (function(){
         }
         html.push('</td>');
         // 签约合同价
-        html.push('<td width="8%" class="text-right">');
+        html.push('<td width="120px" class="text-right">');
         html.push(node.contract_price ? node.contract_price : '');
         html.push('</td>');
         // 总价
-        html.push('<td width="8%" class="text-right">');
+        html.push('<td width="120px" class="text-right">');
         html.push(node.sum_tp ? node.sum_tp : '');
         html.push('</td>');
         // 截止本期累计完成/本期完成/未完成
-        html.push('<td>');
+        html.push('<td width="30%">');
         if (node.lastStage || node.stage_count > 0) {
             html.push(getProgressHtml(node.sum_tp, node.pre_gather_tp, node.gather_tp));
         } else {
@@ -113,15 +113,16 @@ const tenderListSpec = (function(){
     }
     function getTenderTreeHeaderHtml() {
         const html = [];
-        html.push('<table class="table table-hover table-bordered">');
-        html.push('<thead style="position: fixed;left:56px;top: 34px;">', '<tr>');
-        html.push('<th style="width: 25%" class="text-center">', '标段名称', '</th>');
-        html.push('<th class="text-center" style="width: 8%">', '计量进度', '</th>');
-        html.push('<th class="text-center" style="width: 8%">', '当前流程', '</th>');
-        html.push('<th class="text-center" style="width: 8%">', '上一流程审批时间', '</th>');
-        html.push('<th class="text-center" style="width: 8%">', '签约合同价', '</th>');
-        html.push('<th style="width: 8%" class="text-center">', '总价 <i class="fa fa-question-circle text-primary"  data-placement="bottom" data-toggle="tooltip" data-original-title="0号台账+截止本期数量变更"></i>', '</th>');
-        html.push('<th style="width: 35%" class="text-center">', '截止上期完成/本期完成/未完成', '</th>');
+        html.push('<table class="table table-hover table-bordered" id="progress-table">');
+        html.push('<thead style="position: sticky;left:56px;top: 0px;">', '<tr>');
+        // html.push('<thead style="left:56px;top: 34px;">', '<tr>');
+        html.push('<th style="width: 30%;min-width: 300px" class="text-center">', '标段名称', '</th>');
+        html.push('<th class="text-center" style="width: 120px">', '计量进度', '</th>');
+        html.push('<th class="text-center" style="width: 230px">', '当前流程', '</th>');
+        html.push('<th class="text-center" style="width: 150px">', '上一流程审批时间', '</th>');
+        html.push('<th class="text-center" style="width: 120px">', '签约合同价', '</th>');
+        html.push('<th style="width: 120px" class="text-center">', '总价 <i class="fa fa-question-circle text-primary"  data-placement="bottom" data-toggle="tooltip" data-original-title="0号台账+截止本期数量变更"></i>', '</th>');
+        html.push('<th style="width: 30%" class="text-center">', '截止上期完成/本期完成/未完成', '</th>');
         html.push('</tr>', '</thead>');
         return html.join('');
     }

app/public/js/tender_showhide.js

@@ -142,7 +142,9 @@ function setTopTr() {
             }
         }
     }
-    $('.c-body table').css('margin-top', $(".c-body table>thead").height() - 4);
+    if ($("#progress-table").length === 0) {
+        $('.c-body table').css('margin-top', $(".c-body table>thead").height() - 4);
+    }
 }
 
 function doTrStatus(node, status, all = '') {

config/web.js

@@ -85,6 +85,7 @@ const JsFiles = {
                 mergeFiles: [
                     '/public/js/zh_calc.js',
                     '/public/js/PinYinOrder.bundle.js',
+                    '/public/js/colResizable/colResizable-1.6.min.js',
                     '/public/js/shares/tender_list_order.js',
                     '/public/js/shares/show_level.js',
                     '/public/js/tender_showhide.js',