Переглянути джерело

[task-7187] 试剂更换验证子表字段调整

huangws 4 днів тому
батько
коміт
18cff24dcd
1 змінених файлів з 16 додано та 16 видалено
  1. 16 16
      src/views/component/newReagent/newReagentHcqd.vue

+ 16 - 16
src/views/component/newReagent/newReagentHcqd.vue

@@ -168,10 +168,10 @@
                 <span v-else>{{ row.yunXuPianYi || '/' }}</span>
                 <span v-else>{{ row.yunXuPianYi || '/' }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="是否相符" prop="xiangFu" width="80" />
-            <el-table-column label="符合率" prop="biaoZhun" />
+            <el-table-column label="是否合格" prop="xiangFu" width="80" />
+            <!--<el-table-column label="符合率" prop="biaoZhun" />-->
             <el-table-column
             <el-table-column
-              label="符合率可接受标准"
+              label="可接受标准"
               prop="xiangMuFuHeLv"
               prop="xiangMuFuHeLv"
               width="140"
               width="140"
             >
             >
@@ -432,7 +432,7 @@ export default {
       let list = [
       let list = [
         {
         {
           field_name: 'xiangFu',
           field_name: 'xiangFu',
-          label: '是否相符',
+          label: '是否合格',
           name: 'xiangFu'
           name: 'xiangFu'
         },
         },
         {
         {
@@ -475,11 +475,11 @@ export default {
           label: '允许偏倚',
           label: '允许偏倚',
           name: 'yunXuPianYi'
           name: 'yunXuPianYi'
         },
         },
-        {
-          field_name: 'biaoZhun',
-          label: '符合率',
-          name: 'biaoZhun'
-        },
+        //{
+        //  field_name: 'biaoZhun',
+        //  label: '符合率',
+        //  name: 'biaoZhun'
+        //},
         {
         {
           field_name: 'jieLun',
           field_name: 'jieLun',
           label: '结论',
           label: '结论',
@@ -487,7 +487,7 @@ export default {
         },
         },
         {
         {
           field_name: 'xiangMuFuHeLv',
           field_name: 'xiangMuFuHeLv',
-          label: '符合率可接受标准',
+          label: '可接受标准',
           name: 'xiangMuFuHeLv'
           name: 'xiangMuFuHeLv'
         }
         }
       ]
       ]
@@ -523,7 +523,7 @@ export default {
         })
         })
         const filteredArray = list
         const filteredArray = list
           .map((item) => {
           .map((item) => {
-            if (item.jianCeXiangMu && item.biaoZhun && item.jieLun) {
+            if (item.jianCeXiangMu && item.jieLun) {
               return item
               return item
             }
             }
             return null
             return null
@@ -532,7 +532,7 @@ export default {
         filteredArray.forEach((item) => {
         filteredArray.forEach((item) => {
           list.forEach((el) => {
           list.forEach((el) => {
             if (el.jianCeXiangMu === item.jianCeXiangMu) {
             if (el.jianCeXiangMu === item.jianCeXiangMu) {
-              el.biaoZhun = item.biaoZhun
+              //el.biaoZhun = item.biaoZhun
               el.jieLun = item.jieLun
               el.jieLun = item.jieLun
               el.xiangMuFuHeLv = item.xiangMuFuHeLv
               el.xiangMuFuHeLv = item.xiangMuFuHeLv
             }
             }
@@ -634,15 +634,15 @@ export default {
           )
           )
           item.xiangFu =
           item.xiangFu =
             normalizePercent(item.jieGuo) <= normalizePercent(item.yunXuPianYi)
             normalizePercent(item.jieGuo) <= normalizePercent(item.yunXuPianYi)
-              ? '相符'
-              : '不相符'
+              ? '合格'
+              : '不合格'
           // item.shiJiChaZhi = ''
           // item.shiJiChaZhi = ''
         }
         }
 
 
         // 统计符合率
         // 统计符合率
         const stats = projectStats.get(jianCeXiangMu) || { total: 0, yes: 0 }
         const stats = projectStats.get(jianCeXiangMu) || { total: 0, yes: 0 }
         stats.total++
         stats.total++
-        if (item.xiangFu === '相符') stats.yes++
+        if (item.xiangFu === '合格') stats.yes++
         projectStats.set(jianCeXiangMu, stats)
         projectStats.set(jianCeXiangMu, stats)
       })
       })
 
 
@@ -661,7 +661,7 @@ export default {
     spanMethod({ row, column, rowIndex, columnIndex }) {
     spanMethod({ row, column, rowIndex, columnIndex }) {
       if (
       if (
         columnIndex === 1 ||
         columnIndex === 1 ||
-        columnIndex === 12 ||
+        columnIndex === 11 ||
         columnIndex === 13 ||
         columnIndex === 13 ||
         columnIndex === 14
         columnIndex === 14
       ) {
       ) {