更新

src/api/ManufacturingCenter/MonthEndHourAccounting.js

@@ -11,7 +11,7 @@ export function searchTable(num, time, time1, order, orderName, check, name, che
       ModularID: router.currentRoute.path,
       type: '1',
       name: '工艺月底工时核算_查询数据_最新',
-      param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + name,
+      param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + partNumber,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

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)
     },

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -59,7 +59,7 @@
                 {{ scope.row.操作者 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="扫码开始" show-overflow-tooltip width="90">
+            <el-table-column align="center" label="扫码开始" width="90">
               <template slot-scope="scope">
                 {{ scope.row.加工开始时间 }}
               </template>
@@ -75,6 +75,11 @@
       <el-col style="width: 63%">
         <el-card>
           <el-table v-loading="loading" ref="singleTable" :data="tableData" :row-class-name="tableRowClassName" class="table" highlight-current-row border height="630" @row-click="getCurrentRow">
+            <el-table-column align="center" label="跟单号" show-overflow-tooltip width="160">
+              <template slot-scope="scope">
+                {{ scope.row.跟单号 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}

src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue

@@ -24,30 +24,30 @@
           <el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
             <el-table-column label="操作者" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.姓名 }}
+                {{ scope.row.操作工 }}
               </template>
             </el-table-column>
-            <el-table-column label="计划工时" align="center" width="70px">
+            <el-table-column label="计划工时(分)" align="center" width="70px">
               <template slot-scope="scope">
-                {{ scope.row.定额总工时 }}
+                {{ scope.row.计划总工时 }}
               </template>
             </el-table-column>
-            <el-table-column label="实际工时" align="center" width="70px">
+            <el-table-column label="完成工时(分)" align="center" width="70px">
               <template slot-scope="scope">
-                {{ scope.row.设备总工时 }}
+                {{ scope.row.完成总工时 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="录入准结" align="center" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.修补准结总工时 }}
               </template>
             </el-table-column>
+            <!--<el-table-column label="录入准结" align="center" width="70px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.修补准结总工时 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column label="完成数量" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.总数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="扫码工时" align="center" width="70px">
+            <el-table-column label="扫码工时(分)" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.扫码总工时 }}
               </template>
@@ -86,27 +86,27 @@
                 {{ scope.row.完成数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="计划工时" align="center" width="70px">
+            <el-table-column label="计划工时(分)" align="center" width="70px">
               <template slot-scope="scope">
-                {{ scope.row.工时总额 }}
+                {{ scope.row.计划工时 }}
               </template>
             </el-table-column>
-            <el-table-column label="实际工时" align="center" width="70px">
+            <el-table-column label="完成工时(分)" align="center" width="70px">
               <template slot-scope="scope">
-                {{ scope.row.设备工时 }}
+                {{ scope.row.完成工时 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="录入准结" align="center" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.修补准结工时 }}
               </template>
             </el-table-column>
+            <!--<el-table-column label="录入准结" align="center" width="70px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.修补准结工时 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column label="加工时间" align="center" width="115px">
               <template slot-scope="scope">
-                {{ scope.row.操作时间 }}
+                {{ scope.row.完成日期 }}
               </template>
             </el-table-column>
-            <el-table-column label="扫码工时" align="center" width="70px">
+            <el-table-column label="扫码工时(分)" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.扫码工时 }}
               </template>