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

app/public/js/shenpi.js

@@ -781,6 +781,7 @@ $(document).ready(function () {
             }
             postData('/tender/' + cur_tenderid + '/shenpi/audit/save', data, function (result) {
                 self.loadPostData(result);
+                self.refreshOperate();
             });
         }
         refreshOperate() {

app/public/js/tender_list_info.js

@@ -302,7 +302,7 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     const html = [];
     html.push('<tr pid="' + pid + '">');
     // 名称
-    html.push('<td style="width: 10%" class="in-' + node.level + '">');
+    html.push('<td 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> ', node.name);
     } else {
@@ -310,23 +310,23 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
         html.push(arr.indexOf(node) === arr.length - 1 ? '└' : '├');
         html.push('</span>');
         //html.push('<a href="/tender/' + node.id + '">', node[c.field], '</a>');
-        html.push('<a href="javascript: void(0)" id="' + node.id + '">', node.name, '</a>');
+        html.push('<a href="javascript: void(0)" style="min-width: 300px;word-break:break-all;" id="' + node.id + '">', node.name, '</a>');
     }
     html.push('</td>');
     // 计量模式
-    html.push('<td style="width: 5%" class="text-center">');
+    html.push('<td style="width: 75px" class="text-center">');
     if (node.measure_type) {
         html.push(node.measure_type === measureType.tz.value ? '0号台账' : '工程量清单');
     }
     html.push('</td>');
     // 计量进度
-    html.push('<td style="width: 6%">');
+    html.push('<td style="width: 105px">');
     if (!node.cid && node.cur_flow) {
         html.push(node.cur_flow.title + ' (' + '<span class="' + node.cur_flow.status_class +'">' + node.cur_flow.status + '</span>' + ')');
     }
     html.push('</td>');
     // 当前流程
-    html.push('<td style="width: 6%">');
+    html.push('<td style="width: 230px">');
     if (!node.cid && node.cur_flow) {
         html.push((node.lastStage && node.lastStage.status === auditConst.stage.status.uncheck) || (!node.lastStage && node.ledger_status === auditConst.ledger.status.uncheck ) ? '' :
             '<a href="#sp-list" data-toggle="modal" data-target="#sp-list"  data-type="'+ (node.lastStage ? 'stage' : 'ledger') +'"' +
@@ -338,49 +338,49 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     }
     html.push('</td>');
     // 上一流程审批时间
-    html.push('<td style="width: 7%">');
-    if (!node.cid && node.pre_flow) {
-        html.push(node.pre_flow.name + ' ' + moment(node.pre_flow.time).format('YYYY-MM-DD'));
-    }
-    html.push('</td>');
+    // html.push('<td style="width: 7%">');
+    // if (!node.cid && node.pre_flow) {
+    //     html.push(node.pre_flow.name + ' ' + moment(node.pre_flow.time).format('YYYY-MM-DD'));
+    // }
+    // html.push('</td>');
     // 签约合同价
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.contract_price || '');
     html.push('</td>');
     // 0号台账合同
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.total_price || '');
     html.push('</td>');
     // 本期完成
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.gather_tp || '');
     html.push('</td>');
     // 截止本期合同
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.end_contract_tp || '');
     html.push('</td>');
     // 截止本期变更
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.end_qc_tp || '');
     html.push('</td>');
     // 截止本期完成
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.end_gather_tp || '');
     html.push('</td>');
     // 截止上期完成
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.pre_gather_tp || '');
     html.push('</td>');
     // 预付款
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.advance_tp || '');
     html.push('</td>');
     // 本期应付
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.yf_tp || '');
     html.push('</td>');
     // 截止本期应付
-    html.push('<td style="width: 6%" class="text-right">');
+    html.push('<td style="width: 100px" class="text-right">');
     html.push(node.end_yf_tp || '');
     html.push('</td>');
     html.push('</tr>');
@@ -397,21 +397,21 @@ function getTenderTreeHtml () {
         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 class="text-center" style="width: 14%">', '标段名称', '</th>');
-        html.push('<th class="text-center" style="width: 5%">', '计量模式', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '计量进度', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '当前流程', '</th>');
-        html.push('<th class="text-center" style="width: 7%">', '上一流程审批时间', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '签约合同价', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '0号台账', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '本期完成', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '截止本期合同', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '截止本期变更', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '截止本期完成', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '截止上期完成', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '预付款', '<i class="fa fa-question-circle text-primary" data-placement="bottom" data-toggle="tooltip" data-original-title="预付款流程中截止本期金额"></i>', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '本期应付', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '截止本期应付', '</th>');
+        html.push('<th class="text-center" style="min-width: 300px;">', '标段名称', '</th>');
+        html.push('<th class="text-center" style="width: 75px">', '计量模式', '</th>');
+        html.push('<th class="text-center" style="width: 105px">', '计量进度', '</th>');
+        html.push('<th class="text-center" style="width: 230px">', '当前流程', '</th>');
+        // html.push('<th class="text-center" style="width: 7%">', '上一流程审批时间', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '签约合同价', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '0号台账', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '本期完成', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '截止本期合同', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '截止本期变更', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '截止本期完成', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '截止上期完成', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '预付款', '<i class="fa fa-question-circle text-primary" data-placement="bottom" data-toggle="tooltip" data-original-title="预付款流程中截止本期金额"></i>', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '本期应付', '</th>');
+        html.push('<th class="text-center" style="width: 100px">', '截止本期应付', '</th>');
         html.push('</tr>', '</thead>');
         parentId = 0;
         for (const t of tenderTree) {