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
Inline Side-by-side
Showing 4 changed files with 264 additions and 241 deletions
...@@ -59,248 +59,250 @@ ...@@ -59,248 +59,250 @@
59 </template> 59 </template>
60 60
61 <script> 61 <script>
62 import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js" 62 import store from '@/store/index.js'
63 import { getSysSerialSingle } from "@/api/sysSerial.js" 63 import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js"
64 import axios from "axios"; 64 import { getSysSerialSingle } from "@/api/sysSerial.js"
65 export default { 65 import axios from "axios";
66 props: { 66 export default {
67 formData: { 67 props: {
68 type: Object, 68 formData: {
69 default: () => { } 69 type: Object,
70 } 70 default: () => { }
71 }, 71 }
72 data () { 72 },
73 return { 73 data () {
74 readOnly: false, 74 return {
75 //表单提交数据 75 readOnly: false,
76 ruleForm: { 76 //表单提交数据
77 batchno: '', 77 ruleForm: {
78 receiver: '', 78 batchno: '',
79 operator: '超级管理员', 79 receiver: '',
80 operationtime: '', 80 operator: '超级管理员',
81 bz: '', 81 operationtime: '',
82 zsstarno: '', 82 bz: '',
83 zsendno: '', 83 zsstarno: '',
84 zsnum: '', 84 zsendno: '',
85 zmstarno: '', 85 zsnum: '',
86 zmendno: '', 86 zmstarno: '',
87 zmnum: '' 87 zmendno: '',
88 }, 88 zmnum: ''
89 //表格数据
90 tableForm: [
91 {
92 name: '不动产权证书',
93 ksysxlh: '',
94 jsysxlh: '',
95 bs: '',
96 zslx: 'zs'
97 }, 89 },
98 { 90 //表格数据
99 name: '不动产权登记证明', 91 tableForm: [
100 ksysxlh: '', 92 {
101 jsysxlh: '', 93 name: '不动产权证书',
102 bs: '', 94 ksysxlh: '',
103 zslx: 'zm' 95 jsysxlh: '',
104 } 96 bs: '',
105 ], 97 zslx: 'zs'
106 //证书分发业务号固定参数 98 },
107 ywhQueryForm: { 99 {
108 serialtype: 'zsffbh', 100 name: '不动产权登记证明',
109 serialname: '证书分发编号', 101 ksysxlh: '',
110 serialcode: 'zsff', 102 jsysxlh: '',
111 digit: '5' 103 bs: '',
112 }, 104 zslx: 'zm'
113 //用户列表 105 }
114 usernames: [],
115 rules: {
116 batchNo: [
117 { required: true, message: '入库编号不能为空', trigger: 'blur' }
118 ],
119 lqr: [
120 { required: true, message: '请选择领取人', trigger: 'change' }
121 ],
122 rksj: [
123 { required: true, message: '请选择入库时间', trigger: 'change' }
124 ], 106 ],
125 }, 107 //证书分发业务号固定参数
126 } 108 ywhQueryForm: {
127 }, 109 serialtype: 'zsffbh',
128 mounted () { 110 serialname: '证书分发编号',
129 if (this.formData.bsmBatch) { 111 serialcode: 'zsff',
130 this.tableForm[0].jsysxlh = null; 112 digit: '5'
131 this.tableForm[1].jsysxlh = null; 113 },
132 this.getDetailInfo(this.formData.bsmBatch); 114 //用户列表
133 } else { 115 usernames: [],
134 this.ywhSerial(); 116 rules: {
135 this.initStartNo(); 117 batchNo: [
136 } 118 { required: true, message: '入库编号不能为空', trigger: 'blur' }
137 this.getreceiver() 119 ],
138 }, 120 lqr: [
139 methods: { 121 { required: true, message: '请选择领取人', trigger: 'change' }
140 //领取人列表 122 ],
141 /** 123 rksj: [
142 * @description: 领取人列表 124 { required: true, message: '请选择入库时间', trigger: 'change' }
143 * @author: renchao 125 ],
144 */ 126 },
145 getreceiver(){ 127 }
146 let url=window._config.services.management+"/management/rest/users?organizationId="+this.formData.organizationId
147 axios.get(url).then(res => {
148 res.data.content.forEach((item) => {
149 this.usernames.push(item.name)
150 })
151 })
152 },
153 //表单提交
154 /**
155 * @description: 表单提交
156 * @author: renchao
157 */
158 submitForm () {
159 zsff(this.ruleForm).then(res => {
160 if (res.code == 200) {
161 this.$message.success('保存成功')
162 this.$emit("input", false);
163 this.$refs['ruleForm'].resetFields();
164 this.resetTableFields();
165 this.$parent.queryClick();
166 } else {
167 this.$message.error(res.message)
168 }
169 })
170 },
171 //序列号获取
172 /**
173 * @description: 序列号获取
174 * @author: renchao
175 */
176 ywhSerial () {
177 getSysSerialSingle(this.ywhQueryForm).then(res => {
178 if (res.code == 200) {
179 this.ruleForm.batchno = res.message;
180 this.readOnly = true;
181 }
182 })
183 },
184 //获取详情信息
185 /**
186 * @description: 获取详情信息
187 * @param {*} bsmBatch
188 * @author: renchao
189 */
190 getDetailInfo (bsmBatch) {
191 getZsglInfo({ "bsmBatch": bsmBatch }).then(res => {
192 if (res.code == 200) {
193 this.ruleForm = res.result;
194 this.readOnly = false;
195 this.tableForm[0].ksysxlh = res.result.zsstarno;
196 this.tableForm[0].jsysxlh = res.result.zsendno;
197 this.tableForm[0].bs = res.result.zsnum;
198 this.tableForm[1].ksysxlh = res.result.zmstarno;
199 this.tableForm[1].jsysxlh = res.result.zmendno;
200 this.tableForm[1].bs = res.result.zmnum;
201 }
202 })
203 }, 128 },
204 //初始化开始序列号 129 mounted () {
205 /** 130 if (this.formData.bsmBatch) {
206 * @description: 初始化开始序列号 131 this.tableForm[0].jsysxlh = null;
207 * @author: renchao 132 this.tableForm[1].jsysxlh = null;
208 */ 133 this.getDetailInfo(this.formData.bsmBatch);
209 initStartNo () { 134 } else {
210 getZsStartNo().then(res => { 135 this.ywhSerial();
211 if (res.code == 200) { 136 this.initStartNo();
212 this.tableForm[0].ksysxlh = res.result.zsstarno 137 }
213 this.tableForm[1].ksysxlh = res.result.zmstarno 138 this.getreceiver()
214 }
215 })
216 }, 139 },
217 //印刷序列号处理 140 methods: {
218 /** 141 //领取人列表
219 * @description: 印刷序列号处理 142 /**
220 * @param {*} item 143 * @description: 领取人列表
221 * @author: renchao 144 * @author: renchao
222 */ 145 */
223 ysxlhDeal (item) { 146 getreceiver () {
224 if (item.bs) { 147 let url = window._config.services.management + "/management/rest/users?organizationId=" + this.formData.organizationId
225 //存在本数 148 axios.get(url).then(res => {
226 getZsEndNo({ "bookNumber": item.bs, "zslx": item.zslx }).then(res => { 149 res.data.content.forEach((item) => {
150 this.usernames.push(item.name)
151 })
152 })
153 },
154 //表单提交
155 /**
156 * @description: 表单提交
157 * @author: renchao
158 */
159 submitForm () {
160 store.dispatch("user/refreshPage", false);
161 zsff(this.ruleForm).then(res => {
227 if (res.code == 200) { 162 if (res.code == 200) {
228 item.jsysxlh = res.result.endno 163 this.$message.success('保存成功')
229 item.bs = res.result.bookNumber 164 this.$emit("input", false);
230 this.updateRuleForm(res.result.endno, res.result.bookNumber, item); 165 this.$refs['ruleForm'].resetFields();
166 this.resetTableFields();
167 store.dispatch("user/refreshPage", true);
231 } else { 168 } else {
232 this.$message.error(res.message) 169 this.$message.error(res.message)
233 } 170 }
234 }) 171 })
235 } else { 172 },
236 //不存在本数 173 //序列号获取
237 item.bs = 0; 174 /**
238 item.jsysxlh = ''; 175 * @description: 序列号获取
239 this.updateRuleForm('', 0, item); 176 * @author: renchao
240 } 177 */
241 }, 178 ywhSerial () {
242 //更新表单数据 179 getSysSerialSingle(this.ywhQueryForm).then(res => {
243 /** 180 if (res.code == 200) {
244 * @description: 更新表单数据 181 this.ruleForm.batchno = res.message;
245 * @param {*} endno 182 this.readOnly = true;
246 * @param {*} bookNumber 183 }
247 * @param {*} item 184 })
248 * @author: renchao 185 },
249 */ 186 //获取详情信息
250 updateRuleForm (endno, bookNumber, item) { 187 /**
251 if (item.zslx == 'zs') { 188 * @description: 获取详情信息
252 this.ruleForm.zsstarno = item.ksysxlh; 189 * @param {*} bsmBatch
253 this.ruleForm.zsendno = endno; 190 * @author: renchao
254 this.ruleForm.zsnum = bookNumber; 191 */
255 } else if (item.zslx == 'zm') { 192 getDetailInfo (bsmBatch) {
256 this.ruleForm.zmstarno = item.ksysxlh; 193 getZsglInfo({ "bsmBatch": bsmBatch }).then(res => {
257 this.ruleForm.zmendno = endno; 194 if (res.code == 200) {
258 this.ruleForm.zmnum = bookNumber; 195 this.ruleForm = res.result;
259 } 196 this.readOnly = false;
260 }, 197 this.tableForm[0].ksysxlh = res.result.zsstarno;
261 /** 198 this.tableForm[0].jsysxlh = res.result.zsendno;
262 * @description: resetTableFields 199 this.tableForm[0].bs = res.result.zsnum;
263 * @author: renchao 200 this.tableForm[1].ksysxlh = res.result.zmstarno;
264 */ 201 this.tableForm[1].jsysxlh = res.result.zmendno;
265 resetTableFields () { 202 this.tableForm[1].bs = res.result.zmnum;
266 this.tableForm = [ 203 }
267 { 204 })
268 name: '不动产权证书', 205 },
269 ksysxlh: '', 206 //初始化开始序列号
270 jsysxlh: '', 207 /**
271 bs: 0, 208 * @description: 初始化开始序列号
272 zslx: 'zs' 209 * @author: renchao
273 }, 210 */
274 { 211 initStartNo () {
275 name: '不动产权登记证明', 212 getZsStartNo().then(res => {
276 ksysxlh: '', 213 if (res.code == 200) {
277 jsysxlh: '', 214 this.tableForm[0].ksysxlh = res.result.zsstarno
278 bs: 0, 215 this.tableForm[1].ksysxlh = res.result.zmstarno
279 zslx: 'zm' 216 }
217 })
218 },
219 //印刷序列号处理
220 /**
221 * @description: 印刷序列号处理
222 * @param {*} item
223 * @author: renchao
224 */
225 ysxlhDeal (item) {
226 if (item.bs) {
227 //存在本数
228 getZsEndNo({ "bookNumber": item.bs, "zslx": item.zslx }).then(res => {
229 if (res.code == 200) {
230 item.jsysxlh = res.result.endno
231 item.bs = res.result.bookNumber
232 this.updateRuleForm(res.result.endno, res.result.bookNumber, item);
233 } else {
234 this.$message.error(res.message)
235 }
236 })
237 } else {
238 //不存在本数
239 item.bs = 0;
240 item.jsysxlh = '';
241 this.updateRuleForm('', 0, item);
280 } 242 }
281 ] 243 },
282 }, 244 //更新表单数据
283 /** 245 /**
284 * @description: closeDialog 246 * @description: 更新表单数据
285 * @author: renchao 247 * @param {*} endno
286 */ 248 * @param {*} bookNumber
287 closeDialog () { 249 * @param {*} item
288 this.$popupCacel() 250 * @author: renchao
289 this.$refs['ruleForm'].resetFields(); 251 */
290 this.resetTableFields(); 252 updateRuleForm (endno, bookNumber, item) {
253 if (item.zslx == 'zs') {
254 this.ruleForm.zsstarno = item.ksysxlh;
255 this.ruleForm.zsendno = endno;
256 this.ruleForm.zsnum = bookNumber;
257 } else if (item.zslx == 'zm') {
258 this.ruleForm.zmstarno = item.ksysxlh;
259 this.ruleForm.zmendno = endno;
260 this.ruleForm.zmnum = bookNumber;
261 }
262 },
263 /**
264 * @description: resetTableFields
265 * @author: renchao
266 */
267 resetTableFields () {
268 this.tableForm = [
269 {
270 name: '不动产权证书',
271 ksysxlh: '',
272 jsysxlh: '',
273 bs: 0,
274 zslx: 'zs'
275 },
276 {
277 name: '不动产权登记证明',
278 ksysxlh: '',
279 jsysxlh: '',
280 bs: 0,
281 zslx: 'zm'
282 }
283 ]
284 },
285 /**
286 * @description: closeDialog
287 * @author: renchao
288 */
289 closeDialog () {
290 this.$popupCacel()
291 this.$refs['ruleForm'].resetFields();
292 this.resetTableFields();
293 }
291 } 294 }
292 } 295 }
293 }
294 </script> 296 </script>
295 <style scoped lang="scss"> 297 <style scoped lang="scss">
296 @import "~@/styles/mixin.scss"; 298 @import "~@/styles/mixin.scss";
297 @import "~@/styles/dialogBoxheader.scss"; 299 @import "~@/styles/dialogBoxheader.scss";
298 300
299 .font-red { 301 .font-red {
300 color: red 302 color: red;
301 } 303 }
302 304
303 .middle-margin-bottom { 305 .middle-margin-bottom {
304 margin-top: 20px 306 margin-top: 20px;
305 } 307 }
306 </style> 308 </style>
......
...@@ -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: {
......