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

app/public/js/shares/cs_tools.js

@@ -686,7 +686,7 @@ const showSelectTab = function(select, spread, afterShow) {
             tagHtml.push('<div class="pull-right edit-tag-btn">');
             const lid = tag.node ? tag.node.ledger_id : -1;
             tagHtml.push(`<a class="mr-1" name="bills-tag-locate" href="javascript: void(0);" lid="${lid}"><i class="fa fa-crosshairs"></i> 定位</a>`);
-            if (tag.uid === userID) tagHtml.push(`<a href="javascript: void(0);" name="bills-tag-edit" tag-id="${tag.id}"><i class="fa fa-edit"></i> 编辑</a>`);
+            if (tag.uid === userID && !setting.readOnly) tagHtml.push(`<a href="javascript: void(0);" name="bills-tag-edit" tag-id="${tag.id}"><i class="fa fa-edit"></i> 编辑</a>`);
             tagHtml.push('</div>');
             tagHtml.push('<div class="card-body p-2">', '<p class="card-text">', tag.comment, '</p>', '</div>');
             tagHtml.push('</div>');

app/public/js/sr_detail.js

@@ -328,6 +328,7 @@ $(document).ready(() => {
         selector: '#bills-tag',
         relaSpread: slSpread,
         updateUrl: window.location.pathname + '/tag',
+        readOnly: true,
         afterModify: function (nodes) {
             SpreadJsObj.repaintNodesRowHeader(slSpread.getActiveSheet(), nodes);
         },
@@ -844,7 +845,7 @@ $(document).ready(() => {
                 const curIndex = parseInt($('#im-locate-info')[0].innerText.split('/')[0]);
                 const select = SpreadJsObj.getSelectObject(self.spread.getActiveSheet());
                 if (select && select.source) {
-                    const targetIndex = math.max(curIndex-1, 1);
+                    const targetIndex = Math.max(curIndex-1, 1);
                     SpreadJsObj.locateTreeNode(slSpread.getActiveSheet(), select.source[targetIndex-1].id, true);
                     stagePosSpreadObj.loadCurPosData();
                     $('#im-locate-info')[0].innerText = targetIndex + '/' + select.source.length;
@@ -854,7 +855,7 @@ $(document).ready(() => {
                 const curIndex = parseInt($('#im-locate-info')[0].innerText.split('/')[0]);
                 const select = SpreadJsObj.getSelectObject(self.spread.getActiveSheet());
                 if (select && select.source) {
-                    const targetIndex = math.min(curIndex+1, select.source.length);
+                    const targetIndex = Math.min(curIndex+1, select.source.length);
                     SpreadJsObj.locateTreeNode(slSpread.getActiveSheet(), select.source[targetIndex-1].id, true);
                     stagePosSpreadObj.loadCurPosData();
                     $('#im-locate-info')[0].innerText = targetIndex + '/' + select.source.length;

app/public/js/stage.js

@@ -2962,7 +2962,7 @@ $(document).ready(() => {
                 const curIndex = parseInt($('#im-locate-info')[0].innerText.split('/')[0]);
                 const select = SpreadJsObj.getSelectObject(self.spread.getActiveSheet());
                 if (select && select.source) {
-                    const targetIndex = math.max(curIndex-1, 1);
+                    const targetIndex = Math.max(curIndex-1, 1);
                     SpreadJsObj.locateTreeNode(slSpread.getActiveSheet(), select.source[targetIndex-1].id, true);
                     stagePosSpreadObj.loadCurPosData();
                     $('#im-locate-info')[0].innerText = targetIndex + '/' + select.source.length;
@@ -2972,7 +2972,7 @@ $(document).ready(() => {
                 const curIndex = parseInt($('#im-locate-info')[0].innerText.split('/')[0]);
                 const select = SpreadJsObj.getSelectObject(self.spread.getActiveSheet());
                 if (select && select.source) {
-                    const targetIndex = math.min(curIndex+1, select.source.length);
+                    const targetIndex = Math.min(curIndex+1, select.source.length);
                     SpreadJsObj.locateTreeNode(slSpread.getActiveSheet(), select.source[targetIndex-1].id, true);
                     stagePosSpreadObj.loadCurPosData();
                     $('#im-locate-info')[0].innerText = targetIndex + '/' + select.source.length;

app/service/stage_rela.js

@@ -170,7 +170,7 @@ class srCache {
                 this.stagePos.push({
                     tid: this.ctx.tender.id, sid: this.ctx.stage.id, sorder: this.ctx.stage.order,
                     rela_tid: this.stage.tid, rela_sid: this.stage.id, rela_sorder: this.stage.order,
-                    pid: t.pid, lid: t.id,
+                    pid: t.id, lid: t.id,
                     contract_qty: t.contract_qty, contract_expr: t.contract_expr, qc_qty: t.qc_qty, postil: t.postil,
                 });
             }
@@ -178,7 +178,7 @@ class srCache {
                 this.stagePosFinal.push({
                     tid: this.ctx.tender.id, sid: this.ctx.stage.id, sorder: this.ctx.stage.order,
                     rela_tid: this.stage.tid, rela_sid: this.stage.id, rela_sorder: this.stage.order,
-                    pid: t.pid, lid: t.lid,
+                    pid: t.id, lid: t.lid,
                     contract_qty: t.end_contract_qty, qc_qty: t.end_qc_qty
                 })
             }

app/view/report/rpt_individual.ejs

@@ -254,7 +254,7 @@
             pdfFont['SmartSimsun'].push(fontProperty);
         }
         if (pdfFont['SmartSimsun'].length === 2) {
-            JpcJsPDFHelper.outputAsPdf(currentPageRst, PAGE_SIZE, currentReportName, null, null);
+            JpcJsPDFHelper.outputAsPdf(currentPageRst, PAGE_SIZE, currentReportName, [], []);
         }
     }
 

app/view/stage_rela/detail_modal.ejs

@@ -0,0 +1,21 @@
+<!--草图预览-->
+<div class="modal fade" id="imgview" data-backdrop="static">
+    <div class="modal-dialog modal-lgx" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">查看草图</h5>
+            </div>
+            <div class="modal-body">
+                <img src="" id="view-calc-img">
+                <div class="mt-2">
+                    <textarea id="view-calc-remark" class="form-control form-control-sm" placeholder="草图备注" rows="3">
+                    </textarea>
+                </div>
+            </div>
+
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>