Parcourir la source

7191 7208 7202 7207 bug

morphone1995 il y a 4 ans
Parent
commit
b1f9d617ce

+ 21 - 46
src/components/testManager/knowledgeMapRule/CriticalLabTest.vue

@@ -18,18 +18,8 @@
     </crumbs>
     <div style="margin: 60px 20px 0">
       <el-table :data="list" border>
-        <el-table-column
-          :resizable="false"
-          type="index"
-          :index="indexMethod"
-          label="编号"
-          width="80"
-        ></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="gmtModified"
-          label="测试时间"
-        ></el-table-column>
+        <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="80"></el-table-column>
+        <el-table-column :resizable="false" prop="gmtModified" label="测试时间"></el-table-column>
         <el-table-column
           :resizable="false"
           prop="criticalItemName"
@@ -39,33 +29,20 @@
         <el-table-column
           :resizable="false"
           prop="criticalItemHisName"
-          label="实验室检查名(医院术语)"
+          label="实验室检查套餐名(医院术语)"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           :resizable="false"
-          prop="maxValue"
-          label="高危急值"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="minValue"
-          label="低危急值"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="inputValue"
-          label="输入值"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="output"
-          label="实际结果"
+          prop="criticalItemHisDetailName"
+          label="实验室检查名称(医院术语)"
           show-overflow-tooltip
         ></el-table-column>
+
+        <el-table-column :resizable="false" prop="maxValue" label="高危急值" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="minValue" label="低危急值" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="inputValue" label="输入值" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="output" label="实际结果" show-overflow-tooltip></el-table-column>
         <el-table-column
           :resizable="false"
           prop="expectedOutput"
@@ -73,9 +50,7 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column label="测试结果">
-          <template slot-scope="scope">
-            {{ scope.row.success === 1 ? '成功' : '失败' }}
-          </template>
+          <template slot-scope="scope">{{ scope.row.success === 1 ? '成功' : '失败' }}</template>
         </el-table-column>
         <el-table-column
           v-if="type !== 'success'"
@@ -114,7 +89,7 @@ export default {
       pageSizeArr: config.pageSizeArr,
       pageLayout: config.pageLayout,
       total: 0,
-      type: '',
+      type: ''
     };
   },
   created() {
@@ -126,7 +101,7 @@ export default {
     }
   },
   beforeRouteEnter(to, from, next) {
-    next((vm) => {
+    next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
       vm.inCurrentPage = to.params.currentPage;
@@ -147,7 +122,7 @@ export default {
         size: this.pageSize,
         criticalType,
         resultId: data && data.resultId,
-        success: type === 'success' ? 1 : 0,
+        success: type === 'success' ? 1 : 0
       };
     },
     indexMethod(index) {
@@ -174,9 +149,9 @@ export default {
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)',
+        background: 'rgba(0, 0, 0, 0.7)'
       });
-      api.getResultCriticalPage(params).then((res) => {
+      api.getResultCriticalPage(params).then(res => {
         loading.close();
         if (res.data.code === '0') {
           this.list = res.data.data && res.data.data.records;
@@ -194,15 +169,15 @@ export default {
       let params = {
         success: type === 'success' ? 1 : 0,
         resultId: data.resultId,
-        criticalType: 1, //1:检验,2:检查
+        criticalType: 1 //1:检验,2:检查
       };
       this.$alert('确定要导出规则测试结果吗?', '', {
         confirmButtonText: '确定',
         title: '提示',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          api.criticalExportExcel(params).then((res) => {
+          api.criticalExportExcel(params).then(res => {
             if (res.status === 200) {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(
@@ -213,8 +188,8 @@ export default {
           });
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 

+ 7 - 1
src/components/testManager/knowledgeMapRule/OtherAssayRuleTest.vue

@@ -39,12 +39,18 @@
         <el-table-column
           :resizable="false"
           prop="otherItemHisName"
+          label="实验室检查套餐名(医院术语)"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          :resizable="false"
+          prop="otherItemHisDetailName"
           label="实验室检查名称(医院术语)"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           :resizable="false"
-          prop="otherItemRange"
+          prop="inputValue"
           label="实验室检查数值"
           show-overflow-tooltip
         ></el-table-column>

+ 2 - 2
src/components/testManager/knowledgeMapRule/OtherAuxRuleTest.vue

@@ -67,12 +67,12 @@
           label="禁忌项(医院术语)"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           :resizable="false"
           prop="inputAge"
           label="禁忌项输入值/结果"
           show-overflow-tooltip
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           :resizable="false"
           prop="output"

+ 7 - 1
src/components/testManager/knowledgeMapRule/OtherFusionRuleTest.vue

@@ -36,9 +36,15 @@
           label="实验室检查名称(标准术语)"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column
+         <el-table-column
           :resizable="false"
           prop="otherItemHisName"
+          label="实验室检查套餐名(医院术语)"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          :resizable="false"
+          prop="otherItemHisDetailName"
           label="实验室检查名称(医院术语)"
           show-overflow-tooltip
         ></el-table-column>