表头BUG修复

resources/js/queryForm/header.js

@@ -371,7 +371,7 @@ window.Header = function getHeader(object) {
         let total = trs[_before ? 1 : 0].children.length; //最大列
         for (let i=0;i<trs.length;i++){
             if (isNested){ //排除表格嵌套
-                let table = trs[j].parentElement;
+                let table = trs[i].parentElement;
                 while (table.tagName!=='TABLE') table = table.parentElement;
                 if (table.id!==object.el)continue;
             }
@@ -473,7 +473,7 @@ window.Header = function getHeader(object) {
         div.style.display = "none";
         let div1 = document.createElement("div");
         div1.style.width = "100%";
-        div1.style.backgroundColor = "RGB(245,245,200)";
+        div1.style.backgroundColor = "RGB(245,245,220)";
         div1.style.borderTop = "1px solid #1b1e21";
         let div11 = document.createElement("div");
         div11.style.width = "30px";
@@ -481,6 +481,8 @@ window.Header = function getHeader(object) {
         div11.style.textAlign = "center";
         let span = document.createElement("span");
         span.className = "fa fa-gear";
+        span.style.cursor = "pointer";
+        span.onclick = showSetting("setting-2");
         div11.appendChild(span);
         div1.appendChild(div11);
         let div12 = _createSettingHeader("显示列","setting-column");

resources/views/process/index.blade.php

@@ -271,7 +271,7 @@
                 </td>
                 <td v-if="processOne.id" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.completed_amount }}</td>
                 <td v-if="processOne.id" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.created_at }}</td>
-                <td colspan="5" style="margin:0;padding:0;position: relative;min-width: 900px">
+                <td style="margin:0;padding:0;position: relative;min-width: 900px">
                     <div class="w-100" v-if="processUnfold[processOne.code+processOne.id] || processOne.processesContents.length==1 ||
                     (processOne.is_multi_row &&  (processOne.processesContents.length)-(processFullSum[processOne.code])==1) || (!processOne.id &&  processFullSum[processOne.code]==1)">
                         <div class="row" v-for="processesContent in processOne.processesContents"