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

app/public/js/path_tree.js

@@ -1183,17 +1183,6 @@ const createNewPathTree = function (type, setting) {
             this.loadingPwd = false;
         }
 
-        // 解锁相关
-        _loadOnlinePwd() {
-            const cacheArr = this.pwdList;
-            for (const ca of cacheArr) {
-                if (!ca) continue;
-                if (!ca.ledger_id || !ca.pwd) continue;
-
-                const p = this.pwd.find(x => {return x.ledger_id == ca.ledger_id});
-                if (p) p.check = p.pwd === ca.pwd;
-            }
-        }
         // 确认相关
         _loadOnlineConfirm() {
             const cacheArr = this.confirmList;
@@ -1208,22 +1197,6 @@ const createNewPathTree = function (type, setting) {
                 }
             }
         }
-        // loadOnlinePwd(data, pwdList, confirmList) {
-        //     this.loadingPwd = true;
-        //     try {
-        //         this.pwdList = pwdList;
-        //         this.confirmList = confirmList;
-        //         this.pwd = data;
-        //         this._loadOnlinePwd();
-        //         this._loadOnlineConfirm();
-        //         // 旧数据上传，新数据补齐
-        //         for (const p of this.pwd) {
-        //             p.node = this.getItems(p.ledger_id);
-        //             this.lockNode(p, !p.check);
-        //         }
-        //     } catch(err) {}
-        //     this.loadingPwd = false;
-        // }
 
         getStageItems(id) {
             return this.stageItems[itemsPre + id];

app/public/js/stage.js

@@ -349,7 +349,6 @@ $(document).ready(() => {
             } else {
                 html.push('<td>', '</td>');
             }
-            // html.push('<td>', p.check ? (p.confirm ? (moment(p.confirm_time).format('YYYY-MM-DD HH:mm') + ' ' + (coopwd ? `<a name="ledger-unconfirm" href="javascript: void(0);" lid="${p.ledger_id}">重新审批</a>` : '')) : `<a name="ledger-confirm" href="javascript: void(0);" lid="${p.ledger_id}" class="btn btn-sm btn-success">确认</a>`) : '' ,'</td>');
             html.push('</tr>');
         }
         $('#cooperationList').html(html.join(''));
@@ -1968,7 +1967,6 @@ $(document).ready(() => {
         // 加载解锁相关
         if (result.cooperation) {
             stageTree.loadPwd(result.cooperation, 'bills-p-' + userID + '-' + window.location.pathname.split('/')[2], result.cooperationConfirm);
-            // stageTree.loadOnlinePwd(result.cooperation, result.cooperationPwd, result.cooperationConfirm);
             $('#cooperationCount').html(stageTree.pwd.length || '');
             if (stageTree.pwd.length > 0) $('#cooperationCount').parent().show();
             setCooperationSelectHtml();
@@ -4133,9 +4131,6 @@ $(document).ready(() => {
         if (p.pwd === $('#unlock-pwd').val()) {
             const refresh = stageTree.lockNode(p, false);
             // 修改线上
-            // postData(window.location.pathname + '/save/cooperation', { type: 'save-pwd', postData: { ledger_id: lid, pwd: $('#unlock-pwd').val() } }, function (result) {
-            //     stageTree.pwdList = result.cooperationPwd;
-            // });
             SpreadJsObj.reloadRowsReadonly(slSpread.getActiveSheet(), refresh);
             stagePosSpreadObj.loadCurPosData();
             $('#unlock').modal('hide');

app/view/tender/tender_sub_menu.ejs

@@ -58,11 +58,11 @@
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/report') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/report"><i class="fa fa-file-text-o"></i> <span>报表</span></a></li>
             </ul>
         </div>
-        <div class="nav-box">
-            <ul class="nav-list list-unstyled">
-                <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/archiveReport') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/archiveReport"><i class="fa fa-archive"></i> <span>归档报表</span></a></li>
-            </ul>
-        </div>
+        <!--<div class="nav-box">-->
+            <!--<ul class="nav-list list-unstyled">-->
+                <!--<li <% if (ctx.url === '/tender/' + ctx.tender.id + '/archiveReport') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/archiveReport"><i class="fa fa-archive"></i> <span>归档报表</span></a></li>-->
+            <!--</ul>-->
+        <!--</div>-->
         <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-upload fa-rotate-270"></i></a></div>
     </div>
 </div>

app/view/tender/tender_sub_mini_menu.ejs

@@ -62,11 +62,11 @@
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/report') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/report"><i class="fa fa-file-text-o"></i> <span>报表</span></a></li>
             </ul>
         </div>
-        <div class="nav-box">
-            <ul class="nav-list list-unstyled">
-                <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/archiveReport') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/archiveReport"><i class="fa fa-archive"></i> <span>归档报表</span></a></li>
-            </ul>
-        </div>
+        <!--<div class="nav-box">-->
+            <!--<ul class="nav-list list-unstyled">-->
+                <!--<li <% if (ctx.url === '/tender/' + ctx.tender.id + '/archiveReport') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/archiveReport"><i class="fa fa-archive"></i> <span>归档报表</span></a></li>-->
+            <!--</ul>-->
+        <!--</div>-->
         <div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-upload fa-rotate-90"></i></a></div>
     </div>
 </div>

sql/update.sql

@@ -15,20 +15,6 @@ CREATE TABLE `zh_cooperation_confirm` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='多人协同确认表';
 
---
---
-
-CREATE TABLE `zh_cooperation_pwd` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `tid` int(11) NOT NULL COMMENT '标段id',
-  `ledger_id` int(11) NOT NULL COMMENT '台账id',
-  `uid` int(11) NOT NULL COMMENT '审批人id',
-  `pwd` varchar(20) COLLATE utf8_unicode_ci NOT NULL COMMENT '密码',
-  `create_time` datetime DEFAULT NULL COMMENT '解锁时间',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='多人协同密码解锁表';
-
 
 ALTER TABLE `zh_advance_audit`
 CHANGE COLUMN `type` `type` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '预付款类型，0为开工预付款，1为材料预付款，2为安全生产费预付款' ;
@@ -401,4 +387,4 @@ ALTER TABLE `zh_revise_bills_9`
 ADD COLUMN `gxby_limit`  int(4) NOT NULL DEFAULT -1 COMMENT '计量是否受限，-1不受限，0受限不可计量，1受限可计量' AFTER `gxby_status`,
 ADD COLUMN `gxby_ratio`  decimal(6,4) NOT NULL DEFAULT 0 COMMENT '允许计量比例，-1表示不限制' AFTER `gxby_limit`,
 ADD COLUMN `dagl_limit`  int(4) NOT NULL DEFAULT -1 COMMENT '计量是否受限，-1不受限，0受限不可计量，1受限可计量' AFTER `dagl_status`,
-ADD COLUMN `dagl_ratio`  decimal(6,4) NOT NULL DEFAULT 0 COMMENT '允许计量比例，-1表示不限制' AFTER `dagl_limit`;
+ADD COLUMN `dagl_ratio`  decimal(6,4) NOT NULL DEFAULT 0 COMMENT '允许计量比例，-1表示不限制' AFTER `dagl_limit`;