更新

src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue

@@ -20,6 +20,11 @@
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 720px" height="720px" border @sort-change="sortChange">
+        <el-table-column align="center" label="加工日期" width="110px" sortable="custom" prop="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.完成日期 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="姓名" width="80px" sortable="custom" prop="姓名">
           <template slot-scope="scope">
             {{ scope.row.操作工 }}
@@ -80,11 +85,6 @@
         <!--{{ scope.row.不合格数量 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column align="center" label="加工日期" width="110px" sortable="custom" prop="操作时间">
-          <template slot-scope="scope">
-            {{ scope.row.完成日期 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="备注" width="200px" show-overflow-tooltip="">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
@@ -169,11 +169,20 @@ export default {
         this.$message.warning('请查询出要导出的数据')
         return
       }
+      let check, check1, check2
+      this.name ? check = 1 : check = 0
+      this.partNumber ? check1 = 1 : check1 = 0
+      this.check ? check2 = 1 : check2 = 0
       var param = []
       param[0] = ['开始时间', this.startTime[0]]
       param[1] = ['结束时间', this.startTime[1]]
       param[2] = ['排序名称', this.orderName]
       param[3] = ['排序方式', this.order]
+      param[4] = ['筛选', check2]
+      param[5] = ['操作工_check', check]
+      param[6] = ['操作工', this.name]
+      param[7] = ['零件图号_check', check1]
+      param[8] = ['零件图号', this.partNumber]
       var Data = this.CreateData('2001', '报表_工艺月底工时核算_查询数据', param)
       this.exportExcel_NPOI(Data)
     },