Merge remote-tracking branch 'origin/master' into referMaster

src/api/config.js

@@ -147,7 +147,7 @@ export default {
     'zskDelRule':'/klRule/clearRuleInfo',//删除规则
     'zskRuleDetail':'/klRule/getByIdRuleInfo',//规则详情
     'zskTypeList':'/klRulePlan/getMenu',//类型列表
-    'zskSearchConcept':'/klDisease/searchConcept',//知识库搜索术语
+    'zskSearchConcept': '/klDisease/searchConceptRuleClass',//知识库搜索术语
     'zskUpdateAll':'/cache/clearRuleAll',//更新数据
     'zskgetDict':'/kl/dictionary/getDictionarys',//禁止修改基础规则类型
   },

src/components/knowledgeExtra/AddNewRule.vue

@@ -175,6 +175,7 @@
                   :key="item.conceptId"
                   :label="item.conceptName"
                   :value="item.conceptId"
+                  :title="item.conceptName"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -344,7 +345,6 @@ export default {
     },
     // 提交
     submitForm(formName) {
-      console.log(this.form);
       this.$refs[formName].validate(valid => {
         if (valid) {
           let params = JSON.parse(JSON.stringify(this.form));
@@ -622,7 +622,7 @@ export default {
       const param = {
         excludedConceptIds: [this.form.parRuleType],
         libType: this.form.parLenCode,
-        name: val
+        name: val,
       };
       api
         .searchConcept(param)

src/components/knowledgeExtra/AddNewRuleTable.vue

@@ -299,6 +299,7 @@
                 :key="item.conceptId"
                 :label="item.conceptName"
                 :value="item.conceptId"
+                :title="item.conceptName"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -744,7 +745,7 @@ export default {
           this.klRuleByIdSub[this.subConceptIdIndex].subType
         ],
         libType: this.klRuleByIdSub[this.subConceptIdIndex].subLenCode,
-        name: val
+        name: val,
       };
       api
         .searchConcept(param)
@@ -887,7 +888,7 @@ export default {
     },
     ruleTermCodeStr: {
       default: null
-    }
+    },
   }
 };
 </script>

src/components/knowledgeExtra/RuleManager.vue

@@ -170,6 +170,8 @@ export default {
     const param = this.$route.params;
     if (param.currentPage) {
       this.inCurrentPage = param.currentPage;
+    }
+    if (param.filter) {
       this.filter = param.filter;
     }
     this.getTypeList();
@@ -211,7 +213,7 @@ export default {
               (data['21'].map(it => it.val) || []).join(',')
             );
             localStorage.setItem('zskNumDict', data['22'][0].val);
-            localStorage.setItem('zskSubDict', data['23'][0].val);
+            localStorage.setItem('zskSubDict', (data['23'].map(it => it.val) || []).join(','));
           }
         })
         .catch(error => {
@@ -223,13 +225,8 @@ export default {
       return obj && obj.name;
     },
     getTypeList() {
-      const typeListData = JSON.parse(localStorage.getItem('zskTypesList'));
-      if (typeListData) {
-        this.ruleTypeList = typeListData;
-        return;
-      }
       api
-        .getTypesList({ planCode: 'rule' })
+        .getTypesList({ planCode: 'rule'})
         .then(res => {
           if (res.data.code == '0') {
             const data = res.data.data;
@@ -348,6 +345,7 @@ export default {
         .catch(() => {});
     },
     editData(id, isCopy) {
+      this.getTypeList()
       const pam = this.searched
         ? {
             currentPage: this.currentPage,