Pārlūkot izejas kodu

1. 台账修订,工具栏展开收起问题
2. 合同支付,上传附件问题

MaiXinRong 5 gadi atpakaļ
vecāks
revīzija
574eef1bd6

+ 4 - 0
app/middleware/stage_check.js

@@ -37,10 +37,12 @@ module.exports = options => {
             if (stageOrder <= 0) {
                 throw '您访问的期不存在';
             }
+            console.log(stageOrder);
             const stage = yield this.service.stage.getDataByCondition({
                 tid: this.tender.id,
                 order: stageOrder,
             });
+            console.log(stage);
             if (!stage) {
                 throw '期数据错误';
             }
@@ -57,6 +59,7 @@ module.exports = options => {
             // todo 校验权限 (标段参与人、分享)
             const accountId = this.session.sessionUser.accountId, auditorIds = _.map(stage.auditors, 'aid'), shareIds = [];
             if (accountId === stage.user_id) { // 原报
+                console.log(stage.status);
                 if (stage.curAuditor) {
                     stage.readOnly = stage.curAuditor.aid !== accountId;
                 } else {
@@ -96,6 +99,7 @@ module.exports = options => {
             } else { // 其他不可见
                 throw '您无权查看该数据';
             }
+            console.log(stage.readOnly);
 
             const lastRevise = yield this.service.ledgerRevise.getLastestRevise(this.tender.id);
             stage.revising = (lastRevise && lastRevise.status !== reviseStatus.checked) || false;

+ 4 - 2
app/public/js/revise.js

@@ -1240,8 +1240,10 @@ $(document).ready(() => {
                 searchLedger.spread.refresh();
             }
         }
-        else {
-            showSideTools(false);
+        else {// 收起工具栏
+            tab.removeClass('active');
+            tabPanel.removeClass('active');
+            showSideTools(tab.hasClass('active'));
         }
         billsSpread.refresh();
         if (posSpread) {

+ 5 - 0
app/public/js/revise_history.js

@@ -238,6 +238,11 @@ $(document).ready(() => {
                 searchLedger.spread.refresh();
             }
         }
+        else {// 收起工具栏
+            tab.removeClass('active');
+            tabPanel.removeClass('active');
+            showSideTools(tab.hasClass('active'));
+        }
         billsSpread.refresh();
         if (posSpread) {
             posSpread.refresh();

+ 2 - 2
app/public/js/stage_pay.js

@@ -121,7 +121,7 @@ $(document).ready(() => {
                             return '计提期限为(当 计量期数 ≥ ' + data.dl_count + ')';
                         } else if (data.dl_type === 2) {
                             switch (data.dl_tp_type) {
-                                case 'constract':
+                                case 'contract':
                                     return '计提期限为(累计合同计量 ≥ ' + data.dl_tp + ')';
                                 case 'qc':
                                     return '计提期限为(累计变更计量 ≥ ' + data.dl_tp + ')';
@@ -1141,7 +1141,7 @@ $(document).ready(() => {
             formData.append('file[]', file);
         }
         // formData.append('size', sizes.join(','));
-        postDataWithFile('/tender/' + tender.id + '/measure/stage/' + tender.ledger_times + '/pay/upload/file', formData, function (data) {
+        postDataWithFile('/tender/' + tender.id + '/measure/stage/' + stage.order + '/pay/upload/file', formData, function (data) {
             if (select.attachment === null) {
                 select.attachment = data;
             } else {