完善主题库定义

 Source/UBCS-WEB/src/api/GetItem.js

@@ -2,7 +2,7 @@

export const MasterTable =(params)=>{
  return request({
    url: 'api/ubcs-code/ubcs-code//mdmEngineController/getUIInfoByClassifyOid',
    url: 'api/ubcs-code/ubcs-code/mdmEngineController/getUIInfoByClassifyOid',
    method: 'get',
    params:{
      ...params

 Source/UBCS-WEB/src/api/template/templateAttr.js

@@ -138,3 +138,13 @@
    data:data
  })
}
//从业务类型中选择数据
export const  AttrByBtm = (params) =>{
  return request({
    url:'/api/ubcs-code/codeClassifyTempAttrController/codeClassifyTemplateAttrByBtm',
    method: 'get',
    params:{
      ...params
    }
  })
}

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

@@ -6,11 +6,10 @@
          <FormTemplateDialog
            :visible.sync="addvisible"
            :type="add"
            :templateOid="this.templateOids"
            :codeClassifyOid="this.codeClassifyOids"
            :templateOid="this.templateOid"
            :codeClassifyOid="this.codeClassifyOid"
            :codeRuleOid="this.codeRuleOid"
            :disabledProp="disabledProp"
            :rowOid="rowOid"
          >
          </FormTemplateDialog></el-button>
        <el-button size="small" type="primary" plain @click="editvisible=true">编辑
@@ -18,7 +17,7 @@
            :visible.sync="editvisible"
            :type="edit"
            :templateOid="this.templateOids"
            :codeClassifyOid="this.codeClassifyOids"
            :codeClassifyOid="this.codeClassifyOid"
            :codeRuleOid="this.codeRuleOid"
            :disabledProp="disabledProp"
            :rowOid="rowOid"
@@ -32,8 +31,9 @@
        <el-button size="small" type="primary" plain>发布</el-button>
        <el-button size="small" type="primary" plain>数据更改</el-button>
        <el-button size="small" type="primary" plain>回收</el-button>
        <el-button size="small" type="primary" plain>导出
          <transfer filter-placeholder="请输入拼音全拼或者拼音缩写" ></transfer>
        <el-button size="small" type="primary" plain @click="openD">导出
          <integration-transfer :visible.sync="dialogPush" :data="transferData"
                                :props="transferProps" @save="handelTransferSave"></integration-transfer>
        </el-button>
        <el-button size="small" type="primary" plain @click="findvisible=true">查询
        <advancedQuery  :visible.sync="findvisible" :options="this.options"></advancedQuery>
@@ -88,7 +88,13 @@
</template>
<script>
import {MasterTable, TableData} from "@/api/GetItem";
import {listCodeAttributeByClassId} from '@/api/integration/integration.js'
import integrationTransfer from '@/views/integration/integrationTransfer'
import pinyin from "js-pinyin";
export default {
  components: {
    integrationTransfer
  },
  name: "Crud.vue",
  props:{
    page:{
@@ -108,17 +114,28 @@
    tableDataArray:{
      type:Array,
      default:[]
    },
    total:{
      type:String,
      default:""
    },
    tableHeadDataFateher:{
      type:Array,
      default:[]
    }
  },
  data() {
    return {
      transferData:[],
      transferProps: {
        key: 'oid',
        label: 'name'
      },
      templateOid:"",
      addvisible:false,
      editvisible:false,
      findvisible:false,
      templateOids: "78B8C7C5-A042-0B96-FE6D-65421451782A",
      codeClassifyOids: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
      codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
      dialogPush:false,
      rowOid: '6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9',
      disabledProp: ["id"],
      editingRow:null,
@@ -140,15 +157,16 @@
      },
      tableData:[],
      tableHeadData:[],
      tableHeadDataFateher:[],
      items:{},
      aaa:""
      seniorQueryColumns:[]
    }
  },
  computed:{
  },
  created() {
    this.CrudHeaderRend();
    this.$emit('tableData',this.tableData)
    // this.CrudHeaderRend();
    // this.tableHeadHandle()
  },
  mounted() {

@@ -167,11 +185,33 @@
    tableDataArray:{
      handler(newval,oldval){
        this.tableData=newval;
        this.CrudRend()
      //
      }
    },
    total:{
      handler(newval,oldval){
        this.page.total=newval;
      }
    },
    tableHeadData:{
      handler(newval,oldval){
        this.tableHeadDataFateher=newval
      }
    }
  },
  methods: {
    openD(){
      this.dialogPush=true;
      this.getListCodeByClassId()
    },
    async getListCodeByClassId() {
      this.transferData = []
      const response = await listCodeAttributeByClassId({ codeClassifyId: this.codeClassifyOid })
      if (response.status === 200) {
        const data = response.data.data
        this.transferData = data
      }
    },
    rend(){
      this.tableData=this.tableHeadData
    },
@@ -179,16 +219,21 @@
      this.page.pageSize=val
      this.$emit('pageSize',val)
      this.CrudRend()
      console.log(this.tableData)
    },
    handleCurrentChange(val){
      this.page.currentPage=val
      this.$emit('currentPage',val)
      this.CrudRend()
      console.log(val)
      console.log(this.tableData)
    },
    // 监听单元格点击事件并存储正在编辑的行
    handleCellClick(row, column) {
      this.editingRow = row;
      this.editShow = column.property;
      console.log(row)
      this.rowOid=row.oid
    },
    //删除
    enumDeleteRow(row) {
@@ -203,6 +248,21 @@
      this.$nextTick(() => {
        this.$refs.crud.doLayout();
      });
    },
    tableHeadHandle(){
      this.options=this.tableHeadDataFateher.tableDefineVO.seniorQueryColumns
      this.List = this.tableHeadDataFateher.tableDefineVO.cols[0];
      this.List.forEach(item => {
        let columnItem = {
          label: item.title,
          prop: item.field,
          type: this.columnType[item.type],
          sortable: item.sort,
          width: item.minWidth
        };
        this.option.column.push(columnItem);
        this.option.column=this.tableHeadData;
      })
    },
    //表格头渲染
    CrudHeaderRend() {
@@ -225,6 +285,7 @@
            this.option.column=this.tableHeadData;
            this.templateOid=res.data.tableDefineVO.oid
            this.$emit('templateOid',this.templateOid)
            console.log(this.templateOid)
          })
        })
      }
