29f6db53 by renchao@pashanhoo.com

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

2 parents c6ac60f1 f862db22
......@@ -53,7 +53,7 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
查封不动产列表
查封不动产列表{{ ruleForm.ztQlxxList.length }} 个)
<div class="triangle"></div>
</div>
<cfBdcdyTable :tableData="ruleForm.ztQlxxList" />
......@@ -63,58 +63,65 @@
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:">
<el-input v-model="ruleForm.cfdjList[0].cfjg" :disabled="!ableOperation|| isJfOperation"></el-input>
<el-form-item :class="flag ? 'marginBot0' : ''" label="原告:">
<el-input v-model="ruleForm.cfdj.yg" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号:">
<el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="!ableOperation|| isJfOperation"></el-input>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号:" >
<el-input v-model="ruleForm.cfdj.cfwh" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限:">
<el-input v-model="ruleForm.cfdjList[0].cfqx" :disabled="!ableOperation|| isJfOperation"></el-input>
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:">
<el-input v-model="ruleForm.cfdj.cfjg" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限:">
<el-input v-model="ruleForm.cfdj.cfqx" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间:">
<el-date-picker v-model="ruleForm.cfdjList[0].cfqssj" class="width100" type="date" placeholder="选择日期"
<el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" :disabled="!ableOperation|| isJfOperation"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间:">
<el-date-picker v-model="ruleForm.cfdjList[0].cfjssj" class="width100"
<el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"
:disabled="!ableOperation|| isJfOperation" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:">
<el-input v-model="ruleForm.cfdjList[0].cfwj" :disabled="!ableOperation|| isJfOperation"></el-input>
<el-input v-model="ruleForm.cfdj.cfwj" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:">
<el-input v-model="ruleForm.cfdjList[0].cffw" :disabled="!ableOperation|| isJfOperation"></el-input>
<el-input v-model="ruleForm.cfdj.cffw" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="附记:">
<el-input v-model="ruleForm.cfdjList[0].fj" :disabled="!ableOperation|| isJfOperation">
</el-input>
</el-row>
<el-row :gutter="10">
<el-col>
<el-form-item :class="flag ? 'marginBot0' : ''" label="附记:">
<el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.fj"
:disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col>
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdjList[0].djyy">
<el-input class="textArea" type="textarea" v-model="ruleForm.cfdjList[0].djyy"
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdj.djyy">
<el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy"
:disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
......@@ -127,17 +134,17 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="解封机关:">
<el-input v-model="ruleForm.cfdjList[0].jfjg" :disabled="!ableOperation"></el-input>
<el-input v-model="ruleForm.cfdj.jfjg" :disabled="!ableOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="解封文件:">
<el-input v-model="ruleForm.cfdjList[0].jfwj" :disabled="!ableOperation"></el-input>
<el-input v-model="ruleForm.cfdj.jfwj" :disabled="!ableOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="解封文号:">
<el-input v-model="ruleForm.cfdjList[0].jfwh" :disabled="!ableOperation"></el-input>
<el-input v-model="ruleForm.cfdj.jfwh" :disabled="!ableOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -161,7 +168,7 @@
disabled: true,
flagTop: this.flag ? "top" : "",
rules: {
'cfdjList[0].djyy': [
'cfdj.djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
},
......
......@@ -149,9 +149,9 @@
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:" prop="cfdj.cfjg">
<el-form-item :class="flag ? 'marginBot0' : ''" label="原告:" prop="cfdj.cfwh">
<el-input
v-model="ruleForm.cfdj.cfjg"
v-model="ruleForm.cfdj.yg"
:disabled="!viewEdit || ableEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
......@@ -162,11 +162,27 @@
:disabled="!viewEdit || ableEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:" prop="cfdj.cfjg">
<el-input
v-model="ruleForm.cfdj.cfjg"
:disabled="!viewEdit || ableEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc">
<el-input v-model="ruleForm.cfdj.cflxmc" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:" prop="cfdj.cfwj">
<el-input
v-model="ruleForm.cfdj.cfwj"
:disabled="!viewEdit || ableEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
......@@ -199,15 +215,9 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:" prop="cfdj.cfwj">
<el-input
v-model="ruleForm.cfdj.cfwj"
:disabled="!viewEdit || ableEdit || isJfOperation"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="24">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:" prop="cfdj.cffw">
<el-input
v-model="ruleForm.cfdj.cffw"
......