Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/Master/MasterTree.vue

@@ -34,6 +34,7 @@
    return {
      TreeValue: '',
      idData: '',
      referTreeId:'',
      masterVrBtnList: [],
      tableHeadFindData: [],
      tableHeadDataFateher: [],
@@ -56,11 +57,11 @@
        //   console.log(node)
        //   console.log(resolve)
        // }
        treeLoad: function (node, resolve) {
        treeLoad: (node, resolve) =>{
          if (node.data != false) {
            const parentId = (node.level === 0) ? 0 : node.data.oid;
            const parentBtmName = node.data.attributes.btmname
            getTreeList({parentOid: parentId, parentBtmName: parentBtmName}).then(res => {
            const parentBtmName = node.data.attributes.btmname;
            getTreeList({parentOid: parentId, parentBtmName: parentBtmName,'conditionMap[btmTypeId]': this.referTreeId }).then(res => {
              resolve(res.data.map(item => {
                return {
                  ...item,
@@ -103,8 +104,11 @@
            this.$message.error("主数据分类查询为空！");
          } else {
            this.Treedata = res.data;

            const [firstProperty] = res.data;
            this.ModifyProperties(this.Treedata, 'text', 'label');
            this.referTreeId=firstProperty.attributes.btmTypeId;
            // console.log(this.referTreeId)
            this.codeClassifyOid = firstProperty.oid;
            this.coderuleoid = firstProperty.attributes.coderuleoid;
            this.$emit("coderuleoid", this.coderuleoid)