From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 4f0b688..783f534 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:[],
@@ -53,16 +53,22 @@
tableData:[],
editingRow: null,
editShow: "",
- editAttr: ""
+ editAttr: "",
+ columnType: {
+ text: "input",
+ combox: "select",
+ truefalse: "switch",
+ number: "number",
+ datetime: "datetime",
+ }
}
},
watch:{
ids:{
handler(newval,oldval){
this.BuinessOids=newval;
+ this.CrudHeaderRend()
this.BuinseseRend()
- console.log(newval)
- console.log(this.BuinessOids)
},
deep:true
}
@@ -78,9 +84,16 @@
//琛ㄦ牸澶存覆鏌�
CrudHeaderRend() {
if (this.codeClassifyOid != "") {
- MasterTable({
- codeClassifyOid: this.codeClassifyOid,
- functionId: 5,
+ var data=new FormData()
+ data.append('templateId', this.templateId)
+ data.append('taskId', this.taskId)
+ data.append('modelKey', this.modelKey)
+ data.append('codeClassifyOid', this.codeClassifyOid)
+ 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 +110,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)
--
Gitblit v1.9.3