Merge branch 'termMap0909' into test

src/components/cdssManage/dept/DeptManage.vue

@@ -524,7 +524,6 @@ export default {
       //   }
       // });
       this.importDeptRecord(formData, header)
-      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
@@ -534,6 +533,7 @@ export default {
       api.importDeptRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -559,6 +559,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/disease/Disease.vue

@@ -509,7 +509,6 @@ export default {
       //   }
       // });
       this.importDiseaseRecord(formData, header);
-      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
@@ -519,6 +518,7 @@ export default {
       api.importDiseaseRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -544,6 +544,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/drug/DrugManage.vue

@@ -545,7 +545,6 @@ export default {
       //   }
       // });
       this.importDrugRecord(formData, header)
-      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
@@ -555,6 +554,7 @@ export default {
       api.importDrugRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -580,6 +580,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/fusion/Fusion.vue

@@ -513,7 +513,6 @@ export default {
       //   }
       // });
       this.importFusionRecord(formData,header)
-      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
@@ -523,6 +522,7 @@ export default {
       api.importFusionRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -548,6 +548,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/lis/Lis.vue

@@ -538,6 +538,7 @@ export default {
       api.importLisRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -563,6 +564,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/nursing/nursing.vue

@@ -485,7 +485,6 @@ export default {
       };
       // this.uploadInfo = '导入中...';
       this.importNurseRecord(formData, header)
-      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
@@ -529,6 +528,7 @@ export default {
       api.importNurseRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -554,6 +554,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/operation/Operation.vue

@@ -537,6 +537,7 @@ export default {
       api.importOperationRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -562,6 +563,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/pacs/Pacs.vue

@@ -529,6 +529,7 @@ export default {
       api.importPacsRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -554,6 +555,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/scale/ScaleManage.vue

@@ -467,7 +467,6 @@ export default {
         }
       };
       this.importScaleRecord(formData, header)
-      this.getDataList();
       // this.uploadInfo = '导入中...';
       // api.importExcelDataVerify(formData, header).then(res => {
       //   if (res.data.code === '00020001') {
@@ -513,6 +512,7 @@ export default {
       api.importScaleRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -538,6 +538,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/tcmdisease/tcmdisease.vue

@@ -491,7 +491,6 @@ export default {
         }
       };
       this.importTcmRecord(formData, header);
-      this.getDataList();
       // this.uploadInfo = '导入中...';
       // api.importExcelDataVerify(formData, header).then(res => {
       //   if (res.data.code === '00020001') {
@@ -537,6 +536,7 @@ export default {
       api.importTcmRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -562,6 +562,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);

src/components/cdssManage/tcmdrome/tcmdrome.vue

@@ -492,7 +492,6 @@ export default {
         }
       };
       this.importTcmdromeRecord(formData, header);
-      this.getDataList();
       // this.uploadInfo = '导入中...';
       // api.importExcelDataVerify(formData, header).then(res => {
       //   if (res.data.code === '00020001') {
@@ -538,6 +537,7 @@ export default {
       api.importTcmdromeRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
+          this.getDataList();
         } else {
           let r = new FileReader();
           r.onload = function() {
@@ -563,6 +563,7 @@ export default {
                 // customClass: 'exportConfirm',
                 type: 'success'
               });
+              this.getDataList();
             }
           };
           r.readAsText(res.data);