Merge branch 'dev'
Showing
43 changed files
with
473 additions
and
274 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-05-08 15:19:43 | 4 | * @LastEditTime: 2023-07-24 14:10:29 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <section class="app-main"> | 7 | <section class="app-main"> |
8 | <transition name="fade-transform" mode="out-in"> | 8 | <transition name="fade-transform" mode="out-in"> |
9 | <keep-alive :include="['dbx', 'ybx','jtfc', 'dydjb', 'sqcxjl', 'jdcx','djbcx', | ||
10 | 'lpcx','zslqcx', 'zxgcdycx', 'zsrk', 'zsff','zssyjl','dictionaries', 'sqywgz', 'qtjfjmb', | ||
11 | 'xttz','flfg']"> | ||
9 | <router-view /> | 12 | <router-view /> |
13 | </keep-alive> | ||
10 | </transition> | 14 | </transition> |
11 | </section> | 15 | </section> |
12 | </template> | 16 | </template> | ... | ... |
1 | <!-- | ||
2 | * @Description: | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-05-17 10:41:45 | ||
5 | --> | ||
6 | <template> | ||
7 | <div class="from-clues"> | ||
8 | <div class="invalid-title"> | ||
9 | <i class="el-icon-question invalid-icon"></i> | ||
10 | <div class="invalid-body">您是否确定终止该业务办理?</div> | ||
11 | </div> | ||
12 | <div class="invalid-reson">终止原因:</div> | ||
13 | <el-input | ||
14 | v-model="stopMessage" | ||
15 | placeholder="请输入终止原因" | ||
16 | type="textarea" | ||
17 | :rows="4"></el-input> | ||
18 | <el-button style="float: right">取消</el-button> | ||
19 | <el-button type="primary" @click="onSubmit" style="float: right">退件</el-button> | ||
20 | </div> | ||
21 | </template> | ||
22 | |||
23 | <script> | ||
24 | import { stopTask } from "@/api/workFlow.js"; | ||
25 | export default { | ||
26 | props: { | ||
27 | formData: { | ||
28 | type: Object, | ||
29 | default: {}, | ||
30 | }, | ||
31 | }, | ||
32 | data () { | ||
33 | return { | ||
34 | stopMessage: "", | ||
35 | }; | ||
36 | }, | ||
37 | methods: { | ||
38 | /** | ||
39 | * @description: onSubmit | ||
40 | * @author: renchao | ||
41 | */ | ||
42 | onSubmit () { | ||
43 | stopTask({ | ||
44 | bsmSlsq: this.formData.bsmSlsq, | ||
45 | bestepid: this.formData.bestepid, | ||
46 | stopMessage: this.stopMessage, | ||
47 | }).then((res) => { | ||
48 | this.$message.success("终止成功"); | ||
49 | setTimeout(() => { | ||
50 | // window.opener.location.reload(); //刷新父窗口 | ||
51 | if (window.opener && window.opener.getBpageList) { | ||
52 | window.opener.getBpageList(); | ||
53 | } else { | ||
54 | window.opener.frames[0].getBpageList(); | ||
55 | } | ||
56 | window.close(); | ||
57 | this.$emit("input", false); | ||
58 | }, 1000); | ||
59 | }); | ||
60 | }, | ||
61 | }, | ||
62 | }; | ||
63 | </script> | ||
64 | <style scoped lang="scss"> | ||
65 | @import "~@/styles/mixin.scss"; | ||
66 | .invalid-title { | ||
67 | display: flex; | ||
68 | align-content: center; | ||
69 | |||
70 | .invalid-icon { | ||
71 | color: rgb(254, 148, 0); | ||
72 | font-size: 34px; | ||
73 | margin-right: 10px; | ||
74 | } | ||
75 | |||
76 | .invalid-body { | ||
77 | line-height: 40px; | ||
78 | margin-bottom: 10px; | ||
79 | } | ||
80 | } | ||
81 | |||
82 | .invalid-reson { | ||
83 | margin-bottom: 10px; | ||
84 | } | ||
85 | |||
86 | .dialog-footer { | ||
87 | margin-top: 10px; | ||
88 | display: flex; | ||
89 | justify-content: flex-end; | ||
90 | } | ||
91 | </style> |
... | @@ -20,13 +20,15 @@ | ... | @@ -20,13 +20,15 @@ |
20 | 此环节为流程最后环节,转出后流程将结束 | 20 | 此环节为流程最后环节,转出后流程将结束 |
21 | </el-form-item> | 21 | </el-form-item> |
22 | </el-form> | 22 | </el-form> |
23 | <div class="invalid-reson">转出原因:</div> | 23 | <div class="invalid-reson">审批意见:</div> |
24 | <el-input | 24 | <el-input |
25 | class="opinion" | ||
25 | v-model="shyj" | 26 | v-model="shyj" |
26 | placeholder="请输入转出原因" | 27 | placeholder="请输入审批意见" |
27 | type="textarea" | 28 | type="textarea" |
28 | :rows="4" | 29 | :rows="4" |
29 | ></el-input> | 30 | ></el-input> |
31 | <!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> --> | ||
30 | <el-button style="float: right" @click="cancelBack">取消转出</el-button> | 32 | <el-button style="float: right" @click="cancelBack">取消转出</el-button> |
31 | <el-button type="primary" @click="submitForm" style="float: right" | 33 | <el-button type="primary" @click="submitForm" style="float: right" |
32 | >确定转出</el-button | 34 | >确定转出</el-button |
... | @@ -38,36 +40,56 @@ | ... | @@ -38,36 +40,56 @@ |
38 | <script> | 40 | <script> |
39 | import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"; | 41 | import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"; |
40 | import { popupCacel } from "@/utils/popup.js"; | 42 | import { popupCacel } from "@/utils/popup.js"; |
43 | import { mapGetters } from "vuex"; | ||
41 | export default { | 44 | export default { |
42 | components: {}, | 45 | computed: { |
46 | }, | ||
43 | props: { | 47 | props: { |
44 | formData: { | 48 | formData: { |
45 | type: Object, | 49 | type: Object, |
46 | default: {}, | 50 | default: {}, |
47 | }, | 51 | }, |
48 | }, | 52 | }, |
53 | |||
49 | data() { | 54 | data() { |
50 | return { | 55 | return { |
51 | queryForm: {}, | 56 | queryForm: {}, |
52 | shyj: "", | 57 | shyj: "", |
53 | }; | 58 | }; |
54 | }, | 59 | }, |
60 | |||
61 | watch: { | ||
62 | yjsqOptions: { | ||
63 | handler(val) { | ||
64 | this.add(val); | ||
65 | }, | ||
66 | deep: true, | ||
67 | immediate: true, | ||
68 | }, | ||
69 | }, | ||
55 | mounted() { | 70 | mounted() { |
56 | // this.queryForm= this.queryForm.obj | 71 | // this.queryForm= this.queryForm.obj |
57 | console.log("formDataformDataformData", this.formData); | ||
58 | }, | 72 | }, |
59 | methods: { | 73 | methods: { |
60 | /** | 74 | /** |
61 | * @description: submitForm | 75 | * @description: submitForm |
62 | * @author: renchao | 76 | * @author: renchao |
63 | */ | 77 | */ |
78 | commonOpinion() { | ||
79 | this.$popup('常用意见',"workflow/components/dialog/commonOpinion",{ | ||
80 | title:"常用意见", | ||
81 | width: '75%', // 初始化75% 不需要改的话 可以直接不要 | ||
82 | formData:{}, // 父组件传给子组件的参数 | ||
83 | cancel: function () {}, //取消事件的回调 没有按钮可以不需要 | ||
84 | confirm: function () {} //确认事件的回调 没有按钮可以不需要 | ||
85 | }) | ||
86 | }, | ||
64 | submitForm() { | 87 | submitForm() { |
65 | this.queryForm = { | 88 | this.queryForm = { |
66 | bsmSlsq: this.formData.bsmSlsq, | 89 | bsmSlsq: this.formData.bsmSlsq, |
67 | shyj: this.shyj, | 90 | shyj: this.shyj, |
68 | stepform: JSON.stringify(this.formData.tabList), | 91 | stepform: JSON.stringify(this.formData.tabList), |
69 | }; | 92 | }; |
70 | console.log("this.queryForm", this.queryForm); | ||
71 | completeTask(this.queryForm).then((res) => { | 93 | completeTask(this.queryForm).then((res) => { |
72 | if (res.code === 200) { | 94 | if (res.code === 200) { |
73 | this.$message.success("转件成功"); | 95 | this.$message.success("转件成功"); |
... | @@ -88,12 +110,23 @@ export default { | ... | @@ -88,12 +110,23 @@ export default { |
88 | window.close(); | 110 | window.close(); |
89 | this.$emit("input", false); | 111 | this.$emit("input", false); |
90 | }, 1000); | 112 | }, 1000); |
91 | }else{ | 113 | } else { |
92 | this.$message.error(res.message); | 114 | this.$message.error(res.message); |
93 | } | 115 | } |
94 | }); | 116 | }); |
95 | }, | 117 | }, |
96 | /** | 118 | /** |
119 | * @description: add | ||
120 | * @param {*} val | ||
121 | * @author: renchao | ||
122 | */ | ||
123 | add(val) { | ||
124 | if (val != "") { | ||
125 | this.shyj; | ||
126 | } | ||
127 | }, | ||
128 | |||
129 | /** | ||
97 | * @description: closeDialog | 130 | * @description: closeDialog |
98 | * @author: renchao | 131 | * @author: renchao |
99 | */ | 132 | */ |
... | @@ -109,4 +142,15 @@ export default { | ... | @@ -109,4 +142,15 @@ export default { |
109 | margin-top: 20px; | 142 | margin-top: 20px; |
110 | margin-right: 10px; | 143 | margin-right: 10px; |
111 | } | 144 | } |
145 | |||
146 | .opinion { | ||
147 | position: relative; | ||
148 | font-size: 14px; | ||
149 | } | ||
150 | |||
151 | .opinion_btn { | ||
152 | position: absolute; | ||
153 | right: 35px; | ||
154 | bottom: 80px; | ||
155 | } | ||
112 | </style> | 156 | </style> | ... | ... |
... | @@ -476,7 +476,7 @@ export default { | ... | @@ -476,7 +476,7 @@ export default { |
476 | */ | 476 | */ |
477 | ssQlxxchange(val) { | 477 | ssQlxxchange(val) { |
478 | this.ruleForm.ssQlxx = val; | 478 | this.ruleForm.ssQlxx = val; |
479 | this.ruleForm.qlxx.ssywh = val.ssywh; | 479 | this.ruleForm.qlxx.ssywh = val.ywh; |
480 | }, | 480 | }, |
481 | /** | 481 | /** |
482 | * @description: djlxchange | 482 | * @description: djlxchange | ... | ... |
... | @@ -654,7 +654,7 @@ export default { | ... | @@ -654,7 +654,7 @@ export default { |
654 | */ | 654 | */ |
655 | ssQlxxchange(val) { | 655 | ssQlxxchange(val) { |
656 | this.ruleForm.ssQlxx = val; | 656 | this.ruleForm.ssQlxx = val; |
657 | this.ruleForm.qlxx.ssywh = val.ssywh; | 657 | this.ruleForm.qlxx.ssywh = val.ywh; |
658 | }, | 658 | }, |
659 | djlxchange(val) { | 659 | djlxchange(val) { |
660 | if (val == null || val == 100) { | 660 | if (val == null || val == 100) { | ... | ... |
... | @@ -405,7 +405,7 @@ export default { | ... | @@ -405,7 +405,7 @@ export default { |
405 | */ | 405 | */ |
406 | ssQlxxchange(val) { | 406 | ssQlxxchange(val) { |
407 | this.ruleForm.ssQlxx = val; | 407 | this.ruleForm.ssQlxx = val; |
408 | this.ruleForm.qlxx.ssywh = val.ssywh; | 408 | this.ruleForm.qlxx.ssywh = val.ywh; |
409 | }, | 409 | }, |
410 | /** | 410 | /** |
411 | * @description: djlxchange | 411 | * @description: djlxchange | ... | ... |
... | @@ -465,7 +465,7 @@ | ... | @@ -465,7 +465,7 @@ |
465 | */ | 465 | */ |
466 | ssQlxxchange (val) { | 466 | ssQlxxchange (val) { |
467 | this.ruleForm.ssQlxx = val; | 467 | this.ruleForm.ssQlxx = val; |
468 | this.ruleForm.qlxx.ssywh = val.ssywh; | 468 | this.ruleForm.qlxx.ssywh = val.ywh; |
469 | }, | 469 | }, |
470 | /** | 470 | /** |
471 | * @description: djlxchange | 471 | * @description: djlxchange | ... | ... |
... | @@ -367,7 +367,7 @@ export default { | ... | @@ -367,7 +367,7 @@ export default { |
367 | */ | 367 | */ |
368 | ssQlxxchange(val) { | 368 | ssQlxxchange(val) { |
369 | this.ruleForm.ssQlxx = val; | 369 | this.ruleForm.ssQlxx = val; |
370 | this.ruleForm.qlxx.ssywh = val.ssywh; | 370 | this.ruleForm.qlxx.ssywh = val.ywh; |
371 | }, | 371 | }, |
372 | /** | 372 | /** |
373 | * @description: djlxchange | 373 | * @description: djlxchange | ... | ... |
... | @@ -422,7 +422,7 @@ export default { | ... | @@ -422,7 +422,7 @@ export default { |
422 | */ | 422 | */ |
423 | ssQlxxchange(val) { | 423 | ssQlxxchange(val) { |
424 | this.ruleForm.ssQlxx = val; | 424 | this.ruleForm.ssQlxx = val; |
425 | this.ruleForm.qlxx.ssywh = val.ssywh; | 425 | this.ruleForm.qlxx.ssywh = val.ywh; |
426 | }, | 426 | }, |
427 | /** | 427 | /** |
428 | * @description: djlxchange | 428 | * @description: djlxchange | ... | ... |
... | @@ -445,7 +445,7 @@ export default { | ... | @@ -445,7 +445,7 @@ export default { |
445 | */ | 445 | */ |
446 | ssQlxxchange(val) { | 446 | ssQlxxchange(val) { |
447 | this.ruleForm.ssQlxx = val; | 447 | this.ruleForm.ssQlxx = val; |
448 | this.ruleForm.qlxx.ssywh = val.ssywh; | 448 | this.ruleForm.qlxx.ssywh = val.ywh; |
449 | }, | 449 | }, |
450 | /** | 450 | /** |
451 | * @description: djlxchange | 451 | * @description: djlxchange | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 09:50:51 | 4 | * @LastEditTime: 2023-07-21 11:23:22 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="edit"> | 7 | <div class="edit"> |
... | @@ -16,14 +16,16 @@ | ... | @@ -16,14 +16,16 @@ |
16 | :style="{ height: lpbContentHight + 'px' }" | 16 | :style="{ height: lpbContentHight + 'px' }" |
17 | v-show="bjztFlag"> | 17 | v-show="bjztFlag"> |
18 | <!-- 楼盘表主体 --> | 18 | <!-- 楼盘表主体 --> |
19 | <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> | 19 | <div class="lp-overview" :style="{ width: lpbContentwidth + 'px','margin-right': formData.onlyShow ? '10px' : 0 }"> |
20 | <lpbContent | 20 | <lpbContent |
21 | ref="lpbContent" | 21 | ref="lpbContent" |
22 | :zrzbsm="formData.bsm" | 22 | :zrzbsm="formData.bsm" |
23 | :onlyShow="formData.onlyShow" | ||
24 | :unitData="formData.unitData" | ||
23 | :key="time"></lpbContent> | 25 | :key="time"></lpbContent> |
24 | </div> | 26 | </div> |
25 | <!-- 右侧图例 --> | 27 | <!-- 右侧图例 --> |
26 | <div class="lp-legend"> | 28 | <div class="lp-legend" v-if="formData.onlyShow"> |
27 | <div class="handleCol"> | 29 | <div class="handleCol"> |
28 | <div class="btn" @click="legendToggle"> | 30 | <div class="btn" @click="legendToggle"> |
29 | <i v-show="!legendToggleFlag" class="el-icon-d-arrow-left"></i> | 31 | <i v-show="!legendToggleFlag" class="el-icon-d-arrow-left"></i> |
... | @@ -182,7 +184,9 @@ | ... | @@ -182,7 +184,9 @@ |
182 | props: { | 184 | props: { |
183 | formData: { | 185 | formData: { |
184 | type: Object, | 186 | type: Object, |
185 | default: {}, | 187 | default: () => { |
188 | return {} | ||
189 | } | ||
186 | }, | 190 | }, |
187 | }, | 191 | }, |
188 | components: { | 192 | components: { |
... | @@ -404,30 +408,30 @@ | ... | @@ -404,30 +408,30 @@ |
404 | } | 408 | } |
405 | } | 409 | } |
406 | }); | 410 | }); |
407 | getLpbQsxtj(this.formData.bsm).then((res) => { | 411 | // getLpbQsxtj(this.formData.bsm).then((res) => { |
408 | if (res.code === 200) { | 412 | // if (res.code === 200) { |
409 | this.qsxList = [ | 413 | // this.qsxList = [ |
410 | { | 414 | // { |
411 | name: "坐落", | 415 | // name: "坐落", |
412 | bsms: res.result.zl.bsms, | 416 | // bsms: res.result.zl.bsms, |
413 | color: "#2591FD", | 417 | // color: "#2591FD", |
414 | ts: res.result.zl.bsms.length, | 418 | // ts: res.result.zl.bsms.length, |
415 | }, | 419 | // }, |
416 | { | 420 | // { |
417 | name: "分层分户图", | 421 | // name: "分层分户图", |
418 | bsms: res.result.fcfht.bsms, | 422 | // bsms: res.result.fcfht.bsms, |
419 | color: "#2591FD", | 423 | // color: "#2591FD", |
420 | ts: res.result.fcfht.bsms.length, | 424 | // ts: res.result.fcfht.bsms.length, |
421 | }, | 425 | // }, |
422 | { | 426 | // { |
423 | name: "室号", | 427 | // name: "室号", |
424 | bsms: res.result.shbw.bsms, | 428 | // bsms: res.result.shbw.bsms, |
425 | color: "#2591FD", | 429 | // color: "#2591FD", |
426 | ts: res.result.shbw.bsms.length, | 430 | // ts: res.result.shbw.bsms.length, |
427 | }, | 431 | // }, |
428 | ]; | 432 | // ]; |
429 | } | 433 | // } |
430 | }); | 434 | // }); |
431 | }, | 435 | }, |
432 | }, | 436 | }, |
433 | computed: {}, | 437 | computed: {}, |
... | @@ -488,7 +492,6 @@ | ... | @@ -488,7 +492,6 @@ |
488 | border: 1px solid rgb(236, 236, 236); | 492 | border: 1px solid rgb(236, 236, 236); |
489 | border-top: 0; | 493 | border-top: 0; |
490 | border-bottom: 0; | 494 | border-bottom: 0; |
491 | margin-right: 10px; | ||
492 | box-sizing: border-box; | 495 | box-sizing: border-box; |
493 | } | 496 | } |
494 | 497 | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | * @Author: yangwei | 2 | * @Author: yangwei |
3 | * @Date: 2023-02-28 15:47:12 | 3 | * @Date: 2023-02-28 15:47:12 |
4 | * @LastEditors: yangwei | 4 | * @LastEditors: yangwei |
5 | * @LastEditTime: 2023-06-16 16:14:51 | 5 | * @LastEditTime: 2023-07-21 14:39:12 |
6 | * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue | 6 | * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue |
7 | * @Description: | 7 | * @Description: |
8 | * | 8 | * |
... | @@ -86,7 +86,8 @@ export default { | ... | @@ -86,7 +86,8 @@ export default { |
86 | openMenu:{value:'openMenu',default:null}, | 86 | openMenu:{value:'openMenu',default:null}, |
87 | selectAll:{value:'selectAll',default:null}, | 87 | selectAll:{value:'selectAll',default:null}, |
88 | changeChoosedObj:{value:'changeChoosedObj',default:null}, | 88 | changeChoosedObj:{value:'changeChoosedObj',default:null}, |
89 | clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null} | 89 | clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null}, |
90 | getBsmList:{value:'getBsmList',default:null} | ||
90 | }, | 91 | }, |
91 | props: { | 92 | props: { |
92 | ch: { | 93 | ch: { |
... | @@ -102,15 +103,31 @@ export default { | ... | @@ -102,15 +103,31 @@ export default { |
102 | hbsmList: [], | 103 | hbsmList: [], |
103 | //选中层bsm合集 | 104 | //选中层bsm合集 |
104 | cbsmList: [], | 105 | cbsmList: [], |
105 | //选中户qszt集合 | ||
106 | hqsztList: [], | ||
107 | //区分单双击事件的定时器 | 106 | //区分单双击事件的定时器 |
108 | time: null, | 107 | time: null, |
109 | // 边框颜色 | 108 | // 边框颜色 |
110 | borderColor:'rgb(230, 230, 230)' | 109 | borderColor:'rgb(230, 230, 230)', |
110 | // 申请单元列表数据 | ||
111 | unitIdList:[] | ||
111 | }; | 112 | }; |
112 | }, | 113 | }, |
113 | mounted() {}, | 114 | mounted() { |
115 | // 根据申请单元列表数据处理选中户 | ||
116 | if(window.unitData.length){ | ||
117 | window.unitData.forEach(e => { | ||
118 | this.unitIdList.push(e.bdcdyid) | ||
119 | }) | ||
120 | this.ch.forEach((c) => { | ||
121 | c.hs.forEach((h) => { | ||
122 | if (h.dyhbsm.indexOf(this.unitIdList) > -1) { | ||
123 | h.select = true; | ||
124 | // 使用hbsmList时,需要去重 | ||
125 | this.hbsmList.push(h.bsm) | ||
126 | } | ||
127 | }); | ||
128 | }); | ||
129 | } | ||
130 | }, | ||
114 | methods: { | 131 | methods: { |
115 | // 层选中事件 | 132 | // 层选中事件 |
116 | /** | 133 | /** |
... | @@ -120,17 +137,24 @@ export default { | ... | @@ -120,17 +137,24 @@ export default { |
120 | * @author: renchao | 137 | * @author: renchao |
121 | */ | 138 | */ |
122 | handleClickC(e, item) { | 139 | handleClickC(e, item) { |
123 | //判断点击的层是否选中 | 140 | // 判断点击的层是否选中 |
124 | // if (e.target.className.indexOf("tdSelect") == -1) { | 141 | if (e.target.className.indexOf("tdSelect") == -1) { |
125 | // //未选中→选中 | 142 | //未选中→选中 |
126 | // e.target.className += " tdSelect"; //加边框 | 143 | item.hs.forEach((h) => { |
127 | // this.cbsmList.push(item.bsm); | 144 | //加边框 |
128 | // } else { | 145 | e.target.className += " tdSelect"; |
129 | // //选中→未选中 | 146 | h.select = true; |
130 | // e.target.className = "floor"; | 147 | // 使用hbsmList时,需要去重 |
131 | // this.cbsmList = this.cbsmList.filter((i) => i != item.bsm); | 148 | this.hbsmList.push(h.bsm) |
132 | // } | 149 | }); |
133 | // this.$parent.getCbsm(this.cbsmList); | 150 | } else { |
151 | //选中→未选中 | ||
152 | item.hs.forEach((h) => { | ||
153 | e.target.className = "floor"; | ||
154 | h.select = false; | ||
155 | this.hbsmList = this.hbsmList.filter((i) => i != h.bsm); | ||
156 | }); | ||
157 | } | ||
134 | }, | 158 | }, |
135 | //户单击事件 | 159 | //户单击事件 |
136 | /** | 160 | /** |
... | @@ -141,6 +165,26 @@ export default { | ... | @@ -141,6 +165,26 @@ export default { |
141 | * @author: renchao | 165 | * @author: renchao |
142 | */ | 166 | */ |
143 | handleClickH(e, bsm, hs) { | 167 | handleClickH(e, bsm, hs) { |
168 | let self = this; | ||
169 | // 开启延时器,200ms的间隔区分单击和双击,解决双击时执行两次单击事件 | ||
170 | clearTimeout(self.time); | ||
171 | self.time = setTimeout(() => { | ||
172 | // this.closeMenu(); | ||
173 | //判断点击的户是否选中 | ||
174 | if (!hs.select) { | ||
175 | //未选中→选中 | ||
176 | //加边框 | ||
177 | hs.select = true; | ||
178 | // 将户bsm放进hbsmList | ||
179 | self.hbsmList.push(bsm); | ||
180 | } else { | ||
181 | //选中→未选中 | ||
182 | hs.select = false; | ||
183 | self.hbsmList = self.hbsmList.filter((i) => i != bsm); | ||
184 | } | ||
185 | //更新当前选中户数据 | ||
186 | this.$forceUpdate(); | ||
187 | }, 200); | ||
144 | }, | 188 | }, |
145 | // 户单元状态点击事件 | 189 | // 户单元状态点击事件 |
146 | /** | 190 | /** |
... | @@ -151,7 +195,7 @@ export default { | ... | @@ -151,7 +195,7 @@ export default { |
151 | * @author: renchao | 195 | * @author: renchao |
152 | */ | 196 | */ |
153 | hDyztClick(e, bsm, hs) { | 197 | hDyztClick(e, bsm, hs) { |
154 | // this.handleClickH(e.target.parentNode, bsm, hs); | 198 | this.handleClickH(e.target.parentNode, bsm, hs); |
155 | }, | 199 | }, |
156 | //户双击事件 | 200 | //户双击事件 |
157 | /** | 201 | /** |
... | @@ -191,21 +235,51 @@ export default { | ... | @@ -191,21 +235,51 @@ export default { |
191 | // item.style.border = `1px solid ${this.borderColor}` | 235 | // item.style.border = `1px solid ${this.borderColor}` |
192 | }); | 236 | }); |
193 | }, | 237 | }, |
238 | //清除选中 | ||
239 | clearChoosed(){ | ||
240 | //清除选中户 | ||
241 | this.zdySelectAll(false) | ||
242 | //清除选中层 | ||
243 | this.cbsmList = []; | ||
244 | this.$refs.cBsm && this.$refs.cBsm.forEach((item)=>{ | ||
245 | item.className = 'floor' | ||
246 | }) | ||
247 | }, | ||
194 | }, | 248 | }, |
195 | watch: { | 249 | watch: { |
196 | selectAll: { | 250 | selectAll: { |
197 | handler(val) { | 251 | handler(val) { |
198 | this.zdySelectAll(val.selectAll); | 252 | this.zdySelectAll(val.selectAll); |
253 | val.cancelChoosed && this.clearChoosed() | ||
199 | }, | 254 | }, |
200 | immediate: true, | 255 | immediate: true, |
201 | deep: true, | 256 | deep: true, |
202 | }, | 257 | }, |
258 | hbsmList(val){ | ||
259 | let list = [] | ||
260 | val.length && val.forEach((i)=>{ | ||
261 | this.ch.forEach((c) => { | ||
262 | c.hs.forEach((h) => { | ||
263 | if (i == h.bsm) { | ||
264 | list.push( | ||
265 | { | ||
266 | bdcdyh:h.bdcdyh, | ||
267 | bsm:h.bsm, | ||
268 | dyhbsm:h.dyhbsm | ||
269 | } | ||
270 | ) | ||
271 | } | ||
272 | }); | ||
273 | }); | ||
274 | }) | ||
275 | this.getBsmList(list) | ||
276 | }, | ||
203 | changeChoosedObj: { | 277 | changeChoosedObj: { |
204 | handler(val) { | 278 | handler(val) { |
205 | //清除选中户 | ||
206 | this.borderColor = 'rgb(230, 230, 230)'; | 279 | this.borderColor = 'rgb(230, 230, 230)'; |
207 | this.zdySelectAll(false,true) | ||
208 | if (val.bsms.length) { | 280 | if (val.bsms.length) { |
281 | //清除选中户 | ||
282 | this.zdySelectAll(false,true) | ||
209 | this.$refs.hBsm.forEach((item) => { | 283 | this.$refs.hBsm.forEach((item) => { |
210 | val.bsms.forEach((i,ind) => { | 284 | val.bsms.forEach((i,ind) => { |
211 | if (item.dataset.bsm == i) { | 285 | if (item.dataset.bsm == i) { |
... | @@ -214,19 +288,17 @@ export default { | ... | @@ -214,19 +288,17 @@ export default { |
214 | window.lpbContent.$refs.lpbContent.scrollTop = item.offsetTop; | 288 | window.lpbContent.$refs.lpbContent.scrollTop = item.offsetTop; |
215 | window.lpbContent.$refs.lpbContent.scrollLeft = item.offsetLeft; | 289 | window.lpbContent.$refs.lpbContent.scrollLeft = item.offsetLeft; |
216 | } | 290 | } |
217 | item.style.border = '1px solid '+ val.color; | 291 | // item.style.border = '1px solid '+ val.color; |
218 | // item.style.backgroundColor = val.color; | 292 | // 背景色高亮 |
293 | item.style.backgroundColor = val.color; | ||
219 | } | 294 | } |
220 | }); | 295 | }); |
221 | }); | 296 | }); |
222 | }else{ | ||
223 | this.borderColor = 'rgb(230, 230, 230)' | ||
224 | } | 297 | } |
225 | |||
226 | }, | 298 | }, |
227 | immediate: true, | 299 | immediate: true, |
228 | deep: true, | 300 | deep: true, |
229 | }, | 301 | } |
230 | }, | 302 | }, |
231 | }; | 303 | }; |
232 | </script> | 304 | </script> | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="lpbContent-wrap" ref="lpbContentWrap"> | 2 | <div class="lpbContent-wrap" ref="lpbContentWrap"> |
3 | <div class="lpbContent" ref="lpbContent"> | 3 | <div class="lpbContent" ref="lpbContent" :style="{ 'height': 'calc(100% - '+ lpbContentHeight +'px)'}"> |
4 | <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 --> | 4 | <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 --> |
5 | <div class="ch-zdy-wrap"> | 5 | <div class="ch-zdy-wrap"> |
6 | <!-- 幢单元 --> | 6 | <!-- 幢单元 --> |
7 | <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" /> | 7 | <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow"/> |
8 | <!-- 独立层户 --> | 8 | <!-- 独立层户 --> |
9 | <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" /> | 9 | <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" /> |
10 | </div> | 10 | </div> |
11 | <!-- 逻辑幢 --> | 11 | <!-- 逻辑幢 --> |
12 | <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" /> | 12 | <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/> |
13 | </div> | 13 | </div> |
14 | <!-- 自然幢名称 --> | 14 | <!-- 自然幢名称 --> |
15 | <p class="lpb-xmmc"> | 15 | <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> |
16 | <!-- <el-checkbox @change="zdySelectAll($event)">{{ | 16 | <el-checkbox @change="zdySelectAll($event)" v-if="!onlyShow">{{ |
17 | lpbData.xmmc | 17 | lpbData.xmmc |
18 | }}</el-checkbox> --> | 18 | }}</el-checkbox> |
19 | {{lpbData.xmmc}} | 19 | <span v-else>{{lpbData.xmmc}}</span> |
20 | </p> | 20 | </p> |
21 | <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button> | ||
21 | <!-- 右键菜单 --> | 22 | <!-- 右键菜单 --> |
22 | <ul | 23 | <ul |
23 | v-show="lpbChVisible" | 24 | v-show="lpbChVisible" |
... | @@ -40,7 +41,8 @@ export default { | ... | @@ -40,7 +41,8 @@ export default { |
40 | openMenu: this.openMenu, | 41 | openMenu: this.openMenu, |
41 | selectAll: this.selectAllObj, | 42 | selectAll: this.selectAllObj, |
42 | changeChoosedObj:this.changeChoosedObj, | 43 | changeChoosedObj:this.changeChoosedObj, |
43 | clearChangeChoosedObj:this.clearChangeChoosedObj | 44 | clearChangeChoosedObj:this.clearChangeChoosedObj, |
45 | getBsmList:this.getBsmList | ||
44 | }; | 46 | }; |
45 | }, | 47 | }, |
46 | name: "", | 48 | name: "", |
... | @@ -58,6 +60,10 @@ export default { | ... | @@ -58,6 +60,10 @@ export default { |
58 | type: Boolean, | 60 | type: Boolean, |
59 | default: true, | 61 | default: true, |
60 | }, | 62 | }, |
63 | onlyShow:{ | ||
64 | type: Boolean, | ||
65 | default: true, | ||
66 | } | ||
61 | }, | 67 | }, |
62 | data() { | 68 | data() { |
63 | return { | 69 | return { |
... | @@ -79,7 +85,9 @@ export default { | ... | @@ -79,7 +85,9 @@ export default { |
79 | changeChoosedObj:{ | 85 | changeChoosedObj:{ |
80 | bsms:[], | 86 | bsms:[], |
81 | color:'' | 87 | color:'' |
82 | } | 88 | }, |
89 | // 选中户bsm合集 | ||
90 | bsmList:[] | ||
83 | }; | 91 | }; |
84 | }, | 92 | }, |
85 | mounted() { | 93 | mounted() { |
... | @@ -87,6 +95,24 @@ export default { | ... | @@ -87,6 +95,24 @@ export default { |
87 | window.lpbContent = this; | 95 | window.lpbContent = this; |
88 | }, | 96 | }, |
89 | methods: { | 97 | methods: { |
98 | /** | ||
99 | * @description: 获取当前楼盘表选中户信息 | ||
100 | * @param {Array} bsmList | ||
101 | * @author: renchao | ||
102 | */ | ||
103 | getBsmList(bsmList){ | ||
104 | this.bsmList = bsmList; | ||
105 | }, | ||
106 | /** | ||
107 | * @description: 保存当前楼盘表 | ||
108 | * @author: renchao | ||
109 | */ | ||
110 | saveLpb(){ | ||
111 | // todo 调用保存接口 传入参数待定 | ||
112 | console.log(this.bsmList,'this.bsmList'); | ||
113 | // 保存成功后关闭弹框 | ||
114 | this.$popupCacel() | ||
115 | }, | ||
90 | // 改变户选中状态 | 116 | // 改变户选中状态 |
91 | /** | 117 | /** |
92 | * @description: 改变户选中状态 | 118 | * @description: 改变户选中状态 |
... | @@ -125,8 +151,8 @@ export default { | ... | @@ -125,8 +151,8 @@ export default { |
125 | getLpb(zrzbsm, scyclx, actual) { | 151 | getLpb(zrzbsm, scyclx, actual) { |
126 | getLpb(zrzbsm, scyclx).then((res) => { | 152 | getLpb(zrzbsm, scyclx).then((res) => { |
127 | if (res.code == 200) { | 153 | if (res.code == 200) { |
128 | res.result.ljzs = res.result.ljzs.sort(this.compare("place")); | 154 | res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); |
129 | this.lpbData = res.result == null ? this.lpbData : res.result; | 155 | this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; |
130 | // this.$nextTick(() => { | 156 | // this.$nextTick(() => { |
131 | // //渲染楼盘表 | 157 | // //渲染楼盘表 |
132 | // this.dataChange(); | 158 | // this.dataChange(); |
... | @@ -182,6 +208,11 @@ export default { | ... | @@ -182,6 +208,11 @@ export default { |
182 | }; | 208 | }; |
183 | }, | 209 | }, |
184 | }, | 210 | }, |
211 | computed:{ | ||
212 | lpbContentHeight(){ | ||
213 | return this.onlyShow ? 36 : 76 | ||
214 | } | ||
215 | }, | ||
185 | watch: { | 216 | watch: { |
186 | //户右键菜单显示时,监听到鼠标点击时关闭户右键菜单 | 217 | //户右键菜单显示时,监听到鼠标点击时关闭户右键菜单 |
187 | lpbChVisible(value) { | 218 | lpbChVisible(value) { |
... | @@ -190,7 +221,7 @@ export default { | ... | @@ -190,7 +221,7 @@ export default { |
190 | } else { | 221 | } else { |
191 | document.body.removeEventListener("click", this.closeMenu); | 222 | document.body.removeEventListener("click", this.closeMenu); |
192 | } | 223 | } |
193 | }, | 224 | } |
194 | }, | 225 | }, |
195 | }; | 226 | }; |
196 | </script> | 227 | </script> |
... | @@ -201,7 +232,6 @@ export default { | ... | @@ -201,7 +232,6 @@ export default { |
201 | overflow: hidden; | 232 | overflow: hidden; |
202 | .lpbContent { | 233 | .lpbContent { |
203 | width: 100%; | 234 | width: 100%; |
204 | height: calc(100% - 36px); | ||
205 | position: relative; | 235 | position: relative; |
206 | overflow: scroll; | 236 | overflow: scroll; |
207 | -webkit-user-select: none; | 237 | -webkit-user-select: none; |
... | @@ -221,6 +251,10 @@ export default { | ... | @@ -221,6 +251,10 @@ export default { |
221 | border: 0; | 251 | border: 0; |
222 | border-top: 1px solid #e6e6e6; | 252 | border-top: 1px solid #e6e6e6; |
223 | } | 253 | } |
254 | .save-btn{ | ||
255 | display: block; | ||
256 | margin: 5px auto; | ||
257 | } | ||
224 | // 自定义右键菜单样式 | 258 | // 自定义右键菜单样式 |
225 | .contextmenu { | 259 | .contextmenu { |
226 | margin: 0; | 260 | margin: 0; | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | * @Author: yangwei | 2 | * @Author: yangwei |
3 | * @Date: 2023-02-28 17:25:45 | 3 | * @Date: 2023-02-28 17:25:45 |
4 | * @LastEditors: yangwei | 4 | * @LastEditors: yangwei |
5 | * @LastEditTime: 2023-07-11 10:05:55 | 5 | * @LastEditTime: 2023-07-21 14:59:46 |
6 | * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue | 6 | * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue |
7 | * @Description: | 7 | * @Description: |
8 | * | 8 | * |
... | @@ -20,11 +20,13 @@ | ... | @@ -20,11 +20,13 @@ |
20 | " | 20 | " |
21 | > | 21 | > |
22 | <!-- 逻辑幢名称 --> | 22 | <!-- 逻辑幢名称 --> |
23 | <p class="lpb-xmmc ljz-xmmc">{{ ljz.ljzmc }}</p> | 23 | <p class="lpb-xmmc ljz-xmmc"> |
24 | <span>{{ljz.ljzmc}}</span> | ||
25 | </p> | ||
24 | <!-- 独立层户 --> | 26 | <!-- 独立层户 --> |
25 | <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" /> | 27 | <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" /> |
26 | <!-- 幢单元 --> | 28 | <!-- 幢单元 --> |
27 | <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" /> | 29 | <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/> |
28 | </div> | 30 | </div> |
29 | </div> | 31 | </div> |
30 | </div> | 32 | </div> |
... | @@ -40,7 +42,7 @@ | ... | @@ -40,7 +42,7 @@ |
40 | <!-- 独立层户 --> | 42 | <!-- 独立层户 --> |
41 | <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" /> | 43 | <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" /> |
42 | <!-- 幢单元 --> | 44 | <!-- 幢单元 --> |
43 | <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" /> | 45 | <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/> |
44 | </div> | 46 | </div> |
45 | </div> | 47 | </div> |
46 | </div> | 48 | </div> |
... | @@ -59,12 +61,15 @@ export default { | ... | @@ -59,12 +61,15 @@ export default { |
59 | return []; | 61 | return []; |
60 | }, | 62 | }, |
61 | }, | 63 | }, |
64 | onlyShow:{ | ||
65 | type: Boolean, | ||
66 | default: true, | ||
67 | } | ||
62 | }, | 68 | }, |
63 | data() { | 69 | data() { |
64 | return { | 70 | return { |
65 | }; | 71 | }; |
66 | }, | 72 | }, |
67 | |||
68 | mounted() { | 73 | mounted() { |
69 | console.log(this.ljzsCptd); | 74 | console.log(this.ljzsCptd); |
70 | }, | 75 | }, | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | * @Author: yangwei | 2 | * @Author: yangwei |
3 | * @Date: 2023-02-28 16:29:04 | 3 | * @Date: 2023-02-28 16:29:04 |
4 | * @LastEditors: yangwei | 4 | * @LastEditors: yangwei |
5 | * @LastEditTime: 2023-06-08 13:58:58 | 5 | * @LastEditTime: 2023-07-21 14:55:30 |
6 | * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue | 6 | * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue |
7 | * @Description: | 7 | * @Description: |
8 | * | 8 | * |
... | @@ -13,10 +13,10 @@ | ... | @@ -13,10 +13,10 @@ |
13 | <div v-for="zdy in realZdys" :key="zdy.bsm"> | 13 | <div v-for="zdy in realZdys" :key="zdy.bsm"> |
14 | <!-- 幢单元名称 --> | 14 | <!-- 幢单元名称 --> |
15 | <p class="lpb-xmmc"> | 15 | <p class="lpb-xmmc"> |
16 | <!-- <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{ | 16 | <el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{ |
17 | zdy.zdymc | 17 | zdy.zdymc |
18 | }}</el-checkbox> --> | 18 | }}</el-checkbox> |
19 | {{zdy.zdymc}} | 19 | <span v-else>aaa{{zdy.zdymc}}</span> |
20 | </p> | 20 | </p> |
21 | <!-- 每个幢单元下的层户 --> | 21 | <!-- 每个幢单元下的层户 --> |
22 | <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> | 22 | <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> |
... | @@ -36,6 +36,10 @@ export default { | ... | @@ -36,6 +36,10 @@ export default { |
36 | return []; | 36 | return []; |
37 | }, | 37 | }, |
38 | }, | 38 | }, |
39 | onlyShow:{ | ||
40 | type: Boolean, | ||
41 | default: true, | ||
42 | } | ||
39 | }, | 43 | }, |
40 | data() { | 44 | data() { |
41 | return {}; | 45 | return {}; | ... | ... |
... | @@ -44,12 +44,12 @@ | ... | @@ -44,12 +44,12 @@ |
44 | </div> | 44 | </div> |
45 | </template> | 45 | </template> |
46 | <script> | 46 | <script> |
47 | import { mapGetters } from "vuex"; | 47 | import { mapGetters } from "vuex"; |
48 | import table from "@/utils/mixin/table"; | 48 | import table from "@/utils/mixin/table"; |
49 | import { datas, sendThis } from "./dydjbdata"; | 49 | import { datas, sendThis } from "./dydjbdata"; |
50 | import addDydjb from "./components/addDydjb.vue"; | 50 | import addDydjb from "./components/addDydjb.vue"; |
51 | import { getSqcxPage } from "@/api/jtfc.js"; | 51 | import { getSqcxPage } from "@/api/jtfc.js"; |
52 | export default { | 52 | export default { |
53 | name: "dydjb", | 53 | name: "dydjb", |
54 | components: { addDydjb }, | 54 | components: { addDydjb }, |
55 | mixins: [table], | 55 | mixins: [table], |
... | @@ -76,6 +76,9 @@ export default { | ... | @@ -76,6 +76,9 @@ export default { |
76 | }, | 76 | }, |
77 | }; | 77 | }; |
78 | }, | 78 | }, |
79 | activated () { | ||
80 | this.queryClick(); | ||
81 | }, | ||
79 | methods: { | 82 | methods: { |
80 | // 初始化数据 | 83 | // 初始化数据 |
81 | /** | 84 | /** |
... | @@ -121,8 +124,8 @@ export default { | ... | @@ -121,8 +124,8 @@ export default { |
121 | this.sqcxBsm = '' | 124 | this.sqcxBsm = '' |
122 | } | 125 | } |
123 | }, | 126 | }, |
124 | }; | 127 | }; |
125 | </script> | 128 | </script> |
126 | <style scoped lang="scss"> | 129 | <style scoped lang="scss"> |
127 | @import "~@/styles/public.scss"; | 130 | @import "~@/styles/public.scss"; |
128 | </style> | 131 | </style> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-06-28 14:45:20 | 4 | * @LastEditTime: 2023-07-24 11:27:00 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -70,6 +70,9 @@ | ... | @@ -70,6 +70,9 @@ |
70 | }, | 70 | }, |
71 | }; | 71 | }; |
72 | }, | 72 | }, |
73 | activated () { | ||
74 | this.queryClick(); | ||
75 | }, | ||
73 | methods: { | 76 | methods: { |
74 | // 初始化数据 | 77 | // 初始化数据 |
75 | queryClick () { | 78 | queryClick () { | ... | ... |
... | @@ -36,14 +36,14 @@ | ... | @@ -36,14 +36,14 @@ |
36 | <el-row> | 36 | <el-row> |
37 | <el-col :span="6"> | 37 | <el-col :span="6"> |
38 | <el-form-item label="开始日期" class="marginbtm0"> | 38 | <el-form-item label="开始日期" class="marginbtm0"> |
39 | <el-date-picker class="width100" v-model="queryForm.sqr" type="date" placeholder="开始日期" | 39 | <el-date-picker class="width100" v-model="queryForm.kssj" type="date" placeholder="开始日期" |
40 | value-format="yyyy-MM-dd" clearable> | 40 | value-format="yyyy-MM-dd" clearable> |
41 | </el-date-picker> | 41 | </el-date-picker> |
42 | </el-form-item> | 42 | </el-form-item> |
43 | </el-col> | 43 | </el-col> |
44 | <el-col :span="6"> | 44 | <el-col :span="6"> |
45 | <el-form-item label="结束日期" class="marginbtm0"> | 45 | <el-form-item label="结束日期" class="marginbtm0"> |
46 | <el-date-picker class="width100" v-model="queryForm.sqr" type="date" placeholder="结束日期" | 46 | <el-date-picker class="width100" v-model="queryForm.jssj" type="date" placeholder="结束日期" |
47 | value-format="yyyy-MM-dd" clearable> | 47 | value-format="yyyy-MM-dd" clearable> |
48 | </el-date-picker> | 48 | </el-date-picker> |
49 | </el-form-item> | 49 | </el-form-item> |
... | @@ -67,10 +67,10 @@ | ... | @@ -67,10 +67,10 @@ |
67 | </div> | 67 | </div> |
68 | </template> | 68 | </template> |
69 | <script> | 69 | <script> |
70 | import table from "@/utils/mixin/table"; | 70 | import table from "@/utils/mixin/table"; |
71 | import { datas, sendThis } from "./sqcxjldata"; | 71 | import { datas, sendThis } from "./sqcxjldata"; |
72 | import { getSqcxPage } from "@/api/jtfc.js"; | 72 | import { getSqcxPage } from "@/api/jtfc.js"; |
73 | export default { | 73 | export default { |
74 | name: "sqcxjl", | 74 | name: "sqcxjl", |
75 | mixins: [table], | 75 | mixins: [table], |
76 | mounted () { | 76 | mounted () { |
... | @@ -90,6 +90,9 @@ export default { | ... | @@ -90,6 +90,9 @@ export default { |
90 | }, | 90 | }, |
91 | }; | 91 | }; |
92 | }, | 92 | }, |
93 | activated () { | ||
94 | this.queryClick(); | ||
95 | }, | ||
93 | methods: { | 96 | methods: { |
94 | // 初始化数据 | 97 | // 初始化数据 |
95 | /** | 98 | /** |
... | @@ -128,12 +131,12 @@ export default { | ... | @@ -128,12 +131,12 @@ export default { |
128 | }) | 131 | }) |
129 | } | 132 | } |
130 | } | 133 | } |
131 | } | 134 | } |
132 | </script> | 135 | </script> |
133 | <style scoped lang="scss"> | 136 | <style scoped lang="scss"> |
134 | @import "~@/styles/public.scss"; | 137 | @import "~@/styles/public.scss"; |
135 | 138 | ||
136 | .marginbtm0 { | 139 | .marginbtm0 { |
137 | margin-bottom: 0 | 140 | margin-bottom: 0; |
138 | } | 141 | } |
139 | </style> | 142 | </style> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-13 16:31:56 | 4 | * @LastEditTime: 2023-07-24 14:09:53 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -69,6 +69,9 @@ | ... | @@ -69,6 +69,9 @@ |
69 | } | 69 | } |
70 | } | 70 | } |
71 | }, | 71 | }, |
72 | activated () { | ||
73 | this.queryClick() | ||
74 | }, | ||
72 | methods: { | 75 | methods: { |
73 | // 初始化数据 | 76 | // 初始化数据 |
74 | /** | 77 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 16:04:47 | 4 | * @LastEditTime: 2023-07-24 14:12:17 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -46,6 +46,9 @@ | ... | @@ -46,6 +46,9 @@ |
46 | sendThis(this); | 46 | sendThis(this); |
47 | this.queryClick() | 47 | this.queryClick() |
48 | }, | 48 | }, |
49 | activated () { | ||
50 | this.queryClick() | ||
51 | }, | ||
49 | data () { | 52 | data () { |
50 | return { | 53 | return { |
51 | isDialog: false, | 54 | isDialog: false, | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 14:09:29 | 4 | * @LastEditTime: 2023-07-24 14:11:31 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -63,6 +63,9 @@ | ... | @@ -63,6 +63,9 @@ |
63 | bsmMb: '' | 63 | bsmMb: '' |
64 | } | 64 | } |
65 | }, | 65 | }, |
66 | activated () { | ||
67 | this.queryClick() | ||
68 | }, | ||
66 | methods: { | 69 | methods: { |
67 | // 初始化数据 | 70 | // 初始化数据 |
68 | /** | 71 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 14:11:05 | 4 | * @LastEditTime: 2023-07-24 09:47:54 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div> | 7 | <div> |
... | @@ -364,7 +364,12 @@ | ... | @@ -364,7 +364,12 @@ |
364 | height: 75vh; | 364 | height: 75vh; |
365 | overflow-y: scroll; | 365 | overflow-y: scroll; |
366 | } | 366 | } |
367 | 367 | /deep/.el-radio__label { | |
368 | display: inline-block !important; | ||
369 | } | ||
370 | /deep/.el-radio { | ||
371 | margin-right: 5px; | ||
372 | } | ||
368 | .el-radio-group { | 373 | .el-radio-group { |
369 | white-space: nowrap; | 374 | white-space: nowrap; |
370 | } | 375 | } | ... | ... |
... | @@ -47,7 +47,7 @@ | ... | @@ -47,7 +47,7 @@ |
47 | import { datas, sendThis } from "./sqywgzdata"; | 47 | import { datas, sendThis } from "./sqywgzdata"; |
48 | import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/sysSqdjyw.js"; | 48 | import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/sysSqdjyw.js"; |
49 | export default { | 49 | export default { |
50 | name: "djbcx", | 50 | name: "sqywgz", |
51 | components: { | 51 | components: { |
52 | editDialog, | 52 | editDialog, |
53 | componentDialog, | 53 | componentDialog, |
... | @@ -57,6 +57,9 @@ | ... | @@ -57,6 +57,9 @@ |
57 | sendThis(this); | 57 | sendThis(this); |
58 | this.queryClick(); | 58 | this.queryClick(); |
59 | }, | 59 | }, |
60 | activated () { | ||
61 | this.queryClick() | ||
62 | }, | ||
60 | data () { | 63 | data () { |
61 | return { | 64 | return { |
62 | qllxmc: "", | 65 | qllxmc: "", | ... | ... |
... | @@ -37,11 +37,11 @@ | ... | @@ -37,11 +37,11 @@ |
37 | </div> | 37 | </div> |
38 | </template> | 38 | </template> |
39 | <script> | 39 | <script> |
40 | import table from "@/utils/mixin/table"; | 40 | import table from "@/utils/mixin/table"; |
41 | import { datas, sendThis } from "./xttzdata"; | 41 | import { datas, sendThis } from "./xttzdata"; |
42 | import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/sysNotice.js" | 42 | import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/sysNotice.js" |
43 | import addDialog from "./components/addDialog.vue"; | 43 | import addDialog from "./components/addDialog.vue"; |
44 | export default { | 44 | export default { |
45 | name: "xttz", | 45 | name: "xttz", |
46 | components: { addDialog }, | 46 | components: { addDialog }, |
47 | mixins: [table], | 47 | mixins: [table], |
... | @@ -49,6 +49,9 @@ export default { | ... | @@ -49,6 +49,9 @@ export default { |
49 | sendThis(this); | 49 | sendThis(this); |
50 | this.queryClick() | 50 | this.queryClick() |
51 | }, | 51 | }, |
52 | activated () { | ||
53 | this.queryClick() | ||
54 | }, | ||
52 | data () { | 55 | data () { |
53 | return { | 56 | return { |
54 | isDialog: false, | 57 | isDialog: false, |
... | @@ -180,8 +183,8 @@ export default { | ... | @@ -180,8 +183,8 @@ export default { |
180 | window.open(href, '_blank'); | 183 | window.open(href, '_blank'); |
181 | } | 184 | } |
182 | }, | 185 | }, |
183 | }; | 186 | }; |
184 | </script> | 187 | </script> |
185 | <style scoped lang="scss"> | 188 | <style scoped lang="scss"> |
186 | @import "~@/styles/public.scss"; | 189 | @import "~@/styles/public.scss"; |
187 | </style> | 190 | </style> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-05 09:55:42 | 4 | * @LastEditTime: 2023-07-24 08:53:26 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="clxx"> | 7 | <div class="clxx"> |
... | @@ -69,8 +69,8 @@ | ... | @@ -69,8 +69,8 @@ |
69 | created () { | 69 | created () { |
70 | this.clmlInitList(1) | 70 | this.clmlInitList(1) |
71 | }, | 71 | }, |
72 | mounted() { | 72 | mounted () { |
73 | this.ableOperation=this.$parent.ableOperation | 73 | this.ableOperation = this.$parent.ableOperation |
74 | }, | 74 | }, |
75 | methods: { | 75 | methods: { |
76 | // 自动预览 | 76 | // 自动预览 |
... | @@ -151,7 +151,7 @@ | ... | @@ -151,7 +151,7 @@ |
151 | */ | 151 | */ |
152 | updateList (val) { | 152 | updateList (val) { |
153 | let that = this | 153 | let that = this |
154 | if (val.children.length != []) { //删除最后一张图片时 val=null | 154 | if (val.children.length != 0) { //删除最后一张图片时 val=null |
155 | this.tableData.forEach(item => { | 155 | this.tableData.forEach(item => { |
156 | if (item.bsmSj === val.bsmSj) { | 156 | if (item.bsmSj === val.bsmSj) { |
157 | item.children = val.children | 157 | item.children = val.children | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-05-18 10:53:49 | 4 | * @LastEditTime: 2023-07-24 10:22:41 |
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"> |
... | @@ -123,6 +123,9 @@ | ... | @@ -123,6 +123,9 @@ |
123 | getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => { | 123 | getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => { |
124 | if (res.code === 200) { | 124 | if (res.code === 200) { |
125 | this.tableData.data = res.result.list; | 125 | this.tableData.data = res.result.list; |
126 | if(this.tableData.data.length>0) { | ||
127 | this.ruleForm.lzrxm = this.tableData.data[0].qlr | ||
128 | } | ||
126 | this.ruleForm.fzrmc = res.result.fzrmc | 129 | this.ruleForm.fzrmc = res.result.fzrmc |
127 | this.ruleForm.fzsj = res.result.fzsj | 130 | this.ruleForm.fzsj = res.result.fzsj |
128 | this.ruleForm.fzsl = res.result.fzsl | 131 | this.ruleForm.fzsl = res.result.fzsl |
... | @@ -151,12 +154,13 @@ | ... | @@ -151,12 +154,13 @@ |
151 | * @author: renchao | 154 | * @author: renchao |
152 | */ | 155 | */ |
153 | handleSubmit () { | 156 | handleSubmit () { |
154 | |||
155 | this.$refs.ruleForm.validate(valid => { | 157 | this.$refs.ruleForm.validate(valid => { |
156 | if (valid) { | 158 | if (valid) { |
157 | issueCertificate(this.ruleForm).then(res => { | 159 | issueCertificate(this.ruleForm).then(res => { |
158 | if (res.code == 200) { | 160 | if (res.code == 200) { |
159 | this.$message.success('保存成功'); | 161 | this.$message.success('保存成功'); |
162 | //刷新列表 | ||
163 | store.dispatch('user/refreshPage', true) | ||
160 | this.$popupCacel() | 164 | this.$popupCacel() |
161 | } else { | 165 | } else { |
162 | this.$message.error(res.message) | 166 | this.$message.error(res.message) | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-普通 | 2 | * @Description: workFrame左侧菜单列表-普通 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-20 15:37:33 | 4 | * @LastEditTime: 2023-07-24 14:14:01 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
... | @@ -92,6 +92,7 @@ | ... | @@ -92,6 +92,7 @@ |
92 | leftMenu(formdata).then((res) => { | 92 | leftMenu(formdata).then((res) => { |
93 | if (res.code === 200 && res.result) { | 93 | if (res.code === 200 && res.result) { |
94 | this.unitData = res.result; | 94 | this.unitData = res.result; |
95 | window.unitData = res.result; | ||
95 | this.currentSelectProps = res.result[0]; | 96 | this.currentSelectProps = res.result[0]; |
96 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | 97 | this.$emit('getCurrentSelectProps', this.currentSelectProps); |
97 | this.judgeBatchShow(); | 98 | this.judgeBatchShow(); |
... | @@ -176,6 +177,7 @@ | ... | @@ -176,6 +177,7 @@ |
176 | * @author: renchao | 177 | * @author: renchao |
177 | */ | 178 | */ |
178 | batchUnitClick () { | 179 | batchUnitClick () { |
180 | debugger | ||
179 | this.currentSelectProps.batchOperation = true; | 181 | this.currentSelectProps.batchOperation = true; |
180 | // this.activeIndex = "-1"; | 182 | // this.activeIndex = "-1"; |
181 | this.$parent.stepForm(0); | 183 | this.$parent.stepForm(0); | ... | ... |
... | @@ -15,13 +15,14 @@ | ... | @@ -15,13 +15,14 @@ |
15 | placeholder="请输入终止原因" | 15 | placeholder="请输入终止原因" |
16 | type="textarea" | 16 | type="textarea" |
17 | :rows="4"></el-input> | 17 | :rows="4"></el-input> |
18 | <el-button style="float: right">取消</el-button> | 18 | <el-button style="float: right" @click="cancelBack">取消</el-button> |
19 | <el-button type="primary" @click="onSubmit" style="float: right">退件</el-button> | 19 | <el-button type="primary" @click="onSubmit" style="float: right">退件</el-button> |
20 | </div> | 20 | </div> |
21 | </template> | 21 | </template> |
22 | 22 | ||
23 | <script> | 23 | <script> |
24 | import { stopTask } from "@/api/workFlow.js"; | 24 | import { stopTask } from "@/api/workFlow.js"; |
25 | import { popupCacel } from "@/utils/popup.js"; | ||
25 | export default { | 26 | export default { |
26 | props: { | 27 | props: { |
27 | formData: { | 28 | formData: { |
... | @@ -58,6 +59,13 @@ | ... | @@ -58,6 +59,13 @@ |
58 | }, 1000); | 59 | }, 1000); |
59 | }); | 60 | }); |
60 | }, | 61 | }, |
62 | /** | ||
63 | * @description: closeDialog | ||
64 | * @author: renchao | ||
65 | */ | ||
66 | cancelBack() { | ||
67 | popupCacel(); | ||
68 | }, | ||
61 | }, | 69 | }, |
62 | }; | 70 | }; |
63 | </script> | 71 | </script> | ... | ... |
... | @@ -20,13 +20,19 @@ | ... | @@ -20,13 +20,19 @@ |
20 | 此环节为流程最后环节,转出后流程将结束 | 20 | 此环节为流程最后环节,转出后流程将结束 |
21 | </el-form-item> | 21 | </el-form-item> |
22 | </el-form> | 22 | </el-form> |
23 | <div class="invalid-reson">转出原因:</div> | 23 | <div class="invalid-reson">审批意见:</div> |
24 | <el-input | 24 | <el-input |
25 | class="opinion" | ||
25 | v-model="shyj" | 26 | v-model="shyj" |
26 | placeholder="请输入转出原因" | 27 | placeholder="请输入审批意见" |
27 | type="textarea" | 28 | type="textarea" |
28 | :rows="4" | 29 | :rows="4" |
29 | ></el-input> | 30 | ></el-input> |
31 | <!-- <el-button | ||
32 | class="opinion_btn" | ||
33 | @click="commonOpinion" | ||
34 | >常用意见</el-button | ||
35 | > --> | ||
30 | <el-button style="float: right" @click="cancelBack">取消转出</el-button> | 36 | <el-button style="float: right" @click="cancelBack">取消转出</el-button> |
31 | <el-button type="primary" @click="submitForm" style="float: right" | 37 | <el-button type="primary" @click="submitForm" style="float: right" |
32 | >确定转出</el-button | 38 | >确定转出</el-button |
... | @@ -38,36 +44,59 @@ | ... | @@ -38,36 +44,59 @@ |
38 | <script> | 44 | <script> |
39 | import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"; | 45 | import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"; |
40 | import { popupCacel } from "@/utils/popup.js"; | 46 | import { popupCacel } from "@/utils/popup.js"; |
47 | import { mapGetters } from 'vuex' | ||
41 | export default { | 48 | export default { |
42 | components: {}, | 49 | components: {}, |
50 | |||
43 | props: { | 51 | props: { |
44 | formData: { | 52 | formData: { |
45 | type: Object, | 53 | type: Object, |
46 | default: {}, | 54 | default: {}, |
47 | }, | 55 | }, |
48 | }, | 56 | }, |
57 | computed: { | ||
58 | ...mapGetters(['yjsqOptions']) | ||
59 | }, | ||
49 | data() { | 60 | data() { |
50 | return { | 61 | return { |
51 | queryForm: {}, | 62 | queryForm: {}, |
52 | shyj: "", | 63 | shyj: "", |
53 | }; | 64 | }; |
54 | }, | 65 | }, |
66 | |||
67 | watch: { | ||
68 | // yjsqOptions: { | ||
69 | // handler (val) { | ||
70 | // if(val){ | ||
71 | // this.shyj = val | ||
72 | // } | ||
73 | |||
74 | // }, | ||
75 | // }, | ||
76 | }, | ||
55 | mounted() { | 77 | mounted() { |
56 | // this.queryForm= this.queryForm.obj | 78 | // this.queryForm= this.queryForm.obj |
57 | console.log("formDataformDataformData", this.formData); | ||
58 | }, | 79 | }, |
59 | methods: { | 80 | methods: { |
60 | /** | 81 | /** |
61 | * @description: submitForm | 82 | * @description: submitForm |
62 | * @author: renchao | 83 | * @author: renchao |
63 | */ | 84 | */ |
85 | commonOpinion() { | ||
86 | this.$popupDialog( | ||
87 | "常用意见", | ||
88 | "workflow/components/dialog/commonOpinion", | ||
89 | {}, | ||
90 | "70%", | ||
91 | true | ||
92 | ); | ||
93 | }, | ||
64 | submitForm() { | 94 | submitForm() { |
65 | this.queryForm = { | 95 | this.queryForm = { |
66 | bsmSlsq: this.formData.bsmSlsq, | 96 | bsmSlsq: this.formData.bsmSlsq, |
67 | shyj: this.shyj, | 97 | shyj: this.shyj, |
68 | stepform: JSON.stringify(this.formData.tabList), | 98 | stepform: JSON.stringify(this.formData.tabList), |
69 | }; | 99 | }; |
70 | console.log("this.queryForm", this.queryForm); | ||
71 | completeTask(this.queryForm).then((res) => { | 100 | completeTask(this.queryForm).then((res) => { |
72 | if (res.code === 200) { | 101 | if (res.code === 200) { |
73 | this.$message.success("转件成功"); | 102 | this.$message.success("转件成功"); |
... | @@ -88,11 +117,12 @@ export default { | ... | @@ -88,11 +117,12 @@ export default { |
88 | window.close(); | 117 | window.close(); |
89 | this.$emit("input", false); | 118 | this.$emit("input", false); |
90 | }, 1000); | 119 | }, 1000); |
91 | }else{ | 120 | } else { |
92 | this.$message.error(res.message); | 121 | this.$message.error(res.message); |
93 | } | 122 | } |
94 | }); | 123 | }); |
95 | }, | 124 | }, |
125 | |||
96 | /** | 126 | /** |
97 | * @description: closeDialog | 127 | * @description: closeDialog |
98 | * @author: renchao | 128 | * @author: renchao |
... | @@ -109,4 +139,17 @@ export default { | ... | @@ -109,4 +139,17 @@ export default { |
109 | margin-top: 20px; | 139 | margin-top: 20px; |
110 | margin-right: 10px; | 140 | margin-right: 10px; |
111 | } | 141 | } |
142 | |||
143 | .opinion { | ||
144 | position: relative; | ||
145 | font-size: 14px; | ||
146 | |||
147 | |||
148 | } | ||
149 | |||
150 | .opinion_btn { | ||
151 | position: absolute; | ||
152 | right: 35px; | ||
153 | bottom: 80px; | ||
154 | } | ||
112 | </style> | 155 | </style> | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-05-17 10:38:57 | 4 | * @LastEditTime: 2023-07-24 10:24:48 |
5 | */ | 5 | */ |
6 | import filter from '@/utils/filter.js' | 6 | import filter from '@/utils/filter.js' |
7 | let vm = null | 7 | let vm = null |
... | @@ -23,8 +23,13 @@ class data extends filter { | ... | @@ -23,8 +23,13 @@ class data extends filter { |
23 | width: '50' | 23 | width: '50' |
24 | }, | 24 | }, |
25 | { | 25 | { |
26 | prop: "fzrmc", | ||
27 | label: "发证人" | ||
28 | }, | ||
29 | { | ||
26 | prop: "bdcqzlx", | 30 | prop: "bdcqzlx", |
27 | label: "不动产权证类型", | 31 | label: "不动产权证类型", |
32 | width: '130', | ||
28 | render: (h, scope) => { | 33 | render: (h, scope) => { |
29 | return ( | 34 | return ( |
30 | <div> | 35 | <div> | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-21 13:45:48 | 4 | * @LastEditTime: 2023-07-24 14:14:22 |
5 | */ | 5 | */ |
6 | import { getPrintTemplateByCode } from "@/api/print"; | 6 | import { getPrintTemplateByCode } from "@/api/print"; |
7 | import { uploadUndo } from "@/api/clxx"; | 7 | import { uploadUndo } from "@/api/clxx"; |
... | @@ -155,7 +155,9 @@ export default { | ... | @@ -155,7 +155,9 @@ export default { |
155 | getZrzbsmList(this.bsmSlsq).then((res) => { | 155 | getZrzbsmList(this.bsmSlsq).then((res) => { |
156 | if (res.code === 200) { | 156 | if (res.code === 200) { |
157 | this.$popupDialog('楼盘表', 'lpb/index', { | 157 | this.$popupDialog('楼盘表', 'lpb/index', { |
158 | bsm: res.result[0] | 158 | bsm: res.result[0], |
159 | onlyShow:false, | ||
160 | unitData:window.unitData | ||
159 | }, '90%', true) | 161 | }, '90%', true) |
160 | } else { | 162 | } else { |
161 | this.$message.error(res.message) | 163 | this.$message.error(res.message) | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-05-24 15:31:00 | 4 | * @LastEditTime: 2023-07-24 09:39:34 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="container"> | 7 | <div class="container"> |
... | @@ -159,7 +159,12 @@ | ... | @@ -159,7 +159,12 @@ |
159 | //获取单元对应的所有表单信息 | 159 | //获取单元对应的所有表单信息 |
160 | this.tabList = res.result; | 160 | this.tabList = res.result; |
161 | //默认加载第一个表单信息 | 161 | //默认加载第一个表单信息 |
162 | let arr = res.result.filter(item => item.defaultForm) | ||
163 | if (arr.length > 0) { | ||
164 | this.tabName = arr[0].value; | ||
165 | } else { | ||
162 | this.tabName = res.result[0].value; | 166 | this.tabName = res.result[0].value; |
167 | } | ||
163 | this.ableOperation = this.tabList[0].ableOperation | 168 | this.ableOperation = this.tabList[0].ableOperation |
164 | //批量操作无分屏按钮 | 169 | //批量操作无分屏按钮 |
165 | if (index != null) { | 170 | if (index != null) { | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-05-17 10:42:49 | 4 | * @LastEditTime: 2023-07-24 11:25:15 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -106,7 +106,6 @@ | ... | @@ -106,7 +106,6 @@ |
106 | import { datas, sendThis } from "./dbxdata"; | 106 | import { datas, sendThis } from "./dbxdata"; |
107 | import { searchTaskToDo } from "@/api/workflow/search.js"; | 107 | import { searchTaskToDo } from "@/api/workflow/search.js"; |
108 | import { judgeUserTaskPermission, deleteFlow, claimTask } from "@/api/workFlow.js"; | 108 | import { judgeUserTaskPermission, deleteFlow, claimTask } from "@/api/workFlow.js"; |
109 | import { log } from 'bpmn-js-token-simulation'; | ||
110 | export default { | 109 | export default { |
111 | name: "dbx", | 110 | name: "dbx", |
112 | components: { searchBox }, | 111 | components: { searchBox }, |
... | @@ -144,6 +143,9 @@ | ... | @@ -144,6 +143,9 @@ |
144 | immediate: true, | 143 | immediate: true, |
145 | }, | 144 | }, |
146 | }, | 145 | }, |
146 | activated () { | ||
147 | this.queryClick(); | ||
148 | }, | ||
147 | methods: { | 149 | methods: { |
148 | // 列表渲染接口 | 150 | // 列表渲染接口 |
149 | /** | 151 | /** |
... | @@ -225,7 +227,7 @@ | ... | @@ -225,7 +227,7 @@ |
225 | if (res.code == 200) { | 227 | if (res.code == 200) { |
226 | if (res.result) { | 228 | if (res.result) { |
227 | //有任务权限 | 229 | //有任务权限 |
228 | if(item.sjlx=="3"){ | 230 | if (item.sjlx == "3") { |
229 | const { href } = this.$router.resolve( | 231 | const { href } = this.$router.resolve( |
230 | "/djbworkFrame?bsmSlsq=" + | 232 | "/djbworkFrame?bsmSlsq=" + |
231 | item.bsmSlsq + | 233 | item.bsmSlsq + |
... | @@ -236,7 +238,7 @@ | ... | @@ -236,7 +238,7 @@ |
236 | item.djywbm | 238 | item.djywbm |
237 | ); | 239 | ); |
238 | window.open(href, `djbworkFrame${item.bsmSlsq}`); | 240 | window.open(href, `djbworkFrame${item.bsmSlsq}`); |
239 | }else{ | 241 | } else { |
240 | const { href } = this.$router.resolve( | 242 | const { href } = this.$router.resolve( |
241 | "/workFrame?bsmSlsq=" + | 243 | "/workFrame?bsmSlsq=" + |
242 | item.bsmSlsq + | 244 | item.bsmSlsq + | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 14:38:31 | 4 | * @LastEditTime: 2023-07-24 11:26:06 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -166,6 +166,9 @@ | ... | @@ -166,6 +166,9 @@ |
166 | }, | 166 | }, |
167 | }; | 167 | }; |
168 | }, | 168 | }, |
169 | activated () { | ||
170 | this.queryClick(); | ||
171 | }, | ||
169 | methods: { | 172 | methods: { |
170 | // 列表渲染接口 | 173 | // 列表渲染接口 |
171 | /** | 174 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 13:59:35 | 4 | * @LastEditTime: 2023-07-24 14:04:15 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -137,11 +137,14 @@ | ... | @@ -137,11 +137,14 @@ |
137 | }, | 137 | }, |
138 | qllxs: [], | 138 | qllxs: [], |
139 | isDialog: false, | 139 | isDialog: false, |
140 | djbxxData: {}, | 140 | djbxxData: {} |
141 | }; | 141 | } |
142 | }, | 142 | }, |
143 | computed: { | 143 | computed: { |
144 | ...mapGetters(["dictData"]), | 144 | ...mapGetters(["dictData"]) |
145 | }, | ||
146 | activated () { | ||
147 | this.queryClick() | ||
145 | }, | 148 | }, |
146 | methods: { | 149 | methods: { |
147 | // 初始化数据 | 150 | // 初始化数据 | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 13:59:55 | 4 | * @LastEditTime: 2023-07-24 14:02:07 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -110,6 +110,9 @@ | ... | @@ -110,6 +110,9 @@ |
110 | } | 110 | } |
111 | } | 111 | } |
112 | }, | 112 | }, |
113 | activated () { | ||
114 | this.queryClick() | ||
115 | }, | ||
113 | methods: { | 116 | methods: { |
114 | // 初始化数据 | 117 | // 初始化数据 |
115 | /** | 118 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 14:00:03 | 4 | * @LastEditTime: 2023-07-24 14:04:47 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -78,6 +78,9 @@ | ... | @@ -78,6 +78,9 @@ |
78 | } | 78 | } |
79 | } | 79 | } |
80 | }, | 80 | }, |
81 | activated () { | ||
82 | this.queryClick() | ||
83 | }, | ||
81 | methods: { | 84 | methods: { |
82 | // 初始化数据 | 85 | // 初始化数据 |
83 | /** | 86 | /** |
... | @@ -116,13 +119,10 @@ | ... | @@ -116,13 +119,10 @@ |
116 | * @author: renchao | 119 | * @author: renchao |
117 | */ | 120 | */ |
118 | openlpbClick (scope) { | 121 | openlpbClick (scope) { |
119 | this.$popup('楼盘表', 'lpb/index', { | 122 | this.$popupDialog('楼盘表', 'lpb/index', { |
120 | width: '90%', | 123 | bsm: scope.row.bsm, |
121 | height: "92%", | 124 | onlyShow: true |
122 | formData: { | 125 | }, '90%', true) |
123 | bsm: scope.row.bsm | ||
124 | } | ||
125 | }) | ||
126 | } | 126 | } |
127 | } | 127 | } |
128 | } | 128 | } | ... | ... |
... | @@ -58,7 +58,7 @@ | ... | @@ -58,7 +58,7 @@ |
58 | import { getBdcqzReceiveList } from "@/api/search.js" | 58 | import { getBdcqzReceiveList } from "@/api/search.js" |
59 | import { bdcqzPreview } from "@/api/bdcqz.js" | 59 | import { bdcqzPreview } from "@/api/bdcqz.js" |
60 | export default { | 60 | export default { |
61 | components: {}, | 61 | name: "zslqcx", |
62 | mixins: [table], | 62 | mixins: [table], |
63 | mounted () { | 63 | mounted () { |
64 | sendThis(this); | 64 | sendThis(this); |
... | @@ -79,6 +79,9 @@ | ... | @@ -79,6 +79,9 @@ |
79 | }, | 79 | }, |
80 | }; | 80 | }; |
81 | }, | 81 | }, |
82 | activated () { | ||
83 | this.queryClick(); | ||
84 | }, | ||
82 | methods: { | 85 | methods: { |
83 | // 查询 | 86 | // 查询 |
84 | /** | 87 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-06-19 13:32:04 | 4 | * @LastEditTime: 2023-07-24 14:07:02 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -50,7 +50,7 @@ | ... | @@ -50,7 +50,7 @@ |
50 | import { datas, sendThis } from "./zxgcdycx"; | 50 | import { datas, sendThis } from "./zxgcdycx"; |
51 | import { getZjgcdyList } from "@/api/search.js" | 51 | import { getZjgcdyList } from "@/api/search.js" |
52 | export default { | 52 | export default { |
53 | components: {}, | 53 | name: "zxgcdycx", |
54 | mixins: [table], | 54 | mixins: [table], |
55 | mounted () { | 55 | mounted () { |
56 | sendThis(this); | 56 | sendThis(this); |
... | @@ -69,6 +69,9 @@ | ... | @@ -69,6 +69,9 @@ |
69 | }, | 69 | }, |
70 | }; | 70 | }; |
71 | }, | 71 | }, |
72 | activated () { | ||
73 | this.queryClick() | ||
74 | }, | ||
72 | methods: { | 75 | methods: { |
73 | // 查询 | 76 | // 查询 |
74 | /** | 77 | /** | ... | ... |
... | @@ -44,15 +44,18 @@ | ... | @@ -44,15 +44,18 @@ |
44 | </div> | 44 | </div> |
45 | </template> | 45 | </template> |
46 | <script> | 46 | <script> |
47 | import table from "@/utils/mixin/table"; | 47 | import table from "@/utils/mixin/table"; |
48 | import { datas, sendThis } from "./zsffdata"; | 48 | import { datas, sendThis } from "./zsffdata"; |
49 | import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js" | 49 | import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js" |
50 | export default { | 50 | export default { |
51 | name: "zsff", | 51 | name: "zsff", |
52 | mixins: [table], | 52 | mixins: [table], |
53 | mounted () { | 53 | mounted () { |
54 | sendThis(this); | 54 | sendThis(this); |
55 | }, | 55 | }, |
56 | activated () { | ||
57 | this.queryClick() | ||
58 | }, | ||
56 | data () { | 59 | data () { |
57 | return { | 60 | return { |
58 | value: '', | 61 | value: '', |
... | @@ -169,12 +172,12 @@ export default { | ... | @@ -169,12 +172,12 @@ export default { |
169 | }) | 172 | }) |
170 | } | 173 | } |
171 | } | 174 | } |
172 | } | 175 | } |
173 | </script> | 176 | </script> |
174 | <style scoped lang="scss"> | 177 | <style scoped lang="scss"> |
175 | @import "~@/styles/public.scss"; | 178 | @import "~@/styles/public.scss"; |
176 | 179 | ||
177 | /deep/.el-icon-date { | 180 | /deep/.el-icon-date { |
178 | display: none; | 181 | display: none; |
179 | } | 182 | } |
180 | </style> | 183 | </style> | ... | ... |
... | @@ -42,15 +42,18 @@ | ... | @@ -42,15 +42,18 @@ |
42 | </div> | 42 | </div> |
43 | </template> | 43 | </template> |
44 | <script> | 44 | <script> |
45 | import table from "@/utils/mixin/table"; | 45 | import table from "@/utils/mixin/table"; |
46 | import { datas, sendThis } from "./zsrkdata"; | 46 | import { datas, sendThis } from "./zsrkdata"; |
47 | import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js"; | 47 | import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js"; |
48 | export default { | 48 | export default { |
49 | name: "zsrk", | 49 | name: "zsrk", |
50 | mixins: [table], | 50 | mixins: [table], |
51 | mounted () { | 51 | mounted () { |
52 | sendThis(this); | 52 | sendThis(this); |
53 | }, | 53 | }, |
54 | activated () { | ||
55 | this.queryClick() | ||
56 | }, | ||
54 | data () { | 57 | data () { |
55 | return { | 58 | return { |
56 | ruleForm: { | 59 | ruleForm: { |
... | @@ -166,8 +169,8 @@ export default { | ... | @@ -166,8 +169,8 @@ export default { |
166 | }) | 169 | }) |
167 | } | 170 | } |
168 | } | 171 | } |
169 | } | 172 | } |
170 | </script> | 173 | </script> |
171 | <style scoped lang="scss"> | 174 | <style scoped lang="scss"> |
172 | @import "~@/styles/public.scss"; | 175 | @import "~@/styles/public.scss"; |
173 | </style> | 176 | </style> | ... | ... |
... | @@ -47,10 +47,10 @@ | ... | @@ -47,10 +47,10 @@ |
47 | </div> | 47 | </div> |
48 | </template> | 48 | </template> |
49 | <script> | 49 | <script> |
50 | import table from "@/utils/mixin/table"; | 50 | import table from "@/utils/mixin/table"; |
51 | import { getZssyqkList } from "@/api/zsgl.js" | 51 | import { getZssyqkList } from "@/api/zsgl.js" |
52 | import { datas, sendThis } from "./zssyjldata"; | 52 | import { datas, sendThis } from "./zssyjldata"; |
53 | export default { | 53 | export default { |
54 | name: "zssyjl", | 54 | name: "zssyjl", |
55 | mixins: [table], | 55 | mixins: [table], |
56 | mounted () { | 56 | mounted () { |
... | @@ -75,6 +75,9 @@ export default { | ... | @@ -75,6 +75,9 @@ export default { |
75 | ] | 75 | ] |
76 | }; | 76 | }; |
77 | }, | 77 | }, |
78 | activated () { | ||
79 | this.queryClick() | ||
80 | }, | ||
78 | methods: { | 81 | methods: { |
79 | /** | 82 | /** |
80 | * @description: queryClick | 83 | * @description: queryClick |
... | @@ -101,8 +104,8 @@ export default { | ... | @@ -101,8 +104,8 @@ export default { |
101 | }) | 104 | }) |
102 | } | 105 | } |
103 | } | 106 | } |
104 | } | 107 | } |
105 | </script> | 108 | </script> |
106 | <style scoped lang="scss"> | 109 | <style scoped lang="scss"> |
107 | @import "~@/styles/public.scss"; | 110 | @import "~@/styles/public.scss"; |
108 | </style> | 111 | </style> | ... | ... |
-
Please register or sign in to post a comment