Browse Source

多人协同,非当前操作人,不可确认

MaiXinRong 2 years ago
parent
commit
b32500eb5d
2 changed files with 6 additions and 5 deletions
  1. 1 1
      app/public/js/stage.js
  2. 5 4
      sql/update.sql

+ 1 - 1
app/public/js/stage.js

@@ -381,7 +381,7 @@ $(document).ready(() => {
                 html.push('<td>', moment(p.confirm_time).format('YYYY-MM-DD HH:mm') + ' ' + `<a name="ledger-unconfirm" href="javascript: void(0);" lid="${p.ledger_id}">重新审批</a>`, '</td>');
             } else if (!p.check && p.confirm) {
                 html.push('<td>', moment(p.confirm_time).format('YYYY-MM-DD HH:mm'), '</td>');
-            } else if (p.check && !p.confirm) {
+            } else if (p.check && !p.confirm && !readOnly) {
                 html.push('<td>', `<a name="ledger-confirm" href="javascript: void(0);" lid="${p.ledger_id}" class="btn btn-sm btn-success">确认</a>`, '</td>');
             } else {
                 const lockedInfo = stageTree.getLockedInfo(p.node);

+ 5 - 4
sql/update.sql

@@ -1,5 +1,6 @@
-ALTER TABLE `zh_cooperation_confirm`
-ADD COLUMN `locked`  tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否锁定' AFTER `create_time`;
-
 ALTER TABLE `zh_s2b_spec_msg`
-ADD COLUMN `push_count`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '执行推送数量' AFTER `status`;
+ADD COLUMN `push_count`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '执行推送数量' AFTER `status`;
+-- 以上于2022/11/2更新uat、prod,下次更新时,不可执行
+
+ALTER TABLE `zh_cooperation_confirm`
+ADD COLUMN `locked`  tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否锁定' AFTER `create_time`;