冲突解决

src/components/knowledgeExtra/AddNewRule.vue

@@ -242,19 +242,29 @@
           </div>-->
         </div>
         <!-- 表格 -->
-        <AddNewRuleTable ref="tableView" v-if="form.parHasSub && tableShow"
-        :klRuleByIdSub="form.klRuleByIdSub" :maxNum="subRuleMaxNum"
-        :showMsg="showMsg" :showMsg2="showMsg2"
-        :ruleTermCodeStr="ruleTermCodeStr" <<<<<<< HEAD
-        :isStaticChild='isStatic' :isRedMsgs='isRedMsg' =======
-        :isStaticChild="isStatic" :isRedMsgs="isRedMsg" >>>>>>> bug0818
-        @subTypeChange="subTypeChange" @searchConcept="searchConcept"
-        @addGroup="addGroup" @delGroup="delGroup" @delGroupChild="delGroupChild"
-        @setFormData="setFormData" @editKlRuleByIdSub="editKlRuleByIdSub"
-        @clearValidate="clearValidate" @childClearConcept="childClearConcept"
-        @childClearNumText="childClearNumText"
-        @ChildDataTypeChange="ChildDataTypeChange"
-        @childSubCodeChange="childSubCodeChange" />
+        <AddNewRuleTable
+          ref="tableView"
+          v-if="form.parHasSub && tableShow"
+          :klRuleByIdSub="form.klRuleByIdSub"
+          :maxNum="subRuleMaxNum"
+          :showMsg="showMsg"
+          :showMsg2="showMsg2"
+          :ruleTermCodeStr="ruleTermCodeStr"
+          :isStaticChild="isStatic"
+          :isRedMsgs="isRedMsg"
+          @subTypeChange="subTypeChange"
+          @searchConcept="searchConcept"
+          @addGroup="addGroup"
+          @delGroup="delGroup"
+          @delGroupChild="delGroupChild"
+          @setFormData="setFormData"
+          @editKlRuleByIdSub="editKlRuleByIdSub"
+          @clearValidate="clearValidate"
+          @childClearConcept="childClearConcept"
+          @childClearNumText="childClearNumText"
+          @ChildDataTypeChange="ChildDataTypeChange"
+          @childSubCodeChange="childSubCodeChange"
+        />
         <AddNewRuleContent
           ref="ruleContent"
           v-if="(!form.parHasSub && !tableShow) || contentRuls"