Skip to content

bdc / bdcdj-web

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

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

2 parents 1d9c504b 941f30f7
Inline Side-by-side
Showing 25 changed files with 86 additions and 30 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-07 16:28:14 4 * @LastEditTime: 2023-09-11 11:31:17
5 --> 5 -->
6 <template> 6 <template>
7 <transition name="msgbox-fade"> 7 <transition name="msgbox-fade">
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
166 width: 100%; 166 width: 100%;
167 min-height: 30%; 167 min-height: 30%;
168 max-height: 90vh; 168 max-height: 90vh;
169 overflow-y: scroll; 169 // overflow-y: scroll;
170 box-sizing: border-box; 170 box-sizing: border-box;
171 } 171 }
172 172
......
...@@ -49,6 +49,10 @@ export default { ...@@ -49,6 +49,10 @@ export default {
49 this.dealCheckedItem(); 49 this.dealCheckedItem();
50 }, 50 },
51 methods: { 51 methods: {
52 /**
53 * @description: submitForm
54 * @author: renchao
55 */
52 submitForm () { 56 submitForm () {
53 var checkedNodes = this.$refs.tree.getCheckedNodes(); 57 var checkedNodes = this.$refs.tree.getCheckedNodes();
54 if (checkedNodes.length > 6) { 58 if (checkedNodes.length > 6) {
...@@ -65,6 +69,10 @@ export default { ...@@ -65,6 +69,10 @@ export default {
65 } 69 }
66 }) 70 })
67 }, 71 },
72 /**
73 * @description: queryClick
74 * @author: renchao
75 */
68 queryClick () { 76 queryClick () {
69 let that = this 77 let that = this
70 getMenuInfo().then(res => { 78 getMenuInfo().then(res => {
...@@ -79,13 +87,28 @@ export default { ...@@ -79,13 +87,28 @@ export default {
79 } 87 }
80 this.defaultCheckeds = lookForAllId() 88 this.defaultCheckeds = lookForAllId()
81 }, 89 },
90 /**
91 * @description: dealCheckedItem
92 * @author: renchao
93 */
82 dealCheckedItem () { 94 dealCheckedItem () {
83 }, 95 },
84 //关闭窗口 96 //关闭窗口
97 /**
98 * @description: 关闭窗口
99 * @author: renchao
100 */
85 closeDialog () { 101 closeDialog () {
86 this.$emit("input", false); 102 this.$emit("input", false);
87 }, 103 },
88 //节点选择状态发生改变时 104 //节点选择状态发生改变时
105 /**
106 * @description: 节点选择状态发生改变时
107 * @param {*} data
108 * @param {*} checked
109 * @param {*} node
110 * @author: renchao
111 */
89 handleClick (data, checked, node) { 112 handleClick (data, checked, node) {
90 var checkedNodes = this.$refs.tree.getCheckedNodes(); 113 var checkedNodes = this.$refs.tree.getCheckedNodes();
91 if (checkedNodes.length > 6) { 114 if (checkedNodes.length > 6) {
......
...@@ -75,6 +75,10 @@ ...@@ -75,6 +75,10 @@
75 }, 75 },
76 methods: { 76 methods: {
77 // 初始化数据 77 // 初始化数据
78 /**
79 * @description: 初始化数据
80 * @author: renchao
81 */
78 queryClick () { 82 queryClick () {
79 this.$startLoading(); 83 this.$startLoading();
80 getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => { 84 getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -195,6 +195,10 @@ ...@@ -195,6 +195,10 @@
195 } 195 }
196 }, 196 },
197 methods: { 197 methods: {
198 /**
199 * @description: handleSubmit
200 * @author: renchao
201 */
198 handleSubmit () { 202 handleSubmit () {
199 this.loading = true 203 this.loading = true
200 updateClml(this.tableData).then(res => { 204 updateClml(this.tableData).then(res => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-06 16:15:09 4 * @LastEditTime: 2023-09-11 11:29:36
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;">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 </el-tab-pane> 12 </el-tab-pane>
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','height': `calc(100% - ${hdiffHeight}px)`,'overflow-y': 'auto'}">
16 <canvas ref="zs" width="1000" v-show="this.bdcqz.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="this.bdcqz.bdcqzlx==2" height="780"></canvas> 17 <canvas ref="zm" width="1180" v-show="this.bdcqz.bdcqzlx==2" height="780"></canvas>
18 </div> 18 </div>
...@@ -517,6 +517,11 @@ ...@@ -517,6 +517,11 @@
517 517
518 image.src = this.bdczmSrc; 518 image.src = this.bdczmSrc;
519 } 519 }
520 },
521 computed:{
522 hdiffHeight(){
523 return this.headTabBdcqz.length > 1 ? 54 :0
524 }
520 } 525 }
521 } 526 }
522 </script> 527 </script>
......
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
463 return false; 463 return false;
464 } 464 }
465 this.ruleForm.qlrList.forEach((item, index) => { 465 this.ruleForm.qlrList.forEach((item, index) => {
466 if (item.zjh == this.czr) { 466 if (item.zjh == that.czr) {
467 item.sfczr = "1"; 467 item.sfczr = "1";
468 } else { 468 } else {
469 item.sfczr = "0"; 469 item.sfczr = "0";
......
...@@ -330,6 +330,10 @@ ...@@ -330,6 +330,10 @@
330 }; 330 };
331 }, 331 },
332 methods: { 332 methods: {
333 /**
334 * @description: updateFdcwxmList
335 * @author: renchao
336 */
333 updateFdcwxmList (val) { 337 updateFdcwxmList (val) {
334 this.ruleForm.fdcqxm && (this.ruleForm.fdcqxm = _.cloneDeep(val)); 338 this.ruleForm.fdcqxm && (this.ruleForm.fdcqxm = _.cloneDeep(val));
335 this.key++; 339 this.key++;
...@@ -429,7 +433,7 @@ ...@@ -429,7 +433,7 @@
429 return false; 433 return false;
430 } 434 }
431 this.ruleForm.qlrList.forEach((item, index) => { 435 this.ruleForm.qlrList.forEach((item, index) => {
432 if (item.zjh == this.czr) { 436 if (item.zjh == that.czr) {
433 item.sfczr = "1"; 437 item.sfczr = "1";
434 } else { 438 } else {
435 item.sfczr = "0"; 439 item.sfczr = "0";
......
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
585 return false; 585 return false;
586 } 586 }
587 this.ruleForm.qlrList.forEach((item, index) => { 587 this.ruleForm.qlrList.forEach((item, index) => {
588 if (item.zjh == this.czr) { 588 if (item.zjh == that.czr) {
589 item.sfczr = "1"; 589 item.sfczr = "1";
590 } else { 590 } else {
591 item.sfczr = "0"; 591 item.sfczr = "0";
......
...@@ -496,7 +496,7 @@ export default { ...@@ -496,7 +496,7 @@ export default {
496 return false; 496 return false;
497 } 497 }
498 this.ruleForm.qlrList.forEach((item, index) => { 498 this.ruleForm.qlrList.forEach((item, index) => {
499 if (item.zjh == this.czr) { 499 if (item.zjh == that.czr) {
500 item.sfczr = "1"; 500 item.sfczr = "1";
501 } else { 501 } else {
502 item.sfczr = "0"; 502 item.sfczr = "0";
......
...@@ -421,7 +421,7 @@ export default { ...@@ -421,7 +421,7 @@ export default {
421 return false; 421 return false;
422 } 422 }
423 this.ruleForm.qlrList.forEach((item, index) => { 423 this.ruleForm.qlrList.forEach((item, index) => {
424 if (item.zjh == this.czr) { 424 if (item.zjh == that.czr) {
425 item.sfczr = "1"; 425 item.sfczr = "1";
426 } else { 426 } else {
427 item.sfczr = "0"; 427 item.sfczr = "0";
......
...@@ -427,7 +427,7 @@ export default { ...@@ -427,7 +427,7 @@ export default {
427 return false; 427 return false;
428 } 428 }
429 this.ruleForm.qlrList.forEach((item, index) => { 429 this.ruleForm.qlrList.forEach((item, index) => {
430 if (item.zjh == this.czr) { 430 if (item.zjh == that.czr) {
431 item.sfczr = "1"; 431 item.sfczr = "1";
432 } else { 432 } else {
433 item.sfczr = "0"; 433 item.sfczr = "0";
......
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
398 return false; 398 return false;
399 } 399 }
400 this.ruleForm.qlrList.forEach((item, index) => { 400 this.ruleForm.qlrList.forEach((item, index) => {
401 if (item.zjh == this.czr) { 401 if (item.zjh == that.czr) {
402 item.sfczr = "1"; 402 item.sfczr = "1";
403 } else { 403 } else {
404 item.sfczr = "0"; 404 item.sfczr = "0";
......
...@@ -372,7 +372,7 @@ export default { ...@@ -372,7 +372,7 @@ export default {
372 return false; 372 return false;
373 } 373 }
374 this.ruleForm.qlrList.forEach((item, index) => { 374 this.ruleForm.qlrList.forEach((item, index) => {
375 if (item.zjh == this.czr) { 375 if (item.zjh == that.czr) {
376 item.sfczr = "1"; 376 item.sfczr = "1";
377 } else { 377 } else {
378 item.sfczr = "0"; 378 item.sfczr = "0";
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-09-07 17:04:32 4 * @LastEditTime: 2023-09-11 11:14:35
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -143,7 +143,6 @@ ...@@ -143,7 +143,6 @@
143 <el-row :gutter="10"> 143 <el-row :gutter="10">
144 <el-col :span="8"> 144 <el-col :span="8">
145 <el-form-item label="造林年度："> 145 <el-form-item label="造林年度：">
146 <!-- <el-input v-model="ruleForm.lq.zlnd"></el-input> -->
147 <el-date-picker 146 <el-date-picker
148 class="width100" 147 class="width100"
149 value-format="yyyy" 148 value-format="yyyy"
...@@ -349,6 +348,7 @@ ...@@ -349,6 +348,7 @@
349 ? (this.ruleForm.slsq.fzfs = "1") 348 ? (this.ruleForm.slsq.fzfs = "1")
350 : this.ruleForm.slsq.fzfs; 349 : this.ruleForm.slsq.fzfs;
351 this.czrOptions = this.ruleForm.qlrList; 350 this.czrOptions = this.ruleForm.qlrList;
351 this.ruleForm.lq.zlnd ? this.$set(this.ruleForm.lq,'zlnd',this.ruleForm.lq.zlnd.toString()) : this.$set(this.ruleForm.lq,'zlnd',"")
352 setTimeout(() => { 352 setTimeout(() => {
353 this.loading = false 353 this.loading = false
354 }, 200) 354 }, 200)
...@@ -368,7 +368,6 @@ ...@@ -368,7 +368,6 @@
368 czr: "", 368 czr: "",
369 ruleForm: { 369 ruleForm: {
370 lq:{ 370 lq:{
371
372 }, 371 },
373 flow: { 372 flow: {
374 ywh: "", 373 ywh: "",
...@@ -392,7 +391,7 @@ ...@@ -392,7 +391,7 @@
392 propsParam: this.$attrs, 391 propsParam: this.$attrs,
393 //表单是否可操作 392 //表单是否可操作
394 viewEdit: true, 393 viewEdit: true,
395 rules: {}, 394 rules: {}
396 }; 395 };
397 }, 396 },
398 methods: { 397 methods: {
...@@ -482,7 +481,7 @@ ...@@ -482,7 +481,7 @@
482 return false; 481 return false;
483 } 482 }
484 this.ruleForm.qlrList.forEach((item, index) => { 483 this.ruleForm.qlrList.forEach((item, index) => {
485 if (item.zjh == this.czr) { 484 if (item.zjh == that.czr) {
486 item.sfczr = "1"; 485 item.sfczr = "1";
487 } else { 486 } else {
488 item.sfczr = "0"; 487 item.sfczr = "0";
......
...@@ -435,7 +435,7 @@ export default { ...@@ -435,7 +435,7 @@ export default {
435 return false; 435 return false;
436 } 436 }
437 this.ruleForm.qlrList.forEach((item, index) => { 437 this.ruleForm.qlrList.forEach((item, index) => {
438 if (item.zjh == this.czr) { 438 if (item.zjh == that.czr) {
439 item.sfczr = "1"; 439 item.sfczr = "1";
440 } else { 440 } else {
441 item.sfczr = "0"; 441 item.sfczr = "0";
......
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
422 return false; 422 return false;
423 } 423 }
424 this.ruleForm.qlrList.forEach((item, index) => { 424 this.ruleForm.qlrList.forEach((item, index) => {
425 if (item.zjh == this.czr) { 425 if (item.zjh == that.czr) {
426 item.sfczr = "1"; 426 item.sfczr = "1";
427 } else { 427 } else {
428 item.sfczr = "0"; 428 item.sfczr = "0";
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-09-01 13:37:53 4 * @LastEditTime: 2023-09-11 09:51:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -359,6 +359,11 @@ ...@@ -359,6 +359,11 @@
359 czrOptions: [], 359 czrOptions: [],
360 czr: "", 360 czr: "",
361 ruleForm: { 361 ruleForm: {
362 lq:{
363 zlnd:"",
364 ldsyqssj:"",
365 ldsyjssj:""
366 },
362 flow: { 367 flow: {
363 ywh: "", 368 ywh: "",
364 }, 369 },
...@@ -471,7 +476,7 @@ ...@@ -471,7 +476,7 @@
471 return false; 476 return false;
472 } 477 }
473 this.ruleForm.qlrList.forEach((item, index) => { 478 this.ruleForm.qlrList.forEach((item, index) => {
474 if (item.zjh == this.czr) { 479 if (item.zjh == that.czr) {
475 item.sfczr = "1"; 480 item.sfczr = "1";
476 } else { 481 } else {
477 item.sfczr = "0"; 482 item.sfczr = "0";
......
...@@ -510,7 +510,7 @@ ...@@ -510,7 +510,7 @@
510 return false; 510 return false;
511 } 511 }
512 this.ruleForm.qlrList.forEach((item, index) => { 512 this.ruleForm.qlrList.forEach((item, index) => {
513 if (item.zjh == this.czr) { 513 if (item.zjh == that.czr) {
514 item.sfczr = "1"; 514 item.sfczr = "1";
515 } else { 515 } else {
516 item.sfczr = "0"; 516 item.sfczr = "0";
......
...@@ -421,7 +421,7 @@ ...@@ -421,7 +421,7 @@
421 return false; 421 return false;
422 } 422 }
423 this.ruleForm.qlrList.forEach((item, index) => { 423 this.ruleForm.qlrList.forEach((item, index) => {
424 if (item.zjh == this.czr) { 424 if (item.zjh == that.czr) {
425 item.sfczr = "1"; 425 item.sfczr = "1";
426 } else { 426 } else {
427 item.sfczr = "0"; 427 item.sfczr = "0";
......
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
339 return false; 339 return false;
340 } 340 }
341 this.ruleForm.qlrList.forEach((item, index) => { 341 this.ruleForm.qlrList.forEach((item, index) => {
342 if (item.zjh == this.czr) { 342 if (item.zjh == that.czr) {
343 item.sfczr = "1"; 343 item.sfczr = "1";
344 } else { 344 } else {
345 item.sfczr = "0"; 345 item.sfczr = "0";
......
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
427 return false; 427 return false;
428 } 428 }
429 this.ruleForm.qlrList.forEach((item, index) => { 429 this.ruleForm.qlrList.forEach((item, index) => {
430 if (item.zjh == this.czr) { 430 if (item.zjh == that.czr) {
431 item.sfczr = "1"; 431 item.sfczr = "1";
432 } else { 432 } else {
433 item.sfczr = "0"; 433 item.sfczr = "0";
......
...@@ -423,7 +423,7 @@ export default { ...@@ -423,7 +423,7 @@ export default {
423 return false; 423 return false;
424 } 424 }
425 this.ruleForm.qlrList.forEach((item, index) => { 425 this.ruleForm.qlrList.forEach((item, index) => {
426 if (item.zjh == this.czr) { 426 if (item.zjh == that.czr) {
427 item.sfczr = "1"; 427 item.sfczr = "1";
428 } else { 428 } else {
429 item.sfczr = "0"; 429 item.sfczr = "0";
......
...@@ -451,7 +451,7 @@ export default { ...@@ -451,7 +451,7 @@ export default {
451 return false; 451 return false;
452 } 452 }
453 this.ruleForm.qlrList.forEach((item, index) => { 453 this.ruleForm.qlrList.forEach((item, index) => {
454 if (item.zjh == this.czr) { 454 if (item.zjh == that.czr) {
455 item.sfczr = "1"; 455 item.sfczr = "1";
456 } else { 456 } else {
457 item.sfczr = "0"; 457 item.sfczr = "0";
......
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
174 import { datas, sendThis } from "../javascript/selectFwbjDybgSplitMerge.js"; 174 import { datas, sendThis } from "../javascript/selectFwbjDybgSplitMerge.js";
175 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 175 import { defaultParameters } from "../javascript/publicDefaultPar.js";
176 import { selectFwsyq, selectDiyaq } from "@/api/ywsq.js"; 176 import { selectFwsyq, selectDiyaq } from "@/api/ywsq.js";
177 import { startBusinessFlow } from "@/api/workFlow.js"; 177 import { startTogetherFlow } from "@/api/workFlow.js";
178 export default { 178 export default {
179 mixins: [table, jump], 179 mixins: [table, jump],
180 props: { 180 props: {
...@@ -200,6 +200,11 @@ ...@@ -200,6 +200,11 @@
200 sendThis(this) 200 sendThis(this)
201 }, 201 },
202 methods: { 202 methods: {
203 /**
204 * @description: yWstatus
205 * @param {*} row
206 * @author: renchao
207 */
203 yWstatus (row) { 208 yWstatus (row) {
204 let text = ""; 209 let text = "";
205 let keys = 0; 210 let keys = 0;
...@@ -241,12 +246,13 @@ ...@@ -241,12 +246,13 @@
241 }, 246 },
242 /** 247 /**
243 * @description: 单选事件 248 * @description: 单选事件
249 * @param {*} row
244 * @author: renchao 250 * @author: renchao
245 */ 251 */
246 getCurrentRow (row) { 252 getCurrentRow (row) {
247 this.radioVal = row.bdcdyh; 253 this.radioVal = row.bdcdyh;
248 this.bdcdysz = [row] 254 this.bdcdysz = [row]
249 selectDiyaq({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => { 255 selectDiyaq({ bdcdyh: this.radioVal,sqywbm:'A37300', currentPage: 1, pageSize: 10 }).then((res) => {
250 if (res.code === 200) { 256 if (res.code === 200) {
251 this.tableData.dataList = res.result.records 257 this.tableData.dataList = res.result.records
252 this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList] 258 this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList]
...@@ -284,7 +290,7 @@ ...@@ -284,7 +290,7 @@
284 */ 290 */
285 submitForm () { 291 submitForm () {
286 this.loading = true 292 this.loading = true
287 startBusinessFlow({ 293 startTogetherFlow({
288 bsmSqyw: this.sqywInfo.bsmSqyw, 294 bsmSqyw: this.sqywInfo.bsmSqyw,
289 bdcdysz: this.bdcdysz, 295 bdcdysz: this.bdcdysz,
290 }).then((res) => { 296 }).then((res) => {
......
...@@ -214,6 +214,11 @@ ...@@ -214,6 +214,11 @@
214 sendThis(this) 214 sendThis(this)
215 }, 215 },
216 methods: { 216 methods: {
217 /**
218 * @description: yWstatus
219 * @param {*} row
220 * @author: renchao
221 */
217 yWstatus (row) { 222 yWstatus (row) {
218 let text = ""; 223 let text = "";
219 let keys = 0; 224 let keys = 0;
...@@ -255,6 +260,7 @@ ...@@ -255,6 +260,7 @@
255 }, 260 },
256 /** 261 /**
257 * @description: 单选事件 262 * @description: 单选事件
263 * @param {*} row
258 * @author: renchao 264 * @author: renchao
259 */ 265 */
260 getCurrentRow (row) { 266 getCurrentRow (row) {
......