Bläddra i källkod

清单规则被引用、不可删除

zhongzewei 7 år sedan
förälder
incheckning
98b6147f65

+ 18 - 1
web/maintain/bills_lib/html/main.html

@@ -124,6 +124,7 @@
     <script src="/lib/jquery/jquery.min.js"></script>
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
+    <script src="/public/web/common_ajax.js"></script>
     <script src="/web/maintain/bills_lib/scripts/global.js"></script>
     <script src="/web/maintain/bills_lib/scripts/bills_lib_ajax.js"></script>
     <script src="/web/maintain/bills_lib/scripts/tools.js"></script>
@@ -168,7 +169,23 @@
             preDeleteId = deleteId;
             deleteCount++;
             if(deleteCount === 3){
-                mainAjax.deleteStdBillsLib(userAccount, deleteId);
+                //被清单指引引用则不可删除
+                CommonAjax.post('/billsGuidance/api/getBillsGuideLibs', {}, function (rstData) {
+                    let canDel = true;
+                    for(let lib of rstData){
+                        if(lib.billsLibId == deleteId){
+                            canDel = false;
+                            break;
+                        }
+                    }
+                    if(canDel){
+                        mainAjax.deleteStdBillsLib(userAccount, deleteId);
+                    }
+                    else {
+                        alert('当前清单规则已被清单指引库引用,请先删除对应的清单指引库。');
+                        $('#del').modal('hide');
+                    }
+                });
                 deleteCount = 0;
             }
         });

+ 0 - 27
web/maintain/bills_lib/scripts/bills_lib_ajax.js

@@ -1,33 +1,6 @@
 /**
  * Created by vian on 2017/3/27.
  */
-
-/**
- * 设置全局的AJAX请求默认选项
- * 主要设置了AJAX请求遇到Session过期的情况
- */
-$.ajaxSetup({
-    complete: function (data) {
-        console.log(data);
-        if (data.responseJSON&&data.responseJSON.ret_code && data.responseJSON.ret_code == 99) {
-            alert(data.responseJSON.ret_msg);
-            var top = getTopWindow();
-            setTimeout('top.location.href = "/login";', 300);
-        }
-    }
-});
-
-/**
- * 在页面中任何嵌套层次的窗口中获取顶层窗口
- * @return 当前页面的顶层窗口对象
- */
-function getTopWindow() {
-    var p = window;
-    while (p != p.parent) {
-        p = p.parent;
-    }
-    return p;
-}
 var mainAjax = {
     //获取编办
     getCompilationList: function () {

+ 4 - 4
web/maintain/ration_repository/main.html

@@ -96,8 +96,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>
@@ -123,8 +123,8 @@
                 <div class="modal-footer">
                     <!--<button type="button" id="edtCancel" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <button type="button"  id="edtOK" class="btn btn-secondary" data-dismiss="modal">确定</button>-->
-                    <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>
@@ -173,8 +173,8 @@
                     </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <button type="button" class="btn btn-primary" id="source-import">确定导入</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>
@@ -202,8 +202,8 @@
                     </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <button type="button" class="btn btn-primary" id="data-import">确定导入</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>