Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
720fbc4e by liangyifan
Options

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

# Conflicts:
#	src/components/tanchuang/index.vue
2 parents 4e86a5d3 1b0c61e9
Inline Side-by-side
Showing 7 changed files with 39 additions and 47 deletions
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </div> 11 </div>
12 12
13 <div class="ls-mask-content" ref='contentRef' :style="{'height': contentHeight + 'px'}"> 13 <div class="ls-mask-content" ref='contentRef' :style="{'height': contentHeight + 'px'}">
14 <component :is="editItem" ref='childRef' @loading='loadingFn' :formData='formData' /> 14 <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' />
15 </div> 15 </div>
16 <div class="ls-mask-footer" v-if='btnShow'> 16 <div class="ls-mask-footer" v-if='btnShow'>
17 <el-button type="primary" @click="onConfirm">{{confirmText}}</el-button> 17 <el-button type="primary" @click="onConfirm">{{confirmText}}</el-button>
...@@ -39,24 +39,25 @@ export default { ...@@ -39,24 +39,25 @@ export default {
39 width: "75%", 39 width: "75%",
40 height: "auto", 40 height: "auto",
41 formData: "",//父组件传递的参数 负责传给子组件 41 formData: "",//父组件传递的参数 负责传给子组件
42 contentHeight:"", 42 contentHeight: "",
43 iconClass:"", 43 iconClass: "",
44 key: 0
44 } 45 }
45 }, 46 },
46
47 props: { 47 props: {
48 loading: { type: Boolean, default: false }, 48 loading: { type: Boolean, default: false },
49 }, 49 },
50 watch: { 50 watch: {
51 isShow (a, b) { 51 isShow (a, b) {
52 this.key++
52 this.editItem = this.loadViewFn(this.editItem) 53 this.editItem = this.loadViewFn(this.editItem)
53 }, 54 },
54 }, 55 },
55 mounted(){ 56 mounted () {
56 // 计算滚动条高度 57 // 计算滚动条高度
57 setTimeout(() => { 58 setTimeout(() => {
58 this.contentHeight = this.$refs.contentRef.offsetHeight 59 this.contentHeight = this.$refs.contentRef.offsetHeight
59 }, 1000); 60 }, 1000)
60 }, 61 },
61 methods: { 62 methods: {
62 onCancel () { 63 onCancel () {
...@@ -81,7 +82,7 @@ export default { ...@@ -81,7 +82,7 @@ export default {
81 require.ensure([], () => 82 require.ensure([], () =>
82 r(require(`@/views/${view}.vue`)) 83 r(require(`@/views/${view}.vue`))
83 ); 84 );
84 }, 85 }
85 } 86 }
86 } 87 }
87 </script> 88 </script>
...@@ -114,15 +115,18 @@ export default { ...@@ -114,15 +115,18 @@ export default {
114 .ls-mask-window b { 115 .ls-mask-window b {
115 padding-left: 5px; 116 padding-left: 5px;
116 } 117 }
117 .ls-title{ 118
119 .ls-title {
118 padding: 16px; 120 padding: 16px;
119 background: linear-gradient(2deg, #00CCFF, transparent); 121 background: linear-gradient(2deg, #00CCFF, transparent);
120 color: #ffffff; 122 color: #ffffff;
121 123
122 } 124 }
123 .ls-title .svg-icon{ 125
126 .ls-title .svg-icon {
124 font-size: 18px; 127 font-size: 18px;
125 } 128 }
129
126 .ls-mask-content { 130 .ls-mask-content {
127 padding: 20px; 131 padding: 20px;
128 width: 100%; 132 width: 100%;
...@@ -140,7 +144,7 @@ export default { ...@@ -140,7 +144,7 @@ export default {
140 } 144 }
141 145
142 146
143 /deep/.closeStyle{ 147 /deep/.closeStyle {
144 position: absolute; 148 position: absolute;
145 top: 17px; 149 top: 17px;
146 right: 12px; 150 right: 12px;
...@@ -148,10 +152,12 @@ export default { ...@@ -148,10 +152,12 @@ export default {
148 cursor: pointer; 152 cursor: pointer;
149 color: #ffffff; 153 color: #ffffff;
150 } 154 }
155
151 /deep/.el-loading-mask { 156 /deep/.el-loading-mask {
152 background: none; 157 background: none;
153 } 158 }
154 /deep/.el-button{ 159
160 /deep/.el-button {
155 margin: 15px 10px; 161 margin: 15px 10px;
156 width: 75px; 162 width: 75px;
157 } 163 }
......
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
101 .iconName { 101 .iconName {
102 line-height: 24px; 102 line-height: 24px;
103 font-size: 12px; 103 font-size: 12px;
104 white-space: nowrap;
104 } 105 }
105 106
106 .container { 107 .container {
......
...@@ -153,11 +153,8 @@ export default { ...@@ -153,11 +153,8 @@ export default {
153 case "B0": 153 case "B0":
154 let type = queueDjywmc(this.$route.query.sqywbm) 154 let type = queueDjywmc(this.$route.query.sqywbm)
155 this.$popup({ 155 this.$popup({
156 title: '提示', // 弹窗标题 156 title: '查询权利信息',
157 editItem: 'ywbl/ywsq/components/' + type, 157 editItem: 'ywbl/ywsq/components/houseOwnership',
158 formData: this.formData, //父组件传给子组件的参数
159 cancel: function () { }, //取消事件的回调
160 confirm: function () { }, //确认事件的回调
161 }) 158 })
162 break; 159 break;
163 case "B1": 160 case "B1":
......
...@@ -8,35 +8,21 @@ ...@@ -8,35 +8,21 @@
8 </el-tabs> 8 </el-tabs>
9 <el-form :model="queryForm" ref="queryForm" label-width="100px"> 9 <el-form :model="queryForm" ref="queryForm" label-width="100px">
10 <el-row> 10 <el-row>
11 <el-col :span="5"> 11 <el-col :span="6">
12 <el-form-item label="权利类型" label-width="70px">
13 <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
14 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
15 </el-option>
16 </el-select>
17 </el-form-item>
18 </el-col>
19 <el-col :span="5">
20 <el-form-item label="不动产单元号"> 12 <el-form-item label="不动产单元号">
21 <el-input placeholder="不动产单元号" v-model="queryForm.bdcdyh" clearable> 13 <el-input placeholder="不动产单元号" v-model="queryForm.bdcdyh" clearable>
22 </el-input> 14 </el-input>
23 </el-form-item> 15 </el-form-item>
24 </el-col> 16 </el-col>
25 <el-col :span="5"> 17 <el-col :span="6">
26 <el-form-item label="业务号" label-width="70px"> 18 <el-form-item label="坐落">
27 <el-input placeholder="业务号" v-model="queryForm.ywh" clearable> 19 <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width300px">
28 </el-input>
29 </el-form-item>
30 </el-col>
31 <el-col :span="5">
32 <el-form-item label="不动产权证号">
33 <el-input placeholder="不动产权证号" v-model="queryForm.bdcqzh" clearable>
34 </el-input> 20 </el-input>
35 </el-form-item> 21 </el-form-item>
36 </el-col> 22 </el-col>
37 <el-col :span="4" class="btnCol"> 23 <el-col :span="4" class="btnCol">
38 <el-form-item> 24 <el-form-item>
39 <el-button type="primary" @click="fetchData()">查询</el-button> 25 <el-button type="primary" @click="queryClick()">查询</el-button>
40 </el-form-item> 26 </el-form-item>
41 </el-col> 27 </el-col>
42 </el-row> 28 </el-row>
...@@ -58,7 +44,7 @@ ...@@ -58,7 +44,7 @@
58 <script> 44 <script>
59 //国有建设用地使用权/房屋使用权 45 //国有建设用地使用权/房屋使用权
60 import { mapGetters } from 'vuex' 46 import { mapGetters } from 'vuex'
61 import { datas, sendThis } from "../javascript/houseOwnership.js"; 47 import { datas, sendThis } from "../javascript/fwsyq.js";
62 import table from "@/utils/mixin/table"; 48 import table from "@/utils/mixin/table";
63 import jump from "../components/mixin/jump"; 49 import jump from "../components/mixin/jump";
64 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js"; 50 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
...@@ -92,7 +78,7 @@ export default { ...@@ -92,7 +78,7 @@ export default {
92 closeDialog () { 78 closeDialog () {
93 this.$emit("closeDialog"); 79 this.$emit("closeDialog");
94 }, 80 },
95 fetchData () { 81 queryClick () {
96 this.queryForm.sqywbm = this.djywbm; 82 this.queryForm.sqywbm = this.djywbm;
97 selectFwsyq({ ...this.queryForm, ...this.pageData, fwfl: this.activeName }).then((res) => { 83 selectFwsyq({ ...this.queryForm, ...this.pageData, fwfl: this.activeName }).then((res) => {
98 if (res.code === 200) { 84 if (res.code === 200) {
...@@ -104,7 +90,7 @@ export default { ...@@ -104,7 +90,7 @@ export default {
104 }, 90 },
105 handleTabClick () { 91 handleTabClick () {
106 this.pageData.currentPage = 1 92 this.pageData.currentPage = 1
107 this.fetchData() 93 this.queryClick()
108 }, 94 },
109 submitForm () { 95 submitForm () {
110 if (this.bdcdysz.length == 0) { 96 if (this.bdcdysz.length == 0) {
......
...@@ -11,8 +11,8 @@ export function queueDjywmc (djywbm) { ...@@ -11,8 +11,8 @@ export function queueDjywmc (djywbm) {
11 case "A03400": 11 case "A03400":
12 vm = "jsydsyq200"; 12 vm = "jsydsyq200";
13 break; 13 break;
14 case "A04100": 14 case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
15 vm = "houseOwnership"; 15 vm = "fwsyq";
16 break; 16 break;
17 case "A05200": 17 case "A05200":
18 case "A05300": 18 case "A05300":
......
...@@ -116,9 +116,9 @@ export default { ...@@ -116,9 +116,9 @@ export default {
116 // 业务-登记情形选择 116 // 业务-登记情形选择
117 handleSelectYw (item, list) { 117 handleSelectYw (item, list) {
118 list.forEach(item => { 118 list.forEach(item => {
119 item.cselect = false 119 this.$set(item, 'cselect', false)
120 }) 120 })
121 item.cselect = !item.cselect 121 item.cselect = true
122 this.$store.dispatch('ywbl/setDjqxObj', { 122 this.$store.dispatch('ywbl/setDjqxObj', {
123 'djqxbm': item.nodecode, 123 'djqxbm': item.nodecode,
124 'djqxmc': item.nodename, 124 'djqxmc': item.nodename,
...@@ -141,18 +141,18 @@ export default { ...@@ -141,18 +141,18 @@ export default {
141 this.djlxList = [] 141 this.djlxList = []
142 }, 142 },
143 // 获取下个节点类型 143 // 获取下个节点类型
144 getNextNode (bsmSqyw) { 144 getNextNode (bsmSqyw, type) {
145 getNextNode(bsmSqyw).then(res => { 145 getNextNode(bsmSqyw).then(res => {
146 if (res.result.djqx) this.djqxList = res.result.djqx 146 if (res.result.djqx) this.djqxList = res.result.djqx
147 if (res.result.djlx) this.djlxList = res.result.djlx 147 if (res.result.djlx) this.djlxList = res.result.djlx
148 if (type) {
148 this.djqxList.forEach(item => { 149 this.djqxList.forEach(item => {
149 this.$set(item, 'cselect', false) 150 this.$set(item, 'cselect', false)
150 this.$set(item, 'select', false)
151 }) 151 })
152 this.djlxList.forEach(item => { 152 this.djlxList.forEach(item => {
153 this.$set(item, 'cselect', false) 153 this.$set(item, 'cselect', false)
154 this.$set(item, 'select', false)
155 }) 154 })
155 }
156 }) 156 })
157 }, 157 },
158 handleCollection (item) { 158 handleCollection (item) {
...@@ -165,6 +165,7 @@ export default { ...@@ -165,6 +165,7 @@ export default {
165 message: '收藏成功！', 165 message: '收藏成功！',
166 type: 'success' 166 type: 'success'
167 }) 167 })
168 that.getDataList()
168 } 169 }
169 }) 170 })
170 } else { 171 } else {
...@@ -175,6 +176,7 @@ export default { ...@@ -175,6 +176,7 @@ export default {
175 message: '取消收藏成功！', 176 message: '取消收藏成功！',
176 type: 'success' 177 type: 'success'
177 }) 178 })
179 that.getDataList()
178 } 180 }
179 }) 181 })
180 } 182 }
...@@ -197,7 +199,7 @@ export default { ...@@ -197,7 +199,7 @@ export default {
197 this.$store.dispatch('ywbl/setBsmSqyw', item.bsmSqyw) 199 this.$store.dispatch('ywbl/setBsmSqyw', item.bsmSqyw)
198 this.$store.dispatch('ywbl/setDjywbm', item.djywbm) 200 this.$store.dispatch('ywbl/setDjywbm', item.djywbm)
199 } else { 201 } else {
200 this.getNextNode(item.bsmSqyw) 202 this.getNextNode(item.bsmSqyw, false)
201 } 203 }
202 this.djqxList = [] 204 this.djqxList = []
203 }, 205 },
......