Merge remote-tracking branch 'origin/master'

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

@@ -3,7 +3,9 @@
    <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
               :option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
      <template slot-scope="{ node }">
        <span id="labelSize" v-html="node.label" ></span>
        <el-tooltip class="item" effect="dark"  open-delay="350" :content="$createElement('div', { domProps: { innerHTML: node.label } })"  placement="right-start">
          <span id="labelSize" v-html="node.label" ></span>
        </el-tooltip>
      </template>
    </avue-tree>
    <div style="position: absolute; right: 3px; top: -1px;">

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

@@ -77,17 +77,6 @@
                                 :width="item.width"
                                 align="center">
                </el-table-column>
                <!--               参照数据-->
<!--                <el-table-column v-for="(item,index) in referArray"-->
<!--                                 v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"-->
<!--                                 :key="index"-->
<!--                                 :label="item.title" :show-overflow-tooltip="true"-->
<!--                                 :sortable="item.sortable" :width="item.width" align="center"-->
<!--                                 :prop="item.prop">-->
<!--                  <template slot-scope="scope">-->
<!--                    <span>{{ scope.row[item.showField] }}</span>-->
<!--                  </template>-->
<!--                </el-table-column>-->
              </el-table>
            </div>
          </el-row>
@@ -356,15 +345,7 @@
      },
      // 主数据按钮
      masterVrBtnList: [],
      fileOptions: {
        ownbizOid: "0",
        ownbizBtm: "0",
        fileDocClassify: '!=processAuditSuggest',
        fileDocClassifyName: '',
        hasDownload: true,
        hasUpload: true,
        height: 110
      },
      fileOptions:{},
      result: '',
      elapsedTime: '',
    };
