Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Source/UBCS-WEB/vue.config.js

 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue

@@ -442,10 +442,10 @@
      await TableData({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
        page: val.currentPage,
        limit: val.pageSize,
        page: this.page.currentPage,
        limit: this.page.pageSize,
      }).then((res) => {
        this.data = res.data.data;
        this.tableData = res.data.data;
      });
    },
    //多选
@@ -519,15 +519,19 @@
      console.log(val)
      addSaveCode(val).then(res=>{
        console.log(res)
        this.onLoad()
        this.$nextTick(() => {
          this.onLoad()
        })
      })
    },
    EditSumbit(val) {
      this.editvisible = false;
      console.log(val)
      editSaveCode(val).then(res=>{
        console.log(res)
        this.onLoad()
     editSaveCode(val).then(res=>{
       console.log(res)
       this.$nextTick(() => {
         this.onLoad()
       })
      })
    },
    openBatchImport(type) {

 Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue

@@ -238,7 +238,7 @@
          },
          {
            label:"编码规则",
            prop:"coderuleoidName",
            prop:"codeRuleOidName",
            labelWidth:128,
            disabled: true,
          },
@@ -308,7 +308,7 @@
            },
            {
              label:"编码规则",
              prop:"coderuleoidName",
              prop:"codeRuleOidName",
              labelWidth:128,
              focus:this.CodeFoucus,
              readonly: true,
@@ -394,8 +394,8 @@
      }else {
        this.MasterdialogVisible=false;
        this.masterSelectList=[]
        this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
        this.$set(this.loneTreeNewForm,'coderuleoid',this.masterOid)
        this.$set(this.loneTreeNewForm,'codeRuleOidName',this.masterName)
        this.$set(this.loneTreeNewForm,'codeRuleOid',this.masterOid)
        this.$emit('MasterHandler',this.loneTreeNewForm)
      }
    },
@@ -449,8 +449,8 @@
          'conditionMap[name]':this.SelectFInd
        }
        this.KeydefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
        this.SelectValue="";
        this.SelectFInd="";
      }
    },
    //关键属性接口