@@ -235,7 +296,7 @@
         templateOid: this.templateOid,
         codeClassifyOid: this.codeClassifyOid,
         page: this.page.currentPage,
         limit:this.page.pageSize,
         limit: this.page.pageSize,
       }).then(res => {
         this.page.total = res.data.total;
         this.data = res.data.data;

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

@@ -9,7 +9,7 @@
<script>
import {getTreeList} from "@/api/MasterData/master";
import {mapMutations, mapState} from "vuex";
import {TableData} from "@/api/GetItem";
import {TableData,MasterTable} from "@/api/GetItem";

export default {
  name: "MasterTree",
@@ -29,6 +29,8 @@
  },
  data(){
    return{
      tableHeadDataFateher:[],
      templateOids:"",
      tableDataArray:[],
      codeClassifyOid:"",
      coderuleoid:"",
@@ -80,6 +82,7 @@
        this.coderuleoid=res.data[0].attributes.coderuleoid;
        this.$emit("codeClassifyOid", this.codeClassifyOid )
        this.$emit("coderuleoid", this.coderuleoid )
        this.TableHeadRends()
      }).catch(res=>{
        console.log(res)
      })
@@ -97,23 +100,52 @@
        }
      }
    },
    //树点击事件
    nodeClick(data){
      this.nodeClickList = data;
      console.log(this.currentPage,this.pageSize)
    //表格刷新
    TableRend(){
      TableData({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
        page: this.pageSize,
        limit:this.currentPage,
        templateOid: this.templateOids,
        codeClassifyOid: this.nodeClickList.oid,
        page: this.currentPage,
        limit: this.pageSize,
      }).then(res => {
        console.log(res)
        // this.page.total = res.data.total;
        // this.data = res.data.data;
        this.tableDataArray=res.data.data;
        this.$emit('tableDataArray',this.tableDataArray)
        console.log(this.tableDataArray)
        this.$emit('total',res.data.total)
      })
    },
    //表格头部
    TableHeadRend(){
      MasterTable({
        codeClassifyOid:this.nodeClickList.oid,
        functionId: 5,
      }).then(res=>{
        this.tableHeadDataFateher=res.data;
        this.templateOids=res.data.tableDefineVO.oid
        this.$emit("tableHeadDataFateher",this.tableHeadDataFateher)
        console.log("123",res)
      })
    },
    TableHeadRends(){
      MasterTable({
        codeClassifyOid:this.codeClassifyOid,
        functionId: 5,
      }).then(res=>{
        this.tableHeadDataFateher=res.data;
        this.templateOids=res.data.tableDefineVO.oid
        this.$emit("tableHeadDataFateher",this.tableHeadDataFateher)
        console.log("123",res)
      })
    },
    //树点击事件
    nodeClick(data){
      this.nodeClickList = data;
       this.TableHeadRend()
      this.TableRend()
      console.log('code',this.nodeClickList.oid)
      console.log('teoid',this.templateOids)
      console.log()
    }
  }
}

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

