From e5d73c8c050c08172affb9e00e97f3c22ed9d9b6 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 04 八月 2023 12:08:20 +0800
Subject: [PATCH] 修改流程启动参数，流程列表展示页面
---
Source/UBCS-WEB/src/views/work/todo.vue | 71 ++++----
Source/UBCS-WEB/src/views/work/send.vue | 78 ++++-----
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 8
Source/UBCS-WEB/src/views/wel/index.vue | 25 ++-
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 124 ++++++--------
Source/UBCS-WEB/src/components/transfer/transfer-panel.vue | 7
Source/UBCS-WEB/src/views/work/done.vue | 75 ++++----
Source/UBCS-WEB/src/views/work/claim.vue | 74 ++++----
8 files changed, 218 insertions(+), 244 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 0b8e3cd..c3a3aff 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -441,7 +441,7 @@
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.template = this.userName + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.userName + '-鐢宠[' + 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;
@@ -492,7 +492,7 @@
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.template = this.userName + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.userName + '-鍋滅敤[' + 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;
@@ -544,7 +544,7 @@
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.template = this.userName + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.userName + '-鍚敤[' + 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;
@@ -602,7 +602,7 @@
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.template = this.userName + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.userName + '-鍥炴敹[' + 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/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index c208c2b..7ec8388 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -10,7 +10,7 @@
<el-input placeholder="娴佺▼妯℃澘" v-model="saveParam.modelName" disabled></el-input>
</el-form-item>
<el-form-item label="娴佺▼鍚嶇О" prop="processName">
- <el-input placeholder="娴佺▼鍚嶇О" v-model="saveParam.template">
+ <el-input placeholder="娴佺▼鍚嶇О" v-model="saveParam.processName">
</el-input>
</el-form-item>
<el-form-item label="娴佺▼鎻忚堪">
@@ -24,7 +24,7 @@
</div>
<el-form :model="collectParam" class="demo-form-inline" label-position="left" label-width="auto">
<el-form-item :label="item.taskName" v-for="(item, index) in initFrom" :key="index">
- <el-select style="width: 80%;" filterable v-model="collectParam.flowTaskUsers[index]['userId']"
+ <el-select style="width: 100%;" filterable v-model="collectParam.flowTaskUsers[index]['userId']"
:placeholder="item.taskName" @change="handleSelect($event, index)">
<el-option :label="key.userNames" :value="key.userId" v-for="(key, keyi) in typeName"
:key="keyi"></el-option>
@@ -42,61 +42,61 @@
export default {
name: 'SetPersonnel',
props: {
- // 鏄惁鎵撳紑
- visible: {
- typeof: Boolean,
- default: false
- },
- // 鏍囬
- title: {
- typeof: String,
- default: '娴佺▼瀹℃壒'
- },
- // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�,
- // flowTemplate锛�
- // vars锛歰bject鏍煎紡锛屽悕瀛椾负vars锛岄噷闈ey閿�硷紝鑷繁闅忔剰
- parameter: {
- typeof: Object,
- default: () => { }
- },
- parameterKeys: {
- typeof: Object,
- default: () => {
- return {
- ids: 'ids',
- flowTemplate: 'flowTemplate',
- code: 'code',
- type: 'type',
- btmtype:'btmtype'
- }
- }
+ // 鏄惁鎵撳紑
+ visible: {
+ typeof: Boolean,
+ default: false
+ },
+ // 鏍囬
+ title: {
+ typeof: String,
+ default: '娴佺▼瀹℃壒'
+ },
+ // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�,
+ // flowTemplate锛�
+ // vars锛歰bject鏍煎紡锛屽悕瀛椾负vars锛岄噷闈ey閿�硷紝鑷繁闅忔剰
+ parameter: {
+ typeof: Object,
+ default: () => {
}
-
+ },
+ parameterKeys: {
+ typeof: Object,
+ default: () => {
+ return {
+ ids: 'ids',
+ processName: 'processName',
+ code: 'code',
+ type: 'type',
+ btmtype: 'btmtype'
+ }
+ }
+ }
},
watch: {
- visible(n) {
- this.dialogVisible = n;
- if (n) {
- this.apiInit()
- this.apiDict()
- }
+ visible(n) {
+ this.dialogVisible = n;
+ if (n) {
+ this.apiInit()
+ this.apiDict()
+ }
+ },
+ dialogVisible(n) {
+ this.$emit('update:visible', n)
+ },
+ users: {
+ handler(val) {
+ this.collectParam.flowTaskUsers = val
},
- dialogVisible(n) {
- this.$emit('update:visible', n)
+ deep: true,
+ immediate: true
+ },
+ parameter: {
+ handler(newval, oldval) {
+ this.saveParam = Object.assign({processName:'',processDesc: ''},newval) ;
},
- users:{
- handler(val){
- this.collectParam.flowTaskUsers = val
- },
- deep:true,
- immediate:true
- },
- parameter:{
- handler(newval,oldval){
- this.saveParam=newval;
- },
- deep:true,
- immediate:true
+ deep: true,
+ immediate: true
}
},
data() {
@@ -111,8 +111,8 @@
users: [],
rules: {
processName: [
- { required: true, message: '妯℃澘鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
- { min: 1, max: 20, message: '闀垮害鍦� 3 鍒� 20 涓瓧绗�', trigger: 'blur' }
+ { required: true, message: '娴佺▼鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
+ { min: 3, max: 50, message: '闀垮害鍦� 3 鍒� 50 涓瓧绗�', trigger: 'blur' }
]
}
}
@@ -123,16 +123,6 @@
created() {
},
methods: {
- setSaveParam() {
- return {
- processName: this.parameter[this.parameterKeys.flowTemplate],
- topName: this.title,
- ids: this.parameter[this.parameterKeys.ids],
- oids: this.parameter[this.parameterKeys.ids],
- btmtype:this.parameter[this.parameterKeys.btmtype],
- vars:this.parameter['vars']
- }
- },
userIndex(arr1) {
return this.initFrom.findIndex(i => i.taskId === arr1)
},
@@ -145,10 +135,7 @@
let flowTaskUsers = response.data.data.user
this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
this.users = response.data.data.user
- console.log(this.collectParam)
- console.log('this.saveParam.before',this.saveParam)
this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
- console.log('this.saveParam',this.saveParam)
if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
}
},
@@ -171,12 +158,9 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
}).then(async ({ value }) => {
- console.log(this.users)
this.collectParam.flowTaskUsers = this.users
this.collectParam = { ...this.collectParam, name: value }
- console.log(this.collectParam)
const response = await personnelCollect(this.collectParam)
- console.log(response)
if (response.status === 200) {
this.$nextTick(() => {
this.apiInit()
diff --git a/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue b/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
index 232be18..3f1910d 100644
--- a/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
+++ b/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
@@ -24,7 +24,7 @@
</p>
</div>
</template>
-
+
<script>
import ElCheckboxGroup from 'element-ui/packages/checkbox-group';
import ElCheckbox from 'element-ui/packages/checkbox';
@@ -207,9 +207,9 @@
methods: {
updateAllChecked() {
-
+
const checkableDataKeys = this.checkableData.map(item => item[this.keyProp]);
-
+
this.allChecked = checkableDataKeys.length > 0 &&
checkableDataKeys.every(item => this.checked===item);
},
@@ -228,4 +228,3 @@
}
};
</script>
-
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index 863ede5..d7ffd1a 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -95,26 +95,35 @@
delBtn: false,
column: [{
label: '浠诲姟鍚嶇О',
- prop: 'name',
+ prop: 'taskName',
+ sortable:true,
+ headerAlign:'center',
+ align:'left',
html: true,
formatter: (val) => {
- return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.taskName + '</a>'
+ return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
}
},
{
label: '涓婁竴姝ュ鐞嗘椂闂�',
- prop: 'createTime'
- },
- {
- label: '鎻忚堪',
- prop: 'description'
+ sortable:true,
+ prop: 'historyActivityDurationTime'
},
{
label: '涓婁竴姝ユ搷浣滀汉',
- prop: 'creator_name'
+ sortable:true,
+ prop: 'historyActivityAssigneName'
+ },
+ {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
},
{
label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
prop: 'categoryName'
}
]
diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 6eb9ce6..63b6582 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/Source/UBCS-WEB/src/views/work/claim.vue
@@ -80,44 +80,42 @@
dialogWidth: 900,
menuWidth: 200,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign:'center',
+ align:'left',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '鍙戣捣浜�',
+ prop: 'createUser',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.createUser
+ }
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable:true,
+ prop: 'createTime',
+ }, {
+ label: '褰撳墠姝ラ',
+ prop: 'taskName',
+ },{
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 09160ea..88cc1f7 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/Source/UBCS-WEB/src/views/work/done.vue
@@ -74,44 +74,43 @@
dialogWidth: 900,
menuWidth: 150,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign: 'center',
+ align: 'left',
+ sortable: true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '鍙戣捣浜�',
+ prop: 'createUser',
+ sortable: true,
+ formatter: (val) => {
+ return val.variables.createUser
+ }
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable: true,
+ prop: 'createTime',
+ }, {
+ label: '瀹屾垚鏃堕棿',
+ sortable: true,
+ prop: 'endTime',
+ }, {
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable: true,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鍚姩鏃舵弿杩�',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index c1931ee..2cd93e8 100644
--- a/Source/UBCS-WEB/src/views/work/send.vue
+++ b/Source/UBCS-WEB/src/views/work/send.vue
@@ -78,50 +78,40 @@
dialogWidth: 900,
menuWidth: 150,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '娴佺▼杩涘害',
- prop: 'processIsFinished',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign:'center',
+ align:'left',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '娴佺▼杩涘害',
+ prop: 'processIsFinished',
+ slot: true,
+ width: 80,
+ }, {
+ label: '褰撳墠姝ラ',
+ prop: 'taskName',
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable:true,
+ prop: 'createTime',
+ },{
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
diff --git a/Source/UBCS-WEB/src/views/work/todo.vue b/Source/UBCS-WEB/src/views/work/todo.vue
index ca53516..30514b7 100644
--- a/Source/UBCS-WEB/src/views/work/todo.vue
+++ b/Source/UBCS-WEB/src/views/work/todo.vue
@@ -80,44 +80,39 @@
dialogWidth: 900,
menuWidth: 200,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign:'center',
+ align:'left',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '鍙戣捣浜�',
+ prop: 'createUser',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.createUser
+ }
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable:true,
+ prop: 'createTime',
+ }, {
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
--
Gitblit v1.9.3