浏览代码

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

MaiXinRong 4 年之前
父节点
当前提交
9be3994d7f
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      app/public/js/shenpi.js

+ 6 - 3
app/public/js/shenpi.js

@@ -769,6 +769,7 @@ $(document).ready(function () {
                     user_id,
                     pwd: validText,
                 };
+                info.sheet.setSelection(info.row, 0, 1, 1);
                 postData('/tender/' + cur_tenderid + '/shenpi/audit/save', data, function (result) {
                     const lcindex = _.findIndex(ledger_cooperation_list, { ledger_id: select.ledger_id, user_id });
                     let flag = false;
@@ -1054,9 +1055,11 @@ function setParentCanEdit(datas, id, flag) {
 function setAllChildrenCanEdit(ledgerInfo, flag) {
     if (ledgerInfo.children && ledgerInfo.children.length > 0) {
         for(const li of ledgerInfo.children) {
-            li.can_edit = flag;
-            selects.push(li);
-            setAllChildrenCanEdit(li, flag);
+            if (li.pwd === undefined || li.pwd === null) {
+                li.can_edit = flag;
+                selects.push(li);
+                setAllChildrenCanEdit(li, flag);
+            }
         }
     }
 }