@@ -2,7 +2,7 @@
  <basic-container>
    <avue-tabs :option="Taboption" @change="handleChange"></avue-tabs>
    <span v-if="type.prop==='tab1'">
      <attrCrud :ProData="ProData"></attrCrud>
      <attrCrud :ProData="ProData" :crudOid="crudOid" :crudArray="crudArray" :Formlist="Formlist"></attrCrud>
    </span>
    <span v-else-if="type.prop==='tab2'">模板流程</span>
    <span v-else-if="type.prop==='tab3'">模板阶段</span>
@@ -13,7 +13,7 @@
<script>
export default {
  name: "TemplatePro.vue",
  props: ['ProData'],
  props: ['ProData','crudOid','crudArray','Formlist'],
  data: function () {
    return {
      type: {},

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

@@ -1,10 +1,26 @@
<template>
  <avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"
             @cell-click="handleRowClick">
             @cell-click="handleRowClick" @select="selectHandle">
    <template slot="menuLeft">
      <el-button v-if="attrEditVisible == false" size="small" type="primary" @click="addVisible=true">＋ 添加 {{msg}}</el-button>
      <el-button v-if="attrEditVisible == false" size="small" type="primary" @click="busineHandle">＋ 添加 {{msg}}</el-button>
      <el-dialog :visible.sync="addVisible" append-to-body title="从业务类型中选择属性">
        <avue-crud :data="businessData" :option="businessOption"></avue-crud>
        <avue-crud :data="businessData" :option="businessOption">
          <template slot="menuLeft">
            <div style="display: flex;">
              <el-select>
                <el-option>属性英文名称</el-option>
                <el-option>属性中文名称</el-option>
              </el-select>
              <el-input style="width: 300px;margin-left: 20px"></el-input>
              <el-button size="small" style="margin-left: 10px">查询</el-button>
            </div>

          </template>
        </avue-crud>
       <div style="display: flex;justify-content: flex-end;margin-top: 15px">
         <el-button size="small" type="primary">保存</el-button>
         <el-button size="small" type="primary">取消</el-button>
       </div>
      </el-dialog>
    </template>
    <!--        全屏编辑-->
@@ -14,6 +30,12 @@
      <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
        <attrCrud></attrCrud>
      </el-dialog>
    </template>
<!--    组合规则-->
    <template slot="menuLeft">
      <el-button size="small" @click="isShowformulaEdit=true">组合规则</el-button>
        <formula-editor :visible="isShowformulaEdit" :systemVariableTableData="systemVariableTableData" :thisSceneTableData="thisSceneTableData"></formula-editor>

    </template>
    <!--        验证规则-->
    <template slot="menuLeft">
@@ -133,7 +155,7 @@
    </template>
    <!--    级联属性-->
    <template slot="menuLeft">
      <el-button size="small" @click="CascadeVisible=true">级联属性</el-button>
      <el-button size="small" @click="CascadeHandle">级联属性</el-button>
      <el-dialog :visible.sync="CascadeVisible" append-to-body title="请选择级联属性">
        <avue-crud ref="crud" :data="CascadeData" :option="CascadeOption" @row-click="CascaderowClick">
          <template slot="radio"
@@ -168,31 +190,115 @@
    </template>
    <!--    同步到其他模板-->
    <template slot="menuLeft">
      <el-button size="small">同步到其他模板</el-button>
      <el-button size="small" style="margin-top: 10px">同步到其他模板</el-button>
    </template>
  </avue-crud>
</template>

<script>
import {AttrByBtm,gridCodeClassifyTemplateAttr} from '@/api/template/templateAttr'
export default {
  name: "attrCrud .vue",
  props: ['ProData'],
  props: ['ProData','crudOid','crudArray','Formlist'],
  data() {
    return {
      //表格单选数组
      CrudSelect:[],
      //表格oid
      CrudOid:"",
      //场景变量
      thisSceneTableData:[
        {
          formula: "lcstatus",
          desc: "状态",
        },
        {
          formula: "name",
          desc: "集团码",
        },
        {
          formula: "materialname",
          desc: "部门名称",
        },
        {
          formula: "parentcode",
          desc: "上级部门编号",
        },
        {
          formula: "parentname",
          desc: "上级部门名称",
        },
        {
          formula: "description",
          desc: "描述",
        },
      ],
      // 系统变量
      systemVariableTableData:[
        {
          formula: "#CURRENTUSER.OID#",
          desc: "当前用户的主键",
        },
        {
          formula:"#CURRENTUSER.ID",
          desc:"当前用户的账户"
        },
        {
          formula:"#CURRENTTIME#",
          desc:"当前时间"
        },
        {
          formula:"#CURRENTDATE#",
          desc:"当前日期"
        },
        {
          formula:"#CURRENTDATETIME#",
          desc:"当前日期时间"
        },
        {
          formula:"#CURRENTUSER_NAME#",
          desc:"当前用户的姓名"
        },
        {
          formula:"#CURRENTUSER.SECRETGRADE#",
          desc:"当前用户密级"
        },
        {
          formula:"#CURRENTUSER.IPSECRET#",
          desc:"当前用户的IP密级"
        },
        {
          formula:"#CURRENTUSER.BUSINESSUNIT#",
          desc:"当前用户所属业务单元"
        },
        {
          formula:"#CURRENTUSER.BUSINESSUNITNAME#",
          desc:"当前用户所属业务单元名称"
        },
        {
          formula:"#CURRENTUSER.GROUPOID#",
          desc:"当前用户的部门主键"
        },
        {
          formula:"#CURRENTUSER.GROUPNAME#",
          desc:"当前用户所属部门名称"
        },
        {
          formula:"#CURRENTUSER.EMAIL#",
          desc:"当前用户邮件地址"
        },
        {
          formula:"#CURRENTUSER.ROLENAME#",
          desc:"当前用户所属角色名称 "
        },
      ],
      CascadeVisible: false,
      attrEditVisible: false,
      isShowformulaEdit:false,
      // 级联单选
      selectRow: '',
      // 级联data
      CascadeData: [{
        id: 1,
        name: '张三',
        attrIn: '测试一'
      }, {
        id: 2,
        name: '李四',
        attrIn: '测试二'
      }],
      CascadeData: [],
      // 级联option
      CascadeOption: {
        menu: false,
@@ -208,18 +314,19 @@
        },
          {
            label: '属性英文编号',
            prop: 'nid'
          }, {
            label: '性别',
            prop: 'id'
          },
          {
            label: '属性中文名称',
            prop: 'name'
          },
          {
            label: '属性分组',
            prop: 'attrIn'
            prop: 'attributeGroup'
          },
          {
            label: '类型',
            prop: 'type'
            prop: 'attributeDataTypeText'
          },
          {
            label: '列表宽度',
@@ -227,19 +334,63 @@
          },
          {
            label: '关键属性',
            prop: 'keyattrflag'
            prop: 'keyAttrFlag',
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },
          {
            label: '查询属性',
            prop: 'queryattrflag'
            prop: 'queryAttrFlag',
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },
          {
            label: '高级查询属性',
            prop: 'seniorqueryattrflag'
            prop: 'seniorQueryAttrFlag',
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },
          {
            label: '相似查重属性',
            prop: 'samerepeatattrflag'
            prop: 'sameRepeatAttrFlag',
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },
          {
            label: '一维码',
@@ -248,6 +399,170 @@
          {
            label: '二维码',
            prop: 'TwoDimensional'
          },
          {
            label: '必输',
            prop: 'requireFlag',
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },
          {
            label: "表单显示",
            prop: "formDisplayFlag",
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },
          {
            label: "列表显示",
            prop: "tableDisplayFlag",
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },
          {
            label: "只读",
            prop: "readonlyFlag",
          },
          {
            label: "列表排序",
            prop: "sortAttrFlag",
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },

          {
            label: "多行文本",
            prop: "textAreaFlag",
            type:'text',
            dicData:[
              {
                label:"是",
                value:'true'
              },
              {
                label:"否",
                value:'false'
              }
            ]
          },
          {
            label: "默认值",
            prop: "defaultValue",
          },
          {
            label: "前缀",
            prop: "prefixValue",
          },
          {
            label: "后缀",
            prop: "suffixValue",
          },
          {
            label: "组合规则",
            prop: "componentRule",
          },
          {
            label: "验证规则",
            prop: "verifyRule",
          },
          {
            label: "时间格式",
            prop: "codeDateFormat",
          },
          {
            label: "分类注入",
            prop: "classifyInvokeLevel",
          },
          {
            label: "枚举注入",
            prop: "enumString",
          },
          {
            label: "级联属性",
            prop: "parentCode",
          },
          {
            label: "参照配置",
            prop: "referConfig",
          },
          {
            label: "级联查询属性",
            prop: "parentQueryAttr",
          },
          {
            label: "选择库标识",
            prop: "libraryIdentification",
          },
          {
            label: "填写提示",
            prop: "explain",
          },
          {
            label: "表单显示样式",
            prop: "formDisplayStyle",
          },
          {
            label: "表格显示样式",
            prop: "tableDisplayStyle",
          },
          {
            label: "表单超链接",
            prop: "formHref",
          },
          {
            label: "表格超链接",
            prop: "tableHref",
          },
          {
            label: "表格显示js",
            prop: "tableDisplayJs",
          },
          {
            label: "长度",
            prop: "controlLength",
          },
          {
            label: "小数精度",
            prop: "precisionLength",
          },
          {
            label: "取值范围",
            prop: "valueArea",
          },
        ]
      },
@@ -359,90 +674,14 @@
          bds: "测试一",
          shiyong: "测试一"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        },
        {
          bds: "测试二",
          shiyong: "测试二"
        }
      ],
      // 新增业务类型
      businessData: [
        {
          id: "测试一",
          name: "测试一",
          attributeLength: "测试一",
          attrDataType: "测试一"
        },
        {
          id: "测试二",
          name: "测试二",
          attributeLength: "测试二",
          attrDataType: "测试二"
        },
        {
          id: "测试三",
          name: "测试三",
          attributeLength: "测试三",
          attrDataType: "测试三",
        },
        {
          id: "测试三",
          name: "测试三",
          attributeLength: "测试三",
          attrDataType: "测试三",
        }
      ],
      businessData: [],
      businessOption: {
        index: true,
        border: true,
        addBtn: true,
        addBtn: false,
        menu:false,
        column: [
          {
            label: "属性英文名称",
@@ -522,6 +761,7 @@
        index: true,
        border: true,
        editBtn: false,
        selection:true,
        labelWidth: 110,
        cellBtn: true,
        cancelBtn: false,
@@ -756,6 +996,36 @@
    console.log(this.ProData)
  },
  methods: {
    // 从业务类型中选择数据
    busineHandle(){
      if(this.crudArray.length<1){
        this.$message.error('请选择一条模板')
      }else {
        this.addVisible=true;
        AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res=>{
          this.businessData=res.data.data;
          console.log(res.data)
        })
      }
    },
    // 级联属性
    CascadeHandle(){
      if(this.CrudSelect.length >0){
        this.CascadeVisible=true;
        gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
          'conditionMap[oid_notequal]':this.CrudOid
        }).then(res=>{
         this.CascadeData=res.data.data
        })
      }else {
        this.$message.warning('请选择一条模板属性')
      }
    },
    //表格单选
    selectHandle(selection,row){
      this.CrudOid=row.oid;
      this.CrudSelect=selection
    },
    addsHandler(){

    },

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

@@ -17,6 +17,7 @@
      option: {
        submitBtn:false,
        emptyBtn:false,

        column: [
          {
            label: '主题库/分类编号',

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

@@ -74,6 +74,7 @@
                          @row-del="CrudRowDel"
                          @row-update="CrudRowUpdata"
                          :before-close="beforeClose"
                          @select="selectHandle"
               >
            <template slot="menuLeft">
              <el-button plain size="small" type="primary" @click="FindFormVisible = true;">查询</el-button>
@@ -168,7 +169,7 @@
          </avue-crud>

          </basic-container>
          <templatePro :ProData="this.ProData"></templatePro>
          <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist"></templatePro>
        </span>
      </basic-container>
    </el-main>
@@ -202,9 +203,44 @@
  //使用inject接收参数
  //Treeoption左侧树新增表单项 Treedata左侧树节点 配置项 crudTreeOption右侧表格配置项 crudTreeData右侧表格显示内容
  //Treeform右侧表单配置项
  inject: ['crudTreeOption', "crudTreeData"],
  inject: [, "crudTreeData"],
  data() {
    return {
      //表格option配置项
      crudTreeOption: {
        index: true,
        border: true,
        height:180,
        selection:true,
        addBtn:this.addFlag,
        column: [
          {
            label: "模板编号",
            prop: "id"
          },
          {
            label:"模板名称",
            prop:"name"
          },
          {
            label: "模板描述",
            prop:"description"
          },
          {
            label:"版本号",
            prop:"revisionSeq"
          },
          {
            label:"状态",
            prop:"lcStatusText"
          }
        ]
      },
      addFlag:false,
      // 表格当前行id
      crudOid:"",
      //表格当前选择数组
      crudArray:[],
      //模板属性展示内容
      ProData: [],
      //回车键搜索绑定值
@@ -399,6 +435,11 @@
    this.getAttr();
  },
  methods: {
    //行单选事件
    selectHandle(selection,row){
      this.crudOid=row.oid
      this.crudArray=selection
    },
    //分类树数据处理
    getAttr() {
      getAtrrList().then(res => {
@@ -607,19 +648,20 @@
              return item.codeclassifyoid == this.nodeClickList.oid
            }
          })
          gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
            this.ProData = res.data.data
            console.log(this.ProData)
          }).catch(res => {
            this.$message.error(res)
          })
          if(this.Formlist.length >0){
            gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
              this.ProData = res.data.data;
              console.log(this.ProData)
            }).catch(res => {
              this.$message.error(res)
            })
          }
        }).catch(res => {
          console.log(res)
        })
        //  基本信息表单数据
        await getObjectByOid(this.nodeClickList.oid).then(res => {
          this.TreeList = res.data.data
          // eslint-disable-next-line no-const-assig
          this.TreeList = res.data.data;
        }).catch(res => {
          this.$message.error(res)
        })

 Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue

@@ -312,9 +312,9 @@
                    :show-header="false"
                    style="width: 100%"
                  >
                    <el-table-column prop="formula" width="40">
                    <el-table-column prop="formula" width="120">
                    </el-table-column>
                    <el-table-column prop="desc" width="100"> </el-table-column>
                    <el-table-column prop="desc" width="200"> </el-table-column>
                  </el-table>
                </el-tab-pane>
                <el-tab-pane label="系统变量" name="second">
@@ -324,9 +324,9 @@
                    :show-header="false"
                    style="width: 100%"
                  >
                    <el-table-column prop="formula" width="150">
                    <el-table-column prop="formula" width="200">
                    </el-table-column>
                    <el-table-column prop="desc" width="150"> </el-table-column>
                    <el-table-column prop="desc" width="200"> </el-table-column>
                  </el-table>
                </el-tab-pane>
              </el-tabs>
@@ -338,7 +338,7 @@

  </el-dialog>
</template>
  

  <script>
export default {
  name: "formulaEditor",
@@ -675,14 +675,14 @@
      }
      //公式内容回显
      // 触发update:data将子组件值传递给父组件
      this.$emit('updateFormulaContent', this.formulaContent) 
      this.isShowformulaEdit = false;  
      this.$emit('updateFormulaContent', this.formulaContent)
      this.isShowformulaEdit = false;
    },

  },
};
</script>
  

