1. 冻结行列颜色

2. 计量台账，未打开中间计量页面时，计量报错

app/public/js/stage.js

@@ -312,7 +312,9 @@ $(document).ready(() => {
                     const nodes = stageTree.loadPostStageData(result.bills);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
                     stagePosSpreadObj.loadCurPosData();
-                    detail.loadStageChangeUpdateData(result);
+                    if (detail) {
+                        detail.loadStageChangeUpdateData(result);
+                    }
                     self.obj.modal('hide');
                 });
             })
@@ -453,6 +455,7 @@ $(document).ready(() => {
     };
     SpreadJsObj.initSheet(slSpread.getActiveSheet(), ledgerSpreadSetting);
     slSpread.getActiveSheet().frozenColumnCount(5);
+    slSpread.getActiveSheet().options.frozenlineColor = '#93b5e4';
 
     //初始化所有附件列表
     getAllList();
@@ -574,7 +577,9 @@ $(document).ready(() => {
                     // tag update
                     const nodes = stageTree.loadPostStageData(data);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
-                    detail.loadStageLedgerUpdateData(data);
+                    if (detail) {
+                        detail.loadStageLedgerUpdateData(data);
+                    }
                 }, function () {
                     SpreadJsObj.reLoadRowData(info.sheet, info.row);
                 });
@@ -646,7 +651,9 @@ $(document).ready(() => {
                     postData(window.location.href + '/update', {bills: bills}, function (result) {
                         const nodes = stageTree.loadPostStageData(result);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
-                        detail.loadStageLedgerUpdateData(result);
+                        if (detail) {
+                            detail.loadStageLedgerUpdateData(result);
+                        }
                     });
                 }
             }
@@ -749,7 +756,9 @@ $(document).ready(() => {
                     postData(window.location.href + '/update', {bills: updateData}, function (data) {
                         const nodes = stageTree.loadPostStageData(data);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes.concat(filterNodes));
-                        detail.loadStageLedgerUpdateData(data);
+                        if (detail) {
+                            detail.loadStageLedgerUpdateData(data);
+                        }
                     }, function () {
                         // todo
                         //stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), filterNodes);
@@ -796,7 +805,9 @@ $(document).ready(() => {
                 const nodes = stageTree.loadPostStageData(result.ledger);
                 stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
                 stagePosSpreadObj.loadCurPosData();
-                detail.loadStagePosUpdateData(result);
+                if (detail) {
+                    detail.loadStagePosUpdateData(result);
+                }
                 toastr.success('已计量' + data.updateData.length + '条');
             }, function () {
                 stagePosSpreadObj.loadCurPosData();
@@ -1084,7 +1095,9 @@ $(document).ready(() => {
                     const refreshData = stageTree.loadPostStageData(result.ledger);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), refreshData);
                     stagePosSpreadObj.loadCurPosData();
-                    detail.loadStagePosUpdateData(result);
+                    if (detail) {
+                        detail.loadStagePosUpdateData(result);
+                    }
                 }, function () {
                     stagePosSpreadObj.loadCurPosData();
                 });
@@ -1199,7 +1212,9 @@ $(document).ready(() => {
                     const nodes = stageTree.loadPostStageData(result.ledger);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
                     stagePosSpreadObj.loadCurPosData();
-                    detail.loadStagePosUpdateData(result);
+                    if (detail) {
+                        detail.loadStagePosUpdateData(result);
+                    }
                 }, function () {
                     stagePosSpreadObj.loadCurPosData();
                 });
@@ -1244,7 +1259,9 @@ $(document).ready(() => {
                         }
                         const nodes = stageTree.loadPostStageData(result.ledger);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
-                        detail.loadStagePosUpdateData(result);
+                        if (detail) {
+                            detail.loadStagePosUpdateData(result);
+                        }
                         // todo 只加载改变项
                         stagePosSpreadObj.loadCurPosData();
                     });
@@ -1268,7 +1285,9 @@ $(document).ready(() => {
                         const refreshData = stageTree.loadPostStageData(result.ledger);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), refreshData);
                         stagePosSpreadObj.loadCurPosData();
-                        detail.loadStagePosUpdateData(result);
+                        if (detail) {
+                            detail.loadStagePosUpdateData(result);
+                        }
                     });
                 }
             }
