更新

src/views/ManufacturingCenter/ManHourStatistics/index.vue

@@ -14,7 +14,7 @@
         end-placeholder="结束日期"/>
       <el-button type="primary" class="el-icon-search" plain size="small" @click="searchTable();">查询</el-button>
       <el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
-        <el-button type="primary" size="small" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
+        <el-button type="success" size="small" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
       </el-tooltip>
     </el-card>
     <el-card style="width: 720px">
@@ -186,13 +186,13 @@ export default {
       var param = []
       param[0] = ['操作者_check', check]
       param[1] = ['姓名', this.workerName]
-      param[6] = ['时间_check', check1]
+      param[2] = ['时间_check', check1]
       if (check1 === 0) {
-        param[7] = ['开始时间', '']
-        param[8] = ['结束时间', '']
+        param[3] = ['开始时间', '']
+        param[4] = ['结束时间', '']
       } else {
-        param[7] = ['开始时间', this.dateRange[0]]
-        param[8] = ['结束时间', this.dateRange[1]]
+        param[3] = ['开始时间', this.dateRange[0]]
+        param[4] = ['结束时间', this.dateRange[1]]
       }
       var Data = this.CreateData('2001', '报表_人员工时查询', param)
       this.exportExcel_NPOI(Data)

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -297,6 +297,13 @@ export default {
       this.finishTime ? check5 = 1 : (check5 = 0, this.finishTime = '')
       search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1]).then(response => {
         this.tableData = response.data.rows
+        this.tableData.map(v => {
+          this.$set(v)
+          if (v.工艺员 === '超级管理员') {
+            v.工艺员 = ''
+          }
+          return v
+        })
         this.total = response.data.total
         this.loading = false
       })