Merge branch 'dev'

@@ -44,22 +44,33 @@
   </div>
 </template>
 <script>
+  import { mapGetters } from "vuex";
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./zsffdata";
-  import { mapGetters } from "vuex";
   import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js"
- export default {
-  computed: {
-    ...mapGetters(["userInfo"]),
-  },
+  export default {
+    computed: {
+      ...mapGetters(["userInfo"]),
+    },
     name: "zsff",
     mixins: [table],
     mounted () {
       sendThis(this);
     },
+    computed: {
+      ...mapGetters(['isRefresh'])
+    },
     activated () {
       this.queryClick()
     },
+    watch: {
+      isRefresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.queryClick()
+        },
+        immediate: true
+      }
+    },
     data () {
       return {
         value: '',
@@ -96,17 +107,16 @@
       }
     },
     methods: {
-      // 查看弹框
       /**
        * @description: 查看弹框
        * @param {*} bsmBatch
        * @author: renchao
        */
       openDialog (bsmBatch) {
-        console.log("this.userInfo",this.userInfo);
+        console.log("this.userInfo", this.userInfo);
         this.$popupDialog("证书分发", "zsgl/zsff/components/addDialog", {
           bsmBatch: bsmBatch,
-          organizationId:this.userInfo.organizationId
+          organizationId: this.userInfo.organizationId
         }, "50%")
       },
       /**
@@ -122,7 +132,6 @@
           }
         })
       },
-      //确定证书分发
       /**
        * @description: 确定证书分发
        * @param {*} item
@@ -149,7 +158,6 @@
           });
         });
       },
-      //删除证书分发数据
       /**
        * @description: 删除证书分发数据
        * @param {*} item

@@ -151,13 +151,14 @@
             return;
           }
         })
+        store.dispatch("user/refreshPage", false);
         zsrk(this.ruleForm).then(res => {
           if (res.code == 200) {
             this.$message.success('保存成功')
             this.$popupCacel()
-            this.$refs['ruleForm'].resetFields();
-            this.resetTableFields();
-            this.$parent.queryClick();
+            this.$refs['ruleForm'].resetFields()
+            this.resetTableFields()
+            store.dispatch("user/refreshPage", true)
           } else {
             this.$message.error(res.message);
           }

@@ -42,6 +42,7 @@
   </div>
 </template>
 <script>
+  import { mapGetters } from 'vuex'
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./zsrkdata";
   import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js";
@@ -51,9 +52,20 @@
     mounted () {
       sendThis(this);
     },
+    computed: {
+      ...mapGetters(['isRefresh'])
+    },
     activated () {
       this.queryClick()
     },
+    watch: {
+      isRefresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.queryClick()
+        },
+        immediate: true
+      }
+    },
     data () {
       return {
         ruleForm: {