From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 127 ++++++++++++++++++++++++++++++++++++------
1 files changed, 109 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 783f534..503cf32 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-button @click="HandlerRend" size="small" type="primary">淇濆瓨</el-button>
+ <el-button @click="HandlerSave" v-if="hasEditor" size="small" type="primary" style="margin-bottom: 20px">淇濆瓨</el-button>
<el-table
v-loading="isLoading"
:data="tableData"
@@ -8,7 +8,6 @@
style=""
@cell-click="handleCellClick"
>
- <el-table-column fixed type="selection" width="55"> </el-table-column>
<el-table-column fixed label="搴忓彿" type="index" width="55">
</el-table-column>
<el-table-column
@@ -22,17 +21,31 @@
:show-overflow-tooltip="true"
align="center"
>
- <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
- <!-- <template slot-scope="{ row }">-->
- <!-- <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>-->
- <!-- <span v-else>{{row[item.prop]}}</span>-->
- <!-- <el-switch-->
- <!-- v-if="editShow === 'true'"-->
- <!-- v-model="row[item.prop]"-->
- <!-- active-color="#13ce66"-->
- <!-- inactive-color="#ff4949">-->
- <!-- </el-switch>-->
- <!-- </template>-->
+ <template slot-scope="{ row }">
+ <el-input v-if="editingRow === row && editShow== item.prop && item.edit == 'text'" v-model="row[item.prop]"
+ @blur="editingRows=null"></el-input>
+ <el-input-number size="small" controls-position="right" v-if="editingRow === row && editShow== item.prop && item.edit == 'number'" v-model="row[item.prop]"
+ @blur="editingRows=null" :style="{width:(item.width-10)+'px'}"></el-input-number>
+ <el-select v-model="row[item.prop]" filterable allow-create default-first-option slot="prepend" v-if="editingRow === row && editShow== item.prop && item.edit == 'select' " @blur="editingRows=null">
+ <el-option
+ v-for="optionItem in item.dicData"
+ :key="optionItem.dictValue"
+ :label="optionItem.dictValue"
+ :value="optionItem.dictValue">
+ </el-option>
+ </el-select>
+ <el-switch
+ v-if="item.edit === 'switch' || item.edit === 'truefalse'" v-model="row[item.prop]" active-value="true"
+ inactive-value="false">
+ </el-switch>
+ <vciWebRefer v-if="editingRow === row && editShow== item.prop && item.edit == 'refer'"
+ :referConfig="item.referConfig || {}"
+ :value="row[item.referConfig.field] || row[item.prop]"
+ :text="row[item.referConfig.showField]"
+ @setReferValue="setReferValue"
+ ></vciWebRefer>
+ <span v-else v-html="formatter(row,item)"></span>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -40,11 +53,15 @@
<script>
import {businese} from '@/api/work/businese'
-import {FlowTable} from "@/api/GetItem";
+import {FlowTable, batchUpdateCode} from "@/api/GetItem";
import {validatenull} from "@/util/validate";
+import {getDictionary} from "@/api/system/dict";
+import vciWebRefer from "../refer/vciWebRefer.vue";
+
export default {
name: "BusinessWork",
- props:['ids','templateId',"taskId","modelKey","codeClassifyOid"],
+ components: { vciWebRefer },
+ props:['ids','templateId',"taskId","modelKey","codeClassifyOid",'stageAttrs'],
data() {
return {
BuinessOids:[],
@@ -54,12 +71,16 @@
editingRow: null,
editShow: "",
editAttr: "",
+ hasEditor:false,
columnType: {
text: "input",
combox: "select",
truefalse: "switch",
number: "number",
+ textarea: "textarea",
datetime: "datetime",
+ date: "date",
+ refer: "refer"
}
}
},
@@ -71,15 +92,36 @@
this.BuinseseRend()
},
deep:true
+ },
+ stageAttrs(newval,oldval){
+ this.hasEditor=newval.length>0;
}
},
created() {
+
},
mounted() {
},
methods:{
- HandlerRend(){
+ HandlerSave(){
this.editingRow = null;
+ //淇濆瓨
+ let datas=this.tableData.map(item=> {
+ let newitem = {
+ codeClassifyOid: item.codeclsfid,
+ templateOid: this.templateId,
+ editInProcess: true,
+ data: item,
+ oid:item.oid,
+ ts:item.ts
+ }
+ return newitem;
+ })
+ batchUpdateCode(datas).then(res => {
+ if(res.data.data.success){
+ this.$message.success("淇敼鎴愬姛");
+ }
+ })
},
//琛ㄦ牸澶存覆鏌�
CrudHeaderRend() {
@@ -99,6 +141,7 @@
this.List = res.data.tableDefineVO.cols[0];
this.tableHeadData=[];
this.List.forEach((item) => {
+ let editAttr=this.stageAttrs.filter(stageitem => stageitem.attrId == item.field);
let columnItem = {
label: item.title,
prop: item.field,
@@ -117,8 +160,31 @@
return row[column.property] == 'true' || row[column.property] == '1' ? '鏄�' : '鍚�'
}
}
+
}
- this.tableHeadData.push(columnItem)
+ if(editAttr.length>0) {
+ editAttr=editAttr[0]
+ columnItem.edit= 'text';//this.columnType[editAttr.edit]
+ if (typeof editAttr.editConfig == "string") {
+ columnItem.editConfig = eval("(" + item.editConfig + ")");
+ } else {
+ columnItem.editConfig = item.editConfig
+ }
+ if (item.edit == 'select') {
+ //闇�瑕佽幏鍙栦笅鎷夋鏁版嵁
+ columnItem.dicData = columnItem.editConfig.comboxConfig.data || this.geDictData(columnItem.editConfig.comboxConfig.comboxKey)
+ }
+ if (item.edit == 'refer') {
+ columnItem.referConfig = {
+ title: item.title,
+ showField: item.showField || item.field,
+ field: item.field,
+ options: columnItem.editConfig.referConfig
+ }
+ }
+ }
+
+ this.tableHeadData.push(Object.assign(item, columnItem))
});
});
}
@@ -132,11 +198,36 @@
this.tableData = res.data.data;
})
},
+ // 寮傛鑾峰彇瀛楀吀鏁版嵁
+ geDictData(dictKey) {
+ getDictionary({code: dictKey}).then((res) => {
+ if (res.data && res.data.code === 200) {
+ return (res.data.data || []).map((itm) => {
+ itm.value = itm.dictValue;
+ itm.key = itm.dictKey;
+ return itm;
+ });
+ }
+ });
+ },
// 鐩戝惉鍗曞厓鏍肩偣鍑讳簨浠跺苟瀛樺偍姝ｅ湪缂栬緫鐨勮
- handleCellClick(row, column) {
+ handleCellClick(row, column, cell, event) {
this.editingRow = row;
this.editShow = column.property;
},
+ formatter(row, column){
+ if(column.formatter){
+ return column.formatter(row,column)
+ }else{
+ return row[column.prop]
+ }
+ },
+ setReferValue(data) {
+ if (data.field) {
+ this.editingRow[data.field] = data.value || "";
+ this.editingRow[data.showField] = data.text || "";
+ }
+ }
}
}
</script>
--
Gitblit v1.9.3