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

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

@@ -66,7 +66,7 @@
          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                              :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
                              :title="'已发布数据更改'"
                              :type="edit"
                              type="edit"
                              :visible.sync="DataVisible"></FormTemplateDialog>
          <!--          发布-->
          <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleFlow"
@@ -125,6 +125,7 @@
import BatchImport from '@/components/BatchImport'
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
import {getUserInfo} from "@/api/system/user";

export default {
  components: {
@@ -269,8 +270,12 @@
  },
  computed: {},
  created() {
    const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
    this.result = this.$route.query.id.substring(index);
    // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
    // this.result = this.$route.query.id.substring(index);
    getUserInfo().then(res=>{
      console.log(res.data.data)
      this.result=res.data.data.realName
    })
  },
  mounted() {
  },
@@ -440,8 +445,7 @@
          } else if (showMessage) {
            processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
              if (res.data.data.records && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.processName = this.userName + '-申请[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.processName = this.result + '-申请[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'PUBLIC';
                this.parameter.code = this.templateOid;
                this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -491,8 +495,7 @@
          } else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
            processTS({templateId: this.templateOid, buttonTypeKey: 'DISABLE'}).then(res => {
              if (res.data.records != [] && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.processName = this.userName + '-停用[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.processName = this.result + '-停用[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'DISABLE';
                this.parameter.code = this.templateOid
                this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -543,8 +546,7 @@
            processTS({templateId: this.templateOid, buttonTypeKey: 'ENABLE'}).then(res => {
              if (res.data.data.records && res.data.data.records.length != 0) {
                this.parameter = res.data.data.records[0]
                this.userName = localStorage.getItem("username");
                this.parameter.processName = this.userName + '-启用[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.processName = this.result + '-启用[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'Released';
                this.parameter.code = this.templateOid
                this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -601,8 +603,7 @@
            //disabledCount 和 releasedCount 中任意一个等于 this.selectRow 数组的长度则表示全部是同一种状态，返回 true 如果disabledCount 和 releasedCount 都大于0，则表示既有Disabled也有Released返回 true
            processTS({templateId: this.templateOid, buttonTypeKey: 'ROLLBACK'}).then(res => {
              if (res.data.records != [] && res.data.data.records.length != 0) {
                this.userName = localStorage.getItem("username");
                this.parameter.processName = this.userName + '-回收[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
                this.parameter.processName = this.result + '-回收[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
                this.parameter.type = 'TakeBack';
                this.parameter.code = this.templateOid
                this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;

 Source/UBCS-WEB/src/views/wel/index.vue

@@ -90,9 +90,10 @@
          header: false,
          align: 'center',
          index: true,
          menuWidth: 100,
          menuWidth: 80,
          editBtn: false,
          delBtn: false,
          border:true,
          column: [{
            label: '任务名称',
            prop: 'taskName',
@@ -100,6 +101,8 @@
            headerAlign:'center',
            align:'left',
            html: true,
            width:300,
            overHidden:true,
            formatter: (val) => {
              return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
            }
@@ -107,16 +110,19 @@
            {
              label: '上一步处理时间',
              sortable:true,
              width:150,
              prop: 'historyActivityDurationTime'
            },
            {
              label: '上一步操作人',
              sortable:true,
              width:120,
              prop: 'historyActivityAssigneName'
            },
            {
              label: '流程描述',
              prop: 'processDesc',
              overHidden:true,
              formatter: (val) => {
                return  val.variables.processDesc
              }
@@ -124,6 +130,7 @@
            {
              label: '所属流程模板',
              sortable:true,
              overHidden:true,
              prop: 'categoryName'
            }
          ]

 Source/UBCS-WEB/src/views/work/claim.vue

@@ -88,6 +88,8 @@
            headerAlign:'center',
            align:'left',
            sortable:true,
            width:300,
            overHidden:true,
            formatter: (val) => {
              return val.variables.processName
            }
@@ -95,12 +97,14 @@
            label: '发起人',
            prop: 'createUser',
            sortable:true,
            width:150,
            formatter: (val) => {
              return val.variables.createUser
            }
          }, {
            label: '发起时间',
            sortable:true,
            width:180,
            prop: 'createTime',
          }, {
            label: '当前步骤',
@@ -108,10 +112,12 @@
          },{
            label: '所属流程模板',
            sortable:true,
            width:200,
            prop: 'categoryName'
          }, {
            label: '流程描述',
            prop: 'processDesc',
            overHidden:true,
            formatter: (val) => {
              return val.variables.processDesc
            }

 Source/UBCS-WEB/src/views/work/done.vue

@@ -82,6 +82,8 @@
            headerAlign: 'center',
            align: 'left',
            sortable: true,
            overHidden:true,
            width:300,
            formatter: (val) => {
              return val.variables.processName
            }
@@ -89,24 +91,29 @@
            label: '发起人',
            prop: 'createUser',
            sortable: true,
            width:150,
            formatter: (val) => {
              return val.variables.createUser
            }
          }, {
            label: '发起时间',
            sortable: true,
            width:180,
            prop: 'createTime',
          }, {
            label: '完成时间',
            sortable: true,
            prop: 'endTime',
            width:180,
            prop: 'historyTaskEndTime',
          }, {
            label: '所属流程模板',
            sortable: true,
            width:200,
            prop: 'categoryName'
          }, {
            label: '流程启动时描述',
            prop: 'processDesc',
            overHidden:true,
            formatter: (val) => {
              return val.variables.processDesc
            }

 Source/UBCS-WEB/src/views/work/send.vue

@@ -86,6 +86,7 @@
            headerAlign:'center',
            align:'left',
            sortable:true,
            overHidden:true,
            formatter: (val) => {
              return val.variables.processName
            }
@@ -93,21 +94,25 @@
            label: '流程进度',
            prop: 'processIsFinished',
            slot: true,
            width: 80,
            width: 100,
          }, {
            label: '当前步骤',
            prop: 'taskName',
            width:150
          }, {
            label: '发起时间',
            sortable:true,
            prop: 'createTime',
            width:180,
            prop: 'createTime'
          },{
            label: '所属流程模板',
            sortable:true,
            prop: 'categoryName'
            prop: 'categoryName',
            width:200
          }, {
            label: '流程描述',
            prop: 'processDesc',
            overHidden:true,
            formatter: (val) => {
              return val.variables.processDesc
            }

 Source/UBCS-WEB/src/views/work/todo.vue

@@ -78,7 +78,7 @@
          viewBtn: false,
          delBtn: false,
          dialogWidth: 900,
          menuWidth: 200,
          menuWidth: 220,
          dialogClickModal: false,
          align: 'center',
          column: [{
@@ -88,6 +88,8 @@
            headerAlign:'center',
            align:'left',
            sortable:true,
            width:360,
            overHidden:true,
            formatter: (val) => {
              return val.variables.processName
            }
@@ -95,20 +97,24 @@
            label: '发起人',
            prop: 'createUser',
            sortable:true,
            width:150,
            formatter: (val) => {
              return val.variables.createUser
            }
          }, {
            label: '发起时间',
            sortable:true,
            width:180,
            prop: 'createTime',
          }, {
            label: '所属流程模板',
            sortable:true,
            width:200,
            prop: 'categoryName'
          }, {
            label: '流程描述',
            prop: 'processDesc',
            overHidden:true,
            formatter: (val) => {
              return val.variables.processDesc
            }

 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java

@@ -56,7 +56,7 @@
            queryWrapper.ne("id", processTemplate.getId());
        }
        if(baseMapper.selectOne(queryWrapper)!=null){
            throw new ServiceException(processTemplate.getButtonTypeValue()+"功能已经配置了流程!");
            throw new ServiceException("模板key："+processTemplate.getModelKey()+"与模板名称："+processTemplate.getModelName()+",在此模板下已被配置，请检查!");
        }
        if(StringUtils.isEmpty(processTemplate.getButtonTypeValue())){
            processTemplate.setButtonTypeValue(ProcessTemplateTypeEnum.getTextByValue(processTemplate.getButtonTypeKey()));