@@ -416,6 +397,15 @@
        this.tableData = newval;
        this.searchResults = newval
        this.doLayout();
        this.fileOptions= {
          ownbizOid: "0",
          ownbizBtm: "0",
          fileDocClassify: '!=processAuditSuggest',
          fileDocClassifyName: '',
          hasDownload: true,
          hasUpload: true,
          height: 'auto'
        }
      },
    },
    tableHeadFindData: {
@@ -1101,7 +1091,7 @@
<style lang="scss" scoped>
//固定列高度
/deep/ .el-table__fixed {
  height: calc(100vh - 370px) !important;
  height: calc(100vh - 365px) !important;
}

// 滚动条样式修改
@@ -1139,7 +1129,7 @@

.top {
  overflow-y: scroll;
  min-height: 55%;
  min-height: 40%;
}

.bottom {

 Source/UBCS-WEB/src/components/StatisticsComponent/lineChart.vue

@@ -31,15 +31,14 @@
      handler(newval, oldval) {
        if (newval) {
          const series = newval.map((data, index) => ({
            name: index === 0 ? "总量" : "新增",
            type: "line",
            name: index === 0 ? '总量' : '新增',
            type: 'line',
            smooth: true,
            stack: "Total",
            stack: index === 0 ? 'Total' : 'total2', // 根据 index 区分总量和新增的堆叠情况
            label: {
              show: true,
              position: "top",
              textStyle: {
                fontSize: 14 // 调整字体大小
                fontSize: 14
              }
            },
            data: data.map(value => ({value}))
@@ -49,14 +48,14 @@
        }
      }
    },
    chartName:{
      handler(newval,oldval){
        if(newval){
    chartName: {
      handler(newval, oldval) {
        if (newval) {
          this.chartOptions.title.text = newval + "数据统计"
        }
      },
      immediate:true,
      deep:true
      immediate: true,
      deep: true
    }
  },
  data() {

 Source/UBCS-WEB/src/components/StatisticsComponent/pieChart.vue

@@ -6,11 +6,11 @@

<script>
import 'echarts'
import 'echarts/lib/chart/pie'
import 'echarts/lib/chart/bar' // 导入柱状图组件
import 'echarts/lib/component/tooltip'
import 'echarts/lib/component/legend'
export default {
  name: "pieChart",
  name: "polarBarChart",
  props:{
    pieData:{
      type:Array,
@@ -19,97 +19,89 @@
    chartName:{
      type:String,
      default: ""
    },
    monthData:{
      type:Array,
      default: () => ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
    }
  },
  watch:{
    pieData:{
      immediate:true,
      handler(newval,oldval){
      handler(newval, oldval){
        if (newval) {
          // console.log(newval)
          const series=[
          const series = [
            {
              name: '',
              type: 'pie',
              radius: ['40%', '70%'],
              avoidLabelOverlap:false,
              label: {
                formatter: '{b}\n{d}%',
                fontSize:14
              type: 'bar',
              name: '新增',
              data: newval[1],
              coordinateSystem: 'polar',
              stack: 'a',
              emphasis: {
                focus: 'series'
              },
              itemStyle: {
                color: function(params) {
                  // 根据具体需求设置颜色
                  const colorList = ['#5470C6', '#91CC75', '#fac858', '#EE6666', '#3BA272', '#FC8452', '#9A60B4', '#e34d4d', '#b3e9b9', '#eaaaed', '#1bc6e4', '#c6b3e9'];
                  return colorList[params.dataIndex % colorList.length];
                }
                color: '#91cc75' // 新增的颜色
              }
            },
            {
              type: 'bar',
              name: '总量',
              data: newval[0],
              coordinateSystem: 'polar',
              stack: 'a',
              emphasis: {
                focus: 'series'
              },
              data:newval[0].map((value, index) => {
                return {
                  value: value,
                  name: this.getMonthName(index),
                  newValue: newval[1][index]
                };
              }),
              itemStyle: {
                color: '#5470c6' // 总量的颜色
              }
            }
          ]
          ];
          this.chartOptions.series = series;
        }
      }
    },
    chartName:{
      handler(newval,oldval){
      handler(newval, oldval){
        if(newval){
          this.chartOptions.title.text = newval + "数据统计"
        }
      },
      immediate:true,
      deep:true
      immediate:true
    }
  },
  data() {
    return {
      chartOptions: {
        title: {
          text: '供应商主数据统计',
          left: 'center'
        },
        tooltip: {
          trigger: 'item',
          formatter: function (params) {
            let result = '';
            if (params.componentType === 'series') {
              result += params.name + '<br/>';
              result += '新增：' + params.data.newValue + '<br/>';
              result += '总量：' + params.data.value + '<br/>';
              result += '百分比：' + params.percent + '%';
            }
            return result;
          }
          text: '',
        },
        legend: {
          orient: 'vertical',
          right: 10,
          top: 'middle',
          data: ['总量', '新增'],
        },
        polar: {},
        angleAxis: {
          type: 'category',
          data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
        },
        radiusAxis: {},
        tooltip: {
          trigger: 'axis'
        },
        series: []
      },
      }
    }
  },
  methods:{
    getMonthName(index){
      const monthNames = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'];
      return monthNames[index];
    }
  created(){
    this.chartOptions.color = ['#5470c6', '#91cc75', '#fac858', '#ca8622', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4'];
  }
}
</script>

<style scoped lang="scss">
#chart {
  width: 90%;
  width: 97%;
  height: 530px;
}

</style>

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

@@ -2069,16 +2069,23 @@
      const regex = new RegExp(this.rulesData.ruleRowBds);
      if (regex.test(this.RulesForm.TestContent)) {
        this.$message.success('校验成功')
      }else {
        this.$message.error('校验失败')
      }
    },
    //点击分类注入按钮
    injectBtn() {
      if (this.attrSelectList.length > 1) {
        this.$message.warning('只能选择一条模板数据')
      } else if (this.attrSelectList.length < 1) {
        return;
      }
      if (this.attrSelectList.length < 1) {
        this.$message.warning('请选择一条模板数据')
      } else if (this.attrSelectList.length === 1) {
        return;;
      }
      if (this.attrSelectList.length === 1) {
        this.injectVisible = true;
        return;
      }
    },
    //分类注入保存

 Source/UBCS-WEB/src/components/file/main.vue

@@ -88,7 +88,7 @@
      hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel,
      hasDownload:validatenull(this.options.hasDownload) ? true :this.options.hasDownload,
      option: {
        height:(this.options.tableHeight?this.options.tableHeight:'400'),
        height:(this.options.tableHeight?this.options.tableHeight:'300'),
        calcHeight: 30,
        tip: false,
        searchShow: false,

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

@@ -55,7 +55,7 @@
      page: {
        total: 0,
        currentPage: 1,
        pageSize: 100,
        pageSize: 10,
        pageSizes: [10, 30, 50, 100, 200],
      },
      pageSize: "100",

 Source/UBCS-WEB/src/views/flow/manager.vue

@@ -25,8 +25,10 @@
        <el-button type="text"
                   size="small"
                   icon="el-icon-refresh"
                   :style="{color: scope.row.suspensionState === 1 ? '#67C23A' : '#F56C6C'}"
                   v-if="permissionList.state"
                   @click.stop="handleState(scope.row,scope.index)">变更状态
                   @click.stop="handleDoState(scope.row, scope.index)">
          {{ scope.row.suspensionState === 1 ? '激活' : '挂起' }}
        </el-button>
        <el-button type="text"
                   size="small"
@@ -292,15 +294,15 @@
        this.stateBox = true;
        this.selectionId = row.id;
      },
      handleDoState() {
        if (!this.flowState) {
          this.$message({
            type: "warn",
            message: "请先选择流程状态!"
          });
          return;
        }
        changeState({processId: this.selectionId, state: this.flowState}).then(res => {
      handleDoState(row) {
        // if (!this.flowState) {
        //   this.$message({
        //     type: "warn",
        //     message: "请先选择流程状态!"
        //   });
        //   return;
        // }
        changeState({processId: row.id, state: (row.suspensionState === 1 ? 'suspend' : 'active')}).then(res => {
          const data = res.data;
          if (data.success) {
            this.$message({

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

@@ -2959,7 +2959,17 @@
        }
        conditionMap.put("t.lastr", "1");
        conditionMap.put("t.lastv", "1");
        return queryGrid(btmTypeId, templateVO, conditionMap, pageHelper);
        DataGrid<Map<String, String>> mapDataGrid = queryGrid(btmTypeId, templateVO, conditionMap, pageHelper);
        //处理返回数据与模板数据配置的字段不一样问题
        templateVO.getAttributes().stream().forEach(e->{
            for (Map<String, String> datum : mapDataGrid.getData()) {
                if(datum.containsKey(e.getId().toLowerCase()) && !datum.containsKey(e.getId())){
                    datum.put(e.getId(),datum.get(e.getId().toLowerCase()));
                    datum.remove(e.getId().toLowerCase());
                }
            }
        });
        return mapDataGrid;
//        List<String> selectFieldList = templateVO.getAttributes().stream().map(CodeClassifyTemplateAttrVO::getId).collect(Collectors.toList());
//        //参照让平台直接查询就行
//        List<String> finalSelectFieldList = selectFieldList;
@@ -3402,6 +3412,16 @@
        dataList.add(cbo);
        wrapperData(dataList, templateVO, sqlBO.getSelectFieldList(), true);
        R<List<Map<String, String>>> result = R.data(Collections.singletonList(cbo));
        //处理返回数据与模板数据配置的字段不一样问题
        templateVO.getAttributes().stream().forEach(e->{
            for (Map<String, String> datum : result.getData()) {
                if(datum.containsKey(e.getId().toLowerCase()) && !datum.containsKey(e.getId())){
                    datum.put(e.getId(),datum.get(e.getId().toLowerCase()));
                    datum.remove(e.getId().toLowerCase());
                }
            }
        });

        //我们要看是否不是升版的，升版的话，需要对比不相等的属性
/*        String copy = cbo.get("copyfromversion");
//        if (StringUtils.isBlank(copy)) {