Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
52a7cbd8 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents f0f9680f 48fae78f
Expand all
Inline Side-by-side
Showing 4 changed files with 34 additions and 13 deletions
...@@ -44,22 +44,33 @@ ...@@ -44,22 +44,33 @@
44 </div> 44 </div>
45 </template> 45 </template>
46 <script> 46 <script>
47 import { mapGetters } from "vuex";
47 import table from "@/utils/mixin/table"; 48 import table from "@/utils/mixin/table";
48 import { datas, sendThis } from "./zsffdata"; 49 import { datas, sendThis } from "./zsffdata";
49 import { mapGetters } from "vuex";
50 import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js" 50 import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js"
51 export default { 51 export default {
52 computed: { 52 computed: {
53 ...mapGetters(["userInfo"]), 53 ...mapGetters(["userInfo"]),
54 }, 54 },
55 name: "zsff", 55 name: "zsff",
56 mixins: [table], 56 mixins: [table],
57 mounted () { 57 mounted () {
58 sendThis(this); 58 sendThis(this);
59 }, 59 },
60 computed: {
61 ...mapGetters(['isRefresh'])
62 },
60 activated () { 63 activated () {
61 this.queryClick() 64 this.queryClick()
62 }, 65 },
66 watch: {
67 isRefresh: {
68 handler (newVal, oldVal) {
69 if (newVal) this.queryClick()
70 },
71 immediate: true
72 }
73 },
63 data () { 74 data () {
64 return { 75 return {
65 value: '', 76 value: '',
...@@ -96,17 +107,16 @@ ...@@ -96,17 +107,16 @@
96 } 107 }
97 }, 108 },
98 methods: { 109 methods: {
99 // 查看弹框
100 /** 110 /**
101 * @description: 查看弹框 111 * @description: 查看弹框
102 * @param {*} bsmBatch 112 * @param {*} bsmBatch
103 * @author: renchao 113 * @author: renchao
104 */ 114 */
105 openDialog (bsmBatch) { 115 openDialog (bsmBatch) {
106 console.log("this.userInfo",this.userInfo); 116 console.log("this.userInfo", this.userInfo);
107 this.$popupDialog("证书分发", "zsgl/zsff/components/addDialog", { 117 this.$popupDialog("证书分发", "zsgl/zsff/components/addDialog", {
108 bsmBatch: bsmBatch, 118 bsmBatch: bsmBatch,
109 organizationId:this.userInfo.organizationId 119 organizationId: this.userInfo.organizationId
110 }, "50%") 120 }, "50%")
111 }, 121 },
112 /** 122 /**
...@@ -122,7 +132,6 @@ ...@@ -122,7 +132,6 @@
122 } 132 }
123 }) 133 })
124 }, 134 },
125 //确定证书分发
126 /** 135 /**
127 * @description: 确定证书分发 136 * @description: 确定证书分发
128 * @param {*} item 137 * @param {*} item
...@@ -149,7 +158,6 @@ ...@@ -149,7 +158,6 @@
149 }); 158 });
150 }); 159 });
151 }, 160 },
152 //删除证书分发数据
153 /** 161 /**
154 * @description: 删除证书分发数据 162 * @description: 删除证书分发数据
155 * @param {*} item 163 * @param {*} item
......
...@@ -151,13 +151,14 @@ ...@@ -151,13 +151,14 @@
151 return; 151 return;
152 } 152 }
153 }) 153 })
154 store.dispatch("user/refreshPage", false);
154 zsrk(this.ruleForm).then(res => { 155 zsrk(this.ruleForm).then(res => {
155 if (res.code == 200) { 156 if (res.code == 200) {
156 this.$message.success('保存成功') 157 this.$message.success('保存成功')
157 this.$popupCacel() 158 this.$popupCacel()
158 this.$refs['ruleForm'].resetFields(); 159 this.$refs['ruleForm'].resetFields()
159 this.resetTableFields(); 160 this.resetTableFields()
160 this.$parent.queryClick(); 161 store.dispatch("user/refreshPage", true)
161 } else { 162 } else {
162 this.$message.error(res.message); 163 this.$message.error(res.message);
163 } 164 }
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
42 </div> 42 </div>
43 </template> 43 </template>
44 <script> 44 <script>
45 import { mapGetters } from 'vuex'
45 import table from "@/utils/mixin/table"; 46 import table from "@/utils/mixin/table";
46 import { datas, sendThis } from "./zsrkdata"; 47 import { datas, sendThis } from "./zsrkdata";
47 import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js"; 48 import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js";
...@@ -51,9 +52,20 @@ ...@@ -51,9 +52,20 @@
51 mounted () { 52 mounted () {
52 sendThis(this); 53 sendThis(this);
53 }, 54 },
55 computed: {
56 ...mapGetters(['isRefresh'])
57 },
54 activated () { 58 activated () {
55 this.queryClick() 59 this.queryClick()
56 }, 60 },
61 watch: {
62 isRefresh: {
63 handler (newVal, oldVal) {
64 if (newVal) this.queryClick()
65 },
66 immediate: true
67 }
68 },
57 data () { 69 data () {
58 return { 70 return {
59 ruleForm: { 71 ruleForm: {
......