Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
5 changed files
with
64 additions
and
21 deletions
| 1 | <svg t="1661331325273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2167" width="200" height="200"><path d="M521.309091 158.254545a27.927273 27.927273 0 0 1 27.927273 27.927273v586.472727a27.927273 27.927273 0 0 1-27.927273 27.927273h-372.363636a83.781818 83.781818 0 0 1-83.781819-83.781818V242.036364a83.781818 83.781818 0 0 1 83.781819-83.781819z m400.290909 0a83.781818 83.781818 0 0 1 83.502545 76.893091l0.279273 6.888728v474.763636a83.781818 83.781818 0 0 1-76.893091 83.502545l-6.888727 0.279273h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 744.727273h260.654545a27.927273 27.927273 0 0 0 27.554909-23.412364l0.372364-4.514909V242.036364a27.927273 27.927273 0 0 0-23.412364-27.554909L921.6 214.109091h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 158.254545h260.654545z m-428.218182 55.854546H148.945455a27.927273 27.927273 0 0 0-27.55491 23.412364L121.018182 242.036364v474.763636a27.927273 27.927273 0 0 0 27.927273 27.927273h344.436363V214.109091z" p-id="2168"></path></svg> | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 1 | <svg t="1692772463687" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6301" width="200" height="200"><path d="M544.5 754.47H131.78V661.9c0-9.75 3.41-17.3 10.91-23.92 7.23-6.44 18.92-12.22 35.55-17.41l125.74-29.09 1.76-0.41 1.73-0.53c22.89-7.07 92.52-28.61 92.52-98.76v-85.31c0-19-7.62-36.7-21.78-50.14-17.22-16.07-30.6-36.08-38.66-57.8-8.6-23.27-11.23-47.79-7.83-72.89 4.37-32.22 19.94-62.81 43.9-86.19 23.82-23.31 54.72-38.12 87.03-41.72 5.9-0.66 11.85-0.99 17.67-0.99 15.93 0 31.68 2.49 46.66 7.37 19.79 6.5 37.71 16.84 53.26 30.75 31.81 28.42 50.05 69.16 50.05 111.77 0 20.72-4.16 40.74-12.36 59.52-7.93 18.16-19.27 34.43-33.73 48.38-15.25 14.73-23.65 34.17-23.65 54.73v82.42c0 44.31 27.11 69.04 57.01 84.29 13.74-13.37 29.11-24.99 45.71-34.81-48.29-16.6-52.93-34.25-52.93-49.48v-82.42c0-6.92 2.98-13.64 8.45-18.93 19.12-18.44 34.2-40.06 44.77-64.26 10.95-25.07 16.52-51.87 16.52-79.44 0-56.78-24.3-111.05-66.67-148.9-20.75-18.54-44.57-32.27-70.89-40.92-20.16-6.56-41-9.85-62.2-9.85-7.69 0-15.43 0.43-23.2 1.3-43.23 4.81-84.63 24.6-116.33 55.62-31.8 31.03-52.55 71.86-58.41 115.09-4.51 33.33-0.96 65.89 10.47 96.83 10.76 29.01 28.53 55.62 51.4 76.95 3.84 3.65 5.96 8.45 5.96 13.74v85.31c0 16.53-6.82 35.54-57.45 51.2l-127.48 29.49-0.96 0.29c-23.63 7.21-41.6 16.33-54.75 28.05C91.5 616.75 82 637.89 82 661.9v142.36h468.77c-3.74-16.05-5.9-32.69-6.27-49.79zM82 838.45v15.42c0 19.28 15.63 34.91 34.91 34.91h471.86a240.633 240.633 0 0 1-27.33-50.33H82z" fill="#ffffff" p-id="6302"></path><path d="M786.1 557.35c-105.98 0-191.89 85.91-191.89 191.89 0 105.98 85.91 191.89 191.89 191.89S978 855.22 978 749.25c0-105.99-85.92-191.9-191.9-191.9z m0 334c-78.36 0-142.11-63.75-142.11-142.1 0-78.36 63.75-142.11 142.11-142.11 78.36 0 142.11 63.75 142.11 142.11 0 78.35-63.75 142.1-142.11 142.1z" fill="#ffffff" p-id="6303"></path><path d="M865.63 731.81h-62.1v-62.1c0-9.63-7.8-17.43-17.43-17.43s-17.43 7.8-17.43 17.43v62.1h-62.1c-9.63 0-17.43 7.8-17.43 17.43 0 9.63 7.8 17.43 17.43 17.43h62.1v62.11c0 9.63 7.8 17.43 17.43 17.43s17.43-7.8 17.43-17.43v-62.11h62.1c9.63 0 17.43-7.8 17.43-17.43 0-9.63-7.8-17.43-17.43-17.43z" fill="#ffffff" p-id="6304"></path></svg> | ... | ... |
| ... | @@ -113,9 +113,10 @@ export default { | ... | @@ -113,9 +113,10 @@ export default { |
| 113 | }, | 113 | }, |
| 114 | mounted() { | 114 | mounted() { |
| 115 | // 根据申请单元列表数据处理选中户 | 115 | // 根据申请单元列表数据处理选中户 |
| 116 | console.log("window.unitData",window.unitData); | ||
| 116 | if(window.unitData.length){ | 117 | if(window.unitData.length){ |
| 117 | window.unitData.forEach(e => { | 118 | window.unitData.forEach(e => { |
| 118 | this.unitIdList.push(e.bdcdyid) | 119 | this.unitIdList.push(e.bdcdyid) |
| 119 | }) | 120 | }) |
| 120 | this.ch.forEach((c) => { | 121 | this.ch.forEach((c) => { |
| 121 | c.hs.forEach((h) => { | 122 | c.hs.forEach((h) => { |
| ... | @@ -142,7 +143,7 @@ export default { | ... | @@ -142,7 +143,7 @@ export default { |
| 142 | //未选中→选中 | 143 | //未选中→选中 |
| 143 | item.hs.forEach((h) => { | 144 | item.hs.forEach((h) => { |
| 144 | //加边框 | 145 | //加边框 |
| 145 | e.target.className += " tdSelect"; | 146 | e.target.className += " tdSelect"; |
| 146 | h.select = true; | 147 | h.select = true; |
| 147 | // 使用hbsmList时，需要去重 | 148 | // 使用hbsmList时，需要去重 |
| 148 | this.hbsmList.push(h.bsm) | 149 | this.hbsmList.push(h.bsm) |
| ... | @@ -176,7 +177,7 @@ export default { | ... | @@ -176,7 +177,7 @@ export default { |
| 176 | //加边框 | 177 | //加边框 |
| 177 | hs.select = true; | 178 | hs.select = true; |
| 178 | // 将户bsm放进hbsmList | 179 | // 将户bsm放进hbsmList |
| 179 | self.hbsmList.push(bsm); | 180 | self.hbsmList.push(bsm); |
| 180 | } else { | 181 | } else { |
| 181 | //选中→未选中 | 182 | //选中→未选中 |
| 182 | hs.select = false; | 183 | hs.select = false; | ... | ... |
| ... | @@ -71,6 +71,8 @@ export default { | ... | @@ -71,6 +71,8 @@ export default { |
| 71 | //左侧树形结构数据 | 71 | //左侧树形结构数据 |
| 72 | treedata: [], | 72 | treedata: [], |
| 73 | sfqdata: [], | 73 | sfqdata: [], |
| 74 | keyy:"", | ||
| 75 | iskey:"", | ||
| 74 | defaultNode: "", | 76 | defaultNode: "", |
| 75 | defaultProps: { | 77 | defaultProps: { |
| 76 | value: "id", | 78 | value: "id", |
| ... | @@ -109,12 +111,12 @@ export default { | ... | @@ -109,12 +111,12 @@ export default { |
| 109 | return item.bdcdyid ==val.bdcdyid; | 111 | return item.bdcdyid ==val.bdcdyid; |
| 110 | }); | 112 | }); |
| 111 | this.activeName=index | 113 | this.activeName=index |
| 112 | this.setstyle(index,0); | 114 | this.setstyle(index,0,this.iskey); |
| 113 | } else { | 115 | } else { |
| 114 | this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); | 116 | this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); |
| 115 | this.activeName = this.sfqdata.length - 1; | 117 | this.activeName = this.sfqdata.length - 1; |
| 116 | this.$nextTick(() => { | 118 | this.$nextTick(() => { |
| 117 | this.setstyle(this.sfqdata.length - 1,0); | 119 | this.setstyle(this.sfqdata.length - 1,0,this.iskey); |
| 118 | }) | 120 | }) |
| 119 | } | 121 | } |
| 120 | } | 122 | } |
| ... | @@ -146,9 +148,17 @@ export default { | ... | @@ -146,9 +148,17 @@ export default { |
| 146 | { linShi: 0, xianShi: 0, liShi: 0 }, | 148 | { linShi: 0, xianShi: 0, liShi: 0 }, |
| 147 | this.formData.bdcdylx || "" | 149 | this.formData.bdcdylx || "" |
| 148 | ); | 150 | ); |
| 149 | this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 | 151 | this.sfqdata[0].children.forEach((item,index) => { |
| 150 | this.loadComponent(this.defaultNode.form); | 152 | if( item.id==this.defaultNode.id){ |
| 151 | this.setstyle(0,0); | 153 | this.iskey=index |
| 154 | } | ||
| 155 | }) | ||
| 156 | // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 | ||
| 157 | // this.loadComponent(this.defaultNode.form); | ||
| 158 | |||
| 159 | this.setstyle(0,0,this.iskey); | ||
| 160 | |||
| 161 | |||
| 152 | }); | 162 | }); |
| 153 | } | 163 | } |
| 154 | }); | 164 | }); |
| ... | @@ -173,20 +183,26 @@ export default { | ... | @@ -173,20 +183,26 @@ export default { |
| 173 | * @author: renchao | 183 | * @author: renchao |
| 174 | * 设置样式和点击定位到当前功能 | 184 | * 设置样式和点击定位到当前功能 |
| 175 | */ | 185 | */ |
| 176 | setstyle(newindex,index) { | 186 | setstyle(newindex,index,key) { |
| 177 | if(index==0){ | 187 | if(key!=undefined||this.keyy==index){ |
| 178 | this.loadComponent(this.$refs.sfq[newindex].$children[0].$attrs.re.form); | 188 | if(key!=undefined){ |
| 179 | } | 189 | this.keyy=key |
| 180 | let dpme = this.$refs.sfq[newindex].$children[0].$el | 190 | } |
| 181 | if (index != 0) { | 191 | this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form); |
| 182 | dpme.style.backgroundColor = "#ffffff"; | 192 | let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el |
| 183 | dpme.style.color = "black"; | ||
| 184 | dpme.style.border = "none"; | ||
| 185 | } else { | ||
| 186 | dpme.style.backgroundColor = "#f5f5f5"; | 193 | dpme.style.backgroundColor = "#f5f5f5"; |
| 187 | dpme.style.color = "#0079fe"; | 194 | dpme.style.color = "#0079fe"; |
| 188 | dpme.style.borderRight = "4px solid #0079fe"; | 195 | dpme.style.borderRight = "4px solid #0079fe"; |
| 196 | }else{ | ||
| 197 | let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el | ||
| 198 | dpme.style.backgroundColor = "#ffffff"; | ||
| 199 | dpme.style.color = "black"; | ||
| 200 | dpme.style.border = "none"; | ||
| 189 | } | 201 | } |
| 202 | |||
| 203 | |||
| 204 | |||
| 205 | |||
| 190 | }, | 206 | }, |
| 191 | /** | 207 | /** |
| 192 | * @description: addlist | 208 | * @description: addlist |
| ... | @@ -195,12 +211,21 @@ export default { | ... | @@ -195,12 +211,21 @@ export default { |
| 195 | * 新增列表功能 | 211 | * 新增列表功能 |
| 196 | */ | 212 | */ |
| 197 | addlist(data, index) { | 213 | addlist(data, index) { |
| 214 | if(index!=undefined){ | ||
| 198 | let newindex= this.sfqdata.findIndex((item) => { | 215 | let newindex= this.sfqdata.findIndex((item) => { |
| 199 | return item.bdcdyid ==data.bdcdyid; | 216 | return item.bdcdyid ==data.bdcdyid; |
| 200 | }); | 217 | }); |
| 201 | this.setstyle(newindex,index); | 218 | this.setstyle(newindex,index); |
| 202 | this.currentSelectProps.bdcdyid = data.bdcdyid; | 219 | this.currentSelectProps.bdcdyid = data.bdcdyid; |
| 203 | this.loadComponent(data.form); | 220 | this.loadComponent(data.form); |
| 221 | }else{ | ||
| 222 | let newindex= this.sfqdata.findIndex((item) => { | ||
| 223 | return item.bdcdyid ==data.bdcdyid; | ||
| 224 | }); | ||
| 225 | this.setstyle(newindex,index,this.iskey); | ||
| 226 | this.currentSelectProps.bdcdyid = data.bdcdyid; | ||
| 227 | } | ||
| 228 | |||
| 204 | }, | 229 | }, |
| 205 | /** | 230 | /** |
| 206 | * @description: loadComponent | 231 | * @description: loadComponent | ... | ... |
| ... | @@ -38,7 +38,22 @@ | ... | @@ -38,7 +38,22 @@ |
| 38 | </el-input> | 38 | </el-input> |
| 39 | </template> | 39 | </template> |
| 40 | </el-table-column> | 40 | </el-table-column> |
| 41 | 41 | <el-table-column prop="fwxz" label="房屋性质" min-width="100"> | |
| 42 | <template slot-scope="scope"> | ||
| 43 | <treeselect | ||
| 44 | v-model="scope.row.fwxz" | ||
| 45 | :disabled="!ableOperation" | ||
| 46 | noOptionsText="暂无数据" | ||
| 47 | placeholder="" | ||
| 48 | :show-count="true" | ||
| 49 | :options="dictData['A19']" | ||
| 50 | :normalizer="normalizer" | ||
| 51 | :appendToBody="true" | ||
| 52 | z-index="9999" | ||
| 53 | @input="updaterow(scope.row)" | ||
| 54 | /> | ||
| 55 | </template> | ||
| 56 | </el-table-column> | ||
| 42 | <el-table-column prop="ghyt" label="房屋用途" min-width="100"> | 57 | <el-table-column prop="ghyt" label="房屋用途" min-width="100"> |
| 43 | <template slot-scope="scope"> | 58 | <template slot-scope="scope"> |
| 44 | <treeselect | 59 | <treeselect | ... | ... |
| ... | @@ -89,7 +89,9 @@ | ... | @@ -89,7 +89,9 @@ |
| 89 | */ | 89 | */ |
| 90 | queryClick () { | 90 | queryClick () { |
| 91 | this.$startLoading(); | 91 | this.$startLoading(); |
| 92 | this.queryForm.zrzbsm = this.sqywInfo.zrzbsm; | 92 | console.log("this.sqywInfo.zrzbsm",this.sqywInfo); |
| 93 | this.queryForm.zrzbsm = this.sqywInfo.bsm; | ||
| 94 | // this.queryForm.zrzbsm = this.sqywInfo.zrzbsm; | ||
| 93 | selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { | 95 | selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { |
| 94 | this.$endLoading(); | 96 | this.$endLoading(); |
| 95 | if (res.code === 200) { | 97 | if (res.code === 200) { | ... | ... |
-
Please register or sign in to post a comment