Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

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

@@ -270,7 +270,7 @@
                    @blur="saveRows"></el-input>
          <el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                           @blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
          <el-select v-model="row[item.prop]" filterable  allow-create  default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @visible-change="DataChangeHandler($event,item.editConfig,index)">
          <el-select v-model="row[item.prop]" filterable  allow-create  default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @blur="selectChangeHandler(item.editConfig,index)">
            <el-option
              v-for="optionItem in item.data"
              :key="optionItem.dictValue"
@@ -1360,7 +1360,11 @@
    )
  },
  created() {

    this.option.column.forEach((item,index) => {
      if (item.edit == 'select') {
        this.selectChangeHandler(item.editConfig,index)
      }
    })
  },
  methods: {
    formAttr(row, column) {
@@ -1390,12 +1394,12 @@
      this.$set(this.CurrentCell,'referConfig',JSON.stringify(val))

    },
    //时间下拉格式
    DataChangeHandler($event,editConfig,index){
    //可输可选下拉
    selectChangeHandler(editConfig,index){
      let that=this;
      if(!$event){
      /*if(that.option.column[index].data && that.option.column[index].data.length>=0){
        return;
      }
      }*/
      listByFlag(editConfig.extraParams).then(res=>{
        that.option.column[index].data=res.data.data;
      })
@@ -1403,7 +1407,7 @@
    //属性分组按钮
    attrVisibleHandle() {
     if (this.attrSelectList < 1) {
        this.$message.warning('请选择一条模板属性')
        this.$message.warning('请选择模板属性')
      } else  {
        this.attrVisible = true;
       console.log(this.attrSelectList)
@@ -1650,11 +1654,9 @@
    },
    //验证规则按钮
    ruleAddHandler(){
      if(this.attrSelectList.length>1){
        this.$message.warning('只能选择一条数据')
      }else if(this.attrSelectList.length<1){
        this.$message.warning('请选择一提模板属性')
      }else if(this.attrSelectList.length === 1){
      if (this.attrSelectList < 1) {
        this.$message.warning('请选择模板属性')
      } else{
        this.rulesVisible=true
      }

@@ -1671,11 +1673,12 @@
    },
    // 验证规则确定
    rulesHandle() {
     if(this.CurrentCell.length>0){
     if(this.CurrentCell){
       this.$set(this.CurrentCell,'verifyRule',this.RulesForm.expressionText)
     }else {
       console.log(this.attrSelectList)
       this.$set(this.attrSelectList[0],'verifyRule',this.RulesForm.expressionText)
       this.attrSelectList.forEach((item)=>{
         this.$set(item,'verifyRule',this.RulesForm.expressionText)
       })
       this.rulesremove()
     }
      this.rulesVisible = false

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java

@@ -894,6 +894,7 @@
        //设置btmtypeid和name
        CodeClassify codeClassifyDO = codeClassifyDOList.get(0);
        codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
        codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk());
        codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
        codeClassifyTemplateDO.setLcStatus(FRAMEWORK_RELEASE_EDITING);
        codeClassifyTemplateDO.setTs(new Date());

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java

@@ -35,8 +35,6 @@
    public BtmTypeAttributeVO entityVO(BtmTypeAttribute entity) {
        BtmTypeAttributeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeAttributeVO.class));
        // 在这里设置枚举显示值
        vo.setPrecisionLength(vo.getPrecisionLength() == -1 ? null : vo.getPrecisionLength());
        vo.setScaleLength(vo.getScaleLength() == -1 ? null : vo.getPrecisionLength());
        vo.setAttrDataTypeText(EnumCache.getValue("attributeType",vo.getAttrDataType()));
        return vo;
    }