<style scoped>

  .formula-box-card >>> .el-card__body {
@@ -690,7 +690,7 @@
    height: 85%;
    width: 100%;
  }
  

  .formula-editor-total {
    /* margin-top: 3px; */
    height: 100%;
@@ -718,7 +718,7 @@
    height: auto;
    justify-content: space-between;
    align-items: center;
    }    
    }

  .formula-editor-btn-sm {
    width: 4.5vw;
@@ -732,4 +732,3 @@
  }

</style>
  

 Source/UBCS-WEB/src/views/MasterData/items.vue

@@ -9,7 +9,8 @@
                       :currentPage="this.currentPage"
                       :templateOid="this.templateOid"
                       @tableDataArray="tableDataArrays"

                       @tableHeadDataFateher="tableHeadDatas"
                       @total="totals"
                        ></master-tree>
        </basic-container>
      </el-aside>
@@ -22,6 +23,8 @@
                 @currentPage="currentPages"
                 @templateOid="templateOids"
                 :tableDataArray="tableDataArray"
                 :total="this.total"
                 :tableHeadDataFateher="this.tableHeadDataFateher"
      ></TableCrud>
      </el-main>
    </el-container>
@@ -44,7 +47,9 @@
      codeClassifyOid:"",
      coderuleoid:"",
      templateOid:"",
      tableDataArray:[]
      tableDataArray:[],
      tableHeadDataFateher:[],
      total:""
    }
  },
  created() {
@@ -68,6 +73,12 @@
    },
    tableDataArrays(val){
      this.tableDataArray=val
    },
    totals(val){
      this.total=val
    },
    tableHeadDatas(val){
      this.tableHeadDataFateher=val
    }
  }
}

 Source/UBCS-WEB/src/views/modeling/classifyTree.vue

