فهرست منبع

feat(batchRecord): 添加结果列并更新报工状态显示

yusheng 2 هفته پیش
والد
کامیت
82f32e977f
2فایلهای تغییر یافته به همراه13 افزوده شده و 3 حذف شده
  1. 10 2
      src/views/batchRecord/components/list.vue
  2. 3 1
      src/views/produce/components/prenatalExamination/index.vue

+ 10 - 2
src/views/batchRecord/components/list.vue

@@ -292,6 +292,14 @@
               }
             }
           },
+          {
+            label: '结果',
+            prop: 'checkFailed',
+            minWidth: 100,
+            formatter: (row) => {
+              return row.checkFailed == 1 ? '不合格' : '合格';
+            }
+          },
           {
             label: '创建人',
             prop: 'createUserName',
@@ -387,7 +395,7 @@
             page: 1,
             where,
             reportWorkType: this.reportWorkType,
-            recordOrder: [1,2,3].includes(this.reportWorkType) ? 1 : ''
+            recordOrder: [1, 2, 3].includes(this.reportWorkType) ? 1 : ''
           });
         });
       },
@@ -399,7 +407,7 @@
           pageNum: page,
           size: limit,
           reportWorkType: this.reportWorkType,
-          recordOrder: [1,2,3].includes(this.reportWorkType) ? 1 : ''
+          recordOrder: [1, 2, 3].includes(this.reportWorkType) ? 1 : ''
         });
       },
       // 打开编辑新增

+ 3 - 1
src/views/produce/components/prenatalExamination/index.vue

@@ -207,8 +207,10 @@
             return '未报工';
           case 1:
             return '执行中';
-          default:
+          case 2:
             return '已报工';
+          default:
+            return '重新报工';
         }
       },
       // 获取数据