cdcf0bf0 by renchao@pashanhoo.com

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

2 parents 06b6966a 5ff19d3e
<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
<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 {
},
mounted() {
// 根据申请单元列表数据处理选中户
console.log("window.unitData",window.unitData);
if(window.unitData.length){
window.unitData.forEach(e => {
this.unitIdList.push(e.bdcdyid)
this.unitIdList.push(e.bdcdyid)
})
this.ch.forEach((c) => {
c.hs.forEach((h) => {
......@@ -142,7 +143,7 @@ export default {
//未选中→选中
item.hs.forEach((h) => {
//加边框
e.target.className += " tdSelect";
e.target.className += " tdSelect";
h.select = true;
// 使用hbsmList时,需要去重
this.hbsmList.push(h.bsm)
......@@ -176,7 +177,7 @@ export default {
//加边框
hs.select = true;
// 将户bsm放进hbsmList
self.hbsmList.push(bsm);
self.hbsmList.push(bsm);
} else {
//选中→未选中
hs.select = false;
......
......@@ -71,6 +71,8 @@ export default {
//左侧树形结构数据
treedata: [],
sfqdata: [],
keyy:"",
iskey:"",
defaultNode: "",
defaultProps: {
value: "id",
......@@ -109,12 +111,12 @@ export default {
return item.bdcdyid ==val.bdcdyid;
});
this.activeName=index
this.setstyle(index,0);
this.setstyle(index,0,this.iskey);
} else {
this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
this.activeName = this.sfqdata.length - 1;
this.$nextTick(() => {
this.setstyle(this.sfqdata.length - 1,0);
this.setstyle(this.sfqdata.length - 1,0,this.iskey);
})
}
}
......@@ -146,9 +148,17 @@ export default {
{ linShi: 0, xianShi: 0, liShi: 0 },
this.formData.bdcdylx || ""
);
this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
this.loadComponent(this.defaultNode.form);
this.setstyle(0,0);
this.sfqdata[0].children.forEach((item,index) => {
if( item.id==this.defaultNode.id){
this.iskey=index
}
})
// this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
// this.loadComponent(this.defaultNode.form);
this.setstyle(0,0,this.iskey);
});
}
});
......@@ -173,20 +183,26 @@ export default {
* @author: renchao
* 设置样式和点击定位到当前功能
*/
setstyle(newindex,index) {
if(index==0){
this.loadComponent(this.$refs.sfq[newindex].$children[0].$attrs.re.form);
}
let dpme = this.$refs.sfq[newindex].$children[0].$el
if (index != 0) {
dpme.style.backgroundColor = "#ffffff";
dpme.style.color = "black";
dpme.style.border = "none";
} else {
setstyle(newindex,index,key) {
if(key!=undefined||this.keyy==index){
if(key!=undefined){
this.keyy=key
}
this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
dpme.style.backgroundColor = "#f5f5f5";
dpme.style.color = "#0079fe";
dpme.style.borderRight = "4px solid #0079fe";
}else{
let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
dpme.style.backgroundColor = "#ffffff";
dpme.style.color = "black";
dpme.style.border = "none";
}
},
/**
* @description: addlist
......@@ -195,12 +211,21 @@ export default {
* 新增列表功能
*/
addlist(data, index) {
if(index!=undefined){
let newindex= this.sfqdata.findIndex((item) => {
return item.bdcdyid ==data.bdcdyid;
});
this.setstyle(newindex,index);
this.currentSelectProps.bdcdyid = data.bdcdyid;
this.loadComponent(data.form);
}else{
let newindex= this.sfqdata.findIndex((item) => {
return item.bdcdyid ==data.bdcdyid;
});
this.setstyle(newindex,index,this.iskey);
this.currentSelectProps.bdcdyid = data.bdcdyid;
}
},
/**
* @description: loadComponent
......
......@@ -38,7 +38,22 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="fwxz" label="房屋性质" min-width="100">
<template slot-scope="scope">
<treeselect
v-model="scope.row.fwxz"
:disabled="!ableOperation"
noOptionsText="暂无数据"
placeholder=""
:show-count="true"
:options="dictData['A19']"
:normalizer="normalizer"
:appendToBody="true"
z-index="9999"
@input="updaterow(scope.row)"
/>
</template>
</el-table-column>
<el-table-column prop="ghyt" label="房屋用途" min-width="100">
<template slot-scope="scope">
<treeselect
......
......@@ -89,7 +89,9 @@
*/
queryClick () {
this.$startLoading();
this.queryForm.zrzbsm = this.sqywInfo.zrzbsm;
console.log("this.sqywInfo.zrzbsm",this.sqywInfo);
this.queryForm.zrzbsm = this.sqywInfo.bsm;
// this.queryForm.zrzbsm = this.sqywInfo.zrzbsm;
selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
......