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

src/api/ManufacturingCenter/machiningHoursStatistics.js

@@ -1,14 +1,14 @@
 import request from '@/utils/request'
 
 // 查询人员总工工时
-export function searchtable(num1, num2, num3, pageCurrent, pageSize) {
+export function searchtable(num1, num2, num3, num4, num5, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_工时统计_查询数据',
-      param: '时间_check=' + num1 + '&开始时间=' + num2 + '&结束时间=' + num3,
+      param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue

@@ -154,7 +154,6 @@ export default {
   methods: {
     // 查询表格数据
     searchTable() {
-      console.log(this.id, this.name)
       this.loading = true
       this.tableData = []
       this.Data = []
@@ -201,7 +200,7 @@ export default {
     searchTable2() {
       this.loading2 = true
       this.tableData2 = []
-      this.Data = []
+      this.Data2 = []
       if (this.partName2 !== '' && this.partName2 !== null) {
         this.partNamecheck2 = 1
       } else {
@@ -211,19 +210,19 @@ export default {
         if (response.data.total === 0) {
           this.loading2 = false
         } else {
-          this.Data = response.data.rows
+          this.Data2 = response.data.rows
           this.total2 = response.data.total
         }
       }).then(() => {
-        for (let i = 0; i < this.Data.length; i++) {
-          searchtable2(this.Data[i].工艺计划流水号).then(response => {
+        for (let i = 0; i < this.Data2.length; i++) {
+          searchtable2(this.Data2[i].工艺计划流水号).then(response => {
             this.tableData2.push({
-              工艺计划流水号: this.Data[i].工艺计划流水号,
-              零件名称: this.Data[i].零件名称,
-              零件图号: this.Data[i].零件图号,
-              重量1: this.Data[i].重量1,
-              单价: this.Data[i].单价,
-              备注1: this.Data[i].备注1,
+              工艺计划流水号: this.Data2[i].工艺计划流水号,
+              零件名称: this.Data2[i].零件名称,
+              零件图号: this.Data2[i].零件图号,
+              重量1: this.Data2[i].重量1,
+              单价: this.Data2[i].单价,
+              备注1: this.Data2[i].备注1,
               工序流水号: response.data[0].工序流水号
             })
           })

src/views/ManufacturingCenter/machiningHoursStatistics/index.vue

@@ -3,6 +3,8 @@
 
     <el-card>
       <el-row>
+        <span>操作者:</span>
+        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/>
         <span class="demonstration">完成加工时间:</span>
         <el-date-picker
           v-model="startTime"
@@ -105,6 +107,7 @@ import { searchtable, searchtable2 } from '@/api/ManufacturingCenter/machiningHo
 export default {
   data() {
     return {
+      workerName: '',
       startTime: '',
       endTime: '',
       loading: false,
@@ -128,12 +131,21 @@ export default {
     searchTable() {
       this.loading = true
       this.tableData = []
+      this.tableData2 = []
+      this.total2 = 0
       if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) {
         this.timeCheck = 1
       } else {
+        this.startTime = ''
+        this.endTime = ''
         this.timeCheck = 0
       }
-      searchtable(this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
+      if (this.workerName !== '' && this.workerName !== null) {
+        this.workerName_ckeck = 1
+      } else {
+        this.workerName_ckeck = 0
+      }
+      searchtable(this.workerName_ckeck, this.workerName, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
         if (response.data.total === 0) {
           this.loading = false
         } else {