morphone1995 4 years ago
parent
commit
d04178f451

+ 13 - 30
src/components/cdssManage/dept/DeptManage.vue

@@ -4,22 +4,10 @@
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item>
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
-          <input
-            type="file"
-            name="uploadfile "
-            id="upFile"
-            @change="uploadFile($event)"
-
-          />
+          <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
           <el-button size="mini" @click="importPage">{{uploadInfo}}</el-button>
-          <input
-            type="file"
-            name="uploadfile "
-            id="upFileMatch"
-            @change="uploadFileMatch($event)"
-
-          />
-          <el-button size="mini" @click="handleMatchData">预匹配</el-button>
+          <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
+          <el-button size="mini" @click="handleMatchData" style="marginLeft: 10px">预匹配</el-button>
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>
         <el-form-item label="医院科室名称:">
@@ -146,7 +134,15 @@ export default {
         }
       };
       api.precDeptDataMatch(formData, header).then(res => {
-        if (res.status === 200) {
+        console.log(res, 'res');
+        if (res.data.code === '00020007') {
+          this.$alert(`${res.msg}`, '提示', {
+            confirmButtonText: '确定',
+            type: 'warning'
+          })
+            .then(() => {})
+            .catch(() => {});
+        } else if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '科室关联数据(预匹配).xls');
           }, 1500);
@@ -390,14 +386,9 @@ export default {
       };
       this.uploadInfo = '导入中...';
       api.importDeptRecord(formData, header).then(res => {
-        // console.log('导入文件结果', '===================', res);
         if (res.data.code === '00000001') {
           this.$alert(`数据存在异常,导入失败,请修改后再试`, '提示', {
             confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
             type: 'warning'
           })
             .then(() => {})
@@ -409,11 +400,7 @@ export default {
         } else if (res.data === '' && res.status === 200) {
           this.$alert(`导入成功`, '提示', {
             confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});
@@ -424,10 +411,6 @@ export default {
         } else {
           this.$alert(`${res.data.msg}`, '提示', {
             confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
             type: 'warning'
           })
             .then(() => {})

+ 1 - 1
src/components/cdssManage/disease/Disease.vue

@@ -393,7 +393,7 @@ export default {
             // cancelButtonClass: 'cancelSure',
             // confirmButtonClass: 'sure',
             // customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/cdssManage/drug/DrugManage.vue

@@ -410,7 +410,7 @@ export default {
             // cancelButtonClass: 'cancelSure',
             // confirmButtonClass: 'sure',
             // customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 2 - 2
src/components/cdssManage/fusion/Fusion.vue

@@ -25,7 +25,7 @@
         <el-form-item label="医院输血类型:">
           <el-input size="mini" v-model="filter.hisName" placeholder="请输入" clearable></el-input>
         </el-form-item>
-        <el-form-item label="标准输血术语:">
+        <el-form-item label="标准输血类型:">
           <el-input size="mini" v-model="filter.uniqueName" placeholder="请输入" clearable></el-input>
         </el-form-item>
         <el-form-item class="dododo">
@@ -406,7 +406,7 @@ export default {
             // cancelButtonClass: 'cancelSure',
             // confirmButtonClass: 'sure',
             // customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 2 - 2
src/components/cdssManage/lis/AddLis.vue

@@ -22,7 +22,7 @@
           <el-row>
             <el-col :span="16">
               <el-form-item label="检验套餐:" prop="hisName">
-                <el-input v-model="form.hisName" clearable style="minWidth: 240px"></el-input>
+                <el-input v-model.trim="form.hisName" clearable style="minWidth: 240px"></el-input>
               </el-form-item>
               <el-form-item label="检验套餐预览:" style="marginTop: 24px">
                 <span class="previewInfo1" style="minWidth: 240px">{{form.hisName}}</span>
@@ -32,7 +32,7 @@
           <el-row>
             <el-col :span="16">
               <el-form-item label="检验细项:" prop="hisDetailName">
-                <el-input v-model="form.hisDetailName" clearable style="minWidth: 240px"></el-input>
+                <el-input v-model.trim="form.hisDetailName" clearable style="minWidth: 240px"></el-input>
               </el-form-item>
               <el-form-item label="检验细项预览:">
                 <span class="previewInfo1" style="minWidth: 240px">{{form.hisDetailName}}</span>

+ 1 - 1
src/components/cdssManage/lis/Lis.vue

@@ -413,7 +413,7 @@ export default {
             // cancelButtonClass: 'cancelSure',
             // confirmButtonClass: 'sure',
             // customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/cdssManage/operation/Operation.vue

@@ -414,7 +414,7 @@ export default {
             // cancelButtonClass: 'cancelSure',
             // confirmButtonClass: 'sure',
             // customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/cdssManage/pacs/Pacs.vue

@@ -407,7 +407,7 @@ export default {
             // cancelButtonClass: 'cancelSure',
             // confirmButtonClass: 'sure',
             // customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});