Merge branch 'termMap0909' into test

src/components/cdssManage/dept/DeptManage.vue

@@ -62,7 +62,7 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -524,23 +524,44 @@ export default {
       //   }
       // });
       this.importDeptRecord(formData, header)
+      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
     },
     importDeptRecord(formData, header) {
+      let that = this
       api.importDeptRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/disease/Disease.vue

@@ -62,7 +62,9 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span
+              v-if="scope.row.uniqueName && scope.row.uniqueName!=''"
+            >{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -122,7 +124,7 @@ export default {
       statusList: [
         { id: '', name: '全部' },
         { id: 1, name: '启用' },
-        { id: 0, name: '禁用' },
+        { id: 0, name: '禁用' }
       ],
       list: [],
       searched: false,
@@ -285,7 +287,7 @@ export default {
           (data && data.hospitalId) || localStorage.getItem('hospitalId'),
         type: 4,
         isMatch: this.filter.match,
-        status: this.filter.status,
+        status: this.filter.status
       };
       return param;
     },
@@ -450,7 +452,6 @@ export default {
     // 点击导入
     importPage(e) {
       let inp = document.getElementById('upFile');
-
       inp.click();
     },
     // 导入数据
@@ -508,24 +509,57 @@ export default {
       //   }
       // });
       this.importDiseaseRecord(formData, header);
+      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
     },
     importDiseaseRecord(formData, header) {
+      let that = this
       api.importDiseaseRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
+        // if (res.headers['content-disposition']) {
+        //   this.downloadUrl(res);
+        // } else {
+        //   this.$alert(`导入成功`, '提示', {
+        //     confirmButtonText: '确定',
+        //     // cancelButtonText: '取消',
+        //     // cancelButtonClass: 'cancelSure',
+        //     // confirmButtonClass: 'sure',
+        //     // customClass: 'exportConfirm',
+        //     type: 'success'
+        //   });
+        // }
         // if (res.data.code === '00020007') {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {
         //     confirmButtonText: '确定',

src/components/cdssManage/drug/DrugManage.vue

@@ -35,6 +35,16 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="剂型术语状态：" class="selectMedicine">
+            <el-select size="mini" v-model="filter.formStatus" placeholder="请选择" clearable>
+              <el-option
+                v-for="item in formstatusList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="医院药品名称：">
             <el-input size="mini" v-model="filter.hisName" placeholder="请输入" clearable></el-input>
           </el-form-item>
@@ -62,12 +72,12 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="剂型术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.source == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.form && scope.row.form!=''">{{scope.row.formStatus == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -130,13 +140,20 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        match: ''
+        match: '',
+        status:'',
+        formStatus:''
       },
       statusList: [
         { id: '', name: '全部' },
         { id: 1, name: '启用' },
         { id: 0, name: '禁用' },
       ],
+      formstatusList: [
+        { id: '', name: '全部' },
+        { id: 1, name: '启用' },
+        { id: 0, name: '禁用' },
+      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -289,6 +306,7 @@ export default {
         type: 5,
         isMatch: this.filter.match,
         status: this.filter.status,
+        formStatus: this.filter.formStatus,
       };
       return param;
     },
@@ -527,23 +545,44 @@ export default {
       //   }
       // });
       this.importDrugRecord(formData, header)
+      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
     },
     importDrugRecord(formData, header) {
+      let taht = this
       api.importDrugRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/fusion/Fusion.vue

@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -513,23 +513,44 @@ export default {
       //   }
       // });
       this.importFusionRecord(formData,header)
+      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
     },
     importFusionRecord(formData,header){
+      let that = this
       api.importFusionRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/lis/Lis.vue

@@ -60,12 +60,12 @@
         <el-table-column :resizable="false" prop="uniqueName" label="标准检验项" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="匹配状态">
           <template slot-scope="scope">
-            <span>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
+            <span >{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -528,23 +528,44 @@ export default {
       //   }
       // });
       this.importLisRecord(formData, header)
+      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
     },
     importLisRecord(formData, header) {
+      let that = this
       api.importLisRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/nursing/nursing.vue

@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -485,6 +485,7 @@ export default {
       };
       // this.uploadInfo = '导入中...';
       this.importNurseRecord(formData, header)
+      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
@@ -524,18 +525,38 @@ export default {
       // });
     },
     importNurseRecord(formData, header) {
+      let that = this
       api.importNurseRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/operation/Operation.vue

@@ -67,7 +67,7 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -527,23 +527,44 @@ export default {
       //   }
       // });
       this.importOperationRecord(formData, header)
+      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
     },
     importOperationRecord(formData, header) {
+      let that = this
       api.importOperationRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/pacs/Pacs.vue

@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -519,23 +519,44 @@ export default {
       //   }
       // });
       this.importPacsRecord(formData, header)
+      this.getDataList();
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
     },
     importPacsRecord(formData, header) {
+      let that = this
       api.importPacsRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/scale/ScaleManage.vue

@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -467,6 +467,7 @@ export default {
         }
       };
       this.importScaleRecord(formData, header)
+      this.getDataList();
       // this.uploadInfo = '导入中...';
       // api.importExcelDataVerify(formData, header).then(res => {
       //   if (res.data.code === '00020001') {
@@ -508,18 +509,38 @@ export default {
       inp.value = '';
     },
     importScaleRecord(formData, header) {
+      let taht = this
       api.importScaleRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/tcmdisease/tcmdisease.vue

@@ -67,7 +67,7 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -491,6 +491,7 @@ export default {
         }
       };
       this.importTcmRecord(formData, header);
+      this.getDataList();
       // this.uploadInfo = '导入中...';
       // api.importExcelDataVerify(formData, header).then(res => {
       //   if (res.data.code === '00020001') {
@@ -532,18 +533,38 @@ export default {
       inp.value = '';
     },
     importTcmRecord(formData, header) {
+      let taht = this
       api.importTcmRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/cdssManage/tcmdrome/tcmdrome.vue

@@ -67,7 +67,7 @@
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span>{{scope.row.status == 0?'禁用':'启用'}}</span>
+            <span v-if="scope.row.uniqueName && scope.row.uniqueName!=''">{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -492,6 +492,7 @@ export default {
         }
       };
       this.importTcmdromeRecord(formData, header);
+      this.getDataList();
       // this.uploadInfo = '导入中...';
       // api.importExcelDataVerify(formData, header).then(res => {
       //   if (res.data.code === '00020001') {
@@ -533,18 +534,38 @@ export default {
       inp.value = '';
     },
     importTcmdromeRecord(formData, header) {
+      let taht = this
       api.importTcmdromeRecord(formData, header).then(res => {
         if (res.headers['content-disposition']) {
           this.downloadUrl(res);
         } else {
-          this.$alert(`导入成功`, '提示', {
-            confirmButtonText: '确定',
-            // cancelButtonText: '取消',
-            // cancelButtonClass: 'cancelSure',
-            // confirmButtonClass: 'sure',
-            // customClass: 'exportConfirm',
-            type: 'success'
-          });
+          let r = new FileReader();
+          r.onload = function() {
+            const code = JSON.parse(this.result);
+            if (code.code === '00020007') {
+              that
+                .$alert(`${code.msg}`, '提示', {
+                  confirmButtonText: '确定',
+                  // cancelButtonText: '取消',
+                  // cancelButtonClass: 'cancelSure',
+                  // confirmButtonClass: 'sure',
+                  // customClass: 'exportConfirm',
+                  type: 'warning'
+                })
+                .then(() => {})
+                .catch(() => {});
+            } else {
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                // cancelButtonClass: 'cancelSure',
+                // confirmButtonClass: 'sure',
+                // customClass: 'exportConfirm',
+                type: 'success'
+              });
+            }
+          };
+          r.readAsText(res.data);
         }
         // if ((res.data.code === '00020007')) {
         //   this.$alert(`医院术语字符数超出最大数量，请修改后再试`, '提示', {

src/components/knowledgeExtra/AddDevKnow.vue

@@ -136,6 +136,8 @@
                 :total="form.prags.length"
                 :isEdit="isEdit"
                 :isCopy="isCopy"
+                :positionMap="positionMap"
+                :positionList="positionList"
                 ref="subForm"
                 @add="addParagraph(i)"
                 @del="delParagraph"
@@ -229,6 +231,8 @@ export default {
       isFixedTop: true,
       isEdit: false,
       isCopy: false,
+      positionMap:[],   //各类型内容类型对象
+      positionList:[],   //各类型内容类型对象
       title: '添加',
       termTypes: [],
       terms: [], //术语列表
@@ -330,6 +334,7 @@ export default {
     }
   },
   created: function() {
+      this.zskgetDict();    //获取内容类型
     const { isEdit, data, isCopy } = this.$route.params;
     if (isEdit || isCopy) {
       const loading = this.$loading({
@@ -472,6 +477,30 @@ export default {
     }
   },
   methods: {
+      zskgetDict() {  //获取位置枚举
+          api
+              .zskgetDict()
+              .then(res => {
+                  if (res.data.code == '0') {
+                      const data = res.data.data;
+                      this.positionList = data['50'];
+                      this.positionMap=this.getPositionMap(data['50'],data['51']);
+                  }
+              })
+              .catch(error => {
+                  console.log(error);
+              });
+      },
+      getPositionMap(list,maps){    //各类型需要显示的内容类型map
+          let tempObj = {},arr=[];
+          maps.map((it)=>{
+              arr = it.val.split(",").map((i)=>{
+                  return list.find((t)=>t.val===i);
+              });
+              tempObj[it.name]=arr;
+          });
+          return tempObj;
+      },
     scrollTo(dom) {
       var div = this.$refs['elscrollbar'].$refs['wrap'];
       if (dom >= 0) {

src/components/knowledgeExtra/DevInfo.vue

@@ -105,7 +105,7 @@ import config from '@api/config';
 import { container, ImageExtend, QuillWatch } from 'quill-image-extend-module';
 Quill.register('modules/ImageExtend', ImageExtend);
 export default {
-  props: ['data', 'index', 'isEdit', 'isCopy', 'total', 'showType'],
+  props: ['data', 'index', 'isEdit', 'isCopy', 'total', 'showType','positionMap','positionList'],
   name: 'DevInfo',
   components: {
     quillEditor
@@ -165,10 +165,17 @@ export default {
         position: [],
         orderNo: 0
       },
-      positions: [], //位置列表
       rules: {}
     };
   },
+    computed:{
+      'positions':function(){
+          if(this.showType!==-1){
+              return this.positionMap[this.showType];
+          }
+          return this.positionList||[];
+      }
+    },
   watch: {
     'data.content': function() {
       if (this.data.content !== '') {
@@ -186,7 +193,6 @@ export default {
     this.editorOption.modules.toolbar.container = this.toolbars[
       this.toolbarMode
     ];
-    this.zskgetDict();
 
     if (this.isEdit || this.isCopy) {
       setTimeout(() => {
@@ -287,20 +293,6 @@ export default {
     );
   },
   methods: {
-    zskgetDict() {
-      api
-        .zskgetDict()
-        .then(res => {
-          if (res.data.code == '0') {
-            const data = res.data.data;
-            this.positions = data['50'];
-            this.renderPositions(data['50'], data['51']);
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
     reOrder(i) {
       this.$emit('reOrder', i, this.index);
     },
@@ -321,18 +313,6 @@ export default {
       });
       this.data.position = arr;
     },
-    // 渲染内容类型
-    renderPositions(data1, data2) {
-      //显示位置枚举列表
-      if (this.showType>0) {
-        data2 = data2.filter(item => item.name == this.showType);
-        let val = data2[0].val.split(',');
-        this.positions = data1.filter(it => {
-          let arr = val.map(v => v);
-          return arr.includes(it.val);
-        });
-      }
-    }
   }
 };
 </script>