MaiXinRong před 3 týdny
rodič
revize
4160835660
2 změnil soubory, kde provedl 5 přidání a 2 odebrání
  1. 2 1
      app/public/js/stage.js
  2. 3 1
      app/view/template/pos_calc.ejs

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

@@ -5492,7 +5492,7 @@ $(document).ready(() => {
             auditLockedHis.forEach(x => {
                 x.org_locked_lid = x.audit_locked_lid.split(',').map(y => { return parseInt(y); });
                 x.new_locked_lid = [];
-                for (const lid in x.org_locked_lid) {
+                for (const lid of x.org_locked_lid) {
                     if (lockedLid.indexOf(lid) >= 0) x.new_locked_lid.push(lid);
                 }
             });
@@ -5657,6 +5657,7 @@ $(document).ready(() => {
                 tree: stageTree,
                 auditLocked: result.auditLocked,
                 callback: async function(auditLocked) {
+                    if (auditLocked.length === 0) return;
                     const newAuditLocked = await postDataAsync(window.location.pathname + '/unlock', { updateType: 'audit_locked_lid', updateData: auditLocked});
                     if (newAuditLocked.length === 0) $('#sp-unlock').hide();
                 }

+ 3 - 1
app/view/template/pos_calc.ejs

@@ -51,7 +51,9 @@
                                         <a href="javascript: void(0);" name="template-opr" type="move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="移动"><i class="fa fa-exchange" aria-hidden="true"></i></a>
                                         <a href="javascript: void(0);" id="copy-template" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="复制模板"><i class="fa fa-copy" aria-hidden="true"></i></a>
                                         <a href="javascript: void(0);" id="paste-template" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="粘贴模板"><i class="fa fa-paste" aria-hidden="true"></i></a>
-                                        <button class="btn btn-sm btn-light text-primary" href="#rela-no-folder" data-toggle="modal" data-target="#rela-no-folder"> 导入未分类模板</button>
+                                        <a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="batch-import"> 导入</a>
+                                        <a href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="batch-export"> 导出</a>
+                                        <!--<button class="btn btn-sm btn-light text-primary" href="#rela-no-folder" data-toggle="modal" data-target="#rela-no-folder"> 导入未分类模板</button>-->
                                     </li>
                                 </ul>
                             </div>