Merge remote-tracking branch 'origin/master'

src/views/mes/reportWork/index.vue

@@ -170,6 +170,8 @@
 			<el-table-column label="排产数量(母)" align="center" prop="quantity" width="100"/>
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="本次报工数量" align="center" prop="quantityFeedback" width="100"/>
+			<el-table-column label="用人数" align="center" prop="useMan" />
+			<el-table-column label="工时" align="center" prop="workTime" />
 			<el-table-column label="报工时间" align="center" prop="feedbackTime" width="150"/><!--加时分秒生成报工单的逻辑要变切记！！-->
 			<!--
 			<el-table-column label="不合格数量" align="center" prop="quantityUnqualified" width="100">
@@ -185,8 +187,7 @@
 			<el-table-column label="报工状态" align="center" prop="uploadStatus" width="100"/>-->
 			<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150"/>
 			<!--<el-table-column label="报工信息" align="center" prop="uploadMsg" width="100"/>-->
-			<el-table-column label="用人数" align="center" prop="useMan" />
+			
-			<el-table-column label="工时" align="center" prop="workTime" />
 			<el-table-column label="线体编码" align="center" prop="machineCode" />
 			<el-table-column label="线体名称" align="center" prop="machineName" />
 			<el-table-column label="班组编码" align="center" prop="teamCode" v-if="false"/>
@@ -311,6 +312,27 @@
 							/>
 							</el-form-item>
 					</el-col>
+                    <el-col :span="6">
+							<el-form-item label="本次报工工时" prop="workTime">
+							<el-input-number
+								:min="0"
+								:step="1"
+								v-model="form.workTime"
+								style="width: 180px"
+							/>
+							</el-form-item>
+					</el-col>
+				   <el-col :span="6">
+							<el-form-item label="本次报工用人" prop="useMan">
+							<el-input-number
+								:min="0"
+								:step="1"
+								v-model="form.useMan"
+								style="width: 180px"
+							/>
+							</el-form-item>
+					</el-col>
+			
 					<!--
                     <el-col :span="6">
 						<el-form-item label="班组编码" prop="teamCode">