@@ -1,6 +1,5 @@
<template>
  <classifyTrees :crudData="crudTreeData" :crudoption="crudTreeOption" :data="Treedata"
                 :option="Treeoption"
  <classifyTrees :crudData="crudTreeData"
  ></classifyTrees>
</template>

@@ -12,33 +11,6 @@
  //父传子有问题，暂时没解决，用provide代替父传子，子传父还是用$emit传递，注意！！！其他组件不能使用同样的类名否则会报错。
  provide() {
    return {
      crudTreeOption: {
        index: true,
        border: true,
        height:180,
        column: [
          {
            label: "模板编号",
            prop: "id"
          },
          {
            label:"模板名称",
            prop:"name"
          },
          {
            label: "模板描述",
            prop:"description"
          },
          {
            label:"版本号",
            prop:"revisionSeq"
          },
          {
            label:"状态",
            prop:"lcStatusText"
          }
        ]
      },
      crudTreeData: this.crudTreeData,
    }


 Source/UBCS-WEB/vue.config.js

@@ -27,10 +27,15 @@
      '/api': {
        //本地服务接口地址
        //  target: 'http://localhost:37000',
        //target: 'http://192.168.1.51:37000',
        //  target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        target: 'http://192.168.1.46:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        //   target: 'http://localhost:37000',
        // target: 'http://192.168.1.63:37000',
        //target: 'http://192.168.3.7:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://dev.vci-tech.com:37000',
        //target: 'http://192.168.1.51:37000/',
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',