Merge branch 'test' of http://192.168.2.236:10080/zhouna/cdssHospital into test

src/api/index.js

@@ -3,9 +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:6060';
-axios.defaults.baseURL = 'http://192.168.2.241:84';
-//axios.defaults.baseURL = 'http://192.168.2.236:6060';
+// axios.defaults.baseURL = 'http://192.168.2.236:6060';
 // axios.defaults.baseURL = 'http://192.168.2.241';
 // axios.defaults.baseURL = 'http://192.168.3.113:6060';
 

src/components/common/HomePage.vue

@@ -188,14 +188,7 @@ export default {
     this.getMenuList();
   },
   mounted() {
-    let elSide = document.querySelector('.el-aside'),
-      tabWidth = document.querySelector('.collect-left');
-    tabWidth.style.left = elSide.offsetWidth - 36 + 'px';
-    window.onresize = () => {
-      return (() => {
-        tabWidth.style.left = elSide.offsetWidth - 36 + 'px';
-      })();
-    };
+    
   },
   watch: {
     $route: function(to, from) {
@@ -211,7 +204,9 @@ export default {
   },
   methods: {
     collect() {
+      let tabWidth = document.querySelector(".collect-left");
       this.onshow = !this.onshow;
+      tabWidth.style.left = this.onshow ? 300 - 36 + "px" : 300 + "px";
     },
     CalcuMD5(password) {
       password = md5(password);
@@ -360,7 +355,7 @@ export default {
   width: 36px;
   height: 32px;
   position: fixed;
-  // left: calc(20% - 36px);
+  left: 264px;
   top: 65%;
   z-index: 20;
 }
@@ -412,7 +407,7 @@ export default {
 .version {
   position: fixed;
   bottom: 0;
-  width: @aside-width;
+  width: 300px;
   min-width: 270px;
   font-size: 12px;
   /*text-indent: 50px;*/

src/components/icss/bill/Bill.vue

@@ -231,8 +231,8 @@ export default {
       const param = {
         number: this.inCurrentPage - 1 || this.currentPage - 1,
         size: this.pageSize,
-        conditionName: this.filter.conditionName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        conceptName: this.filter.conceptName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        conditionName: this.filter.conditionName.trim(),
+        conceptName: this.filter.conceptName.trim(),
         relationStatus: this.filter.relationStatus
         // uniqueCode: ''
       };

src/components/icss/dept/DeptManage.vue

@@ -266,8 +266,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 7,
         isMatch: this.filter.match,

src/components/icss/disease/ChemicalAndCommonMapping.vue

@@ -267,8 +267,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         icdCode: '',
         type: 4,
         isMatch: this.filter.match,

src/components/icss/drug/DrugManage.vue

@@ -1,18 +1,9 @@
 <template>
   <div>
-    <crumbs
-      title="药品关联维护"
-      style="min-width: 980px"
-      class="knowledgeTitle"
-    >
+    <crumbs title="药品关联维护" style="min-width: 980px" class="knowledgeTitle">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item class="selectMedicine" label="标准术语状态：">
-          <el-select
-            size="mini"
-            v-model="filter.status"
-            placeholder="请选择"
-            clearable
-          >
+          <el-select size="mini" v-model="filter.status" placeholder="请选择" clearable>
             <el-option
               v-for="item in statusList"
               :label="item.name"
@@ -22,12 +13,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="剂型术语状态：" class="selectMedicine">
-          <el-select
-            size="mini"
-            v-model="filter.formStatus"
-            placeholder="请选择"
-            clearable
-          >
+          <el-select size="mini" v-model="filter.formStatus" placeholder="请选择" clearable>
             <el-option
               v-for="item in formstatusList"
               :label="item.name"
@@ -37,137 +23,69 @@
           </el-select>
         </el-form-item>
         <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 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-input size="mini" v-model="filter.hisName" placeholder="请输入" clearable></el-input>
         </el-form-item>
       </el-form>
       <el-form class="secLine" :inline="true">
         <el-form-item>
-          <el-button type="text" class="downTemplate" @click="exportModule"
-            >导入模板下载</el-button
-          >
-          <input
-            type="file"
-            name="uploadfile "
-            id="upFile"
-            @change="uploadFile($event)"
-          />
+          <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
+          <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" />
           <!-- accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
           <el-button size="mini" @click="handleMatchData">预匹配</el-button>
-          <el-button size="mini" @click="importPage" style="margin: 0 10px">{{
-            uploadInfo
-          }}</el-button>
-          <input
-            type="file"
-            name="uploadfile "
-            id="upFileMatch"
-            @change="uploadFileMatch($event)"
-          />
+          <el-button size="mini" @click="importPage" style="margin:0 10px">{{uploadInfo}}</el-button>
+          <input type="file" name="uploadfile " id="upFileMatch" @change="uploadFileMatch($event)" />
           <el-button size="mini" @click="exportData">导出</el-button>
         </el-form-item>
         <el-form-item label="标准药品名称：">
-          <el-input
-            size="mini"
-            v-model="filter.uniqueName"
-            placeholder="请输入"
-            clearable
-          ></el-input>
+          <el-input size="mini" v-model="filter.uniqueName" placeholder="请输入" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button size="mini" @click="filterDatas">检索</el-button>
-          <el-button size="mini" type="warning" @click="addRelation"
-            >添加关联</el-button
-          >
+          <el-button size="mini" type="warning" @click="addRelation">添加关联</el-button>
         </el-form-item>
       </el-form>
     </crumbs>
     <div class="contents knowledgeContents">
       <el-table :data="list" border style="width: 100%">
-        <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="uniqueName"
-          label="标准药品名称"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="form"
-          label="药品剂型"
-          show-overflow-tooltip
-        ></el-table-column>
+        <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="uniqueName" label="标准药品名称" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="form" label="药品剂型" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="标准术语状态">
           <template slot-scope="scope">
-            <span v-if="scope.row.uniqueName && scope.row.uniqueName != ''">{{
-              scope.row.status == 0 ? "禁用" : "启用"
-            }}</span>
+            <span
+              v-if="scope.row.uniqueName && scope.row.uniqueName!=''"
+            >{{scope.row.status == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="剂型术语状态">
           <template slot-scope="scope">
-            <span v-if="scope.row.form && scope.row.form != ''">{{
-              scope.row.formStatus == 0 ? "禁用" : "启用"
-            }}</span>
+            <span
+              v-if="scope.row.form && scope.row.form!=''"
+            >{{scope.row.formStatus == 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="匹配状态">
           <template slot-scope="scope">
-            <span>{{ scope.row.isMatch == 0 ? "未匹配" : "已匹配" }}</span>
+            <span>{{scope.row.isMatch == 0?'未匹配':'已匹配'}}</span>
           </template>
         </el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
-            <el-button
-              @click="modifyRelation(scope.row)"
-              type="text"
-              size="small"
-              >修改</el-button
-            >
-            <span style="margin: 0 3px">|</span>
+            <el-button @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
+            <span style="margin:0 3px;">|</span>
             <el-button
               @click="showDelDialog(scope.row.id)"
               class="delete"
               type="text"
               size="small"
-              >删除</el-button
-            >
+            >删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -197,51 +115,51 @@
 </template>
 
 <script>
-import api from "@api/icss.js";
-import config from "@api/config.js";
-import utils from "@api/utils.js";
-import LtModal from "@components/common/LtModal";
+import api from '@api/icss.js';
+import config from '@api/config.js';
+import utils from '@api/utils.js';
+import LtModal from '@components/common/LtModal';
 export default {
-  name: "DrugManage", //化验大小项和公表维护
-  data: function () {
+  name: 'DrugManage', //化验大小项和公表维护
+  data: function() {
     return {
       list: [],
       matchList: [
-        { id: "", name: "全部" },
-        { id: 1, name: "已匹配" },
-        { id: 0, name: "未匹配" },
-        { id: 2, name: "多项匹配" },
+        { id: '', name: '全部' },
+        { id: 1, name: '已匹配' },
+        { id: 0, name: '未匹配' },
+        { id: 2, name: '多项匹配' }
       ],
       statusList: [
-        { id: "", name: "全部" },
-        { id: 1, name: "启用" },
-        { id: 0, name: "禁用" },
+        { id: '', name: '全部' },
+        { id: 1, name: '启用' },
+        { id: 0, name: '禁用' }
       ],
       formstatusList: [
-        { id: "", name: "全部" },
-        { id: 1, name: "启用" },
-        { id: 0, name: "禁用" },
+        { id: '', name: '全部' },
+        { id: 1, name: '启用' },
+        { id: 0, name: '禁用' }
       ],
       searched: false,
       filter: {
-        hisName: "", // 医院诊断名称
-        uniqueName: "", //标准诊断名称
-        match: "",
-        status: "",
-        formStatus: "",
+        hisName: '', // 医院诊断名称
+        uniqueName: '', //标准诊断名称
+        match: '',
+        status: '',
+        formStatus: ''
       },
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,
       pageLayout: config.pageLayout,
       total: 0,
-      uploadInfo: "导入",
+      uploadInfo: '导入',
       modalVisiable: false,
-      data: {},
+      data: {}
     };
   },
   components: {
-    LtModal,
+    LtModal
   },
   created() {
     const param = this.$route.params;
@@ -258,73 +176,68 @@ export default {
   },
   watch: {
     filter: {
-      handler: function () {
+      handler: function() {
         this.searched = false;
       },
-      deep: true, // watch中的高级用法 为true时  表示深度监听 这时候就能监听到filter中的值
-    },
+      deep: true
+    }
   },
   methods: {
     // 预匹配
     handleMatchData() {
-      let inp = document.getElementById("upFileMatch");
+      let inp = document.getElementById('upFileMatch');
       inp.click();
     },
-
     // 导入数据
     uploadFileMatch(e) {
       let fileInfo = e.target.files[0];
-      let extend = fileInfo.name.substring(fileInfo.name.lastIndexOf(".") + 1);
-      if (extend != "xls" && extend != "xlsx") {
-        this.$message({ message: "请根据模板进行导入", type: "error" });
+      let extend = fileInfo.name.substring(fileInfo.name.lastIndexOf('.') + 1);
+      if (extend != 'xls' && extend != 'xlsx') {
+        this.$message({ message: '请根据模板进行导入', type: 'error' });
         return;
       }
       e.preventDefault();
       let formData = new FormData();
-      formData.append("file", fileInfo);
-      formData.append("type", 5);
+      formData.append('file', fileInfo);
+      formData.append('type', 5);
       const header = {
         headers: {
-          "Content-Type": "multipart/form-data",
-        },
+          'Content-Type': 'multipart/form-data'
+        }
       };
-      // 加载动画效果
       const loading = this.$loading({
         lock: true,
-        text: "预匹配中...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
+        text: '预匹配中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
       });
-
-      // 导入数据接口
-      api.dataDiseaseVerify(formData, header).then((res) => {
-        if (res.data.code === "00020007" || res.data.code === "00020004") {
+      api.dataDiseaseVerify(formData, header).then(res => {
+        if (res.data.code === '00020007' || res.data.code === '00020004') {
           loading.close();
-          this.$alert(`${res.data.msg}`, "提示", {
-            confirmButtonText: "确定",
-            type: "warning",
+          this.$alert(`${res.data.msg}`, '提示', {
+            confirmButtonText: '确定',
+            type: 'warning'
           })
             .then(() => {})
             .catch(() => {});
         } else {
-          api.precDiseaseDataMatch(formData, header).then((res) => {
+          api.precDiseaseDataMatch(formData, header).then(res => {
             setTimeout(() => {
               loading.close();
             }, 800);
             if (res.status === 200) {
               utils.downloadExportedData(
                 res.data,
-                "药品关联数据（预匹配）.xls"
+                '药品关联数据（预匹配）.xls'
               );
             }
           });
         }
       });
 
-      let inp = document.getElementById("upFileMatch");
-      inp.value = "";
+      let inp = document.getElementById('upFileMatch');
+      inp.value = '';
     },
-
     handleSizeChange(val) {
       this.pageSize = val;
       this.currentPage = utils.getCurrentPage(
@@ -339,16 +252,15 @@ export default {
     getDataList(isTurnPage) {
       const params = this.getFilterItems(isTurnPage);
       this.searched = true;
-      // 加载动画效果
       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)'
       });
-      api.getDrugPage(params).then((res) => {
+      api.getDrugPage(params).then(res => {
         loading.close();
-        if (res.data.code === "0") {
+        if (res.data.code === '0') {
           this.list = res.data.data && res.data.data.records;
         }
         this.total = res.data.data && res.data.data.total;
@@ -368,13 +280,13 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueCode: "",
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
+        uniqueCode: '',
         type: 5,
         isMatch: this.filter.match,
         status: this.filter.status,
-        formStatus: this.filter.formStatus,
+        formStatus: this.filter.formStatus
       };
       return param;
     },
@@ -383,19 +295,17 @@ export default {
       this.currentPage = 1;
       this.getDataList();
     },
-
-    // 点击添加关联
     addRelation() {
       const pam = this.searched
         ? {
             currentPage: this.currentPage,
             pageSize: this.pageSize,
-            filter: this.filter,
+            filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
 
       this.data = {};
-      this.showModal(); // 控制弹出框的显示隐藏
+      this.showModal();
       // this.$router.push({ name: 'AddDrug', params: pam });
     },
     // 修改诊断关联-跳转至编辑页面
@@ -405,7 +315,7 @@ export default {
         ? {
             currentPage: this.currentPage,
             pageSize: this.pageSize,
-            filter: this.filter,
+            filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
       // this.$router.push({
@@ -424,12 +334,11 @@ export default {
       //     this.getDataList();
       // }
     },
-
     // 清空搜索参数
     clearFilter() {
       this.filter = {
-        hisName: "",
-        uniqueName: "",
+        hisName: '',
+        uniqueName: ''
       };
     },
 
@@ -443,16 +352,16 @@ export default {
       this.$message({
         showClose: true,
         message: msg,
-        type: type || "warning",
+        type: type || 'warning'
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$confirm(msg, "提示", {
-        confirmButtonText: "删除",
-        cancelButtonText: "取消",
-        cancelButtonClass: "cancelBtn",
-        confirmButtonClass: "confirmC",
-        type: "warning",
+      this.$confirm(msg, '提示', {
+        confirmButtonText: '删除',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: 'confirmC',
+        type: 'warning'
       })
         .then(() => {
           resolve();
@@ -461,11 +370,11 @@ export default {
     },
     // 删除关联
     showDelDialog(id) {
-      this.showConfirmDialog("是否删除该关联？", () => {
+      this.showConfirmDialog('是否删除该关联？', () => {
         api
           .deleteDrugRecord({ id: id })
-          .then((res) => {
-            if (res.data.code == "0") {
+          .then(res => {
+            if (res.data.code == '0') {
               if (!this.searched) {
                 //未点确认时清空搜索条件
                 this.clearFilter();
@@ -476,13 +385,13 @@ export default {
                   this.currentPage === 1 ? 1 : this.currentPage - 1;
               }
               this.getDataList();
-              this.warning(res.data.msg || "操作成功", "success");
+              this.warning(res.data.msg || '操作成功', 'success');
             } else {
               this.warning(res.data.msg);
             }
           })
-          .catch((error) => {
-            if (error.code === "900010001") {
+          .catch(error => {
+            if (error.code === '900010001') {
               return false;
             }
             this.warning(error);
@@ -492,13 +401,13 @@ export default {
 
     // 导出数据
     exportData() {
-      this.$confirm("确定要导出全部药品关联数据吗？", "", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        cancelButtonClass: "leftbtn",
-        customClass: "exportBox6",
-        title: "提示",
-        type: "warning",
+      this.$confirm('确定要导出全部药品关联数据吗？', '', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'leftbtn',
+        customClass: 'exportBox6',
+        title: '提示',
+        type: 'warning'
         // beforeClose: (action, instance, done) => {
         //   if (action === 'confirm') {
         //     // instance.confirmButtonLoading = true;
@@ -519,10 +428,10 @@ export default {
         .then(() => {
           api
             .exportDrugRecord({ type: 5, isMatch: this.filter.match })
-            .then((res) => {
+            .then(res => {
               if (res.status === 200) {
-                this.$message({ message: "导出成功", type: "success" });
-                utils.downloadExportedData(res.data, "药品关联数据.xls");
+                this.$message({ message: '导出成功', type: 'success' });
+                utils.downloadExportedData(res.data, '药品关联数据.xls');
               }
             });
         })
@@ -533,10 +442,10 @@ export default {
 
     // 导入模板
     exportModule() {
-      api.exportDrugModule({ type: 5 }).then((res) => {
+      api.exportDrugModule({ type: 5 }).then(res => {
         if (res.status === 200) {
           setTimeout(() => {
-            utils.downloadExportedData(res.data, "药品导入模板.xls");
+            utils.downloadExportedData(res.data, '药品导入模板.xls');
           }, 1500);
         }
       });
@@ -544,31 +453,30 @@ export default {
 
     // 点击导入
     importPage() {
-      let inp = document.getElementById("upFile");
+      let inp = document.getElementById('upFile');
       inp.click();
     },
-
     // 导入数据
     uploadFile(e) {
       let fileInfo = e.target.files[0];
-      let extend = fileInfo.name.substring(fileInfo.name.lastIndexOf(".") + 1);
-      if (extend != "xls" && extend != "xlsx") {
-        this.$message({ message: "请根据模板进行导入", type: "error" });
+      let extend = fileInfo.name.substring(fileInfo.name.lastIndexOf('.') + 1);
+      if (extend != 'xls' && extend != 'xlsx') {
+        this.$message({ message: '请根据模板进行导入', type: 'error' });
         return;
       }
-      e.preventDefault(); // 阻止默认行为
+      e.preventDefault();
       let formData = new FormData();
-      formData.append("file", fileInfo);
-      formData.append("type", 5);
-      formData.append("uesrId", localStorage.getItem("uesrId"));
+      formData.append('file', fileInfo);
+      formData.append('type', 5);
+      formData.append('uesrId', localStorage.getItem('uesrId'));
       formData.append(
-        "hospitalId",
-        JSON.parse(localStorage.getItem("hospitalLoginDTO")).id
+        'hospitalId',
+        JSON.parse(localStorage.getItem('hospitalLoginDTO')).id
       );
       const header = {
         headers: {
-          "Content-Type": "multipart/form-data",
-        },
+          'Content-Type': 'multipart/form-data'
+        }
       };
       this.importDrugRecord(formData, header);
       // this.uploadInfo = '导入中...';
@@ -608,41 +516,41 @@ export default {
       // });
 
       //解决上传相同文件不触发change
-      let inp = document.getElementById("upFile");
-      inp.value = "";
+      let inp = document.getElementById('upFile');
+      inp.value = '';
     },
     importDrugRecord(formData, header) {
       let that = this;
-      api.importDrugRecord(formData, header).then((res) => {
-        if (res.headers["content-disposition"]) {
+      api.importDrugRecord(formData, header).then(res => {
+        if (res.headers['content-disposition']) {
           this.downloadUrl(res);
           this.getDataList();
         } else {
           let r = new FileReader();
-          r.onload = function () {
+          r.onload = function() {
             if (this.result) {
               const code = JSON.parse(this.result);
-              if (code.code === "00020004" || code.code === "00020007") {
+              if (code.code === '00020004' || code.code === '00020007') {
                 that
-                  .$alert(`${code.msg}`, "提示", {
-                    confirmButtonText: "确定",
+                  .$alert(`${code.msg}`, '提示', {
+                    confirmButtonText: '确定',
                     // cancelButtonText: '取消',
                     // cancelButtonClass: 'cancelSure',
                     // confirmButtonClass: 'sure',
                     // customClass: 'exportConfirm',
-                    type: "warning",
+                    type: 'warning'
                   })
                   .then(() => {})
                   .catch(() => {});
               }
             } else {
-              that.$alert(`导入成功`, "提示", {
-                confirmButtonText: "确定",
+              that.$alert(`导入成功`, '提示', {
+                confirmButtonText: '确定',
                 // cancelButtonText: '取消',
                 // cancelButtonClass: 'cancelSure',
                 // confirmButtonClass: 'sure',
                 // customClass: 'exportConfirm',
-                type: "success",
+                type: 'success'
               });
               that.getDataList();
             }
@@ -698,12 +606,12 @@ export default {
       });
     },
     downloadUrl(res) {
-      var disposition = res.headers["content-disposition"];
+      var disposition = res.headers['content-disposition'];
       var fileName = decodeURI(
-        disposition.split("filename=")[1].split(";filename*=")[0]
+        disposition.split('filename=')[1].split(';filename*=')[0]
       );
-      let blob = new Blob([res.data], { type: "application/.xls" }); //.xls是我和后台约定好的文件格式
-      let link = document.createElement("a");
+      let blob = new Blob([res.data], { type: 'application/.xls' }); //.xls是我和后台约定好的文件格式
+      let link = document.createElement('a');
       link.href = window.URL.createObjectURL(blob);
       link.download = fileName;
       link.click();
@@ -714,20 +622,20 @@ export default {
       this.modalVisiable = true;
     },
     getMsgFormSon(data) {
-      if (data == "close") {
+      if (data == 'close') {
         this.modalVisiable = false;
       } else {
         this.modalVisiable = false;
         this.getDataList();
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
 
 <style lang="less" scoped>
-@import "../../../less/admin.less";
+@import '../../../less/admin.less';
 /deep/ .container.knowledgeTitle {
   height: 80px;
 }

src/components/icss/drugroute/Drugroute.vue

@@ -266,8 +266,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 16,
         isMatch: this.filter.match,

src/components/icss/fusion/Fusion.vue

@@ -259,8 +259,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 8,
         isMatch: this.filter.match,

src/components/icss/hemp/Hemp.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div>
     <crumbs title="麻醉关联维护" style="min-width: 980px" class="knowledgeTitle">
@@ -91,8 +90,8 @@
     <LtModal
       v-if="modalVisiable"
       @func="getMsgFormSon"
-      :meal="'麻醉名称'"
-      :standard="'麻醉名称'"
+      :meal="'麻醉类型'"
+      :standard="'麻醉类型'"
       :tip="'麻醉关联'"
       :type="14"
       :data="data"
@@ -614,582 +613,6 @@ export default {
 </script>
 
 
-<style lang="less" scoped>
-@import '../../../less/admin.less';
-/deep/ .container.knowledgeTitle {
-  height: 80px;
-}
-/deep/ .contents.knowledgeContents {
-  padding: 104px 20px 0;
-}
-/deep/ .secLine.el-form {
-  float: right;
-  display: block;
-  position: relative;
-  top: -5px;
-}
-.delete {
-  color: red;
-}
-.delete:hover {
-  color: red;
-}
-.pagination {
-  min-width: 1010px;
-}
-.downTemplate {
-  margin-right: 8px;
-  span {
-    color: #02a7f0;
-  }
-}
-#upFile {
-  display: none !important;
-}
-.el-message-box {
-  /deep/.cancelBtn {
-    background-color: #d7d7d7;
-    border-color: transparent;
-  }
-  /deep/.confirmC {
-    background-color: #ff545b !important;
-    border-color: transparent !important;
-  }
-}
-.exportBox6 {
-  /deep/ .el-message-box__btns {
-    margin-top: 20px;
-  }
-  /deep/ .el-message-box__message {
-    // text-align: center;
-  }
-  /deep/.leftbtn {
-    background-color: #d7d7d7;
-    border-color: transparent !important;
-  }
-  /deep/ .el-message-box__header {
-    border-bottom: 1px solid #dcdfe6;
-  }
-}
-#upFileMatch {
-  display: none;
-}
-</style>
-
-<script>
-import api from '@api/icss.js';
-import config from '@api/config.js';
-import utils from '@api/utils.js';
-import LtModal from '@components/common/LtModal';
-export default {
-  name: 'Fusion', //化验大小项和公表维护
-  data: function() {
-    return {
-      list: [],
-      matchList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '已匹配' },
-        { id: 0, name: '未匹配' },
-        { id: 2, name: '多项匹配' }
-      ],
-      statusList: [
-        { id: '', name: '全部' },
-        { id: 1, name: '启用' },
-        { id: 0, name: '禁用' }
-      ],
-      searched: false,
-      filter: {
-        hisName: '', // 医院诊断名称
-        uniqueName: '', //标准诊断名称
-        match: '',
-        status: ''
-      },
-      currentPage: 1,
-      pageSize: config.pageSize,
-      pageSizeArr: config.pageSizeArr,
-      pageLayout: config.pageLayout,
-      total: 0,
-      uploadInfo: '导入',
-      modalVisiable: false,
-      data: {}
-    };
-  },
-  components: {
-    LtModal
-  },
-  created() {
-    const param = this.$route.params;
-    if (param.currentPage) {
-      this.inCurrentPage = param.currentPage;
-    }
-    if (param.filter) {
-      this.filter = param.filter;
-    }
-    //返回时避免参数未赋值就获取列表
-    setTimeout(() => {
-      this.getDataList();
-    });
-  },
-  watch: {
-    filter: {
-      handler: function() {
-        this.searched = false;
-      },
-      deep: true
-    }
-  },
-
-  methods: {
-    // 预匹配
-    handleMatchData() {
-      let inp = document.getElementById('upFileMatch');
-      inp.click();
-    },
-
-    // 导入数据
-    uploadFileMatch(e) {
-      let fileInfo = e.target.files[0];
-      let extend = fileInfo.name.substring(fileInfo.name.lastIndexOf('.') + 1);
-      if (extend != 'xls' && extend != 'xlsx') {
-        this.$message({ message: '请根据模板进行导入', type: 'error' });
-        return;
-      }
-      e.preventDefault();
-      let formData = new FormData();
-      formData.append('file', fileInfo);
-      formData.append('type', 14);
-      const header = {
-        headers: {
-          'Content-Type': 'multipart/form-data'
-        }
-      };
-      const loading = this.$loading({
-        lock: true,
-        text: '预匹配中...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      });
-      api.dataDiseaseVerify(formData, header).then(res => {
-        if (res.data.code === '00020007' || res.data.code === '00020004') {
-          loading.close();
-          this.$alert(`${res.data.msg}`, '提示', {
-            confirmButtonText: '确定',
-            type: 'warning'
-          })
-            .then(() => {})
-            .catch(() => {})
-        } else {
-          api.precDiseaseDataMatch(formData, header).then(res => {
-            setTimeout(() => {
-              loading.close();
-            }, 800);
-            if (res.status === 200) {
-              utils.downloadExportedData(
-                res.data,
-                '麻醉关联数据（预匹配）.xls'
-              );
-            }
-          });
-        }
-      });
-
-      let inp = document.getElementById('upFileMatch');
-      inp.value = '';
-    },
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = utils.getCurrentPage(
-        this.currentPage,
-        this.total,
-        this.pageSize
-      );
-      this.getDataList();
-    },
-
-    // 获取列表数据
-    getDataList(isTurnPage) {
-      const params = this.getFilterItems(isTurnPage);
-      this.searched = true;
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      });
-      api.getFusionPage(params).then(res => {
-        loading.close();
-        if (res.data.code === '0') {
-          this.list = res.data.data && res.data.data.records;
-          console.log('麻醉列表数据：', this.list);
-        }
-        this.total = res.data.data && res.data.data.total;
-        if (this.inCurrentPage !== undefined) {
-          this.currentPage = this.inCurrentPage;
-          this.inCurrentPage = undefined;
-        }
-      });
-    },
-
-    // 处理列表请求数据参数
-    getFilterItems(isTurnPage) {
-      //翻页时筛选条件没点确定则清空
-      if (isTurnPage && !this.searched) {
-        this.clearFilter();
-      }
-      const param = {
-        current: this.inCurrentPage || this.currentPage,
-        size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueCode: '',
-        type: 14,
-        isMatch: this.filter.match,
-        status: this.filter.status
-      };
-      return param;
-    },
-
-    filterDatas() {
-      this.currentPage = 1;
-      this.getDataList();
-    },
-    addRelation() {
-      const pam = this.searched
-        ? {
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            filter: this.filter
-          }
-        : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({ name: 'AddFusion', params: pam });
-      this.data = {};
-      this.showModal();
-    },
-    // 修改诊断关联-跳转至编辑页面
-    modifyRelation(row) {
-      const item = Object.assign({}, row);
-      const pam = this.searched
-        ? {
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            filter: this.filter
-          }
-        : { currentPage: this.currentPage, pageSize: this.pageSize };
-      // this.$router.push({
-      //   name: 'AddFusion',
-      //   params: Object.assign(pam, { isEdit: true, data: item })
-      // });
-      this.data = item;
-      this.showModal();
-    },
-    currentChange(next) {
-      this.currentPage = next;
-      this.getDataList(true);
-      // if (this.cacheData[next]) {       //如果已请求过该页数据，则使用缓存不重复请求
-      //     this.list = this.cacheData[next];
-      // } else {
-      //     this.getDataList();
-      // }
-    },
-    // 清空搜索参数
-    clearFilter() {
-      this.filter = {
-        hisName: '',
-        uniqueName: ''
-      };
-    },
-
-    indexMethod(index) {
-      return (this.currentPage - 1) * this.pageSize + index + 1;
-    },
-    getTagType(val) {
-      return val;
-    },
-    warning(msg, type) {
-      this.$message({
-        showClose: true,
-        message: msg,
-        type: type || 'warning'
-      });
-    },
-    showConfirmDialog(msg, resolve) {
-      this.$confirm(msg, '提示', {
-        confirmButtonText: '删除',
-        cancelButtonText: '取消',
-        cancelButtonClass: 'cancelBtn',
-        confirmButtonClass: 'confirmC',
-        type: 'warning'
-      })
-        .then(() => {
-          resolve();
-        })
-        .catch(() => {});
-    },
-    // 删除关联
-    showDelDialog(id) {
-      this.showConfirmDialog('是否删除该关联？', () => {
-        api
-          .deleteFusionRecord({ id: id })
-          .then(res => {
-            if (res.data.code == '0') {
-              if (!this.searched) {
-                //未点确认时清空搜索条件
-                this.clearFilter();
-              }
-              if (this.list.length == 1) {
-                //当前在最后一页且只有一条数据时，删除后跳到前一页
-                this.currentPage =
-                  this.currentPage === 1 ? 1 : this.currentPage - 1;
-              }
-              this.getDataList();
-              this.warning(res.data.msg || '操作成功', 'success');
-            } else {
-              this.warning(res.data.msg);
-            }
-          })
-          .catch(error => {
-            if (error.code === '900010001') {
-              return false;
-            }
-            this.warning(error);
-          });
-      });
-    },
-
-    // 导出数据
-    exportData() {
-      this.$confirm('确定要导出全部麻醉关联数据吗？', '', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        cancelButtonClass: 'leftbtn',
-        customClass: 'exportBox6',
-        title: '提示',
-        type: 'warning'
-        // beforeClose: (action, instance, done) => {
-        //   if (action === 'confirm') {
-        //     // instance.confirmButtonLoading = true;
-        //     instance.confirmButtonText = '导出中...';
-        //     api.exportFusionRecord().then(res => {
-        //       if (res.status === 200) {
-        //         setTimeout(() => {
-        //           utils.downloadExportedData(res.data, '麻醉关联数据.xls');
-        //           done();
-        //         }, 1500);
-        //       }
-        //     });
-        //   } else {
-        //     done();
-        //   }
-        // }
-      })
-        .then(() => {
-          api
-            .exportFusionRecord({ type: 14, isMatch: this.filter.match })
-            .then(res => {
-              if (res.status === 200) {
-                this.$message({ message: '导出成功', type: 'success' });
-                utils.downloadExportedData(res.data, '麻醉关联数据.xls');
-              }
-            });
-        })
-        .catch(() => {
-          // this.$message({ message: '导出失败', type: 'waring' });
-        });
-    },
-    // 导入模板
-    exportModule() {
-      api.exportFusionModule({ type: 14 }).then(res => {
-        if (res.status === 200) {
-          setTimeout(() => {
-            utils.downloadExportedData(res.data, '麻醉导入模板.xls');
-          }, 1500);
-        }
-      });
-    },
-
-    // 点击导入
-    importPage() {
-      let inp = document.getElementById('upFile');
-      inp.click();
-    },
-    // 导入数据
-    uploadFile(e) {
-      let fileInfo = e.target.files[0];
-      let extend = fileInfo.name.substring(fileInfo.name.lastIndexOf('.') + 1);
-      if (extend != 'xls' && extend != 'xlsx') {
-        this.$message({ message: '请根据模板进行导入', type: 'error' });
-        return;
-      }
-      e.preventDefault();
-      let formData = new FormData();
-      formData.append('file', fileInfo);
-      formData.append('type', 14);
-      formData.append('uesrId', localStorage.getItem('uesrId'));
-      formData.append(
-        'hospitalId',
-        JSON.parse(localStorage.getItem('hospitalLoginDTO')).id
-      );
-      const header = {
-        headers: {
-          'Content-Type': 'multipart/form-data'
-        }
-      };
-      this.importFusionRecord(formData, header);
-      // this.uploadInfo = '导入中...';
-      // api.importExcelDataVerify(formData, header).then(res => {
-      //   if (res.data.code === '00020001') {
-      //     this.$confirm(`${res.data.msg}`, '提示', {
-      //       confirmButtonText: '确定',
-      //       cancelButtonText: '取消',
-      //       type: 'warning'
-      //     })
-      //       .then(() => {
-      //         this.importFusionRecord(formData, header);
-      //       })
-      //       .catch(() => {
-      //         setTimeout(() => {
-      //           this.uploadInfo = '导入';
-      //         }, 300);
-      //       });
-      //   } else if (res.data.data === true) {
-      //     this.importFusionRecord(formData, header);
-      //   }else {
-      //     this.$alert(`${res.data.msg}`, '提示', {
-      //       confirmButtonText: '确定',
-      //       // cancelButtonText: '取消',
-      //       // cancelButtonClass: 'cancelSure',
-      //       // confirmButtonClass: 'sure',
-      //       // customClass: 'exportConfirm',
-      //       type: 'warning'
-      //     })
-      //       .then(() => {})
-      //       .catch(() => {});
-
-      //     setTimeout(() => {
-      //       this.uploadInfo = '导入';
-      //     }, 300);
-      //   }
-      // });
-
-      //解决上传相同文件不触发change
-      let inp = document.getElementById('upFile');
-      inp.value = '';
-    },
-    importFusionRecord(formData, header) {
-      let that = this;
-      api.importFusionRecord(formData, header).then(res => {
-        if (res.headers['content-disposition']) {
-          this.downloadUrl(res);
-          this.getDataList();
-        } else {
-          let r = new FileReader();
-          r.onload = function() {
-            if (this.result) {
-              const code = JSON.parse(this.result);
-              if (code.code === '00020004' || code.code === '00020007') {
-                that
-                  .$alert(`${code.msg}`, '提示', {
-                    confirmButtonText: '确定',
-                    // cancelButtonText: '取消',
-                    // cancelButtonClass: 'cancelSure',
-                    // confirmButtonClass: 'sure',
-                    // customClass: 'exportConfirm',
-                    type: 'warning'
-                  })
-                  .then(() => {})
-                  .catch(() => {});
-              }
-            } else {
-              that.$alert(`导入成功`, '提示', {
-                confirmButtonText: '确定',
-                // cancelButtonText: '取消',
-                // cancelButtonClass: 'cancelSure',
-                // confirmButtonClass: 'sure',
-                // customClass: 'exportConfirm',
-                type: 'success'
-              });
-              that.getDataList();
-            }
-          };
-          r.readAsText(res.data);
-        }
-        // if (res.data.code === '00000001') {
-        //   this.$confirm(`医院术语字符数超出最大数量，请修改后再试`, '提示', {
-        //     confirmButtonText: '确定',
-        //     // cancelButtonText: '取消',
-        //     cancelButtonClass: 'cancelSure',
-        //     confirmButtonClass: 'sure',
-        //     customClass: 'exportConfirm',
-        //     type: 'warning'
-        //   })
-        //     .then(() => {})
-        //     .catch(() => {});
-        //   this.getDataList(); // 重新获取列表
-        //   setTimeout(() => {
-        //     this.uploadInfo = '导入';
-        //   }, 300);
-        // } else if (res.data.data === true && res.status === 200) {
-        //   this.$confirm(`导入成功`, '提示', {
-        //     confirmButtonText: '确定',
-        //     // cancelButtonText: '取消',
-        //     cancelButtonClass: 'cancelSure',
-        //     confirmButtonClass: 'sure',
-        //     customClass: 'exportConfirm',
-        //     type: 'success'
-        //   })
-        //     .then(() => {})
-        //     .catch(() => {});
-        //   this.getDataList(); // 重新获取列表
-        //   setTimeout(() => {
-        //     this.uploadInfo = '导入';
-        //   }, 300);
-        // } else {
-        //   this.$confirm(`${res.data.msg}`, '提示', {
-        //     confirmButtonText: '确定',
-        //     // cancelButtonText: '取消',
-        //     cancelButtonClass: 'cancelSure',
-        //     confirmButtonClass: 'sure',
-        //     customClass: 'exportConfirm',
-        //     type: 'warning'
-        //   })
-        //     .then(() => {})
-        //     .catch(() => {});
-
-        //   setTimeout(() => {
-        //     this.uploadInfo = '导入';
-        //   }, 300);
-        // }
-      });
-    },
-    downloadUrl(res) {
-      var disposition = res.headers['content-disposition'];
-      var fileName = decodeURI(
-        disposition.split('filename=')[1].split(';filename*=')[0]
-      );
-      let blob = new Blob([res.data], { type: 'application/.xls' }); //.xls是我和后台约定好的文件格式
-      let link = document.createElement('a');
-      link.href = window.URL.createObjectURL(blob);
-      link.download = fileName;
-      link.click();
-      link.remove();
-    },
-    /********新增编辑弹窗**********/
-    showModal() {
-      this.modalVisiable = true;
-    },
-    getMsgFormSon(data) {
-      if (data == 'close') {
-        this.modalVisiable = false;
-      } else {
-        this.modalVisiable = false;
-        this.getDataList();
-      }
-    }
-  }
-};
-</script>
-
-
 <style lang="less" scoped>
 @import '../../../less/admin.less';
 /deep/ .container.knowledgeTitle {

src/components/icss/lis/Lis.vue

@@ -267,9 +267,9 @@ export default {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
         hisName: this.filter.hisName.trim(),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hisDetailName: this.filter.hisDetailName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisDetailName: this.filter.hisDetailName.trim(),
         type: 1,
         isMatch: this.filter.match,
         status: this.filter.status

src/components/icss/nursing/nursing.vue

@@ -266,8 +266,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 11,
         isMatch: this.filter.match,

src/components/icss/operation/Operation.vue

@@ -267,8 +267,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 6,
         isMatch: this.filter.match,

src/components/icss/pacs/Pacs.vue

@@ -265,8 +265,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 3,
         isMatch: this.filter.match,

src/components/icss/plan/Plan.vue

@@ -166,7 +166,7 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        planName: this.filter.planName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        planName: this.filter.planName.trim(),
         hospitalId: res.data.data.id
       };
       return param;

src/components/icss/scale/ScaleManage.vue

@@ -265,8 +265,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 10,
         isMatch: this.filter.match,

src/components/icss/tcmdisease/tcmdisease.vue

@@ -273,8 +273,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 12,
         isMatch: this.filter.match,

src/components/icss/tcmdrome/tcmdrome.vue

@@ -273,8 +273,8 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        hisName: this.filter.hisName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
-        uniqueName: this.filter.uniqueName.trim().replace(/%/g,"\\%").replace(/_/g,"\\_"),
+        hisName: this.filter.hisName.trim(),
+        uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
         type: 13,
         isMatch: this.filter.match,

src/components/knowledgeExtra/AddNewRuleTable.vue

@@ -196,12 +196,10 @@
                 alt
               />
             </div>
-            <div
-              class="btn_div"
-              v-if="klRuleByIdSub.length > 1 && !scope.row.disabled"
-            >
+            
+            <div class="btn_div" v-if="klRuleByIdSub.length > 1 && !scope.row.disabled">
               <img
-                @click="$emit('delGroupChild', scope.row.groupChildId)"
+                @click="$emit('delGroupChild', scope.row.groupChildId,scope.$index,scope.row.groupId,scope.row.del,scope.row.key,scope.row.baseTermTypeList.length)"
                 src="../../images/add-new-rule-del.png"
                 alt
               />
@@ -243,9 +241,9 @@
               v-model="scope.row.subType"
               :disabled="scope.row.disabled"
               placeholder="请选择"
-              @change="subTypeChange($event, scope.$index)"
+              @change="subTypeChange($event, scope.$index,scope.row.groupId,scope.row.key)"
               @focus="
-                setTheRef($event, `klRuleByIdSub[${scope.$index}].subType`)
+                setTheRef($event, `klRuleByIdSub[${scope.$index}].subType`,'')
               "
               :ref="`klRuleByIdSub[${scope.$index}].subType`"
             >
@@ -274,9 +272,9 @@
               v-model="scope.row.subLenCode"
               placeholder="请选择"
               :ref="`klRuleByIdSub[${scope.$index}].subLenCode`"
-              @change="subCodeChange($event, scope.$index)"
+              @change="subCodeChange($event, scope.$index,scope.row.groupId,scope.row.key,scope.row.baseTermTypeList.length)"
               @focus="
-                setTheRef($event, `klRuleByIdSub[${scope.$index}].subLenCode`)
+                setTheRef($event, `klRuleByIdSub[${scope.$index}].subLenCode`,scope.row.subLenCode,true)
               "
             >
               <el-option
@@ -334,7 +332,7 @@
                 placeholder="选择类型"
                 @change="dataTypeChange($event, scope.$index)"
                 @focus="
-                  setTheRef($event, `klRuleByIdSub[${scope.$index}].dataType`)
+                  setTheRef($event, `klRuleByIdSub[${scope.$index}].dataType`,'')
                 "
                 :ref="`klRuleByIdSub[${scope.$index}].dataType`"
               >
@@ -372,7 +370,7 @@
                         setTheRef(
                           $event,
                           `klRuleByIdSub[${scope.$index}].subMaxOperator`
-                        )
+                        ),''
                       "
                       :ref="`klRuleByIdSub[${scope.$index}].subMaxOperator`"
                     >
@@ -450,7 +448,7 @@
                         setTheRef(
                           $event,
                           `klRuleByIdSub[${scope.$index}].subMinOperator`
-                        )
+                        ),''
                       "
                     >
                       <el-option
@@ -579,16 +577,11 @@ export default {
     return {
       numTypes: "",
       subConceptIdIndex: "",
-      operMaxList: [
-        { name: "<=", key: "<=" },
-        { name: "<", key: "<" },
-      ],
-      operMinList: [
-        { name: ">", key: ">" },
-        { name: ">=", key: ">=" },
-      ],
+      operMaxList: [{ name: "<=", key: "<=" }, { name: "<", key: "<" }],
+      operMinList: [{ name: ">", key: ">" }, { name: ">=", key: ">=" }],
       rules: tableRules,
       theRef: null,
+      code: "",
     };
   },
   methods: {
@@ -643,11 +636,11 @@ export default {
       this.setScrollRight();
     },
     addGroup(scope) {
-      this.$emit("addGroup", null, { groupId: scope.row.groupId });
+      this.$emit("addGroup", null,scope.row.key, { groupId: scope.row.groupId });
       this.$refs.table.bodyWrapper.scrollLeft = 0;
     },
     addChildGroup(scope) {
-      this.$emit("addGroup", scope.row.groupId, { index: scope.$index });
+      this.$emit("addGroup", scope.row.groupId,scope.row.key, { index: scope.$index });
       this.$refs.table.bodyWrapper.scrollLeft = 0;
     },
     scrollFun() {
@@ -733,23 +726,34 @@ export default {
     },
     // 是否超出最大规则数
     isMax(id) {
-      const typeNum = this.klRuleByIdSub.filter(
-        (item) => item.groupId === id
-      ).length;
+      const typeNum = this.klRuleByIdSub.filter((item) => item.groupId === id)
+        .length;
       return typeNum >= this.maxNum;
     },
     // 基础规则类型选择
-    subTypeChange(e, index) {
-      this.$emit("subTypeChange", e, index);
+    subTypeChange(e, index, groupId, key) {
+      this.$emit("subTypeChange", e, index, groupId, key);
     },
     //
-    setTheRef(e, val) {
+    setTheRef(e, val, code, type) {
       this.theRef = val;
+      if (type) {
+        this.code = code ? code : "";
+      }
     },
     // 规则术语类型
-    subCodeChange(val, index) {
+    subCodeChange(val, index, groupId, key,lens) {
       //基础规则术语类型修改
-      this.$emit("childSubCodeChange", val, index, this.numTypes);
+      this.$emit(
+        "childSubCodeChange",
+        val,
+        index,
+        this.numTypes,
+        groupId,
+        key,
+        this.code,
+        lens
+      );
     },
     clearConcept(index) {
       this.$emit("childClearConcept", index);
@@ -761,7 +765,7 @@ export default {
     subConceptIdfocus(index) {
       this.subConceptIdIndex = "";
       this.subConceptIdIndex = index;
-      this.setTheRef(1, `klRuleByIdSub[${index}].subConceptId`);
+      this.setTheRef(1, `klRuleByIdSub[${index}].subConceptId`, "");
     },
     // 医学标准术语
     searchConcept(val) {
@@ -917,4 +921,3 @@ export default {
   },
 };
 </script>
-

src/components/knowledgeExtra/RuleManager.vue

@@ -56,10 +56,10 @@
             <span>{{scope.row.parDescription}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="parRuleType" label="规则类型" width="150">
+        <el-table-column prop="parRuleType" label="规则类型" width="160">
           <template slot-scope="scope">{{statusTrans(scope.row.parRuleType)}}</template>
         </el-table-column>
-        <el-table-column prop="parConceptName" label="医学标准术语" width="180">
+        <el-table-column prop="parConceptName" label="医学标准术语" >
           <template slot-scope="scope">
             <!--<el-tooltip
               v-if="scope.row.parConceptName.length>8"
@@ -73,11 +73,11 @@
             <span>{{scope.row.parConceptName}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="parLibTypeName" label="术语类型" width="180"></el-table-column>
-        <el-table-column prop="parHasSub" label="有无子条件" width="100">
+        <el-table-column prop="parLibTypeName" label="术语类型"></el-table-column>
+        <el-table-column prop="parHasSub" label="有无子条件" width="105">
           <template slot-scope="scope">{{scope.row.parHasSub == '0'?'无':'有'}}</template>
         </el-table-column>
-        <el-table-column label="状态" width="150">
+        <el-table-column label="状态" width="155">
           <template slot-scope="scope">
             <span>{{scope.row.parStatus === 0?'禁用':'启用'}}</span>
           </template>
@@ -98,7 +98,7 @@
             >{{scope.row.modifierName}}</span>
           </template>
         </el-table-column> -->
-        <el-table-column prop="gmtModified" label="操作时间" width="180"></el-table-column>
+        <el-table-column prop="gmtModified" label="操作时间" width="190"></el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="editData(scope.row.parId)">修改</el-button>

src/less/common.less

@@ -42,8 +42,7 @@
 
 .el-aside {
   background: #fff;
-  min-width: @aside-min-width;
-  width: @aside-width !important;
+  width: 300px;
   min-height: 220px;
   border-right: 1px @gray solid;
   height: 100%;