Merge remote-tracking branch 'remotes/origin/uat'

app/controller/material_controller.js

@@ -367,6 +367,19 @@ module.exports = app => {
                 }
                 searchsql.t_type = materialConst.t_type[0].value;
                 renderData.materialBillsData = await ctx.service.materialBills.getAllDataByCondition({ where: searchsql });
+                // 取对应期的截取上期的调差金额和应耗数量
+                if (ctx.material.highOrder !== ctx.material.order) {
+                    for (const [mindex, mb] of renderData.materialBillsData.entries()) {
+                        const result = await ctx.service.materialBillsHistory.getByMbId(ctx.material.id, ctx.material.order, mb.id);
+                        _.forEach(result, function(value, key) {
+                            if (key === 'mb_id') {
+                                renderData.materialBillsData[mindex].id = result ? result[key] : null;
+                            } else {
+                                renderData.materialBillsData[mindex][key] = result ? result[key] : null;
+                            }
+                        });
+                    }
+                }
                 // 取所有已被调用的工料清单表
                 renderData.materialListData = await ctx.service.materialList.getMaterialData(ctx.tender.id, ctx.material.id);
                 renderData.materialNotJoinListData = await ctx.service.materialListNotjoin.getAllDataByCondition({ where: { tid: ctx.tender.id, mid: ctx.material.id } });

app/lib/rpt_data_analysis.js

@@ -1516,7 +1516,7 @@ const loadCooperationData = {
     },
 };
 const signSelect = {
-    name: '电子签名',
+    name: '签字',
     hint: '协作模式下，才需使用，其他情况勿需使用',
     defaultSetting: {
         table: 'mem_stage_im_zl',

app/public/js/material_list.js

@@ -8,6 +8,10 @@
  * @version
  */
 
+function getStageId() {
+    return window.location.pathname.split('/')[5];
+}
+
 function findNotJoinLeafXmj(x, type = '') {
     if (type === 'index') {
         return notJoinList.findIndex(function (item) {
@@ -23,7 +27,7 @@ function getMpSpreadByMBData(id) {
     const info = materialBillsData.find(function (item) {
         return item.id === parseInt(id);
     });
-    return info.m_spread;
+    return info ? info.m_spread : 0;
 }
 
 function getMaterialListByLeafXmj(gcl_id, xmj_id, mx_id = null) {

app/public/report/js/rpt_signature.js

@@ -253,7 +253,7 @@ let rptSignatureHelper = {
                     }
                     if (!hasPic) {
                         // 在交互操作中，有可能实际上是没有
-                        elementsStrArr.push('<a href="#add-sign" onclick="rptSignatureHelper.currentSelectedESignAccDom = this.parentNode; rptSignatureHelper.currentSelectedESignAccName = \'' + sCell.signature_name + '\'" data-toggle="modal" data-target="#add-sign"><i class="fa fa-plus"></i> 添加签名</a>');
+                        elementsStrArr.push('<a href="#add-sign" onclick="rptSignatureHelper.currentSelectedESignAccDom = this.parentNode; rptSignatureHelper.currentSelectedESignAccName = \'' + sCell.signature_name + '\'" data-toggle="modal" data-target="#add-sign"><i class="fa fa-plus"></i> 添加签字</a>');
                     }
                     // if (sCell.path || sCell.pic) {
                     // } else {
@@ -355,7 +355,7 @@ let rptSignatureHelper = {
         let jDom = $(dom.parentNode.parentNode);
         jDom.empty();
         jDom.append('<a href="#add-sign" onclick="rptSignatureHelper.currentSelectedESignAccDom = this.parentNode; rptSignatureHelper.currentSelectedESignAccName = \'' +
-            accTxtName + '\'" data-toggle="modal" data-target="#add-sign"><i class="fa fa-plus"></i> 添加签名</a>');
+            accTxtName + '\'" data-toggle="modal" data-target="#add-sign"><i class="fa fa-plus"></i> 添加签字</a>');
         // 要记得清空相关pre_path属性
         for (const page of zTreeOprObj.currentRptPageRst.items) {
             if (page.signature_cells) {

app/view/profile/sign.ejs

@@ -2,7 +2,7 @@
 <div class="panel-content">
     <div class="panel-title">
         <div class="title-main">
-            <h2>电子签名</h2>
+            <h2>签字</h2>
         </div>
     </div>
     <div class="content-wrap">

app/view/report/index.ejs

@@ -133,7 +133,7 @@
                                 <div class="panel-body">
                                     <button class="btn btn-outline-primary btn-sm" type="button" data-toggle="modal" data-target="#eSignature" onclick="rptSignatureHelper.resetESignature(zTreeOprObj.currentRptPageRst, 'eSignatureBodyDiv'); rptSignatureHelper.checkAndShowCrossTendersESignature();">
                                         <i class="fa fa-pencil"></i><br>
-                                        签名
+                                        签字
                                     </button>
                                 </div>
                             </div>

app/view/report/rpt_all_popup.ejs

@@ -195,7 +195,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">设置电子签名(审核通过后才显示)</h5>
+                <h5 class="modal-title">设置签字(审核通过后才显示)</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -221,7 +221,7 @@
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">批量设置电子签名</h5>
+                <h5 class="modal-title">批量设置签字</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -236,7 +236,7 @@
                         <div class="col-6" id="batch-eSignatureBodyDiv"></div>
                     </div>
                 </div>
-                <div class="alert alert-warning">批量操作会覆盖已设置好的电子签名，请谨慎操作。</div>
+                <div class="alert alert-warning">批量操作会覆盖已设置好的签字，请谨慎操作。</div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
@@ -250,7 +250,7 @@
     <div class="modal-dialog modal-sm" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">添加签名</h5>
+                <h5 class="modal-title">添加签字</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -497,7 +497,7 @@
             </div>
             <div class="modal-body">
                 <h6>归档后，本期报表将自动导出PDF格式，不再受新一期数据影响；</h6>
-                <h6>请确认报表数据无误（正确添加电子签名、设置页面格式等），继续归档操作。</h6>
+                <h6>请确认报表数据无误（正确添加签字、设置页面格式等），继续归档操作。</h6>
 
                 <div class="card">
                     <div class="card-body" id="cardArchiveInfo">

app/view/sign/info.ejs

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>电子签名-计量支付</title>
+    <title>签字-计量支付</title>
     <style>
         #app {
             position: absolute;

builder_report_index_define.js

@@ -59,7 +59,7 @@ const ledger_cooperation = {
         { name: '审批人id', field: 'user_id', type: dataType.int },
         { name: '台账id', field: 'ledger_id', type: dataType.int },
         { name: '密码', field: 'pwd', type: dataType.str },
-        { name: '电子签名地址', field: 'sign_path', type: dataType.str },
+        { name: '签字地址', field: 'sign_path', type: dataType.str },
     ],
 };
 // 其他台账
@@ -1370,11 +1370,11 @@ const stage_audit = {
 };
 
 const sign_select = {
-    name: '电子签名(mem_sign_select)',
+    name: '签字(mem_sign_select)',
     remark: '',
     id: 47,
     key: 'mem_sign_select',
-    prefix: '电子签名',
+    prefix: '签字',
     cols: [
         { name: 'id-1', field: 'sign1.id', type: dataType.int },
         { name: '名字-1', field: 'sign1.name', type: dataType.str },

config/menu.js

@@ -310,7 +310,7 @@ const profileMenu = {
         url: '/profile/wechat',
     },
     sign: {
-        name: '电子签名',
+        name: '签字',
         display: false,
         url: '/profile/sign',
     },