Skip to content

bdc / bdcdj-web

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

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

2 parents 65534023 ae2ed9cd
Inline Side-by-side
Showing 12 changed files with 148 additions and 43 deletions
......@@ -117,6 +117,7 @@
* @author: renchao
*/
loadBdcdylist () {
console.log("获取currentSelectProps表单并加载");
var formdata = new FormData();
if (this.bsmSlsq) {
formdata.append("bsmSlsq", this.bsmSlsq);
......@@ -138,13 +139,11 @@
* @author: renchao
*/
getleftMenubl (row) {
console.log("获取右侧菜单传参",row);
leftMenubl(this.bsmSlsq).then((res) => {
this.supplementarylist = res.result;
if (row == 1) {
this.delel = false
}
if (row && row != 1) {
if (row) {
this.supplementarylist.forEach((item, index) => {
if (item.bsmRepair == row.bsmRepair) {
this.activeIndex = index.toString()
......@@ -152,13 +151,21 @@
this.unitClick(index)
}
})
}
}else{
if (this.supplementarylist.length) {
this.unitClick(0)
this.activeIndex = "0"
} else {
console.log("左侧列表为空");
this.loadBdcdylist()
// this.$emit("getCurrentSelectProps", this.currentSelectProps);
}
}
});
},
/**
......@@ -179,6 +186,7 @@
* @author: renchao
*/
unitClick (index) {
console.log("index数据的下标",index);
this.currentSelectProps = this.supplementarylist[index];
this.$emit("getCurrentSelectProps", this.currentSelectProps);
},
......
......@@ -269,7 +269,6 @@
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.diyaq.jedw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
......
......@@ -119,8 +119,8 @@
<el-input v-model="ruleForm.fdcq2.dytdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
......@@ -138,8 +138,8 @@
<el-input v-model="ruleForm.fdcq2.fttdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
......@@ -259,8 +259,8 @@
<el-input v-model="ruleForm.fdcq2.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
......@@ -278,8 +278,8 @@
<el-input v-model="ruleForm.fdcq2.zyjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
......@@ -297,8 +297,8 @@
<el-input v-model="ruleForm.fdcq2.ftjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
......@@ -449,6 +449,7 @@
},
data () {
return {
mjdw:"1",
ssqlxxshow: true,
props: {
label: "bdcqzh",
......
......@@ -132,7 +132,21 @@
</el-col> -->
<el-col :span="8">
<el-form-item label="使用权面积：">
<el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.jsydsyq.syqmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -302,6 +316,7 @@ export default {
},
data() {
return {
mjdw:"1",
ssqlxxshow:true,
props: {
label: "bdcqzh",
......
......@@ -175,7 +175,7 @@
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
v-model="ruleForm.tdsyq.mjdw1"
:disabled="!ableOperation"
style="width: 20%"
>
......@@ -199,7 +199,7 @@
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
v-model="ruleForm.tdsyq.mjdw2"
:disabled="!ableOperation"
style="width: 20%"
>
......@@ -223,7 +223,7 @@
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
v-model="ruleForm.tdsyq.mjdw3"
:disabled="!ableOperation"
style="width: 20%"
>
......@@ -249,7 +249,7 @@
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
v-model="ruleForm.tdsyq.mjdw4"
:disabled="!ableOperation"
style="width: 20%"
>
......@@ -273,7 +273,7 @@
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
v-model="ruleForm.tdsyq.mjdw5"
:disabled="!ableOperation"
style="width: 20%"
>
......@@ -297,7 +297,7 @@
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
v-model="ruleForm.tdsyq.mjdw6"
:disabled="!ableOperation"
style="width: 20%"
>
......@@ -323,7 +323,7 @@
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
v-model="ruleForm.tdsyq.mjdw7"
:disabled="!ableOperation"
style="width: 20%"
>
......
......@@ -48,6 +48,7 @@ export default {
},
clicksss(el){
console.log("elllllllllllllllllllll",el);
this.qllx=el
},
handleSubmit() {
......@@ -57,7 +58,6 @@ export default {
qllx:this.qllx,
bsmQlxx:""
};
this.$parent.addRepairRecord(qllxobj)
}else{
this.$message({
......
......@@ -151,6 +151,7 @@ export default {
getStepFormInfo(this.oneSelectProps).then((res) => {
this.$nextTick(function () {
this.tabList = res.result;
console.log("加载的右侧界面组件名称",this.tabList);
this.tabName = this.tabList[0].value;
this.ableOperation = this.tabList[0].ableOperation;
this.getFromRouter(this.tabName);
......@@ -176,6 +177,7 @@ export default {
* @author: renchao
*/
getCurrentSelectProps(val) {
console.log("渲染右侧选项卡");
this.bsmRepair = val.bsmRepair;
if (val.bdcdyid) {
this.oneSelectProps = val;
......@@ -257,6 +259,7 @@ export default {
* @author: renchao
*/
addRepairRecord(row, del) {
console.log("row",row,del);
let from = {
bsmQlxx: "",
bsmSlsq: this.bsmSlsq,
......
......@@ -142,7 +142,6 @@ export default {
let that = this;
this.$nextTick(() => {
if (val.length == 0 || !val) {
console.log("进了");
that.tableDataList = _.cloneDeep([
{
yt: null,
......
......@@ -104,12 +104,40 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积：">
<el-input disabled v-model="ruleForm.qlxx.mj"></el-input>
<div class="flex">
<el-input disabled v-model="ruleForm.qlxx.mj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="专有建筑面积：">
<el-input disabled v-model="ruleForm.fdcq2.zyjzmj"></el-input>
<div class="flex">
<el-input disabled v-model="ruleForm.fdcq2.zyjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
......@@ -117,7 +145,21 @@
<el-col :span="8">
<el-form-item label="分摊建筑面积：">
<el-input disabled v-model="ruleForm.fdcq2.ftjzmj"></el-input>
<div class="flex">
<el-input disabled v-model="ruleForm.fdcq2.ftjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
......@@ -234,6 +276,7 @@
},
data () {
return {
mjdw:"1",
disabled: true,
tdytOption: [],
czrOptions: [],
......
......@@ -124,17 +124,59 @@
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-col :span="8">
<el-form-item label="建筑面积：">
<el-input disabled v-model="ruleForm.qlxx.mj"></el-input>
<div class="flex">
<el-input disabled v-model="ruleForm.qlxx.mj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="专有建筑面积：">
<el-input disabled v-model="ruleForm.fdcq2.zyjzmj"></el-input>
<div class="flex">
<el-input disabled v-model="ruleForm.fdcq2.zyjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分摊建筑面积：">
<el-input disabled v-model="ruleForm.fdcq2.ftjzmj"></el-input>
<div class="flex">
<el-input disabled v-model="ruleForm.fdcq2.ftjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
......@@ -234,6 +276,7 @@
},
data () {
return {
mjdw:"1",
//表单是否可操作
ableOperation: true,
disabled: true,
......
......@@ -71,13 +71,13 @@
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="宗地面积：">
<el-form-item label="使用权面积：">
<div class="flex">
<el-input v-model="ruleForm.zdjbxx.zdmj"
<el-input v-model="ruleForm.jsydsyq.syqmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
disabled
v-model="mjdw"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
......@@ -249,6 +249,7 @@
},
data () {
return {
mjdw:"1",
//表单是否可操作
ableOperation: true,
key: 0,
......
......@@ -85,13 +85,6 @@
<el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="面积单位：">
<el-input
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
......