报工查询调整

src/views/mes/pro/feedback/index.vue

@@ -117,12 +117,15 @@
         </template>
       </el-table-column>
       <el-table-column label="工作站" width="120" align="center" prop="workstationName" />
+      <el-table-column label="工作单元" width="120" align="center" prop="workunitName" />
       <el-table-column label="生产工单编号" width="150" align="center" prop="workorderCode" />
       <el-table-column label="产品物料编码" width="120" align="center" prop="itemCode" />
       <el-table-column label="产品物料名称" min-width="250" show-overflow-tooltip align="center" prop="itemName" />
       <el-table-column label="规格型号" width="100" align="center" prop="specification" />
-      <el-table-column label="报工数量" width="100" align="center" prop="quantityFeedback" />   
-      <el-table-column label="报工人" width="100" align="center" prop="nickName" />
+      <el-table-column label="指令号" width="120" align="center" prop="clientCmd" />
+      <el-table-column label="标准SIZE" width="120" align="center" prop="standardSize" />
+      <el-table-column label="报工数量" width="100" align="center" prop="quantityFeedback" />
+      <el-table-column label="报工人" width="100" align="center" prop="createTime" />
       <el-table-column label="报工时间" align="center" prop="feedbackTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d}') }}</span>
@@ -162,7 +165,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -509,13 +512,13 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open=false;
               this.getList();
-              
+
             });
           } else {
             addFeedback(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open=false;
-              this.getList();                            
+              this.getList();
             });
           }
         }
@@ -621,7 +624,7 @@ export default {
         this.$refs.userSelect.showFlag = true;
     },
     //人员选择返回
-    onUserSelected(row){                  
+    onUserSelected(row){
         this.form.nickName = row.nickName;
         this.form.userName = row.userName;
     },
@@ -630,7 +633,7 @@ export default {
         this.$refs.user2Select.showFlag = true;
     },
     //人员选择返回
-    onUser2Selected(row){                  
+    onUser2Selected(row){
         this.form.recordUser = row.userName;
         this.form.recordNick = row.nickName;
     },