@@ -1426,6 +1445,12 @@ $(document).ready(() => {
             autoFlashHeight();
             slSpread.refresh();
             spSpread.refresh();
+            if (searchLedger) {
+                searchLedger.spread.refresh();
+            }
+            if (detail) {
+                detail.spread.refresh();
+            }
         }
     });
 
@@ -1737,6 +1762,9 @@ $(document).ready(() => {
             if (searchLedger) {
                 searchLedger.spread.refresh();
             }
+            if (detail) {
+                detail.spread.refresh();
+            }
         }
     });
 
@@ -1748,7 +1776,6 @@ $(document).ready(() => {
                     {title: '编号', colSpan: '1', rowSpan: '1', field: 'code', hAlign: 0, width: 80, formatter: '@', readOnly: true},
                     {title: '中间计量表号', colSpan: '1', rowSpan: '1', field: 'im_code', hAlign: 0, width: 150, formatter: '@', readOnly: true},
                     {title: '交工证书/凭证号', colSpan: '1', rowSpan: '1', field: 'doc_code', hAlign: 0, width: 180, formatter: '@'},
-                    {title: '分部分项工程', colSpan: '1', rowSpan: '1', field: 'fbfx', hAlign: 0, width: 150, formatter: '@', readOnly: true},
                     {
                         title: stage.im_type === imType.tz.value ? '本期计量金额' : '本期计量数量',
                         colSpan: '1', rowSpan: '1', field: 'jl', hAlign: 2, width: 220, formatter: '@', readOnly: true
@@ -2194,7 +2221,7 @@ $(document).ready(() => {
                 }
 
                 const data = SpreadJsObj.getSelectObject(self.spread.getActiveSheet());
-                const updateData = {lid: data.lid};
+                const updateData = {lid: data.lid, pid: data.pid};
                 if (data.uuid) {
                     updateData.uuid = data.uuid;
                 } else {
@@ -2203,8 +2230,6 @@ $(document).ready(() => {
                     updateData.unit = data.unit;
                     updateData.unit_price = data.unit_price;
                 }
-                updateData.bgl_code = $('#bgl-code').val();
-                updateData.bgl_drawing_code = $('#bgl-drawing-code').val();
                 updateData.bw = $('#bw-name').val();
                 updateData.peg = $('#peg').val();
                 updateData.xm = $('#xm-name').val();

app/public/js/stage_im.js

@@ -9,7 +9,7 @@
  */
 
 const stageIm = (function () {
-    const imFields = ['uuid', 'doc_code', 'bgl_code', 'bgl_drawing_code', 'peg', 'bw', 'xm', 'drawing_code', 'calc_memo', 'calc_img'];
+    const imFields = ['uuid', 'doc_code', 'peg', 'bw', 'xm', 'drawing_code', 'calc_memo', 'calc_img'];
     const splitChar = '-';
     let stage, imType, details, changes, ImData, pre;
     const gsTreeSetting = {

app/view/stage/index.ejs

@@ -151,13 +151,13 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text">变更令号</span>
                                     </div>
-                                    <input type="text" class="form-control" value="" id="bgl-code">
+                                    <input type="text" class="form-control" value="" readonly="" id="bgl-code">
                                 </div>
                                 <div class="input-group input-group-sm mb-2">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text">变更图号</span>
                                     </div>
-                                    <input type="text" class="form-control" value="" id="bgl-drawing-code">
+                                    <input type="text" class="form-control" value="" readonly="" id="bgl-drawing-code">
                                 </div>
                                 <div class="input-group input-group-sm mb-2">
                                     <div class="input-group-prepend">