From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/wel/Statistic.vue | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index e3c52bc..4d4f437 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -8,10 +8,10 @@
<el-dialog :visible.sync="dialogTableVisible" append-to-body class="avue-dialog avue-dialog--top" title="涓绘暟鎹厤缃�"
top='-40px'>
<el-table
+ ref="TableBox"
:data="Crud.data"
border
style="width: 100%"
- ref="TableBox"
@selection-change="selectionChange"
@row-click="TableRoute">
<el-table-column
@@ -53,7 +53,7 @@
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
- <el-button plain type="primary" @click="SaveHandler">淇濆瓨</el-button>
+ <el-button plain type="primary" @click="SaveHandler" v-loading="BtnLoading">淇濆瓨</el-button>
</div>
</el-dialog>
</div>
@@ -66,6 +66,7 @@
name: "Statistic",
data() {
return {
+ BtnLoading: false,
loading: true,
Crud: {
form: '',
@@ -97,7 +98,7 @@
FontInfo() {
this.$nextTick(() => {
const dataFatherBox = this.$refs.dataBox.$el;
- console.log(dataFatherBox);
+ // console.log(dataFatherBox);
this.$nextTick(() => {
setTimeout(() => {
//瀛椾綋
@@ -109,7 +110,7 @@
info.style.fontSize = '16px';
});
items.forEach((item) => {
- item.style.border = '1px solid rgb(200, 200, 200, 1)';
+ item.style.border = '1px solid #DCDFE6';
});
this.loading = false;
}, 1000); // 寤惰繜1绉掓煡鎵緄nfo鍏冪礌
@@ -120,43 +121,41 @@
// console.log(row)
this.SelectRow = row;
},
- SaveHandler() {
+ async SaveHandler() {
if (this.SelectRow.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹紒')
- return
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹紒');
+ return;
}
- let mdmNameList = [];
- mdmNameList = this.SelectRow.map(item => {
- return item.code
- })
- console.log(mdmNameList)
- save(this.userId, mdmNameList).then(res => {
- console.log(res)
- if (res.data.code === 200) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- //娓呴櫎宸叉湁鏁扮粍涓璸ush鏁版嵁
+ this.BtnLoading = true;
+ try {
+ const {data: {code}} = await save(this.userId, this.SelectRow.map(item => item.code));
+ if (code === 200) {
+ this.$message.success('淇濆瓨鎴愬姛锛�');
this.newData = [];
- this.option.data=[]
- this.MasterGetList()
+ this.option.data = [];
+ this.MasterGetList();
this.dialogTableVisible = false;
- //瀛椾綋鍜岃竟妗嗛噸鏂板姞杞�
+ this.BtnLoading = false;
this.loading = true;
- this.FontInfo()
+ this.FontInfo();
}
- })
+ } catch {
+ this.BtnLoading = false;
+ }
},
MoreHandler() {
this.dialogTableVisible = true;
- let checkedrow=[]
- this.newData.forEach(item=>{
- this.option.data.forEach(v=>{
- if(item.code === v.code){
+ let checkedrow = []
+ this.newData.forEach(item => {
+ this.option.data.forEach(v => {
+ if (item.code === v.code) {
checkedrow.push(item)
}
})
})
- console.log(checkedrow)
- this.$nextTick(()=>{
+
+ // console.log(checkedrow)
+ this.$nextTick(() => {
checkedrow.forEach(row => {
this.$refs.TableBox.toggleRowSelection(row, true) // 鍥炴樉
})
@@ -179,7 +178,7 @@
this.Crud.data = this.newData;
if (item.isDefault === 1) {
const colors = ['rgb(49, 180, 141)', 'rgb(56, 161, 242)', 'rgb(117, 56, 199)', 'rgb(242, 104, 31)',
- 'rgb(19, 150, 111)','rgb(26, 131, 212)', 'rgb(87, 26, 169)', 'rgb(212, 83, 1)'];
+ 'rgb(19, 150, 111)', 'rgb(26, 131, 212)', 'rgb(87, 26, 169)', 'rgb(212, 83, 1)'];
const color = colors[index % colors.length];
this.option.data.push({
click: (item) => {
--
Gitblit v1.9.3