From 8ebca469a8b028e07f77a5a7058c9fcac3ced323 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 12 七月 2023 19:08:21 +0800
Subject: [PATCH] 流程中业务数据
---
Source/UBCS-WEB/src/api/GetItem.js | 8 ++++++++
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 9 +++++++--
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 19 ++++++++++++-------
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/GetItem.js b/Source/UBCS-WEB/src/api/GetItem.js
index a6464c9..9281bd4 100644
--- a/Source/UBCS-WEB/src/api/GetItem.js
+++ b/Source/UBCS-WEB/src/api/GetItem.js
@@ -46,3 +46,11 @@
})
}
+//娴佺▼鎵ц涓〃澶�
+export function FlowTable(data){
+ return request({
+ url: 'api/ubcs-code/mdmEngineController/getFlowdUIInfoByClassifyOid',
+ method: 'get',
+ data
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 4f0b688..3597bfa 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -40,11 +40,11 @@
<script>
import {businese} from '@/api/work/businese'
-import {MasterTable} from "@/api/GetItem";
+import {FlowTable} from "@/api/GetItem";
import {validatenull} from "@/util/validate";
export default {
name: "BusinessWork",
- props:['ids','templateId'],
+ props:['ids','templateId',"taskId","modelKey","codeClassifyOid"],
data() {
return {
BuinessOids:[],
@@ -78,9 +78,11 @@
//琛ㄦ牸澶存覆鏌�
CrudHeaderRend() {
if (this.codeClassifyOid != "") {
- MasterTable({
- codeClassifyOid: this.codeClassifyOid,
- functionId: 5,
+ FlowTable({
+ templateId: this.templateId,
+ taskId : this.taskId ,
+ modelKey: this.modelKey,
+ codeClassifyOid: this.codeClassifyOid
}).then((res) => {
this.options = res.data.tableDefineVO.seniorQueryColumns;
this.List = res.data.tableDefineVO.cols[0];
@@ -97,9 +99,12 @@
//浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
columnItem.formatter = '';
}else {
- if (item.templet && typeof (item.templet) == 'string' && !validatenull(item.templet) && item.templet.indexOf("function(row,column)")>-1) {
+ if (item.templet && typeof (item.templet) == 'string' && !validatenull(item.templet) && item.templet.indexOf("function(row,column)") > -1) {
columnItem.formatter = eval("(" + item.templet + ")");
- //function(row,column){return row[column.property]=='true'?'鏄�':'鍚�'}
+ } else if (item.fieldType == "truefalse") {
+ columnItem.formatter = function (row, column) {
+ return row[column.property] == 'true' || row[column.property] == '1' ? '鏄�' : '鍚�'
+ }
}
}
this.tableHeadData.push(columnItem)
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
index 50f4ae3..3dcbcb4 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -5,7 +5,7 @@
<el-card class="dialogwarp_tab_card">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="涓氬姟鏁版嵁淇℃伅" name="first">
- <businesswork ref="businesswork":ids="ids" :templateId="templateId"></businesswork>
+ <businesswork ref="businesswork":ids="ids" :templateId="templateId" :taskId="taskId" :modelKey="modelKey" :codeClassifyOid="codeClassifyOid"></businesswork>
</el-tab-pane>
<el-tab-pane label="娴佺▼璺熻釜" name="second">
<avue-crud :data="flowList" :option="option" ref="crud">
@@ -78,6 +78,8 @@
ids:[],
templateId:'',
taskId: '',
+ modelKey:'',
+ codeClassifyOid:'',
businessId: '',
processInstanceId: '',
src: '',
@@ -142,9 +144,12 @@
const res = response.data
this.ids=res.data.variables.ids;
this.templateId=res.data.variables.templateId;
+ this.modelKey=res.data.variables.modelKey;
+ this.codeClassifyOid=res.data.variables.codeClassifyOid;
+ this.taskId=res.data.variables.taskId;
if (res.success) {
console.log(res)
- this.btnList = res.data.toTasks
+ this.btnList = res.data.toTasks;
}
},
async apiExamineTask(param) {
--
Gitblit v1.9.3