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 |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index e9c4a90..6781e1b 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -49,7 +49,7 @@
     data() {
         return {
             isShowDialog: false,
-            context: 0,
+            context: null,
             options: [
                 {
                     value: 0,
@@ -117,7 +117,7 @@
     },
     methods: {
       getBayonetListData() {
-        bayonet.getBayonetList({ bayonetName: '', current: this.current, size: this.size })
+        bayonet.getBayonetList({ bayonetName: this.context, current: this.current, size: this.size })
             .then(({ records }) => {
               this.list = records;
             })
@@ -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