Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -755,6 +755,7 @@ export default {
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
+      console.log(val)
       if (this.entryNameValue !== null && this.entryNameValue !== '') {
         if (this.entryNameValue !== null && this.entryNameValue !== '') {
           this.check = 1
@@ -786,7 +787,8 @@ export default {
         } else {
           this.check5 = 0
         }
-        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
+          console.log(response)
           for (let i = 0; i < response.data.rows.length; i++) {
             if (response.data.rows[i].入库时间 !== '') {
               response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
@@ -837,7 +839,7 @@ export default {
         } else {
           this.check5 = 0
         }
-        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
           for (let i = 0; i < response.data.rows.length; i++) {
             if (response.data.rows[i].入库时间 !== '') {
               response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -1011,7 +1011,7 @@ export default {
                 tr[i].setAttribute('class', 'tableData')
                 tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
                     '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                document.getElementById('tableHead').after(tr[i])
+                $('#tableHead').after(tr[i])
               }
               for (let j = 0; j < this.returns.length; j++) {
                 document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1138,7 +1138,7 @@ export default {
                 tr[i].setAttribute('class', 'tableData')
                 tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
                     '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                document.getElementById('tableHead').after(tr[i])
+                $('#tableHead').after(tr[i])
               }
               for (let j = 0; j < this.returns.length; j++) {
                 document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1352,7 +1352,7 @@ export default {
                 tr[i].setAttribute('class', 'tableData')
                 tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
                     '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                document.getElementById('tableHead').after(tr[i])
+                $('#tableHead').after(tr[i])
               }
               for (let j = 0; j < this.returns.length; j++) {
                 document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1

src/views/Outsourcing/OutsourcingTaskQuery/index.vue

@@ -451,7 +451,7 @@ export default {
           tr[i].setAttribute('class', 'tableData')
           tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
               '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-          document.getElementById('tableHead').after(tr[i])
+          $('#tableHead').after(tr[i])
         }
         for (let j = 0; j < this.returns.length; j++) {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -750,7 +750,7 @@ export default {
                 tr[i].setAttribute('class', 'tableData')
                 tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
                     '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                document.getElementById('tableHead').after(tr[i])
+                $('#tableHead').after(tr[i])
               }
               for (let j = 0; j < this.returns.length; j++) {
                 document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -877,7 +877,7 @@ export default {
                 tr[i].setAttribute('class', 'tableData')
                 tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
                     '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                document.getElementById('tableHead').after(tr[i])
+                $('#tableHead').after(tr[i])
               }
               for (let j = 0; j < this.returns.length; j++) {
                 document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1092,7 +1092,7 @@ export default {
                 tr[i].setAttribute('class', 'tableData')
                 tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
                     '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                document.getElementById('tableHead').after(tr[i])
+                $('#tableHead').after(tr[i])
               }
               for (let j = 0; j < this.returns.length; j++) {
                 document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
@@ -1227,7 +1227,7 @@ export default {
                   tr[i].setAttribute('class', 'tableData')
                   tr[i].innerHTML = '<td></td>' + '<td colspan="5"></td>' + '<td colspan="2"></td>' + '<td colspan="2"></td>' +
                       '<td colspan="9" style="text-align: left;"></td>' + '<td colspan="1"></td>' + '<td></td><td></td><td></td><td></td><td colspan="2"></td><td colspan="2"></td>'
-                  document.getElementById('tableHead').after(tr[i])
+                  $('#tableHead').after(tr[i])
                 }
                 for (let j = 0; j < this.returns.length; j++) {
                   document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1