Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,7 @@
<template>
  <div>
    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app">

      <el-button-group>
      <!--新增-->
      <el-button v-if="attrEditVisible == false && attrFlagChiledren==false && editOpenFlag &&  (!checkStatus || crudLCStatus=='Editing' )" size="small" type="primary" icon="el-icon-plus" plain @click="busineHandle">添加 {{ msg }}</el-button>
@@ -10,6 +11,16 @@
      <el-button v-if="(!checkStatus || crudLCStatus=='Editing' )&& editOpenFlag" icon="el-icon-info" size="small" @click="ruleAddHandler">验证规则</el-button>
      <!--        属性分组-->
      <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-menu" size="small" @click="attrVisibleHandle">属性分组</el-button>
      </el-button-group>
      <el-button-group>
        <!--    保存-->
        <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" size="small" type="success" plain @click="addsHandler" icon="el-icon-check">保存</el-button>
        <!--    预览排序-->
        <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">预览排序</el-button>
        <!--    删除-->
        <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" size="small" @click="CrudRemove" icon="el-icon-delete">删除</el-button>
        <!--    重置-->
        <el-button size="small" @click="reset" icon="el-icon-refresh-right">重置</el-button>
      </el-button-group>
      <el-button-group>
        <!--新增-->
@@ -22,17 +33,7 @@
      <!--    级联属性-->
      <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-coin" size="small" @click="CascadeHandle">级联属性</el-button>
      </el-button-group>
      <el-button-group>
      <!--    预览排序-->
        <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">预览排序</el-button>
        <!--新增-->
      <!--    保存-->
      <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" size="small" @click="addsHandler" icon="el-icon-check">保存</el-button>
      <!--    删除-->
      <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" size="small" @click="CrudRemove" icon="el-icon-delete">删除</el-button>
      <!--    重置-->
      <el-button size="small" @click="reset" icon="el-icon-refresh-right">重置</el-button>
      </el-button-group>

      <el-button-group>
      <!--    同步到其他模板-->
      <el-button size="small"@click="syncHandle" icon="el-icon-share">同步到其他模板</el-button>
@@ -206,8 +207,8 @@
        </el-container>
      </el-dialog>
      <!--        全屏编辑-->
      <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
        <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :editOpenFlag="editOpenFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud>
      <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true" :before-close="escEdit" >
        <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :editStyleFlag="editStyleFlag" :editOpenFlag="editOpenFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud>
      </el-dialog>
      <!--      组合规则-->
      <formula-editor :systemVariableTableData="systemVariableTableData"
@@ -251,7 +252,7 @@
    </div>
    <el-table :data="ProData"
              style="width: 100%"
              :height="this.editStyleFlag ? 450 : 900"
              :height="this.editStyleFlag? 800 : 343"
              @cell-click="handleCellClicks"
              @select="selectHandle"
              @selection-change="selectionChange"
@@ -276,8 +277,8 @@
                       v-if="item.edit !='referName'"
      >
        <template slot-scope="{ row }">
          <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text'  ||item.edit == 'refer' )" v-model="row[item.prop]"
                    @blur="saveRows" ></el-input>
          <el-input ref="inputRef" v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text'  ||item.edit == 'refer' )" v-model="row[item.prop]"
                    @blur="saveRows" autofocus ></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' " @blur="selectChangeHandler(item.editConfig,index)">
@@ -330,7 +331,12 @@
      type: Boolean,
      default: false
    },
    //控制是否开启编辑
    editOpenFlag:{
      type: Boolean,
      default: false
    },
    editStyleFlag:{
      type: Boolean,
      default: false
    },
