wyq 4 سال پیش
والد
کامیت
6567deff61

+ 1 - 13
src/api/cdss.js

@@ -3,7 +3,7 @@ import config from '@api/config.js';
 const urls = config.urls;
 function request(config) {
   const instance = axios.create({
-    baseURL: "http://192.168.2.121:7010",
+    //baseURL: "http://192.168.2.121:7010",
     timeout: 500000,
     headers: {
       'Content-Type': "application/json;charset=utf-8"
@@ -714,16 +714,4 @@ export default {
   updateRunningStatus(param) {
     return axios.post(urls.updateRunningStatus, param);
   },
-
-
-
-  getRelatedMapping(param) {
-    //查询已映射关系
-    return axios.post(urls.getRelatedMapping, param);
-  },
-  getTermMatching(param) {
-    //推荐匹配
-    return axios.post(urls.getTermMatching, param);
-  },
-  
 };

+ 16 - 15
src/api/config.js

@@ -3,9 +3,9 @@ const testUrl = ''
 
 export default {
   host: 'http://192.168.2.121:5050',
-   imgHost: 'http://192.168.2.236:82',      //富文本编辑器图片回传地址
+   //imgHost: 'http://192.168.2.236:82',      //富文本编辑器图片回传地址
   // imgHost: 'http://192.168.2.121:82',      //富文本编辑器图片回传地址
-  imgHost: 'http://192.168.2.241:82',      //富文本编辑器图片回传地址
+  imgHost:'http://192.168.2.121:82',      //富文本编辑器图片回传地址
   delayTime: 500,
   urls: {
     /* 登录注册相关接口 */
@@ -395,6 +395,7 @@ export default {
     'exportPacsModuleCDSS': '/api/cdssman/tran/mappingConfig/exportExcelModule',
     'precPacsDataMatch': '/api/cdssman/tran/mappingConfig/precDataMatch',
     'dataPacsVerify': '/api/cdssman/tran/mappingConfig/dataVerify',
+    
 
     'getDrugPageCDSS': '/api/cdssman/tran/mappingConfig/getPage',   //药品列表
     'drugIsExistRecordCDSS': '/api/cdssman/tran/mappingConfig/isExistRecord',   //药品-映射关系是否已存在
@@ -532,11 +533,11 @@ export default {
     'getKlmEnumsDataCDSS': '/api/cdssman/getKlmEnumsData',   //枚举数据获取
 
 
-    'getCaseResultList': '/api/cdssman/test/rule/getCaseResultList',
-    'billRuleTest': '/api/cdssman/test/rule/billRuleTest',
-    'getResultBillPage': '/api/cdssman/test/rule/getResultBillPage',
-    'exportRuleExcel': '/api/cdssman/test/rule/exportExcel',
-    'ruleAllTest': '/api/cdssman/test/rule/ruleTest',
+    'getCaseResultList': '/api/cdssman/test/rule/getCaseResultList', 
+    'billRuleTest': '/api/cdssman/test/rule/billRuleTest',   
+    'getResultBillPage': '/api/cdssman/test/rule/getResultBillPage', 
+    'exportRuleExcel': '/api/cdssman/test/rule/exportExcel', 
+    'ruleAllTest': '/api/cdssman/test/rule/ruleTest', 
     'getResultCriticalPage': '/api/cdssman/test/rule/getResultCriticalPage',   //危急值测试列表
     'criticalRuleTest': '/api/cdssman/test/rule/criticalRuleTest',   //危急值规则测试
     'getResultHighriskDrugPage': '/api/cdssman/test/rule/getResultHighriskDrugPage',   //高危药品测试列表
@@ -546,7 +547,7 @@ export default {
     'getResultOtherPacsPage': '/api/cdssman/test/rule/getResultOtherPacsPage',   //其他值提醒(辅检)测试列表
     'getResultOtherTransfusionPage': '/api/cdssman/test/rule/getResultOtherTransfusionPage',   //其他值提醒(输血)测试列表
     'otherRuleTest': '/api/cdssman/test/rule/otherRuleTest',   //其他值提醒规则测试
-
+    
     'billExportExcel': '/api/cdssman/test/rule/billExportExcel',   //开单合理性规则测试结果导出
     'criticalExportExcel': '/api/cdssman/test/rule/criticalExportExcel',   //危急值规则测试结果导出
     'highriskDrugExportExcel': '/api/cdssman/test/rule/highriskDrugExportExcel',   //高危药品规则测试结果导出
@@ -607,13 +608,13 @@ export default {
     'saveBaseOrUpdateRecord': '/api/cdssman/kl/conceptInfo/saveOrUpdateRecord',
     'staticKnowledgeBaseInfo': '/api/cdssman/kl/conceptInfo/staticKnowledgeIndexWithoutInfo',
     //规则测试相关
-    'allRuleTest': '/api/cdssman/test/rule/allRuleTest',
-    'autoGetCaseResultList': '/api/cdssman/test/rule/getCaseResultList',
-    'getDroplistData': '/api/cdssman/test/rule/getDroplistData',
-    'getResultRulePage': '/api/cdssman/test/rule/getResultRulePage',
-    'ruleExportExcel': '/api/cdssman/test/rule/ruleExportExcel',
-    'autoRuleTest': '/api/cdssman/test/rule/ruleTest',
-    'clearDrug': '/api/cdssman/cache/clearDrug',
+    'allRuleTest':'/api/cdssman/test/rule/allRuleTest',
+    'autoGetCaseResultList':'/api/cdssman/test/rule/getCaseResultList',
+    'getDroplistData':'/api/cdssman/test/rule/getDroplistData',
+    'getResultRulePage':'/api/cdssman/test/rule/getResultRulePage',
+    'ruleExportExcel':'/api/cdssman/test/rule/ruleExportExcel',
+    'autoRuleTest':'/api/cdssman/test/rule/ruleTest',
+    'clearDrug':'/api/cdssman/cache/clearDrug',
     //药品维护
     'getPageList': '/api/cdssman/klDrugRegister/getPage',
     'getsearchDrug': '/api/cdssman/klDrugRegister/searchDrug',

+ 1 - 1
src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 500000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-//  axios.defaults.baseURL = 'http://192.168.2.236:5050';
+ //axios.defaults.baseURL = 'http://192.168.2.236:5050';
 // axios.defaults.baseURL = 'http://192.168.2.241';
 // axios.defaults.baseURL = 'http://192.168.3.117:5050';
 

+ 6 - 46
src/components/base/LtModal.vue

@@ -1,3 +1,4 @@
+<!----通用弹窗组件---->
 <template>
   <div class="modal-container">
     <div class="cover"></div>
@@ -33,9 +34,6 @@
                   <el-form-item :label="meal+'预览:'">
                     <span class="previewInfo" style="minWidth: 240px">{{form.hisName}}</span>
                   </el-form-item>
-                  <el-form-item label="科室编码:" prop="hisCode" v-if="type==7">
-                    <el-input v-model.trim="form.hisCode" clearable style="minWidth: 240px"></el-input>
-                  </el-form-item>
                 </el-col>
                 <el-col :span="16" v-if="type == 1">
                   <el-form-item :label="detail+':'" prop="hisDetailName">
@@ -97,7 +95,7 @@
                       <el-table-column prop="name" :show-overflow-tooltip="true" label="词名"></el-table-column>
                       <el-table-column prop="address" :show-overflow-tooltip="true" label="来源">
                         <template slot-scope="scope">
-                          <p>{{scope.row.source == 1?'标准词匹配':scope.row.source == 2?'同义词匹配':scope.row.source == 5?'相似词匹配':''}}</p>
+                          <span>{{scope.row.source == 1?'标准词匹配':scope.row.source == 2?'同义词匹配':scope.row.source == 5?'相似词匹配':''}}</span>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -415,50 +413,13 @@ export default {
         } else {
           this.warning(res.data.msg);
         }
-        this.saveDisable = false;
-      });
-    },
-    // 关联已存在模态框
-    showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
-        // customClass: 'confirmRealation',
-        confirmButtonText: '是',
-        // cancelButtonText: '否',
-        // cancelButtonClass: 'cancelButton',
-        type: 'warning'
-      })
-        .then(() => {
-          resolve();
-        })
-        .catch(() => {
-          this.saveDisable = false;
-          this.warning('建立失败', 'error');
-        });
-    },
-    warning(msg, type) {
-      this.$message({
-        showClose: true,
-        message: msg,
-        type: type || 'warning'
-      });
-    },
-    closeModal() {
-      this.$emit('func', 'close');
     }
-  }
-};
 </script>
 <style lang="less" scoped>
-.modal-container {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 21;
-  .cover {
-    background: #000;
-    opacity: 0.2;
+.modal-container{
+    position: fixed;
+    top:0;
+    left: 0;
     width: 100%;
     height: 100%;
   }
@@ -693,6 +654,5 @@ export default {
     span {
       color: #606266;
     }
-  }
 }
 </style>

+ 21 - 63
src/components/cdssManage/dept/DeptManage.vue

@@ -71,15 +71,6 @@
         ></el-pagination>
       </div>
     </div>
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'科室名称'"
-      :standard="'科室名称'"
-      :type="7"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -87,7 +78,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'DeptManage',
   data: function() {
@@ -96,15 +87,8 @@ export default {
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match: ''
+        uniqueName: '' //标准诊断名称
       },
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -116,14 +100,9 @@ export default {
       uploadInfo: '导入',
       title: '科室关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -165,7 +144,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 7);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -251,9 +229,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 7,
-        isMatch: this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -270,16 +246,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddDept',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = {};
-      this.showModal();
+      this.$router.push({
+        name: 'AddDept',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -291,16 +265,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddDept',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item;
-      this.showModal();
+      this.$router.push({
+        name: 'AddDept',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -418,7 +390,7 @@ export default {
 
     // 导入模板
     exportModule() {
-      api.exportDeptModule({type:7}).then(res => {
+      api.exportDeptModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '科室导入模板.xls');
@@ -440,8 +412,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 7);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -487,18 +457,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 14 - 66
src/components/cdssManage/disease/Disease.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -43,7 +33,7 @@
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="80"></el-table-column>
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <el-table-column :resizable="false" prop="hisName" label="医院诊断名称" show-overflow-tooltip></el-table-column>
-        <el-table-column :resizable="false" prop="code" label="ICD-10编码" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="icdCode" label="ICD-10编码" show-overflow-tooltip></el-table-column>
         <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">
@@ -71,15 +61,6 @@
         ></el-pagination>
       </div>
     </div>
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'诊断名称'"
-      :standard="'诊断名称'"
-      :type="4"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -87,23 +68,16 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'Disease', //化验大小项和公表维护
   data: function() {
     return {
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       list: [],
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '',//标准诊断名称
-        match: ''
+        uniqueName: '' //标准诊断名称
       },
       currentPage: 1,
       pageSize: config.pageSize,
@@ -113,16 +87,9 @@ export default {
       uploadInfo: '导入',
       title: '诊断关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      isEdit: false,
-      editId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -164,7 +131,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 4);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -249,9 +215,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         icdCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 4,
-        isMatch:this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -268,16 +232,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-        this.data={}
-      this.showModal();
-      /*this.$router.push({
+      this.$router.push({
         name: 'AddDisease',
         params: Object.assign(pam, {
           isEdit: false,
           data: { hospitalId: this.hospitalId },
           hospitaiName: this.hospitaiName
         })
-      });*/
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -289,16 +251,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      /*this.$router.push({
+      this.$router.push({
         name: 'AddDisease',
         params: Object.assign(pam, {
           isEdit: true,
           data: { ...item, hospitalId: this.hospitalId },
           hospitaiName: this.hospitaiName
         })
-      });*/
-      this.data = item;
-      this.showModal();
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -400,7 +360,7 @@ export default {
 
     // 导入模板
     exportModule() {
-      api.exportDiseaseModule({type:4}).then(res => {
+      api.exportDiseaseModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '诊断导入模板.xls');
@@ -421,8 +381,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 4);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -480,26 +438,16 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
-    },
+    }
   }
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 @import '../../../less/admin.less';
+</style>
 
+<style lang="less" scoped>
 .delete {
   color: red;
 }

+ 21 - 74
src/components/cdssManage/drug/DrugManage.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -71,16 +61,6 @@
         ></el-pagination>
       </div>
     </div>
-
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'药品名称'"
-      :standard="'药品名称'"
-      :type="5"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -88,23 +68,16 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'DrugManage', //化验大小项和公表维护
   data: function() {
     return {
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       list: [],
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match:''
+        uniqueName: '' //标准诊断名称
       },
       currentPage: 1,
       pageSize: config.pageSize,
@@ -114,14 +87,9 @@ export default {
       uploadInfo: '导入',
       title: '药品关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components:{
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -163,7 +131,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 5);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -249,9 +216,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 5,
-        isMatch:this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -268,16 +233,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddDrug',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data={}
-      this.showModal()
+      this.$router.push({
+        name: 'AddDrug',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -289,16 +252,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddDrug',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item
-      this.showModal()
+      this.$router.push({
+        name: 'AddDrug',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -415,7 +376,7 @@ export default {
 
     // 导入模板
     exportModule() {
-      api.exportDrugModule({type:5}).then(res => {
+      api.exportDrugModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '药品导入模板.xls');
@@ -436,8 +397,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 5);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -496,18 +455,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 21 - 74
src/components/cdssManage/fusion/Fusion.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -70,16 +60,6 @@
         ></el-pagination>
       </div>
     </div>
-
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'输血类型'"
-      :standard="'输血类型'"
-      :type="8"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -87,7 +67,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'Fusion', //化验大小项和公表维护
   data: function() {
@@ -96,15 +76,8 @@ export default {
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match:''
+        uniqueName: '' //标准诊断名称
       },
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -113,14 +86,9 @@ export default {
       uploadInfo: '导入',
       title: '输血关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -162,7 +130,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 8);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -247,9 +214,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 8,
-        isMatch:this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -266,16 +231,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddFusion',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data={}
-      this.showModal()
+      this.$router.push({
+        name: 'AddFusion',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -287,16 +250,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddFusion',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item
-      this.showModal()
+      this.$router.push({
+        name: 'AddFusion',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -412,7 +373,7 @@ export default {
     },
     // 导入模板
     exportModule() {
-      api.exportFusionModule({type:8}).then(res => {
+      api.exportFusionModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '输血导入模板.xls');
@@ -433,8 +394,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 8);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -492,18 +451,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 21 - 74
src/components/cdssManage/lis/Lis.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -74,16 +64,6 @@
         ></el-pagination>
       </div>
     </div>
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'检验套餐'"
-      :detail="'检验细项'"
-      :standard="'检验标准术语'"
-      :type="1"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -91,7 +71,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'Lis', //化验大小项和公表维护
   data: function() {
@@ -101,15 +81,8 @@ export default {
       filter: {
         hisName: '', // 检验套餐
         hisDetailName: '', //检验细项
-        uniqueName: '', //标准检验项
-        match: ''
+        uniqueName: '' //标准检验项
       },
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -118,14 +91,9 @@ export default {
       uploadInfo: '导入',
       title: '检验关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -167,7 +135,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 1);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -253,9 +220,7 @@ export default {
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         hisDetailName: this.filter.hisDetailName.trim(),
-        hospitalId: data && data.hospitalId,
-        type: 1,
-        isMatch: this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -272,16 +237,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      this.data = {};
-      this.showModal();
-      // this.$router.push({
-      //   name: 'AddLis',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
+      this.$router.push({
+        name: 'AddLis',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -293,16 +256,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddLis',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item;
-      this.showModal();
+      this.$router.push({
+        name: 'AddLis',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -419,7 +380,7 @@ export default {
     },
     // 导入模板
     exportModule() {
-      api.exportLisModule({type:1}).then(res => {
+      api.exportLisModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '检验导入模板.xls');
@@ -440,8 +401,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 1);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -499,18 +458,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 21 - 68
src/components/cdssManage/nursing/nursing.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -70,16 +60,6 @@
         ></el-pagination>
       </div>
     </div>
-
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'护理名称'"
-      :standard="'护理名称'"
-      :type="11"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -87,7 +67,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'Nursing', //化验大小项和公表维护
   data: function() {
@@ -102,8 +82,7 @@ export default {
       ],
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match:''
+        uniqueName: '' //标准诊断名称
       },
       currentPage: 1,
       pageSize: config.pageSize,
@@ -113,14 +92,9 @@ export default {
       uploadInfo: '导入',
       title: '护理关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -162,7 +136,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 11);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -247,9 +220,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 11,
-        isMatch:this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -266,16 +237,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddNursing',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data={}
-      this.showModal()
+      this.$router.push({
+        name: 'AddNursing',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -287,16 +256,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddNursing',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item
-      this.showModal()
+      this.$router.push({
+        name: 'AddNursing',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -412,7 +379,7 @@ export default {
     },
     // 导入模板
     exportModule() {
-      api.exportNurseModule({type:11}).then(res => {
+      api.exportNurseModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '护理导入模板.xls');
@@ -433,8 +400,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 11);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -492,18 +457,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 21 - 74
src/components/cdssManage/operation/Operation.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -75,16 +65,6 @@
         ></el-pagination>
       </div>
     </div>
-
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'手术/操作名称'"
-      :standard="'手术/操作名称'"
-      :type="6"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -92,7 +72,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'Operation', //化验大小项和公表维护
   data: function() {
@@ -101,15 +81,8 @@ export default {
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match:''
+        uniqueName: '' //标准诊断名称
       },
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -118,14 +91,9 @@ export default {
       uploadInfo: '导入',
       title: '手术/操作关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -167,7 +135,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 6);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -252,9 +219,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 6,
-        isMatch:this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -271,16 +236,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddOperation',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data={}
-      this.showModal()
+      this.$router.push({
+        name: 'AddOperation',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -292,16 +255,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddOperation',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item
-      this.showModal()
+      this.$router.push({
+        name: 'AddOperation',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -420,7 +381,7 @@ export default {
 
     // 导入模板
     exportModule() {
-      api.exportOperationModule({type:6}).then(res => {
+      api.exportOperationModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '手术/操作导入模板.xls');
@@ -441,8 +402,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 6);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -500,18 +459,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 21 - 74
src/components/cdssManage/pacs/Pacs.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -70,16 +60,6 @@
         ></el-pagination>
       </div>
     </div>
-
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'检查项目'"
-      :standard="'检查项目'"
-      :type="3"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -87,7 +67,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'Pacs', //化验大小项和公表维护
   data: function() {
@@ -96,15 +76,8 @@ export default {
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match: ''
+        uniqueName: '' //标准诊断名称
       },
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -113,14 +86,9 @@ export default {
       uploadInfo: '导入',
       title: '检查关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -162,7 +130,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 3);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -247,9 +214,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 3,
-        isMatch: this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -266,16 +231,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      this.data = {};
-      this.showModal();
-      // this.$router.push({
-      //   name: 'AddPacs',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
+      this.$router.push({
+        name: 'AddPacs',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -287,16 +250,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      this.data = item;
-      this.showModal();
-      // this.$router.push({
-      //   name: 'AddPacs',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
+      this.$router.push({
+        name: 'AddPacs',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -412,7 +373,7 @@ export default {
     },
     // 导入模板
     exportModule() {
-      api.exportPacsModule({type:3}).then(res => {
+      api.exportPacsModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '检查导入模板.xls');
@@ -433,8 +394,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 3);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -493,18 +452,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 21 - 74
src/components/cdssManage/scale/ScaleManage.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -70,16 +60,6 @@
         ></el-pagination>
       </div>
     </div>
-
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'量表名称'"
-      :standard="'量表名称'"
-      :type="10"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -87,7 +67,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'ScaleManage', //化验大小项和公表维护
   data: function() {
@@ -96,15 +76,8 @@ export default {
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match:''
+        uniqueName: '' //标准诊断名称
       },
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -113,14 +86,9 @@ export default {
       uploadInfo: '导入',
       title: '量表关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components:{
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -162,7 +130,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 10);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -248,9 +215,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 10,
-        isMatch:this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -267,16 +232,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddScale',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data={}
-      this.showModal()
+      this.$router.push({
+        name: 'AddScale',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -288,16 +251,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddScale',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item
-      this.showModal()
+      this.$router.push({
+        name: 'AddScale',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -395,7 +356,7 @@ export default {
 
     // 导入模板
     exportModule() {
-      api.exportScaleModule({type:10}).then(res => {
+      api.exportScaleModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '量表导入模板.xls');
@@ -416,8 +377,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 10);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -476,18 +435,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 23 - 76
src/components/cdssManage/tcmdisease/tcmdisease.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -43,7 +33,7 @@
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="80"></el-table-column>
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <el-table-column :resizable="false" prop="hisName" label="医院中医疾病名称" show-overflow-tooltip></el-table-column>
-        <el-table-column :resizable="false" prop="code" label="中医疾病代码" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="uniqueCode" label="中医疾病代码" show-overflow-tooltip></el-table-column>
         <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">
@@ -71,17 +61,6 @@
         ></el-pagination>
       </div>
     </div>
-
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'中医疾病名称'"
-      :standard="'中医疾病名称'"
-      :detail="'中医疾病代码'"
-      :type="12"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -89,7 +68,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'Tcmdisease', //化验大小项和公表维护
   data: function() {
@@ -98,15 +77,8 @@ export default {
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match:''
+        uniqueName: '' //标准诊断名称
       },
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -115,14 +87,9 @@ export default {
       uploadInfo: '导入',
       title: '中医疾病关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -164,7 +131,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 12);
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -249,9 +215,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 12,
-        isMatch:this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -261,6 +225,7 @@ export default {
       this.getDataList();
     },
     addRelation() {
+      console.log(11)
       const pam = this.searched
         ? {
             currentPage: this.currentPage,
@@ -268,16 +233,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-        this.data={}
-        this.showModal()
-      // this.$router.push({
-      //   name: 'AddTcmdisease',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
+      this.$router.push({
+        name: 'AddTcmdisease',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -289,16 +252,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddTcmdisease',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item
-      this.showModal()
+      this.$router.push({
+        name: 'AddTcmdisease',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -414,7 +375,7 @@ export default {
     },
     // 导入模板
     exportModule() {
-      api.exportTcmModule({type:12}).then(res => {
+      api.exportTcmModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '中医疾病导入模板.xls');
@@ -435,8 +396,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 12);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -494,18 +453,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 22 - 76
src/components/cdssManage/tcmdrome/tcmdrome.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                v-for="item in matchList"
-                :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>
@@ -43,7 +33,7 @@
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="80"></el-table-column>
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <el-table-column :resizable="false" prop="hisName" label="医院中医证候名称" show-overflow-tooltip></el-table-column>
-        <el-table-column :resizable="false" prop="code" label="中医证候代码" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="uniqueCode" label="中医证候代码" show-overflow-tooltip></el-table-column>
         <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">
@@ -71,16 +61,6 @@
         ></el-pagination>
       </div>
     </div>
-    <LtModal
-      v-if="modalVisiable"
-      @func="getMsgFormSon"
-      :meal="'中医证候名称'"
-      :standard="'中医证候名称'"
-      :detail="'中医证候代码'"
-      :type="13"
-      :hospitalId="hospitalId"
-      :data="data"
-    ></LtModal>
   </div>
 </template>
 
@@ -88,7 +68,7 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
+
 export default {
   name: 'Tcmdrome', //化验大小项和公表维护
   data: function() {
@@ -97,15 +77,8 @@ export default {
       searched: false,
       filter: {
         hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match:''
+        uniqueName: '' //标准诊断名称
       },
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
@@ -114,14 +87,9 @@ export default {
       uploadInfo: '导入',
       title: '中医证候关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable: false,
-      data: {}
+      hospitalId: ''
     };
   },
-  components: {
-    LtModal
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -163,8 +131,6 @@ export default {
       e.preventDefault();
       let formData = new FormData();
       formData.append('file', fileInfo);
-      formData.append('type', 13);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -249,9 +215,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hospitalId: data && data.hospitalId,
-        type: 13,
-        isMatch:this.filter.match
+        hospitalId: data && data.hospitalId
       };
       return param;
     },
@@ -269,16 +233,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-        this.data={}
-        this.showModal()
-      // this.$router.push({
-      //   name: 'AddTcmdrome',
-      //   params: Object.assign(pam, {
-      //     isEdit: false,
-      //     data: { hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
+      this.$router.push({
+        name: 'AddTcmdrome',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -290,16 +252,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddTcmdrome',
-      //   params: Object.assign(pam, {
-      //     isEdit: true,
-      //     data: { ...item, hospitalId: this.hospitalId },
-      //     hospitaiName: this.hospitaiName
-      //   })
-      // });
-      this.data = item
-      this.showModal()
+      this.$router.push({
+        name: 'AddTcmdrome',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -415,7 +375,7 @@ export default {
     },
     // 导入模板
     exportModule() {
-      api.exportTcmdromeModule({type:13}).then(res => {
+      api.exportTcmdromeModule().then(res => {
         if (res.status === 200) {
           setTimeout(() => {
             utils.downloadExportedData(res.data, '中医证候导入模板.xls');
@@ -436,8 +396,6 @@ export default {
       let formData = new FormData();
       formData.append('file', fileInfo);
       formData.append('hospitalId', this.hospitalId);
-      formData.append('type', 13);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
       const header = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -495,18 +453,6 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
     }
   }
 };

+ 173 - 199
src/components/knowledgeExtra/AddDevKnow.vue

@@ -9,13 +9,7 @@
       ></crumbs>
 
       <div class="info-container">
-        <el-form
-          :rules="rules1"
-          :model="form"
-          label-width="160px"
-          ref="groups1"
-          size="mini"
-        >
+        <el-form :rules="rules1" :model="form" label-width="160px" ref="groups1" size="mini">
           <div class="container_top">
             <div v-if="!isEdit" style="margin-right: 40px">
               <el-form-item label="选择标准术语:" prop="selectedTerm">
@@ -51,9 +45,11 @@
               </el-form-item>
             </div>
 
-            <el-form-item label="已选择标准术语:" label-width="160px">{{
+            <el-form-item label="已选择标准术语:" label-width="160px">
+              {{
               form.selectedTermName
-            }}</el-form-item>
+              }}
+            </el-form-item>
           </div>
         </el-form>
         <div class="tabs_box">
@@ -72,14 +68,14 @@
               <img
                 @click.stop="handleStaticTab"
                 src="@/images/tab_add.png"
-                alt=""
+                alt
                 v-if="AssesComSHow && !AssesTabSHow"
               />
               <img
                 v-if="AssesTabSHow && AssesComSHow"
                 @click.stop="closeStaticTab"
                 src="@/images/tab_close.png"
-                alt=""
+                alt
               />
             </div>
             <div
@@ -97,31 +93,21 @@
                 v-if="!staticTabShow"
                 @click.stop="handleAssesTab"
                 src="@/images/tab_add.png"
-                alt=""
+                alt
               />
               <img
                 v-if="staticTabShow"
                 @click.stop="closeAssesTab"
                 src="@/images/tab_close.png"
-                alt=""
+                alt
               />
             </div>
           </div>
         </div>
 
         <p class="line"></p>
-        <div
-          class="tab_box_left"
-          v-show="tabActive == 'one'"
-          v-if="staticTabShow"
-        >
-          <el-form
-            :rules="rules"
-            :model="form"
-            label-width="160px"
-            ref="groups"
-            size="mini"
-          >
+        <div class="tab_box_left" v-show="tabActive == 'one'" v-if="staticTabShow">
+          <el-form :rules="rules" :model="form" label-width="160px" ref="groups" size="mini">
             <div
               v-if="
                 form.selectedTerm &&
@@ -159,11 +145,7 @@
             </div>
 
             <div v-if="upload">
-              <el-form-item
-                label="标题名称搜索:"
-                prop="fileTitle"
-                label-width="160px"
-              >
+              <el-form-item label="标题名称搜索:" prop="fileTitle" label-width="160px">
                 <el-input v-model="form.fileTitle"></el-input>
               </el-form-item>
             </div>
@@ -193,37 +175,29 @@
                   :show-file-list="showFileList"
                   :file-list="form.fileList"
                 >
-                  <el-button size="small" type="primary" v-if="showUpLoad"
-                    >点击上传</el-button
-                  >
+                  <el-button size="small" type="primary" v-if="showUpLoad">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div> -->
                 </el-upload>
-                <span class="tipInfo" v-show="isShowTip">{{
+                <span class="tipInfo" v-show="isShowTip">
+                  {{
                   form.fileList[0] && form.fileList[0].name
-                }}</span>
+                  }}
+                </span>
                 <!-- <el-button size="small" type="primary" >点击上传</el-button> -->
               </el-form-item>
             </div>
             <el-form-item label-width="160px">
-              <div class="uploadInfo" v-if="isSuccessUpload === 1">
-                文件上传中,请稍等...
-              </div>
+              <div class="uploadInfo" v-if="isSuccessUpload === 1">文件上传中,请稍等...</div>
             </el-form-item>
           </el-form>
         </div>
         <div v-if="AssesComSHow && AssesTabSHow" v-show="tabActive == 'two'">
-          <AddAssess
-            @scrollTo="scrollTo"
-            :childScaleData="scaleData"
-            ref="assessRef"
-          />
+          <AddAssess @scrollTo="scrollTo" :childScaleData="scaleData" ref="assessRef" />
         </div>
       </div>
 
       <div class="btn">
-        <el-button type="primary" :disabled="saveDisable" @click="submitForm"
-          >确 定</el-button
-        >
+        <el-button type="primary" :disabled="saveDisable" @click="submitForm">确 定</el-button>
       </div>
     </div>
   </el-scrollbar>
@@ -232,14 +206,14 @@
 /**
  *
  */
-import api from "@api/knowledgeTree.js";
-import DevInfo from "./DevInfo";
-import config from "@api/config";
-import $ from "jquery";
-import AddAssess from "./AddAssess";
+import api from '@api/knowledgeTree.js';
+import DevInfo from './DevInfo';
+import config from '@api/config';
+import $ from 'jquery';
+import AddAssess from './AddAssess';
 
 export default {
-  name: "AddDevKnow",
+  name: 'AddDevKnow',
   components: {
     DevInfo,
     AddAssess
@@ -255,55 +229,55 @@ export default {
       isFixedTop: true,
       isEdit: false,
       isCopy: false,
-      title: "添加",
+      title: '添加',
       termTypes: [],
       terms: [], //术语列表
       form: {
-        conceptId: "", //术语id
+        conceptId: '', //术语id
         isTip: 0, //是否要覆盖,0不覆盖,1覆盖
-        selectedTerm: "", //术语标签
-        termType: "",
-        typeId: "",
-        selectedTermName: "",
-        selectedTermType: "",
+        selectedTerm: '', //术语标签
+        termType: '',
+        typeId: '',
+        selectedTermName: '',
+        selectedTermType: '',
         // titleChange: '',
         fileList: [],
-        name: "",
+        name: '',
         prags: [
           {
             //单个段落相关
-            title: "",
-            content: "",
+            title: '',
+            content: '',
             isReason: 0,
             orderNo: 0,
             position: [],
-            text: ""
+            text: ''
           }
         ],
-        fileTitle: "",
-        titleChange: ""
+        fileTitle: '',
+        titleChange: ''
       },
       rules1: {
         selectedTerm: [
-          { required: true, message: "请选择标准术语", trigger: "change" }
+          { required: true, message: '请选择标准术语', trigger: 'change' }
         ]
       },
       rules: {
         fileTitle: [
-          { required: true, message: "请输入标题名称", trigger: "change" },
+          { required: true, message: '请输入标题名称', trigger: 'change' },
           {
             validator: (rule, value, callback) => {
               if (value.trim().length > 30) {
-                callback(new Error("标题名称不能超过30字"));
+                callback(new Error('标题名称不能超过30字'));
               } else {
                 callback();
               }
             },
-            trigger: "change"
+            trigger: 'change'
           }
         ],
         fileList: [
-          { required: true, message: "请上传文件", trigger: "change" }
+          { required: true, message: '请上传文件', trigger: 'change' }
         ],
         titleChange: [
           // {
@@ -318,7 +292,7 @@ export default {
           //   },
           //   trigger: 'change'
           // },
-          { max: 30, message: "标题最多30字", trigger: "change" }
+          { max: 30, message: '标题最多30字', trigger: 'change' }
         ]
       },
       saveDisable: false, //保存按钮禁止点击
@@ -334,14 +308,14 @@ export default {
       editCount: -1, // 页面会否被编辑 >0被编辑   =0 未编辑
       startCount: -1,
       isSaveSuccess: false, // 是否保存成功
-      tabActive: "one"
+      tabActive: 'one'
     };
   },
   watch: {
     showType: {
       handler(newVal, oldVal) {
         if (newVal !== oldVal) {
-          this.form.prags = this.form.prags.map((item) => {
+          this.form.prags = this.form.prags.map(item => {
             return { ...item, position: [] };
           });
         }
@@ -355,27 +329,27 @@ export default {
       immediate: true
     }
   },
-  created: function () {
+  created: function() {
     const { isEdit, data, isCopy } = this.$route.params;
     if (isEdit || isCopy) {
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
       });
       this.showType = data.type; // 编辑页确认显示类型
       this.isEdit = isEdit;
       this.isCopy = isCopy;
-      this.title = isEdit ? "修改" : isCopy ? "复制" : "添加";
+      this.title = isEdit ? '修改' : isCopy ? '复制' : '添加';
       (isEdit || isCopy) && this.changeWord(data);
 
       api
         .getBaseRecordById({ id: data.id })
-        .then((res) => {
-          if (res.data.code == "0") {
+        .then(res => {
+          if (res.data.code == '0') {
             const data = res.data.data;
-            console.log("dwadfesvgeosboau13131213h", data.scale);
+            console.log('dwadfesvgeosboau13131213h', data.scale);
             if (data.type === 8) {
               this.AssesComSHow = true;
               if (data.scale) {
@@ -389,7 +363,7 @@ export default {
               // console.log('data',data)
               this.form.fileList =
                 data &&
-                data.map((it) => {
+                data.map(it => {
                   return JSON.parse(it.content);
                 });
               this.showFileList = true;
@@ -406,18 +380,18 @@ export default {
                     data.type == 5 ||
                     data.type == 6
                   ? data.noticeName
-                  : "";
+                  : '';
               this.form.selectedTermName =
-                data.name + (data.typeName ? "(" + data.typeName + ")" : "");
+                data.name + (data.typeName ? '(' + data.typeName + ')' : '');
               this.form.selectedTerm =
-                data.name + (data.typeName ? "(" + data.typeName + ")" : "");
+                data.name + (data.typeName ? '(' + data.typeName + ')' : '');
               if (isCopy) {
                 this.handleClear();
               }
               if (data.details.length) {
                 this.form.prags =
                   data &&
-                  data.details.map((it) => {
+                  data.details.map(it => {
                     return {
                       title: it.title,
                       position: this.mapStringToNum(it.contentType),
@@ -432,7 +406,7 @@ export default {
                   });
               } else {
                 this.staticTabShow = false;
-                this.tabActiveChange("two");
+                this.tabActiveChange('two');
               }
             }
           }
@@ -440,9 +414,9 @@ export default {
             loading.close();
           }, 200);
         })
-        .catch((error) => {
+        .catch(error => {
           loading.close();
-          if (error.code === "900010001") {
+          if (error.code === '900010001') {
             return false;
           }
           console.log(error);
@@ -482,12 +456,12 @@ export default {
     // }
 
     if (this.startCount !== this.editCount && !this.isSaveSuccess) {
-      this.$alert("还有未保存的内容,确定要退出当前页面吗?", "提示", {
-        confirmButtonText: "确定",
+      this.$alert('还有未保存的内容,确定要退出当前页面吗?', '提示', {
+        confirmButtonText: '确定',
         // cancelButtonText: '取消',
         // cancelButtonClass: 'leaveBtn',
         // customClass: 'leaveBox',
-        type: "warning"
+        type: 'warning'
       })
         .then(() => {
           next();
@@ -499,7 +473,7 @@ export default {
   },
   methods: {
     scrollTo(dom) {
-      var div = this.$refs["elscrollbar"].$refs["wrap"];
+      var div = this.$refs['elscrollbar'].$refs['wrap'];
       if (dom >= 0) {
         div.scrollTop += dom - 120;
       } else {
@@ -509,64 +483,64 @@ export default {
     handleStaticTab() {
       this.AssesTabSHow = true;
       this.AssesComSHow = true;
-      this.tabActiveChange("two");
+      this.tabActiveChange('two');
     },
     handleAssesTab() {
       this.staticTabShow = true;
       this.form.prags = [
         {
           //单个段落相关
-          title: "",
-          content: "",
+          title: '',
+          content: '',
           isReason: 0,
           orderNo: 0,
           position: [],
-          text: ""
+          text: ''
         }
       ];
-      this.tabActiveChange("one");
+      this.tabActiveChange('one');
     },
     closeStaticTab() {
-      this.$alert("确定要删除该标签?删除后该标签内容将会被清空!", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      this.$alert('确定要删除该标签?删除后该标签内容将会被清空!', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
         // cancelButtonClass: 'leaveBtn',
         // customClass: 'leaveBox',
-        type: "warning"
+        type: 'warning'
       })
         .then(() => {
           this.staticTabShow = false;
-          this.tabActiveChange("two");
+          this.tabActiveChange('two');
         })
         .catch(() => {});
     },
     closeAssesTab() {
-      this.$alert("确定要删除该标签?删除后该标签内容将会被清空!", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      this.$alert('确定要删除该标签?删除后该标签内容将会被清空!', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
         // cancelButtonClass: 'leaveBtn',
         // customClass: 'leaveBox',
-        type: "warning"
+        type: 'warning'
       })
         .then(() => {
           this.AssesTabSHow = false;
           // this.AssesComSHow = false;
-          this.tabActiveChange("one");
+          this.tabActiveChange('one');
         })
         .catch(() => {});
     },
     tabActiveChange(type) {
       this.tabActive = type;
-      if (type == "two") {
+      if (type == 'two') {
         setTimeout(() => {
           this.$refs.assessRef.resizeTable();
         }, 200);
       }
     },
     handleClear() {
-      this.form.selectedTermName = "";
-      this.form.selectedTerm = "";
-      this.form.titleChange = "";
+      this.form.selectedTermName = '';
+      this.form.selectedTerm = '';
+      this.form.titleChange = '';
     },
 
     handleMouseenter() {
@@ -578,12 +552,12 @@ export default {
       this.isShowTip = false;
     },
     changeWord(newVal) {
-      if (newVal.typeName == "量表") {
+      if (newVal.typeName == '量表') {
         this.AssesComSHow = true;
       } else {
         this.staticTabShow = true;
         this.AssesComSHow = false;
-        this.tabActive = "one";
+        this.tabActive = 'one';
       }
       this.toAssesTermId = newVal.id;
       this.showType = newVal.type || -1;
@@ -591,20 +565,20 @@ export default {
       const typeName = newVal.typeName;
       const type = newVal.type;
       this.form.selectedTermName =
-        name + (typeName ? "(" + typeName + ")" : "");
+        name + (typeName ? '(' + typeName + ')' : '');
       // this.form.selectedTerm = name + (typeName ? '(' + typeName + ')' : '');
       this.form.name = name;
       this.form.fileList = [];
       this.showFileList = false;
-      this.form.typeId = type || "";
+      this.form.typeId = type || '';
       this.showUpLoad = true;
       this.titleChange =
         type == 1
-          ? "临床路径标题:"
+          ? '临床路径标题:'
           : type == 3 || type == 4 || type == 5 || type == 6
-          ? "注意事项标题:"
-          : "";
-      this.form.fileTitle = "";
+          ? '注意事项标题:'
+          : '';
+      this.form.fileTitle = '';
       if (newVal.typeId === 82 || newVal.typeId === 83) {
         this.upload = true;
         this.form.fileTitle = newVal.title;
@@ -619,12 +593,12 @@ export default {
     },
     reOrder(isUp, i) {
       // isUp: 1 上升    0 下降
-      let div = this.$refs["elscrollbar"].$refs["wrap"];
+      let div = this.$refs['elscrollbar'].$refs['wrap'];
       let temp = {},
         it = {};
       if (isUp === 1) {
         if (i === 0) {
-          this.warning("已经是第一个,不能再升啦!");
+          this.warning('已经是第一个,不能再升啦!');
           return;
         }
         temp = Object.assign(this.form.prags[i - 1]);
@@ -635,7 +609,7 @@ export default {
         });
       } else {
         if (i === this.form.prags.length - 1) {
-          this.warning("已经是最后一个,不能再降啦!");
+          this.warning('已经是最后一个,不能再降啦!');
           return;
         }
         temp = Object.assign(this.form.prags[i + 1]);
@@ -645,25 +619,25 @@ export default {
     },
     addParagraph(i) {
       this.form.prags.splice(i + 1, 0, {
-        title: "",
-        content: "",
+        title: '',
+        content: '',
         isReason: 0,
         position: [],
-        text: ""
+        text: ''
       });
       //添加段落光标自动落到新增的段落中
       setTimeout(() => {
         this.$refs.subForm[i + 1].$el
-          .getElementsByClassName("el-input__inner")[0]
+          .getElementsByClassName('el-input__inner')[0]
           .focus();
       });
     },
     delParagraph(i) {
       if (this.form.prags.length == 1) {
-        this.warning("只剩一个段落,不能再删啦!");
+        this.warning('只剩一个段落,不能再删啦!');
         return;
       }
-      this.showConfirmDialog("确定要删除该段落?", () => {
+      this.showConfirmDialog('确定要删除该段落?', () => {
         this.form.prags.splice(i, 1);
       });
     },
@@ -679,33 +653,33 @@ export default {
       this.showDrop = true;
       api
         .staticKnowledgeBaseInfo({ inputStr: query.trim(), types: [0] })
-        .then((res) => {
+        .then(res => {
           this.showDrop = false;
-          if (res.data.code === "0") {
+          if (res.data.code === '0') {
             this.terms = res.data.data;
           } else {
-            this.warning("数据获取失败");
+            this.warning('数据获取失败');
           }
         });
     },
     mapStringToNum(str) {
-      return str.split(",").map((it) => {
+      return str.split(',').map(it => {
         return +it;
       });
     },
 
     // 额外的表单检验
     formVal() {
-      let positiontemp = this.form.prags.map((item) => {
+      let positiontemp = this.form.prags.map(item => {
         return [...item.position];
       });
-      let positionArr = positiontemp.reduce(function (a, b) {
+      let positionArr = positiontemp.reduce(function(a, b) {
         return a.concat(b);
       }); // 所有被选中的值集合
       // console.log(positionArr, "positionArr");
       // console.log(this.showType, "当前页的显示类型");
-      let isVisFlag = positionArr.some((item) => item === 2);
-      let isDiagFlag = positionArr.some((item) => item === 3);
+      let isVisFlag = positionArr.some(item => item === 2);
+      let isDiagFlag = positionArr.some(item => item === 3);
       // console.log(isVisFlag, "isVisFlag是否显示");
       if (
         (this.showType == 3 ||
@@ -719,18 +693,18 @@ export default {
         this.$refs.groups && this.$refs.groups.clearValidate();
         this.rules.titleChange.push({
           required: true,
-          message: "请输入注意事项标题",
-          trigger: "change"
+          message: '请输入注意事项标题',
+          trigger: 'change'
         });
-        this.$refs.groups && this.$refs.groups.validateField("titleChange");
-        this.$refs.groups && this.$refs.groups.validateField("selectedTerm");
+        this.$refs.groups && this.$refs.groups.validateField('titleChange');
+        this.$refs.groups && this.$refs.groups.validateField('selectedTerm');
         this.rules.titleChange = this.rules.titleChange.slice(0, 1);
 
-        if (this.form.titleChange.trim() !== "") {
+        if (this.form.titleChange.trim() !== '') {
           // console.log('内容不为空');
           return true;
         } else {
-          var div = this.$refs["elscrollbar"].$refs["wrap"];
+          var div = this.$refs['elscrollbar'].$refs['wrap'];
           this.$nextTick(() => {
             div.scrollTop = 0;
           });
@@ -742,18 +716,18 @@ export default {
         this.$refs.groups && this.$refs.groups.clearValidate();
         this.rules.titleChange.push({
           required: true,
-          message: "请输入临床路径标题",
-          trigger: "change"
+          message: '请输入临床路径标题',
+          trigger: 'change'
         });
-        this.$refs.groups && this.$refs.groups.validateField("titleChange");
-        this.$refs.groups && this.$refs.groups.validateField("selectedTerm");
+        this.$refs.groups && this.$refs.groups.validateField('titleChange');
+        this.$refs.groups && this.$refs.groups.validateField('selectedTerm');
         this.rules.titleChange = this.rules.titleChange.slice(0, 1);
 
-        if (this.form.titleChange.trim() !== "") {
+        if (this.form.titleChange.trim() !== '') {
           // console.log('内容不为空');
           return true;
         } else {
-          var div = this.$refs["elscrollbar"].$refs["wrap"];
+          var div = this.$refs['elscrollbar'].$refs['wrap'];
           this.$nextTick(() => {
             div.scrollTop = 0;
           });
@@ -775,7 +749,7 @@ export default {
           if (valid) {
             resolve(true);
           } else {
-            reject("top", object);
+            reject('top', object);
             return false;
           }
         });
@@ -783,7 +757,7 @@ export default {
       all.push(fvalidate1);
       if (this.staticTabShow) {
         if (this.isSuccessUpload === 1) {
-          this.warning("文件上传中,请稍等");
+          this.warning('文件上传中,请稍等');
           return;
         }
         let flagVal = this.formVal(); // 额外的表单校验
@@ -797,7 +771,7 @@ export default {
               if (valid) {
                 resolve(true);
               } else {
-                reject("f", object);
+                reject('f', object);
                 return false;
               }
             });
@@ -815,7 +789,7 @@ export default {
                 // viewHeight += it.$el.getBoundingClientRect().top;
                 it.$refs.form.validate((valid, object) => {
                   if (!valid) {
-                    reject("f", object);
+                    reject('f', object);
                     goOn = false;
                     viewHeightArr.push(it.$el);
                   } else {
@@ -834,20 +808,20 @@ export default {
         all.push(...this.$refs.assessRef.assessCommit());
       }
       // 批量处理Promise返回
-      let transferedPromises = (promises) => {
+      let transferedPromises = promises => {
         // 返回一个处理之后的promise数组
-        return promises.map((promise) => {
-          return promise.then((res) => res).catch((err) => err);
+        return promises.map(promise => {
+          return promise.then(res => res).catch(err => err);
         });
       };
       let promiseArr = transferedPromises(all);
-      await Promise.all(promiseArr).then((resArr) => {
-        let cErrIndex = resArr.findIndex((item) => item.type == "c");
-        let fErrIndex = resArr.findIndex((item) => item == "f");
-        let topErrIndex = resArr.findIndex((item) => item == "top");
+      await Promise.all(promiseArr).then(resArr => {
+        let cErrIndex = resArr.findIndex(item => item.type == 'c');
+        let fErrIndex = resArr.findIndex(item => item == 'f');
+        let topErrIndex = resArr.findIndex(item => item == 'top');
         if (topErrIndex != -1) {
           outIsVia = false;
-          var div = this.$refs["elscrollbar"].$refs["wrap"];
+          var div = this.$refs['elscrollbar'].$refs['wrap'];
           this.$nextTick(() => {
             div.scrollTop = 0;
           });
@@ -855,20 +829,20 @@ export default {
           if (this.staticTabShow) {
             goOn = false;
           }
-          this.tabActive = "one";
+          this.tabActive = 'one';
           this.$message({
             showClose: true,
             message: `"静态信息"和"评估内容"标签内有未填写项目,请填写完整或者删除该标签!`,
-            type: "warning"
+            type: 'warning'
           });
         } else if (cErrIndex != -1 && fErrIndex == -1) {
-          this.tabActive = "two";
+          this.tabActive = 'two';
           this.$message({
             showClose: true,
             message: `"评估内容"标签内有未填写项目,请填写完整或者删除该标签!`,
-            type: "warning"
+            type: 'warning'
           });
-          let cErrArr = resArr.filter((item) => item.type == "c");
+          let cErrArr = resArr.filter(item => item.type == 'c');
           if (cErrArr) {
             cErrArr = Object.keys(cErrArr[0].object);
           }
@@ -876,7 +850,7 @@ export default {
           this.$nextTick(() => {
             setTimeout(() => {
               let domTop = this.$refs.assessRef.getDom(cErrArr[0]);
-              var div = this.$refs["elscrollbar"].$refs["wrap"];
+              var div = this.$refs['elscrollbar'].$refs['wrap'];
               if (domTop >= 0) {
                 div.scrollTop += domTop - 120;
               } else {
@@ -885,11 +859,11 @@ export default {
             }, 100);
           });
         } else if (cErrIndex == -1 && fErrIndex != -1) {
-          this.tabActive = "one";
+          this.tabActive = 'one';
           this.$message({
             showClose: true,
             message: `"静态信息"标签内有未填写项目,请填写完整或者删除该标签!`,
-            type: "warning"
+            type: 'warning'
           });
         } else {
           assessRule = true;
@@ -897,7 +871,7 @@ export default {
       });
       if (this.staticTabShow && !goOn) {
         setTimeout(() => {
-          var div = this.$refs["elscrollbar"].$refs["wrap"];
+          var div = this.$refs['elscrollbar'].$refs['wrap'];
           if (outIsVia) {
             // 外层校验通过,跳转至下层校验具体位置
             let sTop = viewHeightArr[0].getBoundingClientRect().top;
@@ -928,14 +902,14 @@ export default {
 
       if (this.form.typeId === 82 || this.form.typeId === 83) {
         if (this.form.fileList.length === 0) {
-          this.warning("文件未上传,不存储数据");
+          this.warning('文件未上传,不存储数据');
           return;
         }
         param.push(
           Object.assign(
             {},
             {
-              position: this.form.typeId === 82 ? "8" : "9",
+              position: this.form.typeId === 82 ? '8' : '9',
               conceptId: this.form.conceptId,
               title: this.form.fileTitle,
               orderNo: 0,
@@ -957,16 +931,16 @@ export default {
           obj.conceptId = data[i].conceptId;
           obj.orderNo = i;
           obj.title = data[i].title;
-          obj.contentType = data[i].position.join(",");
+          obj.contentType = data[i].position.join(',');
           tempArr.push(obj);
         }
-        paramsAll.clinicalPathwayName = types == 1 ? this.form.titleChange : "";
+        paramsAll.clinicalPathwayName = types == 1 ? this.form.titleChange : '';
         paramsAll.id = this.conceptId;
         paramsAll.name = this.form.name;
         paramsAll.noticeName =
           types == 3 || types == 4 || types == 5 || types == 6
             ? this.form.titleChange
-            : "";
+            : '';
         paramsAll.type = this.form.typeId;
         if (this.staticTabShow) {
           paramsAll.details = tempArr;
@@ -975,29 +949,29 @@ export default {
         }
         param = paramsAll;
         if (!param.details) param.details = [];
-        param.details.forEach((item) => {
-          let regExp = new RegExp(config.imgHost, "g");
-          item.content = item.content.replace(regExp, "{imageUrlPrefix}");
+        param.details.forEach(item => {
+          let regExp = new RegExp(config.imgHost, 'g');
+          item.content = item.content.replace(regExp, '{imageUrlPrefix}');
         });
         // 评估内容的数据
         param.scale = {};
         console.log(
-          "this.AssesComSHow",
+          'this.AssesComSHow',
           this.AssesComSHow,
-          "AssesTabSHow",
+          'AssesTabSHow',
           this.AssesTabSHow
         );
         if (this.AssesComSHow && this.AssesTabSHow) {
           const assessParam = this.$refs.assessRef.formtParams();
           param.scale = assessParam;
           param.scale.conceptId = this.toAssesTermId;
-          const userInfo = localStorage.getItem("userLoginDTO");
+          const userInfo = localStorage.getItem('userLoginDTO');
           param.scale.modifier = userInfo.linkman;
         }
       }
       // return;
       // this.showSaveDialog(param,'是否'+(this.isEdit?'修改':'保存')+'该静态知识?');
-      console.log("param-------");
+      console.log('param-------');
       console.dir(param);
       // return;
       if (!this.isEdit) {
@@ -1024,14 +998,14 @@ export default {
       param.source = 1; //0:医院端  1:云平台
       api
         .saveBaseOrUpdateRecord(param)
-        .then((res) => {
-          if (res.data.code === "0") {
+        .then(res => {
+          if (res.data.code === '0') {
             this.isSuccessUpload = 0; // 修改文件上传状态为0
-            this.warning(res.data.msg || "保存成功", "success");
+            this.warning(res.data.msg || '保存成功', 'success');
             this.isSaveSuccess = true; // 保存成功,可正常退出
             //返回带搜索条件的首页
             this.$router.push({
-              name: "StaticInfo",
+              name: 'StaticInfo',
               params: Object.assign({}, this.$route.params, {
                 currentPage: 1
               })
@@ -1041,8 +1015,8 @@ export default {
           }
           this.saveDisable = false;
         })
-        .catch((err) => {
-          if (err.code === "900010001") {
+        .catch(err => {
+          if (err.code === '900010001') {
             return false;
           }
           this.saveDisable = false;
@@ -1052,13 +1026,13 @@ export default {
 
     // 弹出窗
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, "提示", {
-        confirmButtonText: "确定",
+      this.$alert(msg, '提示', {
+        confirmButtonText: '确定',
         // cancelButtonText: '取消',
         // cancelButtonClass: 'cancel',
         // confirmButtonClass: 'confirmBtn',
         dangerouslyUseHTMLString: true,
-        type: "warning"
+        type: 'warning'
       })
         .then(() => {
           resolve();
@@ -1069,7 +1043,7 @@ export default {
       this.$message({
         showClose: true,
         message: msg,
-        type: type || "warning"
+        type: type || 'warning'
       });
     },
     handleChange(file, fileList) {
@@ -1083,7 +1057,7 @@ export default {
       // console.log(fileList,this.form.fileList,'aa')
     },
     handleSuccess(response, file, fileList) {
-      if (response.code == "0") {
+      if (response.code == '0') {
         this.showFileList = true;
         this.form.fileList = [];
         this.form.fileList.push({
@@ -1098,7 +1072,7 @@ export default {
         this.isSuccessUpload = 2; // 上传成功状态
         this.$refs.upload && this.$refs.upload.clearValidate(); // 清除校验
       } else {
-        this.warning(response.msg || "上传失败");
+        this.warning(response.msg || '上传失败');
         // this.form.fileList = []
         this.showUpLoad = true;
         this.showFileList = false;
@@ -1118,7 +1092,7 @@ export default {
 
       this.showUpLoad = false;
       if (file.size / 1024 / 1024 >= 500) {
-        this.warning("文件上传失败,超出大小限制500MB");
+        this.warning('文件上传失败,超出大小限制500MB');
         this.form.fileList = [];
         this.showConfirm = false;
         return false;
@@ -1129,8 +1103,8 @@ export default {
     handlePreview(file) {},
     beforeRemove(file, fileList) {
       if (this.showConfirm) {
-        return this.$alert(`确定移除 ${file.name}?`, "", {
-          cancelButtonClass: "cacelBtn"
+        return this.$alert(`确定移除 ${file.name}?`, '', {
+          cancelButtonClass: 'cacelBtn'
         });
       }
     }
@@ -1138,7 +1112,7 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-@import "../../less/common.less";
+@import '../../less/common.less';
 .cell .el-button.delete:focus {
   color: red !important;
 }
@@ -1219,7 +1193,7 @@ export default {
   font-size: 14px;
 }
 .tipInfo:before {
-  content: "";
+  content: '';
   display: block;
   position: absolute;
   // bottom: 9px;

+ 2 - 1
src/components/knowledgeExtra/DevInfo.vue

@@ -331,7 +331,8 @@ export default {
         this.showType == 2 ||
         this.showType == 7 ||
         this.showType == 8 ||
-        this.showType == 9
+        this.showType == 9 ||
+        this.showType == 10
       ) {
         // 药品/手术
         this.positions = positions.filter((item) => item.key === 1);

+ 167 - 196
src/components/login/Login.vue

@@ -1,203 +1,177 @@
 <template>
-  <div class="login-container">
-    <banner></banner>
-    <div class="login-img fl">
-      <img src="../../images/loginImg.png" />
-    </div>
-    <div class="login-box">
-      <!-- <div class="box-le"><img src="../../images/left.jpg"/></div> -->
-      <div class="box-ri">
-        <div class="title-box clearfix">
-          <h3 class="login-title fl">登录</h3>
-          <h4 class="num fr" @click="toRegister">立即注册</h4>
-        </div>
-
-        <div class="ri-center">
-          <el-form :model="ruleForm2" :rules="rules2" ref="ruleFormReg">
-            <el-form-item prop="tel">
-              <el-input
-                v-model="ruleForm2.tel"
-                name="username"
-                autocomplete="off"
-                maxlength="11"
-                placeholder="请输入用户名或手机号"
-                clearable
-                class="ri-tel"
-                @keyup.enter.native="submitForm('ruleForm2')"
-                ref="username"
-              ></el-input>
-            </el-form-item>
-            <div style="height: 20px;"></div>
-            <el-form-item prop="pwd">
-              <el-input
-                v-model="ruleForm2.pwd"
-                name="password"
-                autocomplete="off"
-                maxlength="16"
-                placeholder="请输入密码"
-                clearable
-                type="password"
-                class="ri-pwd"
-                @keyup.enter.native="submitForm('ruleForm2')"
-                ref="password"
-              ></el-input>
-            </el-form-item>
-            <el-form-item>
-              <!-- <span class="num" @click="toRegister">注册账号</span> -->
-              <span class="pwd" @click="toForgetPsw">忘记密码?</span>
-            </el-form-item>
-            <el-form-item>
-              <el-button plain v-if="otherCor">登录</el-button>
-              <el-button ref="btn" v-else class="otherCor" plain @click="submitForm('ruleForm2')">登录</el-button>
-            </el-form-item>
-          </el-form>
+    <div class="login-container">
+        <banner></banner>
+        <div class="login-img fl"><img src="../../images/loginImg.png"/></div>
+        <div class="login-box">
+            <!-- <div class="box-le"><img src="../../images/left.jpg"/></div> -->
+            <div class="box-ri">
+                <div class="title-box clearfix"> <h3 class="login-title fl">登录</h3> <h4 class="num fr" @click="toRegister">立即注册</h4></div>
+               
+                <div class="ri-center">
+                    <el-form :model="ruleForm2" :rules="rules2" ref="ruleFormReg">
+                        <el-form-item prop="tel">
+                            <el-input v-model="ruleForm2.tel" name="username" autocomplete="off" maxlength="11"
+                                      placeholder="请输入用户名或手机号"
+                                      clearable class="ri-tel" @keyup.enter.native="submitForm('ruleForm2')"
+                                      ref="username"></el-input>
+                        </el-form-item>
+                        <div style="height: 20px;"></div>
+                        <el-form-item prop="pwd">
+                            <el-input v-model="ruleForm2.pwd" name="password" autocomplete="off" maxlength="16"
+                                      placeholder="请输入密码"
+                                      clearable type="password" class="ri-pwd"
+                                      @keyup.enter.native="submitForm('ruleForm2')" ref="password"></el-input>
+                        </el-form-item>
+                        <el-form-item>
+                            <!-- <span class="num" @click="toRegister">注册账号</span> -->
+                            <span class="pwd" @click="toForgetPsw">忘记密码?</span>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button plain v-if="otherCor" >登录</el-button>
+                            <el-button ref="btn" v-else class="otherCor" plain @click="submitForm('ruleForm2')">登录
+                            </el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
         </div>
-      </div>
+        <copy-right-info></copy-right-info>
     </div>
-    <copy-right-info></copy-right-info>
-  </div>
 </template>
 
 <script>
-import Vue from 'vue';
-import banner from '../common/Banner.vue';
-import copyRightInfo from '../common/CopyRightInfo.vue';
-import api from '../../api/index.js';
-import './login.less';
-import md5 from 'js-md5';
+  import Vue from 'vue';
+  import banner from '../common/Banner.vue';
+  import copyRightInfo from '../common/CopyRightInfo.vue';
+  import api from '../../api/index.js';
+  import './login.less';
+  import md5 from 'js-md5'
+	
+  export default {
+    name: 'Login',
+    data() {
+      //手机号码验证
+      var myreg = /^1[0-9]{10}$/;
+      //密码验证 纯字母纯英文
+      var numreg = /^(?![0-9]+$)(?![a-zA-Z]+$)/;
+      //密码验证 密码长度
+      var lengreg = /^[0-9A-Za-z]{6,16}$/;
+      var validatePass = (rule, value, callback) => {
+        // if(isNaN(value) == false){   //手机号
+        // 正常情况
 
-export default {
-  name: 'Login',
-  data() {
-    //手机号码验证
-    var myreg = /^1[0-9]{10}$/;
-    //密码验证 纯字母纯英文
-    var numreg = /^(?![0-9]+$)(?![a-zA-Z]+$)/;
-    //密码验证 密码长度
-    var lengreg = /^[0-9A-Za-z]{6,16}$/;
-    var validatePass = (rule, value, callback) => {
-      // if(isNaN(value) == false){   //手机号
-      // 正常情况
-
-      if (value.trim() == '') {
-        callback(new Error('用户名不能为空'));
-        this.$refs.username.value = '';
-      }
-      // 手机号
-      if (isNaN(value) == false) {
-        if (value.length !== 11 || !myreg.test(value)) {
-          callback(new Error('手机号格式有误'));
+        if (value.trim() == '') {
+          callback(new Error('用户名不能为空'));
+          this.$refs.username.value = "";
+        }
+        // 手机号
+        if (isNaN(value) == false) {
+          if (value.length !== 11 || !myreg.test(value)) {
+            callback(new Error('手机号格式有误'));
+          } else {
+            callback();
+          }
+        } else if (isNaN(value) == true) {
+          callback();
+        }
+      };
+      var validatePass2 = (rule, value, callback) => {
+        if (value.trim() == '') {
+          callback(new Error('密码不能为空'));
+          this.$refs.password.value = "";
+        } else if (value.length < 6) {
+          callback(new Error('密码长度应为6位至16位之间'));
+        } else if (!numreg.test(value)) {
+          callback(new Error('密码不能为纯数字或纯英文'));
         } else {
           callback();
         }
-      } else if (isNaN(value) == true) {
-        callback();
-      }
-    };
-    var validatePass2 = (rule, value, callback) => {
-      if (value.trim() == '') {
-        callback(new Error('密码不能为空'));
-        this.$refs.password.value = '';
-      } else if (value.length < 6) {
-        callback(new Error('密码长度应为6位至16位之间'));
-      } else if (!numreg.test(value)) {
-        callback(new Error('密码不能为纯数字或纯英文'));
-      } else {
-        callback();
-      }
-    };
-    return {
-      otherCor: true,
-      ruleForm2: {
-        tel: '',
-        pwd: ''
-      },
-      rules2: {
-        tel: [
-          {
+      };
+      return {
+        otherCor: true,
+        ruleForm2: {
+          tel: '',
+          pwd: ''
+        },
+        rules2: {
+          tel: [{
             required: true,
             validator: validatePass,
             trigger: 'blur'
-          }
-        ],
-        pwd: [
-          {
+          }],
+          pwd: [{
             required: true,
             validator: validatePass2,
             trigger: 'blur'
-          }
-        ]
-      }
-    };
-  },
-  mounted() {
-    if (window.history && window.history.pushState) {
-      history.pushState(null, null, document.URL);
-      window.addEventListener('popstate', function() {
-        history.pushState(null, null, document.URL);
-      });
-    }
-  },
-  computed: {
-    nextButton() {
-      const { tel, pwd } = this.ruleForm2;
-      return {
-        tel,
-        pwd
+          }],
+        }
       };
-    }
-  },
-  watch: {
-    nextButton: {
-      handler: function(val) {
-        if (val.tel.trim() && val.pwd.trim()) {
-          this.otherCor = false;
-        } else {
-          this.otherCor = true;
+    },
+    mounted() {
+      if (window.history && window.history.pushState) {
+        history.pushState(null, null, document.URL);
+        window.addEventListener('popstate', function () {
+            history.pushState(null, null, document.URL);
+        });
+      }
+    },
+    computed: {
+      nextButton() {
+        const {
+          tel,
+          pwd
+        } = this.ruleForm2;
+        return {
+          tel,
+          pwd
         }
-      },
-      deep: true
-    }
-  },
-  methods: {
-    CalcuMD5(password) {
-      // password = password.toUpperCase();
-      password = md5(password);
-      return password;
+      }
     },
-    submitForm: function() {
-      const username = this.ruleForm2.tel;
-      const password = this.CalcuMD5(this.ruleForm2.pwd);
-      let params = {
-        username: username,
-        password: password
-      };
-      //重新登录清空原有token;
-      localStorage.removeItem('token');
-      this.$refs.ruleFormReg.validate(valid => {
-        if (valid) {
-          api
-            .loginMess(params)
-            .then(res => {
+    watch: {
+      nextButton: {
+        handler: function (val) {
+          if (val.tel.trim() && val.pwd.trim()) {
+            this.otherCor = false;
+          } else {
+            this.otherCor = true;
+          }
+        },
+        deep: true
+      }
+    },
+    methods: {
+      CalcuMD5(password){
+        // password = password.toUpperCase();
+        password = md5(password);
+        return password;
+      },
+      submitForm: function () {
+        const username = this.ruleForm2.tel;
+        const password = this.CalcuMD5(this.ruleForm2.pwd);
+        let params = {
+          "username": username,
+          "password": password
+        }
+        //重新登录清空原有token;
+        localStorage.removeItem('token');
+        this.$refs.ruleFormReg.validate((valid) => {
+          if (valid) {
+            api.loginMess(params).then((res) => {
               if (res.status == 200) {
-                // console.log(res)
-                if (res.data.code == '10020000') {
-                  //未注册
+								// console.log(res)
+                if (res.data.code == '10020000') { //未注册
                   // this.$message.error(res.data.msg);
-                  this.$message.error('该账号或手机号未注册!');
-                } else if (res.data.code == '10020001') {
-                  //密码错误
+									this.$message.error("该账号或手机号未注册!")
+                } else if (res.data.code == '10020001') { //密码错误
                   this.$message.error(res.data.msg);
                 } else if (res.data.code == '0') {
                   const token = JSON.stringify(res.data.data);
-                  localStorage.setItem('token', token);
-                  const uesrId = JSON.stringify(res.data.data.type);
-                  localStorage.setItem('uesrId', uesrId);
+                  localStorage.setItem("token", token);
                   this.$message({
                     message: '登录成功!',
                     type: 'success',
                     duration: 1000,
-                    onClose: function() {
+                    onClose: function () {
                       const type = res.data.data.type;
                       if (type == 0) {
                         this.$router.push({
@@ -212,32 +186,29 @@ export default {
                   });
                 }
               }
-            })
-            .catch(err => {
+            }).catch((err) => {
               console.log(err);
-            });
-        } else {
-          console.log('faild');
-          return false;
-        }
-      });
+            })
+          } else {
+            console.log('faild')
+            return false;
+          }
+        });
+      },
+      toRegister() { //点击注册
+        this.$router.push({
+          path: '/register'
+        });
+      },
+      toForgetPsw() {//忘记密码
+        this.$router.push({
+          path: '/forgetPassword'
+        });
+      }
     },
-    toRegister() {
-      //点击注册
-      this.$router.push({
-        path: '/register'
-      });
+    components: {
+      'banner': banner,
+      'copyRightInfo': copyRightInfo
     },
-    toForgetPsw() {
-      //忘记密码
-      this.$router.push({
-        path: '/forgetPassword'
-      });
-    }
-  },
-  components: {
-    banner: banner,
-    copyRightInfo: copyRightInfo
   }
-};
 </script>

+ 2 - 2
vue.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
-// const proxy_path = 'http://192.168.2.241:88';
-const proxy_path = 'http://192.168.2.236:5050';
+const proxy_path = 'http://192.168.2.241:88';
+// const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.113:5050'; //王峰