debug

modules/bills_lib/models/bills_lib_interfaces.js

@@ -9,6 +9,7 @@ let Bills = mongoose.model('std_bills_lib_bills');
 let JobContent = mongoose.model('std_bills_lib_jobContent');
 let ItemCharacter = mongoose.model('std_bills_lib_itemCharacter');
 let moment = require("moment");
+let billsGuidanceLib = mongoose.model('std_billsGuidance_lib');
 let billsLibDao = function(){};
 
 
@@ -193,7 +194,14 @@ billsLibDao.prototype.renameStdBillsLib = function(renameData, callback){
                         callback(1, "Error");
                     }
                     else{
-                        callback(0, "");
+                        billsGuidanceLib.update({billsLibId: billsLibId}, {$set: {billsLibName: renameVal}}, {multi: true}, function (err) {
+                            if(err){
+                                callback(1, "Error");
+                            }
+                            else {
+                                callback(0, "");
+                            }
+                        });
                     }
                 });
             }

web/maintain/billsGuidance_lib/html/main.html

@@ -68,8 +68,8 @@
                   </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a href="javascript:void(0);" id="addY" class="btn btn-primary">新建</a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -101,8 +101,8 @@
                   </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a href="javascript:void(0);" id="editY" class="btn btn-primary">确定</a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>

web/maintain/bills_lib/html/main.html

@@ -68,8 +68,8 @@
                   </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a id="createA"  href="javascript:void(0);" class="btn btn-primary">新建</a>
+                    <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -93,8 +93,8 @@
                   </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a id="renameA" href="javascript: void(0);" class="btn btn-primary" data-dismiss="modal" renameId="">确定</a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>

web/maintain/std_glj_lib/html/gongliao.html

@@ -35,7 +35,7 @@
         </nav>
     </div>
     <div class="main">
-        <div class="content" style="z-index: 700">
+        <div class="content" style="z-index: 700; overflow: hidden">
             <div class="container-fluid">
                 <div class="row">
                     <!--org 3:7:2-->

web/maintain/std_glj_lib/html/main.html

@@ -69,8 +69,8 @@
                   </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a id="addBtn" href="javascript:void(0)" class="btn btn-primary">新建</a>
+                    <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -98,8 +98,8 @@
                   </form>
                 </div>
                 <div class="modal-footer">
-                    <button id="editCancelBtn" type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a href="javascript: void(0);"  id="renameA" class="btn btn-primary">确定</a>
+                    <button id="editCancelBtn" type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>

web/maintain/std_glj_lib/js/gljComponent.js

@@ -348,6 +348,12 @@ let gljComponentOprObj = {
                 that.updateRationBasePrcRq(updateBasePrc)
             }
         }
+        let focusInter = setInterval(function () {
+            if(!$('#loadingPage').is(':visible')){
+                me.workBook.focus(true);
+                clearInterval(focusInter);
+            }
+        }, 100);
     },
     onClipboardPasting: function (sender, info) {
         let me = gljComponentOprObj;

web/users/views/tool/index.html

@@ -33,7 +33,7 @@
             <div class="col-xs-6 mb-30 ">
                 <div class="c-body">
                     <h2>清单指引编辑器
-                        <a id="billsGuidanceLib" href="/billsGuidance/main" class="btn btn-primary pull-right">进入</a></h2>
+                        <a id="billsGuidanceLib" href="javascript:void(0);" class="btn btn-primary pull-right">进入</a></h2>
                 </div>
             </div>
             <div class="col-xs-6 mb-30 ">