090280d3 by renchao@pashanhoo.com

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

2 parents 62fc4b00 ad5d220f
......@@ -14,76 +14,132 @@
label-width="130px">
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
电力信息
申请信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="服务代码:">
<el-input v-model="ruleForm.serviceCode"></el-input>
<el-form-item label="业务号:">
<el-input disabled v-model="ruleForm.flow.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="行政区划区县代码:">
<el-input v-model="ruleForm.areacode"></el-input>
<el-form-item label="受理人员:">
<el-input disabled v-model="ruleForm.slsq.slry"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记系统业务号:">
<el-input v-model="ruleForm.ywh"></el-input>
<el-form-item label="受理时间:">
<el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="推送日期:">
<el-input v-model="ruleForm.SENDTIME"></el-input>
<el-form-item label="权利类型:" prop="qllx">
<el-input disabled v-model="ruleForm.sldy.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="原户主姓名:">
<el-input v-model="ruleForm.mcOld"></el-input>
<el-form-item label="登记类型:" prop="djlx">
<el-input disabled v-model="ruleForm.sldy.djlxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="原户主身份证号码:">
<el-input v-model="ruleForm.zjhmOld"></el-input>
<el-form-item label="登记情形:" prop="djqx">
<el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="不动产单元号:">
<el-input disabled v-model="ruleForm.sldy.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="原房产证号:">
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="坐落:">
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
电力过户信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="电表编号:">
<el-input disabled v-model="dlxxForm.cons_no"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="行政区代码:">
<el-input disabled v-model="dlxxForm.AREACODE"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务号:">
<el-input disabled v-model="dlxxForm.YWH"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="原户主姓名:">
<el-input disabled v-model="dlxxForm.MC_OLD"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="原户主身份证号码:">
<el-input disabled v-model="dlxxForm.ZJHM_OLD"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="原户主联系电话:">
<el-input v-model="ruleForm.lxdhOld"></el-input>
<el-input disabled v-model="dlxxForm.LXDH_OLD"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="新户主姓名:">
<el-input v-model="ruleForm.mcNew"></el-input>
<el-input disabled v-model="dlxxForm.MC_NEW"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="新户主身份证号码:">
<el-input v-model="ruleForm.zjhmNew"></el-input>
<el-input disabled v-model="dlxxForm.ZJHM_NEW"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="新户主联系电话:">
<el-input v-model="ruleForm.lxdhNew"></el-input>
<el-input disabled v-model="dlxxForm.LXDH_NEW"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<el-form-item label="房屋坐落(地址):">
<el-input disabled v-model="dlxxForm.FWZL"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="房产证编号:">
<el-input v-model="ruleForm.fczbh"></el-input>
<el-input disabled v-model="dlxxForm.FCZBH"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否过户:">
<el-switch
v-model="ruleForm.sfgh"
<el-switch disabled
v-model="dlxxForm.SFGH"
:active-value='1'
active-text="是"
:inactive-value="0"
......@@ -91,28 +147,33 @@
</el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<el-form-item label="房屋坐落(地址):">
<el-input v-model="ruleForm.fwzl" type="textarea"
:rows="2"></el-input>
<el-col :span="8">
<el-form-item label="推送日期:">
<el-input disabled v-model="dlxxForm.SENDTIME"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row class="btn" v-if="viewEdit">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
</el-row>
</el-row>
<div class="slxx_title title-block">
自来水过户信息
<div class="triangle"></div>
</div>
<div class="slxx_title title-block">
天然气过户信息
<div class="triangle"></div>
</div>
<div class="slxx_title title-block">
热力供暖过户信息
<div class="triangle"></div>
</div>
</div>
</el-form>
</div>
</template>
<script>
import { mapGetters } from "vuex";
import { getDlxxByBsmSldy, saveOrUpdateDlxx } from "@/api/sfxx.js";
import { getDetail } from "@/api/workflow/swhtxx.js";
export default {
computed: {
...mapGetters(["dictData", "flag"]),
......@@ -121,12 +182,7 @@
// this.loading = true
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
formdata.append("isEdit", this.viewEdit);
console.log(this.propsParam)
this.getDlxxByBsmSldy()
this.getDlxxByBsmSldy();
},
data () {
return {
......@@ -134,16 +190,17 @@
//表单是否可操作
viewEdit: false,
ruleForm: {
SFGH: 1
}
},
dlxxForm:{}
}
},
methods: {
getDlxxByBsmSldy() {
getDlxxByBsmSldy(this.propsParam.bsmSldy).then((res) => {
getDlxxByBsmSldy() {
getDetail(this.propsParam.bsmSldy).then((res) => {
if (res.code === 200) {
if (res.result != null) {
this.ruleForm = res.result
this.ruleForm = res.result;
this.dlxxForm = JSON.parse(res.result.wqht.dlnr);
}
}
});
......
......@@ -53,7 +53,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="原产证号:">
<el-form-item label="原产证号:">
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
......@@ -146,17 +146,17 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="合同签订时间:">
<el-input disabled v-model="ruleForm.HTQDSJ"></el-input>
<el-input disabled v-model="fwxx.HTQDSJ"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="共有方式:">
<el-input disabled v-model="ruleForm.GYFS"></el-input>
<el-input disabled v-model="fwxx.GYFS"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋坐落:">
<el-input disabled v-model="ruleForm.TDFWZL"></el-input>
<el-input disabled v-model="fwxx.TDFWZL"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -164,22 +164,22 @@
买受人信息
<div class="triangle"></div>
</div>
<lb-table :column="column" :pagination="false" :heightNumSetting="true"
:data="ruleForm.tableDataList">
<lb-table :column="clmSqr" :pagination="false" :heightNumSetting="true"
:data="qlrList">
</lb-table>
<div class="slxx_title title-block">
出卖人信息
<div class="triangle"></div>
</div>
<lb-table :column="column1" :pagination="false" :heightNumSetting="true"
:data="ruleForm.tableDataList">
<lb-table :column="clmSqr" :pagination="false" :heightNumSetting="true"
:data="ywrList">
</lb-table>
<div class="slxx_title title-block">
缴税信息
<div class="triangle"></div>
</div>
<lb-table :column="column2" :pagination="false" :heightNumSetting="true"
:data="ruleForm.tableDataList">
<lb-table :column="clmSwxx" :pagination="false" :heightNumSetting="true"
:data="swxxList">
</lb-table>
</div>
</el-form>
......@@ -198,7 +198,16 @@
this.propsParam = this.$attrs;
getDetail(this.propsParam.bsmSldy).then((res) => {
if (res.code === 200 && res.result) {
that.ruleForm = res.result;
that.ruleForm = res.result;
if(res.result.wqht.htnr!="" && res.result.wqht.htnr!=null){
let htxx= JSON.parse(res.result.wqht.htnr);
that.fwxx = htxx[0].h[0];
that.qlrList = htxx[1].msr;
that.ywrList = htxx[2].cmr;
}
if(res.result.wqht.jsnr!="" && res.result.wqht.jsnr!=null){
that.swxxList= JSON.parse(res.result.wqht.jsnr);
}
}
});
},
......@@ -208,44 +217,33 @@
loading: false,
//表单是否可操作
viewEdit: false,
column: [
clmSqr: [
{
prop: "qlrxm",
label: "权利人姓名"
prop: "NSRMC",
label: "名称"
},
{
prop: "gyqk",
label: "共有情况"
prop: "ZJZL_DM",
label: "证件种类"
},
{
prop: "zjzl",
label: "身份证号种类"
prop: "ZJHM",
label: "证件号码"
},
{
prop: "zjhm",
label: "证件号码"
prop: "LXDH",
label: "联系电话"
},
],
column1: [{
prop: "ywrxm",
label: "义务人姓名"
},
],
clmSwxx: [
{
prop: "zjzl",
label: "身份证号种类"
},
{
prop: "zjhm",
label: "证件号码"
}],
column2: [{
type: 'skssqq',
label: "税款所属日期起"
},
prop: "ywslh",
label: "业务受理号"
},
{
prop: "skssqz",
label: "税款所属日期止"
},
prop: "kprq",
label: "开票日期"
},
{
prop: "sjje",
label: "实缴金额"
......@@ -255,6 +253,14 @@
label: "凭证序号"
},
{
prop: 'skssqq',
label: "税款所属日期起"
},
{
prop: "skssqz",
label: "税款所属日期止"
},
{
prop: "zsxmdm",
label: "征收项目代码"
},
......@@ -273,22 +279,16 @@
{
prop: "rkrq",
label: "入库日期"
},
{
prop: "kprq",
label: "开票日期"
},
{
prop: "ywslh",
label: "业务受理号"
}],
}
],
ruleForm: {
tableDataList: []
},
qlrList:[],
ywrList:[],
fwxx:{},
swxx:{}
swxxList:{}
}
},
methods: {
......