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

src/components/knowledgeExtra/AddDiagBase.vue

@@ -25,6 +25,7 @@
                                        :isLast="form.klDiagnoseTypeVO.length===1"
                                        @setRules="setRules"
                                        @addDiag="addDiag"
+                                       @copyDiag="copyDiag"
                                        @delDiag="delDiag"></DiagBaseType>
                     </el-form-item>
                     <el-button class="disclButn" size="small" type="primary" @click="confirm">保存</el-button>
@@ -94,7 +95,13 @@
                 this.title = "诊断依据维护-"+(this.isCopy?'复制':'修改')+"诊断依据";
                 this.conceptList = [{conceptId:info.conceptId,conceptName:info.conceptName}];
                 this.form=Object.assign({},this.form,this.formatData(info));
-                this.isCopy&&delete this.form.id;
+                if(this.isCopy){
+                    this.conceptList =[];
+                    delete this.form.conceptName;
+                    delete this.form.conceptId;
+                    delete this.form.description;
+                    delete this.form.id;
+                }
                 console.log(info)
             }
             this.setRules()
@@ -240,6 +247,11 @@
                 this.form.klDiagnoseTypeVO.push(temp);
                 this.setRules();
             },
+            copyDiag(i){
+                let temp = JSON.parse(JSON.stringify(this.form.klDiagnoseTypeVO[i]));
+                this.form.klDiagnoseTypeVO.splice(i,0,temp);
+                this.setRules();
+            },
             delDiag(i){
                 this.form.klDiagnoseTypeVO.splice(i,1);
             },

src/components/knowledgeExtra/DiagBaseType.vue

@@ -12,6 +12,7 @@
                         :value="item.ruleType">
                 </el-option>
             </el-select>
+            <span class="tip-text">注：选择诊断依据类型后才能展示基础依据类型~</span>
         </el-form-item>
         <DiagBaseGroup v-for="(group,i) in data.groupVO"
                    ref="groups"
@@ -26,7 +27,7 @@
     <div class="group-oper">
         <el-button size="small" @click="addDiag">+新增依据</el-button>
         <el-button size="small" @click="copyDiag">复制依据</el-button>
-        <el-button :disabled="isLast" size="small" type="danger" plain @click="delGroup">-删除依据</el-button>
+        <el-button :disabled="isLast" size="small" type="danger" plain @click="delDiag">-删除依据</el-button>
     </div>
           </div>
        <!-- </el-form>-->