Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -925,6 +925,7 @@
        this.$set(this.TreeAddform, 'codeRuleOidName', this.masterName)
        this.$set(this.TreeAddform, 'codeRuleOid', this.masterOid)
        this.$emit('MasterHandler', this.loneTreeNewForm)
        this.masterRow=null;
      }
    },
    //编码接口
@@ -954,6 +955,7 @@
        this.KeySelectLIst = []
        this.$set(this.TreeAddform, 'codeKeyAttrRepeatOidName', this.KeyName)
        this.$set(this.TreeAddform, 'codeKeyAttrRepeatOid', this.KeyOid)
        this.masterRow=null;
      }
    },
    //关键属性查询
@@ -998,6 +1000,7 @@
        this.$set(this.TreeAddform, 'codeResembleRuleOidName', this.simName)
        this.$set(this.TreeAddform, 'codeResembleRuleOid', this.simOid)
        this.$emit('MasterHandler', this.loneTreeNewForm)
        this.masterRow=null;
      }
    },
    //相似项查询
@@ -1043,6 +1046,7 @@
        this.$set(this.TreeAddform, 'btmTypeName', this.btmName)
        this.$set(this.TreeAddform, 'btmTypeId', this.btmOid)
        this.$emit('MasterHandler', this.loneTreeNewForm)
        this.masterRow=null;
      }
    },
    //业务类型查询