Merge branch 'dev'

@@ -59,10 +59,11 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js"
-import { getSysSerialSingle } from "@/api/sysSerial.js"
-import axios from "axios";
-export default {
+  import store from '@/store/index.js'
+  import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js"
+  import { getSysSerialSingle } from "@/api/sysSerial.js"
+  import axios from "axios";
+  export default {
     props: {
     props: {
       formData: {
       formData: {
         type: Object,
         type: Object,
@@ -142,8 +143,8 @@ export default {
        * @description: 领取人列表
        * @description: 领取人列表
        * @author: renchao
        * @author: renchao
        */
        */
-    getreceiver(){
-      let url=window._config.services.management+"/management/rest/users?organizationId="+this.formData.organizationId
+      getreceiver () {
+        let url = window._config.services.management + "/management/rest/users?organizationId=" + this.formData.organizationId
         axios.get(url).then(res => {
         axios.get(url).then(res => {
           res.data.content.forEach((item) => {
           res.data.content.forEach((item) => {
             this.usernames.push(item.name)
             this.usernames.push(item.name)
@@ -156,13 +157,14 @@ export default {
        * @author: renchao
        * @author: renchao
        */
        */
       submitForm () {
       submitForm () {
+        store.dispatch("user/refreshPage", false);
         zsff(this.ruleForm).then(res => {
         zsff(this.ruleForm).then(res => {
           if (res.code == 200) {
           if (res.code == 200) {
             this.$message.success('保存成功')
             this.$message.success('保存成功')
             this.$emit("input", false);
             this.$emit("input", false);
             this.$refs['ruleForm'].resetFields();
             this.$refs['ruleForm'].resetFields();
             this.resetTableFields();
             this.resetTableFields();
-          this.$parent.queryClick();
+            store.dispatch("user/refreshPage", true);
           } else {
           } else {
             this.$message.error(res.message)
             this.$message.error(res.message)
           }
           }
@@ -290,17 +292,17 @@ export default {
         this.resetTableFields();
         this.resetTableFields();
       }
       }
     }
     }
-}
+  }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-@import "~@/styles/dialogBoxheader.scss";
+  @import "~@/styles/mixin.scss";
+  @import "~@/styles/dialogBoxheader.scss";
 
 
-.font-red {
-  color: red
-}
+  .font-red {
+    color: red;
+  }
 
 
-.middle-margin-bottom {
-  margin-top: 20px
-}
+  .middle-margin-bottom {
+    margin-top: 20px;
+  }
 </style>
 </style>

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

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

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