From e53e0d9cc7472153946147d548f572fd14be13f3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 15:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/work/todo.vue | 8 +++
Source/UBCS-WEB/src/views/work/send.vue | 11 ++++-
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 23 ++++++-----
Source/UBCS-WEB/src/views/wel/index.vue | 9 ++++
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java | 2
Source/UBCS-WEB/src/views/work/done.vue | 9 ++++
Source/UBCS-WEB/src/views/work/claim.vue | 6 +++
7 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index c3a3aff..cc7c67f 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/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;
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index d7ffd1a..69a47eb 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/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'
}
]
diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 63b6582..9d31372 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/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
}
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 88cc1f7..7dd1822 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/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
}
diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index 2cd93e8..2e50088 100644
--- a/Source/UBCS-WEB/src/views/work/send.vue
+++ b/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
}
diff --git a/Source/UBCS-WEB/src/views/work/todo.vue b/Source/UBCS-WEB/src/views/work/todo.vue
index 30514b7..bff6aab 100644
--- a/Source/UBCS-WEB/src/views/work/todo.vue
+++ b/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
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java
index 601c524..c82ff71 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java
+++ b/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()));
--
Gitblit v1.9.3