console清除，stage列表调整

app/public/js/change_information_set.js

@@ -618,7 +618,7 @@ $(document).ready(() => {
                         const select = SpreadJsObj.getSelectObject(changeSpreadSheet);
                         const sel = changeSpreadSheet.getSelections()[0];
                         changeSpreadObj.resetXmjSpread(select);
-                        console.log(select, sel);
+                        // console.log(select, sel);
                         if (!readOnly && select && sel.row !== changeSpreadSheet.getRowCount() - 1 && !_.find(changeUsedData, { id: select.id })) {
                             return false;
                         } else {
@@ -1165,7 +1165,7 @@ function tableDataRemake(changeListData) {
                                 (leafInfo.mx_id ? leafInfo.mx_id : '') + '!_!' +
                                 (leafInfo.bwmx !== undefined ? leafInfo.bwmx : (listinfo.leafXmjs.length > 1 && listinfo.name ? listinfo.name : (leafInfo.jldy !== undefined ? leafInfo.jldy : ''))) + '*;*' + (leafInfo.quantity !== null ? leafInfo.quantity : 0);
                         } else {
-                            console.log(clinfo, listinfo.leafXmjs);
+                            // console.log(clinfo, listinfo.leafXmjs);
                             toastr.warning('台账清单列表已不存在'+ clinfo.code +'，已更新变更清单列表');
                             // changeList.splice(index, 1);
                             removeList.push(clinfo);
@@ -1216,7 +1216,7 @@ function tableDataRemake(changeListData) {
             }
         }
         if(updateList.length > 0) {
-            console.log(updateList);
+            // console.log(updateList);
             postData(window.location.pathname + '/save', { type:'update_list', updateData: updateList }, function (result) {
             }, function () {
             });

app/public/js/change_set.js

@@ -68,7 +68,7 @@ $(document).ready(() => {
             }
         }
         changeListData = gclGatherData.concat(dealBillList).sort(sortByCode);
-        console.log(changeListData);
+        // console.log(changeListData);
         // 先加载台账数据
         let listHtml = '';
         let list_index = 1;
@@ -724,7 +724,7 @@ function tableDataRemake(changeListData) {
                     const leafInfo = listinfo.leafXmjs.find(function (item) {
                         return (item.bwmx === undefined || item.bwmx === clinfo[2]) && (item.quantity !== null ? item.quantity === parseFloat(clinfo[5]) : 0 === parseFloat(clinfo[5]));
                     });
-                    console.log(leafInfo);
+                    // console.log(leafInfo);
                     if (leafInfo) {
                         pushbwmx = leafInfo.code + '!_!' + (leafInfo.jldy !== undefined ? leafInfo.jldy : '') + '!_!' + (leafInfo.gcl_id ? leafInfo.gcl_id : '') + '!_!' + (leafInfo.bwmx !== undefined ? leafInfo.bwmx : '') + '*;*' + (leafInfo.quantity !== null ? leafInfo.quantity : 0);
                     } else {

app/public/js/measure_stage.js

@@ -198,18 +198,18 @@ function checkValidForm() {
 }
 $(window).resize(checkTableWidth);
 function checkTableWidth() {
-    if($('table th').eq(2).outerWidth() < 107) {
-        $('table th').eq(2).html('本期<br>合同计量');
-        $('table th').eq(3).html('本期数量<br>变更计量');
-        $('table th').eq(4).html('本期<br>完成计量');
-        $('table th').eq(5).html('截止上期<br>完成计量');
-        $('table th').eq(6).html('截止本期<br>完成计量');
+    if($('table th').eq(3).outerWidth() < 107) {
+        $('table th').eq(3).html('本期<br>合同计量');
+        $('table th').eq(4).html('本期数量<br>变更计量');
+        $('table th').eq(5).html('本期<br>完成计量');
+        $('table th').eq(6).html('截止上期<br>完成计量');
+        $('table th').eq(7).html('截止本期<br>完成计量');
     } else {
-        $('table th').eq(2).html('本期合同计量');
-        $('table th').eq(3).html('本期数量变更计量');
-        $('table th').eq(4).html('本期完成计量');
-        $('table th').eq(5).html('截止上期完成计量');
-        $('table th').eq(6).html('截止本期完成计量');
+        $('table th').eq(3).html('本期合同计量');
+        $('table th').eq(4).html('本期数量变更计量');
+        $('table th').eq(5).html('本期完成计量');
+        $('table th').eq(6).html('截止上期完成计量');
+        $('table th').eq(7).html('截止本期完成计量');
     }
 }
 

app/public/js/schedule_ledger.js

@@ -115,7 +115,7 @@ $(function () {
         }
         ledgerTree.sortTreeNode(true);
         // treeCalc.calculateAll(ledgerTree);
-        console.log(ledgerTree);
+        // console.log(ledgerTree);
 
         SpreadJsObj.loadSheetData(ledgerSpread.getActiveSheet(), SpreadJsObj.DataType.Tree, ledgerTree);
     }, null, true);
@@ -230,7 +230,7 @@ $(function () {
         // 重新计算每一期计量进度金额并提交
         const stageTpList = calcStageTp(under_ledger);
         const stageSjTp = calcStageSjTp(under_ledger);
-        console.log(under_ledger, stageSjTp);
+        // console.log(under_ledger, stageSjTp);
         postData(window.location.pathname + '/save',  { select_ledger: _.map(select_ledger, 'ledger_id'), under_ledger, parent_ledger, stageTpList, stageSjTp, type: 'sz' } , function (result) {
             toastr.success('设置成功');
             setTimeout(function () {
@@ -264,7 +264,7 @@ $(function () {
         // 重新计算每一期计量进度金额并提交
         const stageTpList = calcStageTp(under_ledger);
         const stageSjTp = calcStageSjTp(under_ledger);
-        console.log(stageSjTp);
+        // console.log(stageSjTp);
         postData(window.location.pathname + '/save',  { select_ledger: _.map(select_ledger, 'ledger_id'), under_ledger, parent_ledger, stageTpList, stageSjTp, type: 'xz' } , function (result) {
             toastr.success('进度台账数据修正成功');
             setTimeout(function () {

app/public/js/sr_detail.js

@@ -84,7 +84,6 @@ function getAllList(currPageNum = 1) {
     // 当前页附件内容
     const currPageAttData = attData.slice((currPageNum-1)*pageCount, currPageNum*pageCount);
     currPageFileData = currPageAttData;
-    console.log(currPageFileData);
     let html = '';
     for(const att of currPageAttData) {
         html += `<tr>

app/service/material_list_notjoin.js

@@ -97,8 +97,8 @@ module.exports = app => {
             const materialListData = await this.ctx.service.materialList.getAllDataByCondition({
                 where: searchSql,
             });
-            console.log(data);
-            console.log(materialListData);
+            // console.log(data);
+            // console.log(materialListData);
             if (materialListData && materialListData.length !== 0) {
                 // 对应修改更新本期应耗数量值和总的本期金额计算
                 const mbIdList = [];

app/service/revise_pos.js

@@ -174,7 +174,7 @@ module.exports = app => {
         }
 
         async updatePosArr(tid, data) {
-            console.log(data);
+            // console.log(data);
             if (data.length === 0) return;
             const op = await this.getDataById(data[0].id);
             const bills = await this.ctx.service.reviseBills.getDataById(op.lid);
@@ -364,4 +364,4 @@ module.exports = app => {
     }
 
     return RevisePos;
-};
+};

app/view/measure/stage.ejs

@@ -24,16 +24,16 @@
                 <table class="table table-bordered">
                     <thead>
                     <tr>
-                        <th class="text-center" width="80px">计量期数</th>
+                        <th class="text-center" width="70px">计量期数</th>
                         <th class="text-center" width="70px">计量月份</th>
-                        <th class="text-center" width="70px">计量周期</th>
-                        <th class="text-center" width="110px">本期合同计量</th>
-                        <th class="text-center" width="110px">本期数量变更计量</th>
-                        <th class="text-center" width="110px">本期完成计量</th>
-                        <th class="text-center" width="110px">截止上期完成计量</th>
-                        <th class="text-center" width="110px">截止本期完成计量</th>
-                        <th class="text-center" width="110px">本期应付</th>
-                        <th class="text-center" width="110px">本期实付</th>
+                        <th class="text-center" width="70px">截止日期</th>
+                        <th class="text-center" width="100px">本期合同计量</th>
+                        <th class="text-center" width="100px">本期数量变更计量</th>
+                        <th class="text-center" width="100px">本期完成计量</th>
+                        <th class="text-center" width="100px">截止上期完成计量</th>
+                        <th class="text-center" width="100px">截止本期完成计量</th>
+                        <th class="text-center" width="100px">本期应付</th>
+                        <th class="text-center" width="100px">本期实付</th>
                         <th class="text-center" width="200px">审批进度</th>
                         <th class="text-center" width="90px">操作</th>
                     </tr>
@@ -48,7 +48,11 @@
                             <% } %>
                         </td>
                         <td class="text-center"><%- s.s_time %></td>
-                        <td class="text-center"><%- s.period %></td>
+                        <td class="text-center">
+                            <span data-toggle="tooltip" data-placement="bottom" data-original-title="<%- (s.period ? s.period : '') %>">
+                                <%- (s.period ? s.period.split('~')[1] : '') %>
+                            </span>
+                        </td>
                         <% if (ctx.tender.info.display.thousandth) { %>
                         <td class="text-right"><%- (s.contract_tp ? ctx.helper.formatNum(s.contract_tp, '#,##0.######') : '')%></td>
                         <td class="text-right"><%- (s.qc_tp ? ctx.helper.formatNum(s.qc_tp, '#,##0.######') : '')%></td>

app/view/stage/detail_modal.ejs

@@ -10,7 +10,6 @@
                     <label>中间计量模式 <a href="/public/images/example/jiliangmoshi.png" target="_blank" data-toggle="tooltip" data-placement="bottom" data-original-title="点击查看相关报表"><i class="fa fa-question-circle-o"></i></a></label>
                     <div class="row" id="im-type">
                         <% for (const i in imType) { %>
-                        <% console.log(ctx.stage.im_type === imType[i].value); %>
                         <div class="col-4">
                             <div class="card border-primary" name="im-type" im-type="<%- imType[i].value %>" <% if (ctx.stage.im_type !== imType[i].value) { %>style="cursor:pointer;"<% } %>>
                                 <div class="card-body<% if (ctx.stage.im_type === imType[i].value) { %> text-primary<% } %>">
@@ -164,4 +163,4 @@
         </div>
     </div>
 </div>
-<% include ./audit_modal.ejs %>
+<% include ./audit_modal.ejs %>