Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
11 changed files
with
55 additions
and
80 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-22 16:27:35 | 4 | * @LastEditTime: 2023-08-30 15:52:11 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <!-- 受理信息 --> | 7 | <!-- 受理信息 --> |
... | @@ -10,7 +10,6 @@ | ... | @@ -10,7 +10,6 @@ |
10 | :model="ruleForm" | 10 | :model="ruleForm" |
11 | :rules="rules" | 11 | :rules="rules" |
12 | :class="{ readonly: editDisabled }" | 12 | :class="{ readonly: editDisabled }" |
13 | class="loadingtext" | ||
14 | ref="ruleForm" | 13 | ref="ruleForm" |
15 | :label-position="flag ? 'top' : ''" | 14 | :label-position="flag ? 'top' : ''" |
16 | :inline="flag" | 15 | :inline="flag" |
... | @@ -313,20 +312,6 @@ | ... | @@ -313,20 +312,6 @@ |
313 | <el-input v-model="ruleForm.qlxx.zl"></el-input> | 312 | <el-input v-model="ruleForm.qlxx.zl"></el-input> |
314 | </el-form-item> | 313 | </el-form-item> |
315 | </el-col> | 314 | </el-col> |
316 | <!-- <el-col :span="8"> | ||
317 | <el-form-item label="不动产登记证明号:" prop="bdcqzh"> | ||
318 | <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> | ||
319 | </el-form-item> | ||
320 | </el-col> --> | ||
321 | <!-- <el-col :span="8"> | ||
322 | <el-form-item | ||
323 | label="区县代码:" | ||
324 | prop="qlxx.qxdm" | ||
325 | :rules="rules.qxdmrules" | ||
326 | > | ||
327 | <el-input v-model="ruleForm.qlxx.qxdm"></el-input> | ||
328 | </el-form-item> | ||
329 | </el-col> --> | ||
330 | <el-col :span="8"> | 315 | <el-col :span="8"> |
331 | <el-form-item label="在建建筑物抵押范围:"> | 316 | <el-form-item label="在建建筑物抵押范围:"> |
332 | <el-input v-model="ruleForm.diyaq.zjjzwdyfw"></el-input> | 317 | <el-input v-model="ruleForm.diyaq.zjjzwdyfw"></el-input> |
... | @@ -401,24 +386,6 @@ | ... | @@ -401,24 +386,6 @@ |
401 | </el-date-picker> | 386 | </el-date-picker> |
402 | </el-form-item> | 387 | </el-form-item> |
403 | </el-col> | 388 | </el-col> |
404 | |||
405 | <!-- <el-col :span="8"> | ||
406 | <el-form-item label="是否预告登记:"> | ||
407 | <el-select v-model="ruleForm.diyaq.sfygdj"> | ||
408 | <el-option | ||
409 | v-for="item in dictData['A6']" | ||
410 | :key="item.dcode" | ||
411 | :label="item.dname" | ||
412 | :value="item.dcode"></el-option> | ||
413 | </el-select> | ||
414 | </el-form-item> | ||
415 | </el-col> --> | ||
416 | <!-- <el-col :span="8"> | ||
417 | <el-form-item label="在建建筑物坐落:"> | ||
418 | <el-input v-model="ruleForm.diyaq.zjzzwzl"></el-input> | ||
419 | </el-form-item> | ||
420 | </el-col> --> | ||
421 | |||
422 | <el-col :span="24"> | 389 | <el-col :span="24"> |
423 | <el-form-item label="登记原因:"> | 390 | <el-form-item label="登记原因:"> |
424 | <el-input v-model="ruleForm.diyaq.djyy"></el-input> | 391 | <el-input v-model="ruleForm.diyaq.djyy"></el-input> | ... | ... |
1 | /* | 1 | /* |
2 | * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 | 2 | * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 |
3 | * @Autor: miaofang | 3 | * @Autor: miaofang |
4 | * @LastEditTime: 2023-08-10 13:41:26 | 4 | * @LastEditTime: 2023-08-30 15:52:01 |
5 | */ | 5 | */ |
6 | import { getPrintTemplateByCode } from "@/api/print"; | 6 | import { getPrintTemplateByCode } from "@/api/print"; |
7 | import { getQllxByBdcdyid } from "@/api/djbDetail.js"; | 7 | import { getQllxByBdcdyid } from "@/api/djbDetail.js"; |
... | @@ -44,7 +44,6 @@ export default { | ... | @@ -44,7 +44,6 @@ export default { |
44 | this.flowInitParam(); | 44 | this.flowInitParam(); |
45 | }, | 45 | }, |
46 | methods: { | 46 | methods: { |
47 | //加载流程初始参数 | ||
48 | /** | 47 | /** |
49 | * @description: 加载流程初始参数 | 48 | * @description: 加载流程初始参数 |
50 | * @author: renchao | 49 | * @author: renchao | ... | ... |
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-30 10:33:52 | 4 | * @LastEditTime: 2023-08-30 17:07:26 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> | 7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> |
... | @@ -13,8 +13,8 @@ | ... | @@ -13,8 +13,8 @@ |
13 | </el-tabs> | 13 | </el-tabs> |
14 | <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> | 14 | <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> |
15 | <div style="width:1180px;"> | 15 | <div style="width:1180px;"> |
16 | <canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas> | 16 | <canvas ref="zs" width="1000" v-show="this.bdcqz.bdcqzlx==1" height="700"></canvas> |
17 | <canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas> | 17 | <canvas ref="zm" width="1180" v-show="this.bdcqz.bdcqzlx==2" height="780"></canvas> |
18 | </div> | 18 | </div> |
19 | </div> | 19 | </div> |
20 | </template> | 20 | </template> |
... | @@ -93,7 +93,7 @@ | ... | @@ -93,7 +93,7 @@ |
93 | this.activeName = res.result[0].bsmBdcqz | 93 | this.activeName = res.result[0].bsmBdcqz |
94 | this.bdcqz = res.result[0] | 94 | this.bdcqz = res.result[0] |
95 | this.headTabBdcqz = res.result | 95 | this.headTabBdcqz = res.result |
96 | if (res.result[0].bdcqzlx == 1) { | 96 | if (this.bdcqz.bdcqzlx == 1) { |
97 | this.drawTextOnImage() | 97 | this.drawTextOnImage() |
98 | } else { | 98 | } else { |
99 | this.drawTextzmImage() | 99 | this.drawTextzmImage() |
... | @@ -108,9 +108,8 @@ | ... | @@ -108,9 +108,8 @@ |
108 | * @param {*} e | 108 | * @param {*} e |
109 | * @author: renchao | 109 | * @author: renchao |
110 | */ | 110 | */ |
111 | handleClick (e) { | 111 | handleClick (tab, event) { |
112 | this.bdcqz = this.headTabBdcqz[e.index - 0] | 112 | this.bdcqz = this.headTabBdcqz[tab.index] |
113 | this.activeName = this.headTabBdcqz.bsmBdcqz | ||
114 | if (this.bdcqz.bdcqzlx == 1) { | 113 | if (this.bdcqz.bdcqzlx == 1) { |
115 | this.drawTextOnImage() | 114 | this.drawTextOnImage() |
116 | } else { | 115 | } else { |
... | @@ -461,19 +460,20 @@ | ... | @@ -461,19 +460,20 @@ |
461 | arr.push(currentLine); | 460 | arr.push(currentLine); |
462 | if (i > 0) { | 461 | if (i > 0) { |
463 | arr.forEach((line, index) => { | 462 | arr.forEach((line, index) => { |
464 | context.fillText(line, 770, 438 + (23 * (i - 1)) + 5 * num + (index * 18)); // 调整行高 | 463 | context.fillText(line, 770, 428 + (23 * (i - 1)) + 5 * num + (index * 14)); // 调整行高 |
465 | }) | 464 | }) |
466 | } else { | 465 | } else { |
467 | arr.forEach((line, index) => { | 466 | arr.forEach((line, index) => { |
468 | context.fillText(line, 770, 438 + (23 * (i - 1)) + (index * 18)); // 调整行高 | 467 | context.fillText(line, 770, 428 + (23 * (i - 1)) + (index * 14)); // 调整行高 |
469 | }) | 468 | }) |
470 | } | 469 | } |
471 | } else { | 470 | } else { |
472 | if (i > 0) { | 471 | context.fillText(lines[i] ? lines[i] : '', 770, 440 + 4 * num + (22 * (i - 1))); |
473 | context.fillText(lines[i] ? lines[i] : '', 770, 450 + 5 * num + (23 * (i - 1))); | 472 | // if (i > 0) { |
474 | } else { | 473 | // context.fillText(lines[i] ? lines[i] : '', 770, 440 + 5 * num + (23 * (i - 1))); |
475 | context.fillText(lines[i] ? lines[i] : '', 770, 450 + (23 * (i - 1))); | 474 | // } else { |
476 | } | 475 | // context.fillText(lines[i] ? lines[i] : '', 770, 440 + (23 * (i - 1))); |
476 | // } | ||
477 | } | 477 | } |
478 | } | 478 | } |
479 | // fj | 479 | // fj | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-25 09:53:27 | 4 | * @LastEditTime: 2023-08-30 16:03:09 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div> | 7 | <div> |
... | @@ -66,13 +66,13 @@ | ... | @@ -66,13 +66,13 @@ |
66 | ) | 66 | ) |
67 | } | 67 | } |
68 | }, | 68 | }, |
69 | { | 69 | // { |
70 | label: '身份证读卡器', | 70 | // label: '身份证读卡器', |
71 | align: 'center', | 71 | // align: 'center', |
72 | render: (h, scope) => { | 72 | // render: (h, scope) => { |
73 | return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button> | 73 | // return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button> |
74 | } | 74 | // } |
75 | }, | 75 | // }, |
76 | { | 76 | { |
77 | prop: "sqrmc", | 77 | prop: "sqrmc", |
78 | label: "姓名/名称" | 78 | label: "姓名/名称" |
... | @@ -124,12 +124,12 @@ | ... | @@ -124,12 +124,12 @@ |
124 | let that = this | 124 | let that = this |
125 | this.$nextTick(() => { | 125 | this.$nextTick(() => { |
126 | if (val.length == 0 || !val) { | 126 | if (val.length == 0 || !val) { |
127 | that.tableDataList = _.cloneDeep([{ | 127 | // that.tableDataList = _.cloneDeep([{ |
128 | sqrmc: '', | 128 | // sqrmc: '', |
129 | dlrzjlx: '', | 129 | // dlrzjlx: '', |
130 | dlrzjh: '', | 130 | // dlrzjh: '', |
131 | fr: '' | 131 | // fr: '' |
132 | }]) | 132 | // }]) |
133 | } else { | 133 | } else { |
134 | that.tableDataList = _.cloneDeep(val) | 134 | that.tableDataList = _.cloneDeep(val) |
135 | } | 135 | } |
... | @@ -164,7 +164,7 @@ | ... | @@ -164,7 +164,7 @@ |
164 | * @param {*} value | 164 | * @param {*} value |
165 | * @author: renchao | 165 | * @author: renchao |
166 | */ | 166 | */ |
167 | handleupdateDetail (value) { | 167 | handleupdateDetail (value) { |
168 | let arr = this.tableData.map(item => item.zjh) | 168 | let arr = this.tableData.map(item => item.zjh) |
169 | if (this.isaddupdate) { | 169 | if (this.isaddupdate) { |
170 | if (!arr.includes(value.zjh)) { | 170 | if (!arr.includes(value.zjh)) { |
... | @@ -174,7 +174,7 @@ | ... | @@ -174,7 +174,7 @@ |
174 | this.$message.error('证件号不能重复'); | 174 | this.$message.error('证件号不能重复'); |
175 | } | 175 | } |
176 | } else { | 176 | } else { |
177 | if (!arr.includes(value.zjh)||this.tableData[this.dataIndex].zjh==value.zjh) { | 177 | if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) { |
178 | this.tableDataList[this.dataIndex] = _.cloneDeep(value); | 178 | this.tableDataList[this.dataIndex] = _.cloneDeep(value); |
179 | this.$emit('upDateQlrxxList', this.tableDataList) | 179 | this.$emit('upDateQlrxxList', this.tableDataList) |
180 | } else { | 180 | } else { |
... | @@ -205,9 +205,8 @@ | ... | @@ -205,9 +205,8 @@ |
205 | * @author: renchao | 205 | * @author: renchao |
206 | */ | 206 | */ |
207 | deleClick (index, row) { | 207 | deleClick (index, row) { |
208 | this.tableData.splice(index, 1) | 208 | this.tableData.splice(index, 1) |
209 | }, | 209 | }, |
210 | |||
211 | /** | 210 | /** |
212 | * @description: 身份证读取 | 211 | * @description: 身份证读取 |
213 | * @param {*} row | 212 | * @param {*} row |
... | @@ -244,7 +243,7 @@ | ... | @@ -244,7 +243,7 @@ |
244 | */ | 243 | */ |
245 | editClick (index, row) { | 244 | editClick (index, row) { |
246 | this.details = row | 245 | this.details = row |
247 | this.details.gyfs=this.gyfs | 246 | this.details.gyfs = this.gyfs |
248 | this.dataIndex = index | 247 | this.dataIndex = index |
249 | this.dialog = true | 248 | this.dialog = true |
250 | 249 | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-29 10:03:25 | 4 | * @LastEditTime: 2023-08-30 16:54:26 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="szxx"> | 7 | <div class="szxx"> |
... | @@ -136,7 +136,7 @@ | ... | @@ -136,7 +136,7 @@ |
136 | store.dispatch('user/reWorkFresh', false) | 136 | store.dispatch('user/reWorkFresh', false) |
137 | if (type == 1) { | 137 | if (type == 1) { |
138 | //证书预览 | 138 | //证书预览 |
139 | this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); | 139 | this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); |
140 | } else { | 140 | } else { |
141 | this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); | 141 | this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true); |
142 | } | 142 | } | ... | ... |
This diff is collapsed.
Click to expand it.
1 | <!-- | 1 | <!-- |
2 | * @Description: 房屋多幢受理信息 | 2 | * @Description: 房屋多幢受理信息 |
3 | * @Autor: ssq | 3 | * @Autor: ssq |
4 | * @LastEditTime: 2023-08-30 14:57:39 | 4 | * @LastEditTime: 2023-08-30 15:53:18 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="slxx"> | 7 | <div class="slxx"> |
8 | <el-form | 8 | <el-form |
9 | :model="ruleForm" | 9 | :model="ruleForm" |
10 | :rules="rules" | 10 | :rules="rules" |
11 | v-Loading="loading" | ||
11 | ref="ruleForm" | 12 | ref="ruleForm" |
12 | :label-position="flag ? 'top' : ''" | 13 | :label-position="flag ? 'top' : ''" |
13 | :inline="flag" | 14 | :inline="flag" |
... | @@ -285,6 +286,7 @@ | ... | @@ -285,6 +286,7 @@ |
285 | export default { | 286 | export default { |
286 | mixins: [ywmix], | 287 | mixins: [ywmix], |
287 | mounted () { | 288 | mounted () { |
289 | this.loading = true | ||
288 | this.viewEdit = this.$parent.currentSelectTab.ableOperation; | 290 | this.viewEdit = this.$parent.currentSelectTab.ableOperation; |
289 | this.propsParam = this.$attrs; | 291 | this.propsParam = this.$attrs; |
290 | var formdata = new FormData(); | 292 | var formdata = new FormData(); |
... | @@ -307,15 +309,19 @@ | ... | @@ -307,15 +309,19 @@ |
307 | ? (this.ruleForm.slsq.fzfs = "1") | 309 | ? (this.ruleForm.slsq.fzfs = "1") |
308 | : this.ruleForm.slsq.fzfs; | 310 | : this.ruleForm.slsq.fzfs; |
309 | this.czrOptions = this.ruleForm.qlrList; | 311 | this.czrOptions = this.ruleForm.qlrList; |
312 | setTimeout(() => { | ||
313 | this.loading = false | ||
314 | }, 200) | ||
310 | } | 315 | } |
311 | }); | 316 | }) |
312 | }, | 317 | }, |
313 | components: { qlrCommonTable, tdytTable }, | 318 | components: { qlrCommonTable, tdytTable }, |
314 | computed: { | 319 | computed: { |
315 | ...mapGetters(["dictData", "flag"]), | 320 | ...mapGetters(["dictData", "flag"]) |
316 | }, | 321 | }, |
317 | data () { | 322 | data () { |
318 | return { | 323 | return { |
324 | loading: false, | ||
319 | disabled: true, | 325 | disabled: true, |
320 | tdytOption: [], | 326 | tdytOption: [], |
321 | czrOptions: [], | 327 | czrOptions: [], | ... | ... |
... | @@ -4,7 +4,7 @@ | ... | @@ -4,7 +4,7 @@ |
4 | <el-form | 4 | <el-form |
5 | :model="ruleForm" | 5 | :model="ruleForm" |
6 | :rules="rules" | 6 | :rules="rules" |
7 | class="loadingtext" | 7 | v-Loading="loading" |
8 | ref="ruleForm" | 8 | ref="ruleForm" |
9 | :label-position="flag ? 'top' : ''" | 9 | :label-position="flag ? 'top' : ''" |
10 | :inline="flag" | 10 | :inline="flag" |
... | @@ -284,7 +284,7 @@ | ... | @@ -284,7 +284,7 @@ |
284 | mounted () { | 284 | mounted () { |
285 | this.viewEdit = this.$parent.currentSelectTab.ableOperation; | 285 | this.viewEdit = this.$parent.currentSelectTab.ableOperation; |
286 | this.propsParam = this.$attrs; | 286 | this.propsParam = this.$attrs; |
287 | this.$startLoading(); | 287 | this.loading = true |
288 | var formdata = new FormData(); | 288 | var formdata = new FormData(); |
289 | formdata.append("bsmSldy", this.propsParam.bsmSldy); | 289 | formdata.append("bsmSldy", this.propsParam.bsmSldy); |
290 | formdata.append("djlx", this.propsParam.djlx); | 290 | formdata.append("djlx", this.propsParam.djlx); |
... | @@ -293,12 +293,14 @@ | ... | @@ -293,12 +293,14 @@ |
293 | if (res.code === 200 && res.result) { | 293 | if (res.code === 200 && res.result) { |
294 | this.ruleForm = res.result; | 294 | this.ruleForm = res.result; |
295 | this.czrOptions = this.ruleForm.qlrList; | 295 | this.czrOptions = this.ruleForm.qlrList; |
296 | this.$endLoading(); | ||
297 | this.ruleForm.qlrList.forEach((item) => { | 296 | this.ruleForm.qlrList.forEach((item) => { |
298 | if (item.sfczr == 1) { | 297 | if (item.sfczr == 1) { |
299 | this.czr = item.sqrmc | 298 | this.czr = item.sqrmc |
300 | } | 299 | } |
301 | }) | 300 | }) |
301 | setTimeout(() => { | ||
302 | this.loading = false | ||
303 | }, 200) | ||
302 | } | 304 | } |
303 | }) | 305 | }) |
304 | }, | 306 | }, |
... | @@ -308,6 +310,7 @@ | ... | @@ -308,6 +310,7 @@ |
308 | }, | 310 | }, |
309 | data () { | 311 | data () { |
310 | return { | 312 | return { |
313 | loading: false, | ||
311 | mjdw: "1", | 314 | mjdw: "1", |
312 | //表单是否可操作 | 315 | //表单是否可操作 |
313 | viewEdit: true, | 316 | viewEdit: true, | ... | ... |
... | @@ -286,7 +286,7 @@ | ... | @@ -286,7 +286,7 @@ |
286 | import { mapGetters } from "vuex"; | 286 | import { mapGetters } from "vuex"; |
287 | export default { | 287 | export default { |
288 | mixins: [ywmix], | 288 | mixins: [ywmix], |
289 | created () { | 289 | mounted () { |
290 | this.viewEdit = this.$parent.currentSelectTab.ableOperation; | 290 | this.viewEdit = this.$parent.currentSelectTab.ableOperation; |
291 | this.propsParam = this.$attrs; | 291 | this.propsParam = this.$attrs; |
292 | var formdata = new FormData(); | 292 | var formdata = new FormData(); |
... | @@ -298,7 +298,6 @@ | ... | @@ -298,7 +298,6 @@ |
298 | formdata.append("isEdit", this.viewEdit); | 298 | formdata.append("isEdit", this.viewEdit); |
299 | Init(formdata).then((res) => { | 299 | Init(formdata).then((res) => { |
300 | if (res.code === 200 && res.result) { | 300 | if (res.code === 200 && res.result) { |
301 | console.log(res.result, 'res.result'); | ||
302 | that.ruleForm = res.result; | 301 | that.ruleForm = res.result; |
303 | this.czrOptions = this.ruleForm.qlrList; | 302 | this.czrOptions = this.ruleForm.qlrList; |
304 | this.ruleForm.qlrList.forEach((item) => { | 303 | this.ruleForm.qlrList.forEach((item) => { |
... | @@ -306,7 +305,9 @@ | ... | @@ -306,7 +305,9 @@ |
306 | this.czr = item.sqrmc; | 305 | this.czr = item.sqrmc; |
307 | } | 306 | } |
308 | }); | 307 | }); |
309 | that.loading = false | 308 | setTimeout(() => { |
309 | this.loading = false | ||
310 | }, 200) | ||
310 | } | 311 | } |
311 | }) | 312 | }) |
312 | }, | 313 | }, | ... | ... |
-
Please register or sign in to post a comment