From 654668c8e2b56e6b334dd96ffce21b25cf70199a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 17 九月 2023 21:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index a074199..6a65f49 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="HandlerSave" v-if="hasEditor" size="small" type="primary" style="margin-bottom: 20px">淇濆瓨</el-button>
+ <el-button @click="HandlerSave" v-if="hasEditor" size="small" type="primary" style="margin-bottom: 10px">淇濆瓨</el-button>
<el-table
v-loading="isLoading"
:data="tableData"
@@ -17,7 +17,7 @@
:prop="item.prop"
:sortable="item.sortable"
:formatter="item.formatter"
- :width="item.label.length >=4 ?'150':item.label.length==3 ?'120':'90'"
+ :width="item.width"
:show-overflow-tooltip="true"
align="center"
>
@@ -46,7 +46,9 @@
:type="item.edit" :format="item.dateFormate" :value-format="item.dateFormate"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
- <vciWebRefer v-if="editingRow === row && editShow== item.prop && item.edit == 'refer'"
+ <vciWebRefer
+ :key="item.prop" :data-key="item.prop"
+ 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]" :disabled="item.disabled" :display="item.display"
@@ -127,8 +129,9 @@
return newitem;
})
batchUpdateCode(datas).then(res => {
- if (res.data.data.success) {
+ if (res.data.success) {
this.$message.success("淇敼鎴愬姛");
+ this.BuinseseRend()
}
})
}
--
Gitblit v1.9.3