Merge branch 'dev'

@@ -59,248 +59,250 @@
 </template>
 
 <script>
-import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js"
-import { getSysSerialSingle } from "@/api/sysSerial.js"
-import axios from "axios";
-export default {
-  props: {
-    formData: {
-      type: Object,
-      default: () => { }
-    }
-  },
-  data () {
-    return {
-      readOnly: false,
-      //表单提交数据
-      ruleForm: {
-        batchno: '',
-        receiver: '',
-        operator: '超级管理员',
-        operationtime: '',
-        bz: '',
-        zsstarno: '',
-        zsendno: '',
-        zsnum: '',
-        zmstarno: '',
-        zmendno: '',
-        zmnum: ''
-      },
-      //表格数据
-      tableForm: [
-        {
-          name: '不动产权证书',
-          ksysxlh: '',
-          jsysxlh: '',
-          bs: '',
-          zslx: 'zs'
+  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: {
+      formData: {
+        type: Object,
+        default: () => { }
+      }
+    },
+    data () {
+      return {
+        readOnly: false,
+        //表单提交数据
+        ruleForm: {
+          batchno: '',
+          receiver: '',
+          operator: '超级管理员',
+          operationtime: '',
+          bz: '',
+          zsstarno: '',
+          zsendno: '',
+          zsnum: '',
+          zmstarno: '',
+          zmendno: '',
+          zmnum: ''
         },
-        {
-          name: '不动产权登记证明',
-          ksysxlh: '',
-          jsysxlh: '',
-          bs: '',
-          zslx: 'zm'
-        }
-      ],
-      //证书分发业务号固定参数
-      ywhQueryForm: {
-        serialtype: 'zsffbh',
-        serialname: '证书分发编号',
-        serialcode: 'zsff',
-        digit: '5'
-      },
-      //用户列表
-      usernames: [],
-      rules: {
-        batchNo: [
-          { required: true, message: '入库编号不能为空', trigger: 'blur' }
-        ],
-        lqr: [
-          { required: true, message: '请选择领取人', trigger: 'change' }
-        ],
-        rksj: [
-          { required: true, message: '请选择入库时间', trigger: 'change' }
+        //表格数据
+        tableForm: [
+          {
+            name: '不动产权证书',
+            ksysxlh: '',
+            jsysxlh: '',
+            bs: '',
+            zslx: 'zs'
+          },
+          {
+            name: '不动产权登记证明',
+            ksysxlh: '',
+            jsysxlh: '',
+            bs: '',
+            zslx: 'zm'
+          }
         ],
-      },
-    }
-  },
-  mounted () {
-    if (this.formData.bsmBatch) {
-      this.tableForm[0].jsysxlh = null;
-      this.tableForm[1].jsysxlh = null;
-      this.getDetailInfo(this.formData.bsmBatch);
-    } else {
-      this.ywhSerial();
-      this.initStartNo();
-    }
-    this.getreceiver()
-  },
-  methods: {
-        //领取人列表
-    /**
-     * @description: 领取人列表
-     * @author: renchao
-     */
-    getreceiver(){
-      let url=window._config.services.management+"/management/rest/users?organizationId="+this.formData.organizationId
-    axios.get(url).then(res => {
-      res.data.content.forEach((item) => {
-        this.usernames.push(item.name)
-      })
-        })
-    },
-    //表单提交
-    /**
-     * @description: 表单提交
-     * @author: renchao
-     */
-    submitForm () {
-      zsff(this.ruleForm).then(res => {
-        if (res.code == 200) {
-          this.$message.success('保存成功')
-          this.$emit("input", false);
-          this.$refs['ruleForm'].resetFields();
-          this.resetTableFields();
-          this.$parent.queryClick();
-        } else {
-          this.$message.error(res.message)
-        }
-      })
-    },
-    //序列号获取
-    /**
-     * @description: 序列号获取
-     * @author: renchao
-     */
-    ywhSerial () {
-      getSysSerialSingle(this.ywhQueryForm).then(res => {
-        if (res.code == 200) {
-          this.ruleForm.batchno = res.message;
-          this.readOnly = true;
-        }
-      })
-    },
-    //获取详情信息
-    /**
-     * @description: 获取详情信息
-     * @param {*} bsmBatch
-     * @author: renchao
-     */
-    getDetailInfo (bsmBatch) {
-      getZsglInfo({ "bsmBatch": bsmBatch }).then(res => {
-        if (res.code == 200) {
-          this.ruleForm = res.result;
-          this.readOnly = false;
-          this.tableForm[0].ksysxlh = res.result.zsstarno;
-          this.tableForm[0].jsysxlh = res.result.zsendno;
-          this.tableForm[0].bs = res.result.zsnum;
-          this.tableForm[1].ksysxlh = res.result.zmstarno;
-          this.tableForm[1].jsysxlh = res.result.zmendno;
-          this.tableForm[1].bs = res.result.zmnum;
-        }
-      })
+        //证书分发业务号固定参数
+        ywhQueryForm: {
+          serialtype: 'zsffbh',
+          serialname: '证书分发编号',
+          serialcode: 'zsff',
+          digit: '5'
+        },
+        //用户列表
+        usernames: [],
+        rules: {
+          batchNo: [
+            { required: true, message: '入库编号不能为空', trigger: 'blur' }
+          ],
+          lqr: [
+            { required: true, message: '请选择领取人', trigger: 'change' }
+          ],
+          rksj: [
+            { required: true, message: '请选择入库时间', trigger: 'change' }
+          ],
+        },
+      }
     },
-    //初始化开始序列号
-    /**
-     * @description: 初始化开始序列号
-     * @author: renchao
-     */
-    initStartNo () {
-      getZsStartNo().then(res => {
-        if (res.code == 200) {
-          this.tableForm[0].ksysxlh = res.result.zsstarno
-          this.tableForm[1].ksysxlh = res.result.zmstarno
-        }
-      })
+    mounted () {
+      if (this.formData.bsmBatch) {
+        this.tableForm[0].jsysxlh = null;
+        this.tableForm[1].jsysxlh = null;
+        this.getDetailInfo(this.formData.bsmBatch);
+      } else {
+        this.ywhSerial();
+        this.initStartNo();
+      }
+      this.getreceiver()
     },
-    //印刷序列号处理
-    /**
-     * @description: 印刷序列号处理
-     * @param {*} item
-     * @author: renchao
-     */
-    ysxlhDeal (item) {
-      if (item.bs) {
-        //存在本数
-        getZsEndNo({ "bookNumber": item.bs, "zslx": item.zslx }).then(res => {
+    methods: {
+      //领取人列表
+      /**
+       * @description: 领取人列表
+       * @author: renchao
+       */
+      getreceiver () {
+        let url = window._config.services.management + "/management/rest/users?organizationId=" + this.formData.organizationId
+        axios.get(url).then(res => {
+          res.data.content.forEach((item) => {
+            this.usernames.push(item.name)
+          })
+        })
+      },
+      //表单提交
+      /**
+       * @description: 表单提交
+       * @author: renchao
+       */
+      submitForm () {
+        store.dispatch("user/refreshPage", false);
+        zsff(this.ruleForm).then(res => {
           if (res.code == 200) {
-            item.jsysxlh = res.result.endno
-            item.bs = res.result.bookNumber
-            this.updateRuleForm(res.result.endno, res.result.bookNumber, item);
+            this.$message.success('保存成功')
+            this.$emit("input", false);
+            this.$refs['ruleForm'].resetFields();
+            this.resetTableFields();
+            store.dispatch("user/refreshPage", true);
           } else {
             this.$message.error(res.message)
           }
         })
-      } else {
-        //不存在本数
-        item.bs = 0;
-        item.jsysxlh = '';
-        this.updateRuleForm('', 0, item);
-      }
-    },
-    //更新表单数据
-    /**
-     * @description: 更新表单数据
-     * @param {*} endno
-     * @param {*} bookNumber
-     * @param {*} item
-     * @author: renchao
-     */
-    updateRuleForm (endno, bookNumber, item) {
-      if (item.zslx == 'zs') {
-        this.ruleForm.zsstarno = item.ksysxlh;
-        this.ruleForm.zsendno = endno;
-        this.ruleForm.zsnum = bookNumber;
-      } else if (item.zslx == 'zm') {
-        this.ruleForm.zmstarno = item.ksysxlh;
-        this.ruleForm.zmendno = endno;
-        this.ruleForm.zmnum = bookNumber;
-      }
-    },
-    /**
-     * @description: resetTableFields
-     * @author: renchao
-     */
-    resetTableFields () {
-      this.tableForm = [
-        {
-          name: '不动产权证书',
-          ksysxlh: '',
-          jsysxlh: '',
-          bs: 0,
-          zslx: 'zs'
-        },
-        {
-          name: '不动产权登记证明',
-          ksysxlh: '',
-          jsysxlh: '',
-          bs: 0,
-          zslx: 'zm'
+      },
+      //序列号获取
+      /**
+       * @description: 序列号获取
+       * @author: renchao
+       */
+      ywhSerial () {
+        getSysSerialSingle(this.ywhQueryForm).then(res => {
+          if (res.code == 200) {
+            this.ruleForm.batchno = res.message;
+            this.readOnly = true;
+          }
+        })
+      },
+      //获取详情信息
+      /**
+       * @description: 获取详情信息
+       * @param {*} bsmBatch
+       * @author: renchao
+       */
+      getDetailInfo (bsmBatch) {
+        getZsglInfo({ "bsmBatch": bsmBatch }).then(res => {
+          if (res.code == 200) {
+            this.ruleForm = res.result;
+            this.readOnly = false;
+            this.tableForm[0].ksysxlh = res.result.zsstarno;
+            this.tableForm[0].jsysxlh = res.result.zsendno;
+            this.tableForm[0].bs = res.result.zsnum;
+            this.tableForm[1].ksysxlh = res.result.zmstarno;
+            this.tableForm[1].jsysxlh = res.result.zmendno;
+            this.tableForm[1].bs = res.result.zmnum;
+          }
+        })
+      },
+      //初始化开始序列号
+      /**
+       * @description: 初始化开始序列号
+       * @author: renchao
+       */
+      initStartNo () {
+        getZsStartNo().then(res => {
+          if (res.code == 200) {
+            this.tableForm[0].ksysxlh = res.result.zsstarno
+            this.tableForm[1].ksysxlh = res.result.zmstarno
+          }
+        })
+      },
+      //印刷序列号处理
+      /**
+       * @description: 印刷序列号处理
+       * @param {*} item
+       * @author: renchao
+       */
+      ysxlhDeal (item) {
+        if (item.bs) {
+          //存在本数
+          getZsEndNo({ "bookNumber": item.bs, "zslx": item.zslx }).then(res => {
+            if (res.code == 200) {
+              item.jsysxlh = res.result.endno
+              item.bs = res.result.bookNumber
+              this.updateRuleForm(res.result.endno, res.result.bookNumber, item);
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+        } else {
+          //不存在本数
+          item.bs = 0;
+          item.jsysxlh = '';
+          this.updateRuleForm('', 0, item);
         }
-      ]
-    },
-    /**
-     * @description: closeDialog
-     * @author: renchao
-     */
-    closeDialog () {
-      this.$popupCacel()
-      this.$refs['ruleForm'].resetFields();
-      this.resetTableFields();
+      },
+      //更新表单数据
+      /**
+       * @description: 更新表单数据
+       * @param {*} endno
+       * @param {*} bookNumber
+       * @param {*} item
+       * @author: renchao
+       */
+      updateRuleForm (endno, bookNumber, item) {
+        if (item.zslx == 'zs') {
+          this.ruleForm.zsstarno = item.ksysxlh;
+          this.ruleForm.zsendno = endno;
+          this.ruleForm.zsnum = bookNumber;
+        } else if (item.zslx == 'zm') {
+          this.ruleForm.zmstarno = item.ksysxlh;
+          this.ruleForm.zmendno = endno;
+          this.ruleForm.zmnum = bookNumber;
+        }
+      },
+      /**
+       * @description: resetTableFields
+       * @author: renchao
+       */
+      resetTableFields () {
+        this.tableForm = [
+          {
+            name: '不动产权证书',
+            ksysxlh: '',
+            jsysxlh: '',
+            bs: 0,
+            zslx: 'zs'
+          },
+          {
+            name: '不动产权登记证明',
+            ksysxlh: '',
+            jsysxlh: '',
+            bs: 0,
+            zslx: 'zm'
+          }
+        ]
+      },
+      /**
+       * @description: closeDialog
+       * @author: renchao
+       */
+      closeDialog () {
+        this.$popupCacel()
+        this.$refs['ruleForm'].resetFields();
+        this.resetTableFields();
+      }
     }
   }
-}
 </script>
 <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>

@@ -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: {