Skip to content

bdc / bdcdj-web

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

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

2 parents 29c9e685 41e669de
Expand all
Inline Side-by-side
Showing 18 changed files with 229 additions and 31 deletions
......@@ -407,6 +407,7 @@
<el-date-picker
v-model="ruleForm.qlxx.djsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
......
......@@ -115,12 +115,40 @@
</el-col>
<el-col :span="8">
<el-form-item label="独用土地面积：">
<el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
<div class="flex">
<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"
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 v-model="ruleForm.fdcq2.fttdmj"></el-input>
<div class="flex">
<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"
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">
......@@ -137,10 +165,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="房地产交易价格：">
<div style="display: flex">
<div class="flex">
<el-input
v-model="ruleForm.fdcq2.qjjg"
style="width: 500%"></el-input>
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select v-model="ruleForm.fdcq2.jedw">
<el-option
v-for="item in dictData['A57']"
......@@ -225,17 +255,59 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积：">
<el-input v-model="ruleForm.fdcq2.jzmj"></el-input>
<div class="flex">
<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"
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 v-model="ruleForm.fdcq2.zyjzmj"></el-input>
<div class="flex">
<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"
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 v-model="ruleForm.fdcq2.ftjzmj"></el-input>
<div class="flex">
<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"
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">
......@@ -647,4 +719,10 @@
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
.el-date-editor.el-input {
width: 100%;
}
.el-table__row {
height: 30px !important;
}
</style>
......
......@@ -45,6 +45,32 @@
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item label="上手权利信息：">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产单元号：">
<el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
......
......@@ -328,7 +328,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积：">
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
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" v-if="ruleForm.qlxx.qszt == '2'">
......@@ -356,7 +373,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额：">
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.qdjg"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
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">
......
......@@ -240,8 +240,25 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积：">
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
<el-form-item label="建筑面积：">
<div class="flex">
<el-input v-model="ruleForm.ygdj.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
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" v-if="ruleForm.qlxx.qszt == '2'">
......@@ -268,8 +285,22 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额：">
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
<el-form-item label="取得价格/被担保主债权数额：">
<div class="flex">
<el-input v-model="ruleForm.ygdj.qdjg"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
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">
......
......@@ -282,11 +282,6 @@
<el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.yydj.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记：">
<el-input v-model="ruleForm.yydj.fj"></el-input>
......
......@@ -40,7 +40,7 @@
:normalizer="normalizer"
:appendToBody="true"
z-index="9999"
@input="addrow(scope.$index)"
@input="addrow(scope.row)"
/>
</template>
</el-table-column>
......@@ -192,10 +192,10 @@ export default {
// this.tableDataList = this.tableDataList.map((item) => {
// return {
// ...item,
// yt: this.tdyt,
// yt: a.yt,
// };
// });
// this.$emit("upDateTdytxxList", this.tableDataList);
this.$emit("upDateTdytxxList", this.tableDataList);
},
/**
* @description: startTime
......
......@@ -35,6 +35,10 @@
</div>
<!-- 表单内容区域 -->
<div class="rightContainer">
<div class="count">
当前流程所在环节:
<span>{{ this.zbhj }}</span>
</div>
<el-tabs v-model="tabName" :before-leave="beforeLeave">
<el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
</el-tab-pane>
......@@ -84,6 +88,8 @@
bsmSlsq: this.$route.query.bsmSlsq,
//当前流程所在环节
bestepid: this.$route.query.bestepid,
//当前流程所在环节
zbhj: this.$route.query.zbhj,
//设置那个表单选中
tabName: "",
//设置那个表单选择
......@@ -201,4 +207,19 @@
}
}
</script>
<style scoped lang="scss">
.rightContainer {
position: relative;
}
.count {
font-size: 14px;
position: absolute;
right: 25px;
top: 12px;
height: 30px;
span {
font-weight: 600;
color: #3498db;
}
}
</style>
......
......@@ -32,7 +32,7 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：" prop="slsq.qllx">
<el-select disabled v-model="ruleForm.sldy.qllx" filterable clearable placeholder="请选择权利类型">
<el-select disabled v-model="ruleForm.sldyList[0].qllx" filterable clearable placeholder="请选择权利类型">
<el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
......@@ -40,7 +40,7 @@
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：" prop="slsq.djlx">
<el-select disabled v-model="ruleForm.sldy.djlx" filterable clearable placeholder="请选择登记类型">
<el-select disabled v-model="ruleForm.sldyList[0].djlx" filterable clearable placeholder="请选择登记类型">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
......
......@@ -72,7 +72,21 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="宗地面积：">
<el-input v-model="ruleForm.zdjbxx.zdmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.zdjbxx.zdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
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">
......@@ -88,7 +102,7 @@
<el-col :span="8">
<el-form-item label="取得价格：">
<div style="display:flex">
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw">
<el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......
......@@ -102,7 +102,7 @@
<el-input
v-model="ruleForm.jsydsyq.qdjg"
style="width: 500%"
oninput="value=value.replace(/[^\d.]/g,'')"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
disabled
></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw" disabled>
......
......@@ -242,7 +242,8 @@
if (!this.isJump) {
startBusinessFlow({
bsmSqyw: this.bsmSqyw,
sjlx: 'zrz',
//sjlx: 'zrz',
sjlx: this.activeName,
bdcdysz: this.bdcdysz,
djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
......
......@@ -28,7 +28,7 @@ export default {
"/workFrame?bsmSlsq=" +
data.bsmSlsq +
"&bestepid=" +
data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type
data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type+"&zbhj=受理"
);
window.open(href, "_blank");
this.$popupCacel()
......
......@@ -122,7 +122,7 @@ class data extends filter {
minWidth: '130'
},
{
label: '操作111',
label: '操作',
width: '160',
align: 'center',
fixed: 'right',
......
......@@ -103,7 +103,7 @@ class data extends filter {
minWidth: '130'
},
{
label: '操作111',
label: '操作',
width: '160',
align: 'center',
fixed: 'right',
......