luolei 4 éve
szülő
commit
4c046091a3

+ 26 - 15
src/components/autoTest/AutoBillCommonTest.vue

@@ -240,13 +240,14 @@ export default {
   },
   created() {
     const localAuto = localStorage.getItem('localAuto');
-    let params;
-    if(localAuto){
-      params = JSON.parse(localStorage.getItem(localAuto));
-    }else{
-      params = this.handleInitData();
-      localStorage.setItem('localAuto',JSON.stringify(params))
-    }
+    let params = this.handleInitData();;
+    // if(localAuto&&!this.$route.param){
+    //   params = JSON.parse(localAuto);
+    // }else{
+    //   alert(999)
+    //   params = this.handleInitData();
+    //   localStorage.setItem('localAuto',JSON.stringify(params))
+    // }
     this.getDataList();
     this.getDroplistData(params);
   },
@@ -295,15 +296,17 @@ export default {
       this.getDataList();
     },
     handleInitData() {
-      const { data, type } = this.$route.params;
-      this.type = type;
+      const localAuto = JSON.parse(localStorage.getItem('localAuto'));
+      const { data, type,hospitalName } = this.$route.params;
+      this.type = type||localAuto.type;
       return {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        resultId: data && data.resultId,
-        success: type === 'success' ? 1 : 0,
+        resultId: data && data.resultId||localAuto.resultId,
+        success: type === 'success' ? 1 : type === 'failed'? 0 : localAuto.type === 'success' ? 1 : 0,
         ruleLibType:this.autoType||null,//规则术语类型
         ruleLibName:this.autoRule,//规则医学标准术语(模糊查询)
+        hospitalName:hospitalName||localAuto.hospitalName,
         ruleBaseLibType:this.baseType,//基础规则术语类型
         ruleBaseLibName:this.baseHosTxt,//基础规则医学标准术语(模糊查询)
         message:this.whyTxt,//失败原因(模糊查询
@@ -349,10 +352,18 @@ export default {
     },
     // 导出
     exportData() {
-      const { data, hospitalId, hospitalName, type } = this.$route.params;
+
+      const localAuto = localStorage.getItem('localAuto');
+      let parm;
+      if(localAuto){
+        parm = JSON.parse(localAuto);
+      }else{
+        parm = this.handleInitData();
+      }
+    
       let params = {
-        success: type === 'success' ? 1 : 0,
-        resultId: data.resultId,
+        success: parm.success,
+        resultId: parm.resultId,
         billType: 1, //1:通用,2:输血
       };
       this.$alert('确定要导出规则测试结果吗?', '', {
@@ -366,7 +377,7 @@ export default {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(
                 res.data,
-                `${hospitalName}-开单合理性提醒规则测试结果.xlsx`
+                `${parm.hospitalName}-开单合理性提醒规则测试结果.xlsx`
               );
             }
           });

+ 6 - 0
src/components/autoTest/AutoKnowledgeMapRuleTest.vue

@@ -266,6 +266,12 @@ export default {
       const page = this.handleGoPage(row.caseName);
       let hospital = this.hospitalData.find(item => item.id === this.hospitalId);
       let hospitalName = hospital.name;
+      let localAuto = {
+        resultId:row.resultId,
+        type,
+        hospitalName
+      }
+      localStorage.setItem('localAuto',JSON.stringify(localAuto))
       this.$router.push({
         name: 'AutoBillCommonTest',
         params: {