bug修改

src/api/config.js

@@ -1,5 +1,6 @@
 // const testUrl = 'http://223.93.170.82:23650'
-const testUrl = 'http://192.168.2.236:5050'
+// const testUrl = 'http://192.168.2.236:5050'
+const testUrl = ''
 
 export default {
   host: 'http://192.168.2.121:5050',

src/api/index.js

@@ -4,7 +4,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';
-// axios.defaults.baseURL = 'http://192.168.2.241';
+axios.defaults.baseURL = 'http://192.168.2.241';
 // axios.defaults.baseURL = 'http://192.168.3.117:5050';
 
 const urls = config.urls;

src/components/basicKnow/AddTerm.vue

@@ -231,7 +231,7 @@
             <td :colspan="colspan" class="addSpan">+</td>
           </tr>
         </table>
-        <div class="moreInfo" v-if="showMore==1">
+        <div class="moreInfo" v-if="showMore == 1">
           <p>更多信息：</p>
           <el-form label-width="150px">
             <el-form-item label="性别：">
@@ -244,6 +244,26 @@
               <span class="ageLine">~</span>
               <el-input v-model.number="maxAge" type="number" @input="inputAge"></el-input>
             </el-form-item>
+            <el-form-item
+              v-if="data.type=='实验室检查套餐'" label="最大值与最小值：" class="ages">
+              <el-input v-model.number="minValue" type="number" @input="inputAge"></el-input>
+              <span class="ageLine">~</span>
+              <el-input v-model.number="maxValue" type="number" @input="inputAge"></el-input>
+            </el-form-item>
+            <el-form-item v-if="data.type=='实验室检查套餐'" label="范围：" class="range">
+              <el-select v-model="rangeSelect">
+                <el-option v-for="(it,i) in range" :key="i" :label="it.name" :value="it.name"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              v-if="data.type=='疾病'"
+              label="ICD10编码："
+              prop="description"
+              class="marT description"
+            >
+              <span class="necess">*</span>
+              <el-input v-model.trim="icdCode" maxlength="7" placeholder="请输入编码"></el-input>
+            </el-form-item>
             <el-form-item label="科室：" v-if="dioType" class="marT">
               <el-select v-model="dept">
                 <!-- <el-option v-for="(it,i) in deptList" :label="it.name" :value="it.name"></el-option> -->
@@ -320,8 +340,12 @@ export default {
       show: false,
       tmpSynonymous: [],
       sexType: '通用',
+      rangeSelect: '内',
       maxAge: 200,
       minAge: 0,
+      maxValue: null,
+      minValue: null,
+      icdCode:'',
       showMore: '',
       sex: [
         {
@@ -337,6 +361,16 @@ export default {
           value: 2
         }
       ],
+      range: [
+        {
+          name: '内',
+          value: 1
+        },
+        {
+          name: '外',
+          value: 2
+        }
+      ],
       unfit: false, //点确认时是否弹提示,
       saveDisable: false, //保存按钮禁止点击
       options: [],
@@ -490,9 +524,13 @@ export default {
             this.singleword = redata.libName;
             this.synonymous = redata.otherNames;
             this.allwords = redata.libName.concat(redata.otherNames);
-            this.showMore = redata.isHasCommon;
+            this.showMore = redata.isHasCommon; //是否支持通用扩展
             this.maxAge = redata.maxAge;
             this.minAge = redata.minAge;
+            this.maxValue = redata.maxVal;
+            this.minValue = redata.minVal;
+            this.rangeSelect = redata.scopeType == '1'?'外':'内'
+            this.icdCode = redata.icdCode;
             this.description = redata.description;
             this.explains = redata.explains;
             const type = redata.type;
@@ -823,15 +861,17 @@ export default {
           remark: this.data.remark,
           spell: this.data.spell,
           status: this.data.status||1,
-          libType: this.data.typeId,
-          typeId:this.data.typeId,
+          libType: this.data.typeId||this.data.code,
+          // typeId:this.data.typeId,
           synonymName: this.data.synonymName,
-          isHasCommon: this.data.isHasCommon,
+          isHasCommon: 1,
           libId: this.data.libId,
           klConceptSub:detailList,
           sexType:sexCode,
+          scopeType:this.rangeSelect == '外'?'1':'0',
           maxAge:this.maxAge,
-          minAge:this.minAge
+          minAge:this.minAge,
+          icdCode:this.icdCode||undefined
         }
       }else{
         params = {
@@ -840,15 +880,23 @@ export default {
           libName: this.data.name,
           remark: this.data.remark,
           spell: this.data.spell,
+          status: this.data.status||1,
           libType: this.data.typeId||this.data.code,
-          typeId:this.data.typeId||this.data.code,
+          // typeId:this.data.typeId||this.data.code,
           libId: this.data.libId,
-          status: this.data.status||1,
+          sexType:sexCode,
+          maxAge:this.maxAge,
+          minAge:this.minAge,
+          maxValue:this.maxValue,
+          minValue:this.minValue,
+          icdCode: this.icdCode||undefined,
+          scopeType:this.rangeSelect == '外'?1:0,
           isHasCommon: this.data.isHasCommon||0,
           synonymName: '',
           klConceptSub: detailList||[],
         };
       }
+      console.log(this.data)
       // return false
       this.saveDisable = true; //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
       api.saveBaseConceptInfo(params).then(res => {
@@ -926,6 +974,9 @@ td {
     }
   }
 }
+.range {
+  margin-top: 20px;
+}
 .el-select-group__wrap::after {
   background: #fff !important;
 }

src/components/basicKnow/SearchList.vue

@@ -38,6 +38,9 @@ export default {
       deep: true
     }
   },
+  destroyed(){
+    this.$emit('searchConcept','')
+  },
   methods:{
     closeSearch() {
       this.$emit('closeSearch')

src/components/knowledgeExtra/KnowledgeAll.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="addMedicalMultRelationWrapper">
-    <crumbs :title="minTitle" fix="fixed" linkTo="MedicalMultRelation"></crumbs>
+    <crumbs :title="minTitle" fix="fixed" linkTo=""></crumbs>
     <TreeTab @getTreeList="getTreeList" />
     <div class="contents">
       <div class="content">
@@ -110,6 +110,10 @@ export default {
     },
     methods:{
       getTreeList(id){
+        if(id != this.id){
+          this.id = id
+          this.showSearch = false
+        }
         const params = {
           "type": id,
         }
@@ -210,6 +214,10 @@ export default {
       },
       searchConcept(txt) {
         let  excludedConceptIds = [];
+        if(!txt){
+          this.conceptList = []
+          return
+        }
         if(this.list[0]) {
           excludedConceptIds.push(this.list[0].conceptId)
           this.excludedConceptIds = this.IteraNodeList(this.list[0].nodeList,excludedConceptIds, 2)
@@ -232,7 +240,7 @@ export default {
         if(this.addLevel == 0) {
           this.list.push(Object.assign({}, item,  {nodeList: [], level: 0, conceptId: item.conceptId, sonRelationId: 17}))
           this.list = JSON.parse(JSON.stringify(this.list))
-        }else {
+        }else { 
           const data = this.operaList
           const newChild = Object.assign({}, item,  {nodeList: [], level: data.level+1, conceptId: item.conceptId, relationId: 17,sonRelationId: 17});
           // const newChild = { id: id++, label: 'nodeList', level: data.level+1, children: [] };
@@ -335,7 +343,7 @@ export default {
   color: #8F8F8F;
   padding-left: 28px;
 }
-.addBtn {
+.addBtn { 
   width: 66px;
   order: 1px solid #21CBC7;
   border-radius: 2px;