631029fe by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 28f75ab2 9a6981a0
......@@ -80,6 +80,18 @@ export function getStepFormInfo (data) {
});
}
/**
* @description: 获取单元对应的环节表单信息
* @param {*} data
* @author: renchao
*/
export function getBlYbxStepFormInfo (data) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/getBlYbxStepFormInfo',
method: 'post',
data
});
}
/**
* @description: 环节扩展信息
* @param {*} data
* @author: renchao
......
......@@ -321,19 +321,6 @@
:key="key"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
<div class="slxx_title title-block">
义务人信息
<div class="triangle"></div>
</div>
<qlrCommonTable
v-if="ruleForm.ywrData"
:tableData="ruleForm.ywrData"
:key="key"
@upDateQlrxxList="upDateYwrxxList"
/>
</div>
</div>
<el-row class="btn" v-if="!$route.query.viewtype">
<el-form-item>
......
......@@ -266,19 +266,6 @@
:gyfs="ruleForm.qlxx.gyfs"
/>
<div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
<div class="slxx_title title-block">
义务人信息
<div class="triangle"></div>
</div>
<ywrCommonTable
v-if="ruleForm.ywrData"
:tableData="ruleForm.ywrData"
:key="key"
@upDateQlrxxList="upDateYwrxxList"
:viewtype="$route.query.viewtype"
/>
</div>
</div>
<el-row class="btn" v-if="!$route.query.viewtype">
<el-form-item>
......
......@@ -39,7 +39,7 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
建设用地、宅基地使用权信息
土地所有权信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
......@@ -79,6 +79,42 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="登簿人:"
prop="qlxx.dbr"
:rules="rules.dbrrules"
>
<el-input v-model="ruleForm.qlxx.dbr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="登记机构:"
prop="qlxx.djjg"
:rules="rules.djjgrules"
>
<el-input v-model="ruleForm.qlxx.djjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="区县代码:"
prop="qlxx.qxdm"
:rules="rules.qxdmrules"
>
<el-input v-model="ruleForm.qlxx.qxdm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="不动产权证号:"
prop="qlxx.bdcqzh"
:rules="rules.bdcqzhrules"
>
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权属状态:">
<el-select v-model="ruleForm.qlxx.qszt">
<el-option
......@@ -94,93 +130,84 @@
<el-col :span="8">
<el-form-item label="登记原因:">
<el-input v-model="ruleForm.jsydsyq.djyy"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="房地坐落:">
<el-input v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="使用权面积:">
<el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="使用权起始时间">
<el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input>
<el-input v-model="ruleForm.tdsyq.djyy"></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.jsydsyq.syqjssj"></el-input>
<el-form-item label="农用地面积:">
<el-input
v-model="ruleForm.tdsyq.nydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用期限">
<el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
<el-form-item label="耕地面积:">
<el-input
v-model="ruleForm.tdsyq.gdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地用途">
<el-input v-model="ruleForm.jsydsyq.yt"></el-input>
<el-form-item label="林地面积:">
<el-input
v-model="ruleForm.tdsyq.ldmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="取得价格:">
<div style="display: flex">
<el-form-item label="草地面积:">
<el-input
v-model="ruleForm.jsydsyq.qdjg"
style="width: 500%"
v-model="ruleForm.tdsyq.cdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/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>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="不动产权证号:"
prop="qlxx.bdcqzh"
:rules="rules.bdcqzhrules"
>
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
<el-form-item label="其他农用地面积:">
<el-input
v-model="ruleForm.tdsyq.qtnydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="区县代码:"
prop="qlxx.qxdm"
:rules="rules.qxdmrules"
>
<el-input v-model="ruleForm.qlxx.qxdm"></el-input>
<el-form-item label="建筑使用面积:">
<el-input
v-model="ruleForm.tdsyq.jsydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item
label="登记机构:"
prop="qlxx.djjg"
:rules="rules.djjgrules"
>
<el-input v-model="ruleForm.qlxx.djjg"></el-input>
<el-form-item label="未利用地面积:">
<el-input
v-model="ruleForm.tdsyq.wlydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="登簿人:"
prop="qlxx.dbr"
:rules="rules.dbrrules"
>
<el-input v-model="ruleForm.qlxx.dbr"></el-input>
<el-form-item label="面积单位:">
<el-input
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -203,7 +230,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="附记:">
<el-input v-model="ruleForm.jsydsyq.fj"></el-input>
<el-input v-model="ruleForm.tdsyq.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -265,20 +292,6 @@
:viewtype="$route.query.viewtype"
:gyfs="ruleForm.qlxx.gyfs"
/>
<div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
<div class="slxx_title title-block">
义务人信息
<div class="triangle"></div>
</div>
<ywrCommonTable
v-if="ruleForm.ywrData"
:tableData="ruleForm.ywrData"
:key="key"
@upDateQlrxxList="upDateYwrxxList"
:viewtype="$route.query.viewtype"
/>
</div>
</div>
<el-row class="btn" v-if="!$route.query.viewtype">
<el-form-item>
......@@ -382,7 +395,6 @@ export default {
return store.getters.dictData[val];
},
loadData() {
this.propsParam.isEdit = this.$parent.isEdit;
init(this.propsParam).then((res) => {
if (res.code == 200) {
......
......@@ -73,7 +73,7 @@
<script>
import WorkFlow from "./mixin/index";
import { getForm } from "./flowform";
import { getStepFormInfo } from "@/api/fqsq.js";
import { getBlYbxStepFormInfo } from "@/api/fqsq.js";
import NoticeBar from "@/components/NoticeBar/index";
import ProcessViewer from "./components/processViewer.vue";
// 引入左侧菜单
......@@ -140,7 +140,7 @@ export default {
this.oneSelectProps.qllx = qllx;
if (this.$refs.Menu.supplementarylist.length) {
this.oneSelectProps.type = this.type
getStepFormInfo(this.oneSelectProps).then((res) => {
getBlYbxStepFormInfo(this.oneSelectProps).then((res) => {
this.$nextTick(function () {
this.tabList = res.result;
this.tabName = this.tabList[0].value;
......
......@@ -14,7 +14,7 @@
.workbench {
flex-wrap: wrap;
height: 100%;
padding-left: 0;
li {
width: 32.5%;
height: 90px;
......
......@@ -15,7 +15,7 @@
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="业务号111:">
<el-form-item label="业务号:">
<el-input disabled v-model="ruleForm.flow.ywh"></el-input>
</el-form-item>
</el-col>
......