Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
82d30000 by xiaomiao
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 4f0d1e28 2c90423b
Inline Side-by-side
Showing 21 changed files with 108 additions and 48 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 10:01:32 4 * @LastEditTime: 2023-09-14 16:21:51
5 --> 5 -->
6 <template> 6 <template>
7 <el-image-viewer :on-close="closeViewer" :url-list="urlList"> 7 <el-image-viewer :on-close="closeViewer" :url-list="urlList" :initial-index="initialIndex">
8 </el-image-viewer> 8 </el-image-viewer>
9 </template> 9 </template>
10 <script> 10 <script>
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
19 default: function () { 19 default: function () {
20 return [] 20 return []
21 } 21 }
22 },
23 initialIndex: {
24 type: Number,
25 default: 0
22 } 26 }
23 }, 27 },
24 data () { 28 data () {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 10:18:11 4 * @LastEditTime: 2023-09-14 17:11:15
5 --> 5 -->
6 <template> 6 <template>
7 <transition name="msgbox-fade"> 7 <transition name="msgbox-fade">
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
160 .mask-content { 160 .mask-content {
161 padding: 5px 20px 30px 20px; 161 padding: 5px 20px 30px 20px;
162 width: 100%; 162 width: 100%;
163 min-height: 20%; 163 min-height: 253px;
164 max-height: 90vh; 164 max-height: 90vh;
165 overflow-y: scroll; 165 overflow-y: scroll;
166 } 166 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 15:36:42 4 * @LastEditTime: 2023-09-14 16:16:57
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
148 } else { 148 } else {
149 this.previewImg.index = this.previewImg.index + 1 149 this.previewImg.index = this.previewImg.index + 1
150 } 150 }
151 this.initialIndex = this.previewImg.index
151 this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj }) 152 this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
152 this.$message({ 153 this.$message({
153 message: '移动成功!', 154 message: '移动成功!',
...@@ -234,6 +235,7 @@ ...@@ -234,6 +235,7 @@
234 */ 235 */
235 showCurrent (index) { 236 showCurrent (index) {
236 this.previewImg.index = index 237 this.previewImg.index = index
238 this.initialIndex = index
237 }, 239 },
238 /** 240 /**
239 * @description: closeViewer 241 * @description: closeViewer
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 17:08:19 4 * @LastEditTime: 2023-09-14 16:37:15
5 --> 5 -->
6 <template> 6 <template>
7 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"> 7 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
...@@ -28,25 +28,30 @@ ...@@ -28,25 +28,30 @@
28 :calcHeight="300"> 28 :calcHeight="300">
29 </lb-table> 29 </lb-table>
30 <el-row> 30 <el-row>
31 <el-col :span="6"> 31 <el-col :span="3">
32 <el-form-item label="领证人" prop="lzrxm"> 32 <el-form-item label="身份证读卡器">
33 <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
34 </el-form-item>
35 </el-col>
36 <el-col :span="5">
37 <el-form-item label="领证人" prop="lzrxm" label-width="70px">
33 <el-input v-model="ruleForm.lzrxm"></el-input> 38 <el-input v-model="ruleForm.lzrxm"></el-input>
34 </el-form-item> 39 </el-form-item>
35 </el-col> 40 </el-col>
36 <el-col :span="6"> 41 <el-col :span="5">
37 <el-form-item label="证件类型" prop="lzrzjlb"> 42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
38 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> 43 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
39 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode"> 44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
40 </el-option> 45 </el-option>
41 </el-select> 46 </el-select>
42 </el-form-item> 47 </el-form-item>
43 </el-col> 48 </el-col>
44 <el-col :span="6"> 49 <el-col :span="5">
45 <el-form-item label="证件号" prop="lzrzjh"> 50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
46 <el-input v-model="ruleForm.lzrzjh"></el-input> 51 <el-input v-model="ruleForm.lzrzjh"></el-input>
47 </el-form-item> 52 </el-form-item>
48 </el-col> 53 </el-col>
49 <el-col :span="6"> 54 <el-col :span="5">
50 <el-form-item label="领证人电话" prop="lzrdh"> 55 <el-form-item label="领证人电话" prop="lzrdh">
51 <el-input v-model="ruleForm.lzrdh"></el-input> 56 <el-input v-model="ruleForm.lzrdh"></el-input>
52 </el-form-item> 57 </el-form-item>
...@@ -62,7 +67,8 @@ ...@@ -62,7 +67,8 @@
62 import Vue from 'vue' 67 import Vue from 'vue'
63 import store from '@/store/index.js' 68 import store from '@/store/index.js'
64 import table from "@/utils/mixin/table"; 69 import table from "@/utils/mixin/table";
65 import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js"; 70 import { getIdCardInfo } from '@/utils/operation.js'
71 import { getUnclaimedBdcqz, issueCertificate, getBdcqzQlr } from "@/api/bdcqz.js";
66 import { datas } from "../../javascript/fzxxdata"; 72 import { datas } from "../../javascript/fzxxdata";
67 export default { 73 export default {
68 props: { 74 props: {
...@@ -115,6 +121,29 @@ ...@@ -115,6 +121,29 @@
115 }, 121 },
116 methods: { 122 methods: {
117 /** 123 /**
124 * @description: 身份证打卡器
125 * @author: renchao
126 */
127 readClick () {
128 getIdCardInfo().then(res => {
129 if (res.data.code == 0) {
130 let data = res.data.IDCardInfo
131 this.ruleForm.lzrxm = data.name
132 this.ruleForm.lzrzjlb = '1'
133 this.ruleForm.lzrzjh = data.cardID
134 this.$message({
135 message: '读取成功！',
136 type: 'success'
137 })
138 } else {
139 this.$message({
140 message: res.data.message,
141 type: 'warning'
142 })
143 }
144 })
145 },
146 /**
118 * @description: 列表初始化 147 * @description: 列表初始化
119 * @author: renchao 148 * @author: renchao
120 */ 149 */
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-06 15:20:16 4 * @LastEditTime: 2023-09-14 17:19:26
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx sdqxx"> 7 <div class="slxx sdqxx">
...@@ -119,10 +119,6 @@ ...@@ -119,10 +119,6 @@
119 formdata.append("bsmSldy", this.propsParam.bsmSldy); 119 formdata.append("bsmSldy", this.propsParam.bsmSldy);
120 formdata.append("djlx", this.propsParam.djlx); 120 formdata.append("djlx", this.propsParam.djlx);
121 formdata.append("isEdit", this.viewEdit); 121 formdata.append("isEdit", this.viewEdit);
122 // Init(formdata).then((res) => {
123 // if (res.code === 200 && res.result) {
124 // }
125 // });
126 }, 122 },
127 data () { 123 data () {
128 return { 124 return {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 16:16:08 4 * @LastEditTime: 2023-09-14 16:06:51
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div style="width:90%;height:100%;">
8 <canvas id="mxcad" style="width:100%;height:100%"> 8 <canvas id="mxcad" style="width:90%;height:80%; position: relative;top:0">
9 </canvas> 9 </canvas>
10 </div> 10 </div>
11 </template> 11 </template>
...@@ -20,20 +20,17 @@ ...@@ -20,20 +20,17 @@
20 Mx.MxFun.createMxObject({ 20 Mx.MxFun.createMxObject({
21 canvasId: "mxcad", // canvas元素的id 21 canvasId: "mxcad", // canvas元素的id
22 cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸 22 cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸
23 // cadFile: "test2.dwg", // socket通信方式请直接提供图纸名称 如：text.dwg
24 callback: (mxDraw, { 23 callback: (mxDraw, {
25 canvas, 24 canvas,
26 canvasParent 25 canvasParent
27 }) => { 26 }) => {
28 // 可以拿到canvas元素和它的父级元素 27 // 可以拿到canvas元素和它的父级元素
29 console.log(canvas, canvasParent)
30 console.log(mxDraw)
31 // 拿到图层数据 28 // 拿到图层数据
32 mxDraw.addEvent('uiSetLayerData', (listLayer) => { 29 mxDraw.addEvent('uiSetLayerData', (listLayer) => {
33 console.log(listLayer) 30 console.log(listLayer)
34 }) 31 })
35 }, 32 },
36 isNewFile: false // 是否新建文件 33 isNewFile: true // 是否新建文件
37 }) 34 })
38 }) 35 })
39 } 36 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 13:57:48 4 * @LastEditTime: 2023-09-14 17:19:13
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -194,7 +194,8 @@ ...@@ -194,7 +194,8 @@
194 setTimeout(() => { 194 setTimeout(() => {
195 this.prinsss() 195 this.prinsss()
196 }, 100) 196 }, 100)
197 197 } else {
198 this.$message.error(res.message);
198 } 199 }
199 }) 200 })
200 }, 201 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 13:46:29 4 * @LastEditTime: 2023-09-14 16:24:07
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 // 缩略图 86 // 缩略图
87 thumbnailImages: [], 87 thumbnailImages: [],
88 showViewer: false, 88 showViewer: false,
89 initialIndex: undefined, 89 initialIndex: 0,
90 allLi: [], 90 allLi: [],
91 } 91 }
92 }, 92 },
...@@ -152,6 +152,7 @@ ...@@ -152,6 +152,7 @@
152 } else { 152 } else {
153 this.previewImg.index = this.previewImg.index + 1 153 this.previewImg.index = this.previewImg.index + 1
154 } 154 }
155 this.initialIndex = this.previewImg.index
155 this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial }) 156 this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
156 this.$message({ 157 this.$message({
157 message: '移动成功!', 158 message: '移动成功!',
...@@ -238,6 +239,7 @@ ...@@ -238,6 +239,7 @@
238 */ 239 */
239 showCurrent (index) { 240 showCurrent (index) {
240 this.previewImg.index = index 241 this.previewImg.index = index
242 this.initialIndex = index
241 }, 243 },
242 /** 244 /**
243 * @description: closeViewer 245 * @description: closeViewer
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 09:50:02 4 * @LastEditTime: 2023-09-14 17:19:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -310,6 +310,8 @@ ...@@ -310,6 +310,8 @@
310 Init(formdata).then((res) => { 310 Init(formdata).then((res) => {
311 if (res.code === 200 && res.result) { 311 if (res.code === 200 && res.result) {
312 this.ruleForm = res.result; 312 this.ruleForm = res.result;
313 } else {
314 this.$message.error(res.message);
313 } 315 }
314 }); 316 });
315 }, 317 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 09:59:18 4 * @LastEditTime: 2023-09-14 17:19:58
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -365,6 +365,7 @@ ...@@ -365,6 +365,7 @@
365 import { mapGetters } from "vuex"; 365 import { mapGetters } from "vuex";
366 export default { 366 export default {
367 mounted () { 367 mounted () {
368 let that = this
368 this.loading = true 369 this.loading = true
369 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 370 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
370 this.propsParam = this.$attrs; 371 this.propsParam = this.$attrs;
...@@ -381,14 +382,16 @@ ...@@ -381,14 +382,16 @@
381 this.loading = false 382 this.loading = false
382 }, 200) 383 }, 200)
383 if (res.code === 200 && res.result) { 384 if (res.code === 200 && res.result) {
384 this.ruleForm = res.result; 385 that.ruleForm = res.result;
385 this.czrOptions = this.ruleForm.qlrList; 386 that.czrOptions = this.ruleForm.qlrList;
387 that.ruleForm.qlrList.forEach((item) => {
388 if (item.sfczr == 1) {
389 that.czr = item.zjh
390 }
391 })
392 } else {
393 that.$message.error(res.message);
386 } 394 }
387 this.ruleForm.qlrList.forEach((item) => {
388 if (item.sfczr == 1) {
389 this.czr = item.zjh
390 }
391 });
392 }).catch(() => { 395 }).catch(() => {
393 this.loading = false 396 this.loading = false
394 }) 397 })
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-09-13 14:41:34 4 * @LastEditTime: 2023-09-14 17:20:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 </el-col> 103 </el-col>
104 </el-row> 104 </el-row>
105 <el-row :gutter="10" v-if="ruleForm.fdcq1"> 105 <el-row :gutter="10" v-if="ruleForm.fdcq1">
106 <el-col :span="8"> 106 <el-col :span="8">
107 <el-form-item label="独用土地面积："> 107 <el-form-item label="独用土地面积：">
108 <div class="flex"> 108 <div class="flex">
109 <el-input 109 <el-input
...@@ -313,6 +313,8 @@ ...@@ -313,6 +313,8 @@
313 } 313 }
314 }); 314 });
315 this.czrOptions = this.ruleForm.qlrList; 315 this.czrOptions = this.ruleForm.qlrList;
316 } else {
317 this.$message.error(res.message);
316 } 318 }
317 }) 319 })
318 }, 320 },
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 10:04:14 4 * @LastEditTime: 2023-09-14 17:17:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -440,6 +440,8 @@ ...@@ -440,6 +440,8 @@
440 } 440 }
441 }); 441 });
442 this.czrOptions = this.ruleForm.qlrList; 442 this.czrOptions = this.ruleForm.qlrList;
443 } else {
444 this.$message.error(res.message);
443 } 445 }
444 }).catch(() => { 446 }).catch(() => {
445 this.loading = false 447 this.loading = false
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 14:16:46 4 * @LastEditTime: 2023-09-14 17:20:53
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -299,6 +299,8 @@ ...@@ -299,6 +299,8 @@
299 } 299 }
300 }); 300 });
301 this.czrOptions = this.ruleForm.qlrList; 301 this.czrOptions = this.ruleForm.qlrList;
302 } else {
303 this.$message.error(res.message);
302 } 304 }
303 }).catch(() => { 305 }).catch(() => {
304 this.loading = false 306 this.loading = false
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 14:17:15 4 * @LastEditTime: 2023-09-14 17:20:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -296,6 +296,8 @@ ...@@ -296,6 +296,8 @@
296 this.czrOptions = this.ruleForm.qlrList; 296 this.czrOptions = this.ruleForm.qlrList;
297 this.gyfs = this.ruleForm.sldyList[0].gyfs; 297 this.gyfs = this.ruleForm.sldyList[0].gyfs;
298 this.splicingFdcq2Info(); 298 this.splicingFdcq2Info();
299 } else {
300 this.$message.error(res.message);
299 } 301 }
300 this.ruleForm.qlrList.forEach((item) => { 302 this.ruleForm.qlrList.forEach((item) => {
301 if (item.sfczr == 1) { 303 if (item.sfczr == 1) {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 14:05:26 4 * @LastEditTime: 2023-09-14 17:21:04
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -264,6 +264,8 @@ ...@@ -264,6 +264,8 @@
264 } 264 }
265 }); 265 });
266 this.czrOptions = this.ruleForm.qlrList; 266 this.czrOptions = this.ruleForm.qlrList;
267 } else {
268 this.$message.error(res.message);
267 } 269 }
268 }).catch(() => { 270 }).catch(() => {
269 this.loading = false 271 this.loading = false
...@@ -356,6 +358,8 @@ ...@@ -356,6 +358,8 @@
356 ...res.result.qlxxdatas, 358 ...res.result.qlxxdatas,
357 ...res.result.jsydsyqdatas, 359 ...res.result.jsydsyqdatas,
358 }; 360 };
361 } else {
362 this.$message.error(res.message);
359 } 363 }
360 }); 364 });
361 }, 365 },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-09-13 14:17:49 5 * @LastEditTime: 2023-09-14 17:21:19
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -239,6 +239,8 @@ ...@@ -239,6 +239,8 @@
239 if (res.code === 200 && res.result) { 239 if (res.code === 200 && res.result) {
240 this.ruleForm = res.result; 240 this.ruleForm = res.result;
241 this.czrOptions = this.ruleForm.qlrList; 241 this.czrOptions = this.ruleForm.qlrList;
242 } else {
243 this.$message.error(res.message);
242 } 244 }
243 this.ruleForm.qlrList.forEach((item) => { 245 this.ruleForm.qlrList.forEach((item) => {
244 if (item.sfczr == 1) { 246 if (item.sfczr == 1) {
......
...@@ -352,6 +352,8 @@ ...@@ -352,6 +352,8 @@
352 setTimeout(() => { 352 setTimeout(() => {
353 this.loading = false 353 this.loading = false
354 }, 200) 354 }, 200)
355 } else {
356 this.$message.error(res.message);
355 } 357 }
356 }) 358 })
357 }, 359 },
......
...@@ -345,6 +345,8 @@ ...@@ -345,6 +345,8 @@
345 ? (this.ruleForm.slsq.fzfs = "1") 345 ? (this.ruleForm.slsq.fzfs = "1")
346 : this.ruleForm.slsq.fzfs; 346 : this.ruleForm.slsq.fzfs;
347 this.czrOptions = this.ruleForm.qlrList; 347 this.czrOptions = this.ruleForm.qlrList;
348 } else {
349 this.$message.error(res.message);
348 } 350 }
349 }); 351 });
350 }, 352 },
......
...@@ -227,9 +227,11 @@ ...@@ -227,9 +227,11 @@
227 if (item.sfczr == 1) { 227 if (item.sfczr == 1) {
228 this.czr = item.zjh 228 this.czr = item.zjh
229 } 229 }
230 }); 230 })
231 } else {
232 this.$message.error(res.message);
231 } 233 }
232 }); 234 })
233 }, 235 },
234 components: { qlrCommonTable, ywrCommonTable }, 236 components: { qlrCommonTable, ywrCommonTable },
235 computed: { 237 computed: {
......
...@@ -327,6 +327,8 @@ ...@@ -327,6 +327,8 @@
327 setTimeout(() => { 327 setTimeout(() => {
328 that.loading = false 328 that.loading = false
329 }, 200) 329 }, 200)
330 } else {
331 this.$message.error(res.message);
330 } 332 }
331 }) 333 })
332 }, 334 },
......
...@@ -345,6 +345,8 @@ ...@@ -345,6 +345,8 @@
345 this.czr = item.zjh 345 this.czr = item.zjh
346 } 346 }
347 }) 347 })
348 } else {
349 this.$message.error(res.message);
348 } 350 }
349 }).catch(() => { 351 }).catch(() => {
350 this.loading = false 352 this.loading = false
......