From 27bd6a398f88ee8de1b548b66d2f18cdf346b3b2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 04 三月 2024 20:15:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 10 +++++++++-
Source/UBCS-WEB/src/views/wel/Statistic.vue | 1 +
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 2a101b6..5e11c79 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -328,6 +328,7 @@
</template>
</avue-crud>
<div slot="footer" class="dialog-footer">
+ <el-button type="info" @click="sysClear">娓呯┖</el-button>
<el-button type="primary" @click="sysnonymSubmit">纭畾</el-button>
<el-button @click="sysnonymCancel">鍙栨秷</el-button>
</div>
@@ -1697,12 +1698,17 @@
this.$set(this.CurrentCell, 'sysonymRuleOids', newString)
//text
this.$set(this.CurrentCell, 'sysonymRuleOidsText', newStringName)
+ this.$set(this.CurrentCell, 'sysonymRuleOidsData', this.sysSelectData)
this.AddCellFlag = true;
this.synonymVisible = false;
}
},
+ sysClear(){
+ this.CurrentCell.sysonymRuleOidsText = "";
+ this.CurrentCell.sysonymRuleOidsData = "";
+ this.AddCellFlag = true;
+ },
sysChange(row) {
- console.log(row)
this.sysSelectData = row;
},
//鏂板鎼滅储
@@ -1969,6 +1975,7 @@
//琛ㄦ牸琛岀紪杈�
handleCellClicks(row, column) {
if (this.editOpenFlag) {
+ this.AddCellFlag = false;
this.editingRows = row;
this.editShows = column.property;
this.rowOid = row.oid;
@@ -2043,6 +2050,7 @@
}).catch(() => {
this.$message.error('璇锋鏌ユ帶鍒跺彴閿欒淇℃伅锛�')
})
+
this.synonymVisible = true;
}
};
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index 4b74518..4d4f437 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -153,6 +153,7 @@
}
})
})
+
// console.log(checkedrow)
this.$nextTick(() => {
checkedrow.forEach(row => {
--
Gitblit v1.9.3