2024/1/19 返工返修记录

src/views/modules/production/reworkRecord.vue

@@ -117,6 +117,11 @@ export default {
       this.saveRework.reworkEndDate = new Date()
       this.reportWorkDialog = true
       this.saveType = type
+      if (type === 0){
+        if (this.saveRework.productionTime || this.saveRework.productionTime === 0){
+          return
+        }
+      }
       this.saveRework.productionTime = new Decimal(dayjs(new Date()).diff(this.saveRework.createTime,'hour',true)).toFixed(2, Decimal.ROUND_HALF_UP)
       this.saveRework.productionTime = new Decimal(this.saveRework.productionTime).toSignificantDigits()
     },
@@ -228,7 +233,7 @@ export default {
 <template>
 <div>
   <choose-list ref="baseList"  @getBaseData="getBaseData"></choose-list>
-  <el-dialog title="开始返修" @close="closeStartReworkRecordDialog" @open="closeStartReworkRecordDialog" :visible.sync="startReworkRecordDialog" :close-on-click-modal="false" width="13%">
+  <el-dialog title="开始返修" @close="closeStartReworkRecordDialog" :visible.sync="startReworkRecordDialog" :close-on-click-modal="false" width="13%">
     <el-form :model="saveRework" label-position="top" @submit.native.prevent>
       <el-form-item label="派工单号" prop="seqNo">
         <el-input type="number" v-model="saveRework.seqNo" @keydown.native.enter="startRework"></el-input>
@@ -239,7 +244,7 @@ export default {
       <el-button type="primary" @click="startReworkRecordDialog = false">取消</el-button>
     </el-footer>
   </el-dialog>
-  <el-dialog title="派工单返修" :visible.sync="seqNoReworkRecordDialog" :close-on-click-modal="false" width="13%">
+  <el-dialog title="派工单返修" :visible.sync="seqNoReworkRecordDialog" @close="closeStartReworkRecordDialog" :close-on-click-modal="false" width="13%">
     <el-form :model="saveRework" label-position="top" @submit.native.prevent>
       <el-form-item label="派工单号" prop="seqNo">
         <el-input type="number" v-model="saveRework.seqNo" @keydown.native.enter="getRework"></el-input>
@@ -250,7 +255,7 @@ export default {
       <el-button type="primary" @click="seqNoReworkRecordDialog = false">取消</el-button>
     </el-footer>
   </el-dialog>
-  <el-dialog title="返工信息" @close="closeStartReworkRecordDialog" top="15vh" :close-on-click-modal="false" :visible.sync="reportWorkDialog" width="40%">
+  <el-dialog title="返工信息" @close="closeStartReworkRecordDialog" :close-on-click-modal="false" :visible.sync="reportWorkDialog" width="40%">
     <el-form :model="saveRework" style="padding: 5px" label-position="top">
       <el-row :gutter="20">
         <el-col :span="6">
@@ -526,14 +531,14 @@ export default {
     <el-table-column
       header-align="center"
       align="left"
-      min-width="100"
+      min-width="70"
       prop="site"
       label="工厂编码">
     </el-table-column>
     <el-table-column
       header-align="center"
       align="left"
-      min-width="100"
+      min-width="70"
       prop="seqNo"
       label="派工单号">
     </el-table-column>
@@ -561,7 +566,7 @@ export default {
     <el-table-column
       header-align="center"
       align="left"
-      min-width="100"
+      min-width="70"
       prop="workCenterNo"
       label="加工编码">
     </el-table-column>
@@ -584,19 +589,45 @@ export default {
       align="left"
       min-width="100"
       prop="itemDesc"
-      label="工序名称">
+      label="工序名称"/>
+    <el-table-column
+      header-align="center"
+      align="right"
+      min-width="100"
+      prop="qualifiedQty"
+      label="合格数量"/>
+    <el-table-column
+      header-align="center"
+      align="right"
+      min-width="80"
+      prop="missingQty"
+      label="不合格数量">
+    </el-table-column>
+    <el-table-column
+      header-align="center"
+      align="left"
+      min-width="100"
+      prop="operatorName"
+      label="操作员">
+    </el-table-column>
+    <el-table-column
+      header-align="center"
+      align="left"
+      min-width="80"
+      prop="productionTime"
+      label="制造时间(h)">
     </el-table-column>
     <el-table-column
       header-align="center"
       align="center"
       min-width="100"
       prop="reworkStatus"
-      label="工序名称">
+      label="返工状态">
     </el-table-column>
     <el-table-column
       header-align="center"
       align="center"
-      min-width="100"
+      min-width="120"
       prop="createTime"
       label="创建时间">
     </el-table-column>