From 0e68368c1df02acb4e96c14b7f4a307d369f1415 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 25 十一月 2022 17:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/systemSetting/device/bayonet/index.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index 1a69872..6781e1b 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -30,8 +30,8 @@
</main>
<footer>
<!-- 娣诲姞鍗″彛 -->
- <el-dialog :destroy-on-close="true" :key="dialogType" :title="getDialogTitle" :visible.sync="isShowDialog" width="60%" :before-close="handleClose">
- <MyCreate @closeDialog="closeDialog" :originalBayonet="originalBayonet" :isEdit="isEdit"></MyCreate>
+ <el-dialog :destroy-on-close="true" :title="getDialogTitle" :visible.sync="isShowDialog" width="60%" :before-close="handleClose">
+ <MyCreate v-if="isShowDialog" @closeDialog="closeDialog" :originalBayonet="originalBayonet" :isEdit="isEdit"></MyCreate>
</el-dialog>
</footer>
</div>
@@ -49,7 +49,7 @@
data() {
return {
isShowDialog: false,
- context: 0,
+ context: null,
options: [
{
value: 0,
@@ -117,9 +117,9 @@
},
methods: {
getBayonetListData() {
- bayonet.getBayonetList({ bayonetName: '', current: this.current, size: this.size })
- .then(data => {
- this.list = data;
+ bayonet.getBayonetList({ bayonetName: this.context, current: this.current, size: this.size })
+ .then(({ records }) => {
+ this.list = records;
})
.catch(err => {
this.$message({ type: 'error', message: err });
@@ -135,6 +135,7 @@
closeDialog() {
this.isShowDialog = false;
+ this.getBayonetListData();
},
handleExport() {
@@ -150,7 +151,7 @@
showDialog(isEdit, data) {
this.isShowDialog = true;
this.isEdit = isEdit;
- this.originalBayonet = data;
+ this.originalBayonet = data.info.row;
}
}
}
--
Gitblit v1.8.0