Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

resources/js/queryForm/header.js

@@ -4,10 +4,10 @@ window.Header = function getHeader(object) {
     let _targetDom = object.el ? document.getElementById(object.el) : document.getElementsByTagName("table")[0];//基点元素
     let _columns = object.column;   //列名
     let _fixedTop = object.fixedTop || 0;  //同级浮动元素高度，使当前元素追加该元素高度浮动
-    let _isCheckAllBox = object.isCheckAllBox || true;//是否开启全选框
+    let _isCheckAllBox = object.isCheckAllBox!==false;//是否开启全选框
     let _data = object.data || [];   //被排序数据
     let _restorationColumn = object.restorationColumn || 'id'; //恢复原数据基准字段
-    let _is_restorationColumn_asc = object.is_restorationColumn_asc || false;    //恢复原数据基准字段的排序类型 true:asc false:desc
+    let _isRestorationColumnAsc = object.isRestorationColumnAsc || false;    //恢复原数据基准字段的排序类型 true:asc false:desc
     let _before = object.before;//前置元素
     let _name = "header:"+(object.name ? object.name+"." : "");//唯一名称 用于区别模块 本地存储
     let _isForbidDrag = object.isForbidDrag;
@@ -61,7 +61,6 @@ window.Header = function getHeader(object) {
         let firstTr = _targetDom.getElementsByTagName("tr")[0];
         let tds = [];
         if (firstTr)tds = firstTr.children;
-
         if (_isCheckAllBox){//是否开启全选
             let div = document.createElement("div");
             let check = document.createElement("input");
@@ -77,7 +76,7 @@ window.Header = function getHeader(object) {
             let div = document.createElement("div");
             let th = appendFloat(div);
             let column = _columns[(_isCheckAllBox && firstTr) ? i-1 : i];
-            let wid = localStorage.getItem(_name+column.name);
+            let wid = column ? localStorage.getItem(_name+column.name) : null;
             if (wid){
                 div.style.width = wid+"px";
                 th.style.minWidth = wid+"px";
@@ -175,7 +174,7 @@ window.Header = function getHeader(object) {
                         for(let i = gap; i < len; i++) {
                             let j = i;
                             let current = arr[i];
-                            if (_is_restorationColumn_asc){
+                            if (_isRestorationColumnAsc){
                                 while(j - gap >= 0 && Number(current[_restorationColumn]) < Number(arr[j - gap][_restorationColumn])) {
                                     arr[j] = arr[j - gap];
                                     j = j - gap;

resources/views/inventory/statement/changeInventory.blade.php

@@ -139,7 +139,7 @@
                     column: column,
                     data: this.oracleActTransactingLogs,
                     restorationColumn: 'rn',
-                    is_restorationColumn_asc:true,
+                    isRestorationColumnAsc:true,
                     fixedTop:($('#form_div').height())+2,
                 }).init();
 

resources/views/maintenance/role/index.blade.php

@@ -85,6 +85,7 @@
                     column: column,
                     data: this.roles,
                     fixedTop: ($('#form_div').height())+2,
+                    isCheckAllBox:false,
                 }).init();
             },
             methods:{

resources/views/maintenance/user/index.blade.php

@@ -101,7 +101,8 @@
                     column: column,
                     data: this.users,
                     fixedTop: ($('#form_div').height())+2,
-                    is_restorationColumn_asc:true,
+                    isRestorationColumnAsc:true,
+                    isCheckAllBox:false,
                 }).init();
             },
             methods:{

resources/views/process/index.blade.php

@@ -587,7 +587,7 @@
                     data: this.processes,
                     restorationColumn: 'serial_number',
                     fixedTop:($('#form_div').height())+2,
-                    is_restorationColumn_asc :true,
+                    isRestorationColumnAsc :true,
                     isForbidDrag:true,
                 }).init();
             },