Merge remote-tracking branch 'origin/diagBase6.0' into test

src/components/knowledgeExtra/DiagBaseGroup.vue

@@ -19,6 +19,7 @@
                            :groupData="rules"
                            :ind="i"
                            :inx="inx"
+                           :len="data.klDiagnoseDetail.length"
                            :parInx="parInx"
                            :isLast="isLast&&data.klDiagnoseDetail.length===1"
                            :baseTypes="diagTypeList"
@@ -61,21 +62,24 @@
             },
             addRule(){
                 let temp={
-                    subDescription:'',
-                    subConceptId:'',
-                    subType:'',
-                    subLenName:'',
-                    subLenCode:'',
-                    subLibName:'',
-                    subMaxOperator:'',
-                    subMaxUnit:'',
-                    subMaxValue:'',
-                    subMinOperator:'',
-                    subMinUnit:'',
-                    subMinValue:'',
-                    subEqValue:'',
-                    dataType:'',
+                    "basConceptId": '',
+                    "basDescription": "",
+                    "basLename": "",
+                    "basLibName": "",
+                    "basLibType": null,
+                    "basType": '',
+                    "eqOperator": "",
+                    "eqUnit": "",
+                    "eqValue": "",
+                    "maxOperator": "",
+                    "maxUnit": "",
+                    "maxVal": "",
+                    "minOperator": "",
+                    "minUnit": "",
+                    "minVal": "",
+                    "dataType":"",
                 };
+                //this.$set(this.data,'klDiagnoseDetail',[...this.data.klDiagnoseDetail,temp]);
                 this.data.klDiagnoseDetail.push(temp);
                 this.$emit("setRule");
             },

src/components/knowledgeExtra/DiagBaseItem.vue

@@ -122,7 +122,7 @@
             </el-form-item>
         </div>
         <!--</el-form>-->
-        <div class="inner-oper">
+        <div class="inner-oper" v-if="ind===len-1">
             <span>新增基础依据：</span>
             <span class="add-btn" @click="addRule"><img src="../../images/add.png" alt="新增基础依据"></span>
         </div>
@@ -132,7 +132,7 @@
     import api from '@api/zskDiagBase.js';
     export default {
         name:'DiagBaseItem',
-        props:['groupData','ind','isLast','baseTypes','parInx','inx'],
+        props:['groupData','ind','isLast','baseTypes','parInx','inx','len'],
         data(){
             return {
                 baseTermTypeList:[],

src/routes.js

@@ -518,21 +518,11 @@ export default [
                 component: DisclaimerDetailCDSS,
                 name: 'DisclaimerDetailCDSS',
             }, //免责声明维护--新增编辑
-            /*{
-                path: 'LT-YYSYZDHCS-ZSTPGZCS',
-                component: KnowledgeMapRuleTest,
-                name: 'KnowledgeMapRuleTest',
-            },*/ //知识图谱规则测试
             {
                 path: 'LT-YYSYZDHCS-JTZSYSCS',
                 component: StaticKnowledgeMapTest,
                 name: 'StaticKnowledgeMapTest',
             }, //静态知识映射测试
-            /*{
-                path: 'LT-YYSYZDHCS-ZSTPGZCS-TYGZCS',
-                component: BillCommonTest,
-                name: 'BillCommonTest',
-            },*/
             {
                 path: 'LT-YYSYZDHCS-ZSTPGZCS-SXGZCS',
                 component: BillFusionTest,