fix:修改问题单 156、157 、158

src/views/pro-operation/report-work/index.vue

@@ -38,16 +38,16 @@
               </el-col>
             </el-row>
 
-<!--            <el-row>
+            <el-row>
               <el-col :span="24">
                 <el-input
                   v-model="operateCondition"
-                  placeholder="请输入工艺条件"
+                  placeholder="备注"
                   style="margin-bottom: 20px"
                   type="textarea"
                 />
               </el-col>
-            </el-row>-->
+            </el-row>
 
             <el-select
               v-if="processStore.scanInfo.batchReport == 1"

src/views/traceability/components/traceability.vue

@@ -3,12 +3,13 @@
     <el-table-column label="工序名称" prop="operationName" />
     <el-table-column label="工段" prop="workSection" />
     <el-table-column label="状态" prop="currentState" />
-    <el-table-column label="工艺条件" prop="operateCondition" />
     <el-table-column label="开始时间" prop="realStartWhen" />
     <el-table-column label="结束时间" prop="realEndWhen" />
-    <el-table-column label="操作人" prop="creator" />
+    <el-table-column label="操作人" prop="operator" />
+    <el-table-column label="报工人" prop="reportName" />
     <el-table-column label="工时" prop="standardWorktime" />
     <el-table-column label="工步" prop="operationSort" />
+    <el-table-column label="备注" prop="operateCondition" />
     <template #empty>
       <div class="empty">
         <Empty />