@@ -355,9 +361,16 @@
    crudArrayFlag:{
      type: Boolean,
      default: false
    }
    },
  },
  watch:{
    crudOid:{
      handler(newval,oldval){
        if(newval){
          this.editOpenFlag=false
        }
      }
    },
    crudArray:{
      handler(newval,oldval){
        if(newval != undefined){
@@ -400,7 +413,7 @@
    },
    editOpenFlag:{
      handler(newval,oldval){
        console.log(newval)
        console.log('editOpenFlag',newval)
      },
      deep:true,
      immediate:true
@@ -410,7 +423,7 @@
  data() {
    return {
      //全屏编辑高度状态
      edittStyleFlag:false,
      editStyleFlag:false,
      loading:false,
      referConfigText:"",
      referConfigVisble:false,
@@ -508,7 +521,7 @@
          desc: "当前用户的姓名"
        },
        {
          formula: "#CURRENTUSER.SECRETGRADE#",
          formula: "#CURRENTUSER.SECRETARIAT#",
          desc: "当前用户密级"
        },
        {
@@ -1486,7 +1499,7 @@
    //表格数据
    CrudRend() {
      if (this.crudOid != '') {
        gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.crudOid}).then(res => {
        gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.crudOid,limit:-1}).then(res => {
          this.loading=true
          setTimeout(() => {
            this.ProData = res.data.data;
@@ -1540,7 +1553,6 @@
        }
      })
      this.addVisible = false;

    },
    //业务类型选择
    businessSelect(selection, row) {
@@ -1631,7 +1643,7 @@
         if(column.property == 'referConfig' ){
           this.referConfigVisble= true;
           this.referConfigOption = {
             referConfig: this.referConfigText || '',
             referConfig: this.CurrentCell.referConfig || '',
           }
           if(this.CurrentCell.referConfig == ''){
             this.referConfigOption = {
@@ -1656,7 +1668,8 @@
         }else if(column.property == 'parentCode'){
           gridCodeClassifyTemplateAttr({
             'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
             'conditionMap[oid_notequal]': this.CurrentCell.oid
             'conditionMap[oid_notequal]': this.CurrentCell.oid,
             limit:-1
           }).then(res => {
             console.log(res)
             this.CascadeData = res.data.data;
@@ -1901,8 +1914,7 @@
      if (this.crudArray.length < 1) {
        this.$message.warning('请选择一个模板')
      } else {
        this.editStyleFlag=!this.editStyleFlag;
        // this.editOpenFlag=true;
        this.editStyleFlag=true;
        this.attrEditVisible = true;
        this.attrFlag = true;
      }
@@ -1912,6 +1924,7 @@
    escEdit() {
      this.attrFlagChiledren = false;
      this.attrEditVisible = false;
      this.editStyleFlag=false;
    },
    //组合规则确定
    updataFormlaContent(val) {

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

@@ -967,7 +967,7 @@
      this.crudOid=row.oid;
      this.crudLCStatus=row.lcStatus;
      this.crudArray.push(row);
      gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid}).then(res => {
      gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid,limit:-1}).then(res => {
        this.ProData = res.data.data;
        //分类注入数据格式
        this.ProData =  res.data.data.map((item) => {
@@ -1220,9 +1220,10 @@
          })
          console.log('form',this.Formlist)
          if(this.Formlist.length >= 1){
            this.crudLCStatus=this.Formlist[0].lcStatus;
            this.crudArray.push(this.Formlist[0]);
            gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
            this.crudLCStatus=this.Formlist[this.selectRow].lcStatus;
            this.crudArray.push(this.Formlist[this.selectRow]);
            this.crudOid=this.Formlist[this.selectRow].oid
            gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid,limit:-1}).then(res => {
              this.ProData = res.data.data;
              console.log(this.ProData)
              //分类注入数据格式

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

@@ -2,7 +2,7 @@
  <basic-container>
    <avue-tabs :option="Taboption" @change="handleChange"></avue-tabs>
    <span v-if="type.prop==='tab1'">
      <attrCrud :ProData="ProData" :editOpenFlag="editOpenFlag" :crudOid="crudOid" :checkStatus="checkStatus"  :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
      <attrCrud :ProData="ProData"  :crudOid="crudOid" :checkStatus="checkStatus"  :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
    </span>
    <span v-else-if="type.prop==='tab2'">
       <FlowPath :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus"></FlowPath>
@@ -35,7 +35,6 @@
        }]
      },
      checkStatus:true,//是否需要验证模板状态,
      editOpenFlag:false,//开启编辑状态
    }
  },
  created() {
@@ -44,13 +43,6 @@
    this.type.prop = "tab1";
  },
  watch:{
    crudOid:{
      handler(newval,oldval){
        if(newval){
          this.editOpenFlag=false
        }
      }
    }
  },
  methods: {
    // Tab栏切换

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

@@ -425,6 +425,8 @@
//        //设置编码需要的默认属性的内容
        copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
        cbo.setOid(VciBaseUtil.getPk());
        cbo.setRevisionOid(VciBaseUtil.getPk());
        cbo.setNameOid(VciBaseUtil.getPk());
        cbo.setCreateTime(new Date());
        cbo.setLastModifyTime(new Date());
        cbo.setCreator(AuthUtil.getUser().getUserName());
@@ -3383,7 +3385,7 @@
        if (!listR.isSuccess() || listR.getData().size() == 0) {
            throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
        }
        String userName = String.valueOf(AuthUtil.getUser().getUserId());
//        String userName = String.valueOf(AuthUtil.getUser().getUserId());
        BaseModel bo = new BaseModel();
//        bo.setOid(VciBaseUtil.getPk());
//        bo.setRevisionid(VciBaseUtil.getPk());
@@ -3393,17 +3395,15 @@
        bo.setFirstR("1");
        bo.setFirstV("1");
        bo.setLastV("1");
        bo.setCreator(userName);
        bo.setCreateTime(new Date());
        bo.setLastModifier(userName);
        bo.setLastModifyTime(new Date());
        bo.setRevisionRule(listR.getData().get(0).getRevisionRuleId());
        bo.setVersionRule(String.valueOf(listR.getData().get(0).getVersionRule()));
        bo.setVersionRule("".equals(listR.getData().get(0).getVersionRule())?"0":listR.getData().get(0).getVersionRule());
        if (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId())) {
            R<List<RevisionRuleVO>> revisionRuleVO = revisionRuleClient
                    .selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId().toLowerCase()));
            if(revisionRuleVO.getData().size() != 0 ){
                bo.setRevisionValue(revisionRuleVO.getData().get(0).getStartCode());
            }else{
                bo.setRevisionValue("1");
            }
        }
        bo.setRevisionSeq(1);
@@ -3417,7 +3417,7 @@
        bo.setId("");
        bo.setName("");
        bo.setDescription("");
        bo.setOwner(userName);
        bo.setOwner("1");
//        bo.setCheckinby(userName);
        bo.setCopyFromVersion("");
//        this.initTypeAttributeValue(bo,btmTypeVO);