Skip to content

bdc / bdcdj-web

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

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

2 parents 4c7539c9 15e96424
Inline Side-by-side
Showing 13 changed files with 161 additions and 287 deletions
......@@ -566,7 +566,7 @@
handleSelect (val) {
let that = this
let bsmSldy = window.currentSelect.bsmSldy ? window.currentSelect.bsmSldy : ''
this.$confirm('是否同步材料信息?', '提示', {
this.$confirm('是否使用备案内容及材料信息?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
distinguishCancelAndClose: true,//区分取消与关闭
......@@ -584,10 +584,10 @@
}
})
}).catch(action => {
if (action == 'cancel') {
that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
that.$emit("input", false);
}
// if (action == 'cancel') {
// that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
// that.$emit("input", false);
// }
})
},
/**
......
......@@ -111,46 +111,51 @@
data: [],
},
tableDatajf: {
columns: [
{
prop: "jfjs",
label: "计费基数",
columns: [
{
prop: "bdcdyh",
label: "不动产单元号",
},
{
prop: "jflx",
label: "计费类型",
},
prop: "zl",
label: "坐落",
},
{
prop: "jflxmc",
label: "计费类型名称",
prop: "qlrmc",
label: "权利人名称",
},
{
prop: "ysje",
label: "应收金额",
prop: "ywrmc",
label: "义务人名称",
},
{
prop: "qlxzmc",
label: "性质",
},
{
prop: "zkhysje",
label: "折扣后应收金额",
prop: "qlmjmc",
label: "面积",
},
{
prop: "qlrmc",
label: "权利人名称",
prop: "qlytmc",
label: "用途",
},
{
prop: "ywrmc",
label: "义务人名称",
prop: "jflxmc",
label: "计费类型",
},
{
prop: "qlytmc",
label: "权利用途名称",
prop: "ysje",
label: "应收金额",
},
{
prop: "qlxzmc",
label: "权利性质名称",
prop: "jfjs",
label: "计费基数",
},
{
prop: "zl",
label: "坐落",
prop: "zkhysje",
label: "折扣后应收金额",
}
],
data: [],
......
......@@ -5,7 +5,7 @@
</lb-table>
<div class="text-center">
<el-button type="primary" @click="hanldeRecharge">重新计费</el-button>
<el-button type="primary" @click="hanldeRecharge">重置</el-button>
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" @click="handleSubmit" plain>保存</el-button>
</div>
......
......@@ -32,18 +32,12 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：">
<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>
<el-input disabled v-model="ruleForm.sldyList[0].qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：">
<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>
<el-input disabled v-model="ruleForm.sldyList[0].djlxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -73,12 +67,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" >
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" prop="cfdj.cfwh">
<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-form-item :class="flag ? 'marginBot0' : ''" label="查封机关：" prop="cfdj.cfjg">
<el-input v-model="ruleForm.cfdj.cfjg" :disabled="!ableOperation|| isJfOperation"></el-input>
</el-form-item>
</el-col>
......@@ -90,13 +84,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：">
<el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
<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-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj">
<el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"
:disabled="!ableOperation|| isJfOperation" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd"></el-date-picker>
......@@ -138,18 +132,18 @@
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="解封机关：">
<el-form-item :class="flag ? 'marginBot0' : ''" label="解封机关：" prop="cfdj.jfjg">
<el-input v-model="ruleForm.cfdj.jfjg" :disabled="!ableOperation"></el-input>
</el-form-item>
</el-col>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="解封文件：">
<el-input v-model="ruleForm.cfdj.jfwj" :disabled="!ableOperation"></el-input>
<el-form-item :class="flag ? 'marginBot0' : ''" label="解封文号：" prop="cfdj.jfwh">
<el-input v-model="ruleForm.cfdj.jfwh" :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.cfdj.jfwh" :disabled="!ableOperation"></el-input>
<el-form-item :class="flag ? 'marginBot0' : ''" label="解封文件：">
<el-input v-model="ruleForm.cfdj.jfwj" :disabled="!ableOperation"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -165,6 +159,7 @@
import qlxxTable from "../commonTable/qlxxTable.vue";
import cfdjTable from "../commonTable/cfdjTable";
import { BatchInit, batchSaveData } from "@/api/workflow/cfdjFlow.js";
import { formValidate } from "./slxxValidate";
import { mapGetters } from "vuex";
export default {
data () {
......@@ -173,11 +168,7 @@
ableOperation: true,
disabled: true,
flagTop: this.flag ? "top" : "",
rules: {
'cfdj.djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
},
rules: {},
//传递参数
propsParam: {},
//页面数据
......@@ -201,7 +192,8 @@
formdata.append("isEdit", this.ableOperation);
BatchInit(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = res.result
this.ruleForm = res.result;
this.rules = formValidate(this.ruleForm.sldyList[0].djlx);
}
})
},
......@@ -237,7 +229,7 @@
} else {
this.$message({
showClose: true,
message: "请输入登记原因",
message: "请输入红框内的相关信息！",
type: "error"
})
return false;
......
......@@ -19,56 +19,34 @@
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：" prop="slsq.ywh">
<el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：">
<el-input disabled v-model="ruleForm.flow.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="受理人员：" prop="slsq.slry">
<el-form-item :class="flag ? 'marginBot0' : ''" label="受理人员：">
<el-input disabled v-model="ruleForm.slsq.slry"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="受理时间：" prop="slsq.slsj">
<el-form-item :class="flag ? 'marginBot0' : ''" 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 :class="flag ? 'marginBot0' : ''" label="权利类型：" prop="slsq.qllx">
<el-select
disabled
v-model="ruleForm.sldy.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>
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：">
<el-input disabled v-model="ruleForm.sldy.qllxmc"></el-input>
</el-form-item>
</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-option
v-for="item in dictData['A21']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"></el-option>
</el-select>
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：">
<el-input disabled v-model="ruleForm.sldy.djlxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：" prop="slsq.djqx">
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：">
<el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
</el-form-item>
</el-col>
......@@ -92,7 +70,7 @@
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：" prop="qlxx.bdcqzh">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：">
<el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
......@@ -104,7 +82,7 @@
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人：" prop="qlxx.qlrmc">
<el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人：">
<el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
</el-form-item>
</el-col>
......@@ -121,7 +99,7 @@
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：" prop="qlxx.bdcdyh">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：">
<el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
</el-form-item>
</el-col>
......
......@@ -565,7 +565,7 @@
handleSelect (val) {
let that = this
let bsmSldy = window.currentSelect.bsmSldy ? window.currentSelect.bsmSldy : ''
this.$confirm('是否同步材料信息?', '提示', {
this.$confirm('是否备案内容及材料信息?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
distinguishCancelAndClose: true,//区分取消与关闭
......@@ -583,10 +583,10 @@
}
})
}).catch(action => {
if (action == 'cancel') {
that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
that.$emit("input", false);
}
// if (action == 'cancel') {
// that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
// that.$emit("input", false);
// }
})
},
/**
......
......@@ -3,6 +3,7 @@
<div class="slxx">
<el-form
:model="ruleForm"
:rules="rules"
v-Loading="loading"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -75,7 +76,7 @@
v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
<el-col :span="8">
<el-form-item label="抵押方式：">
<el-radio-group disabled v-model="ruleForm.diyaqList[0].dyfs">
<el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
<el-radio label="1">一般抵押</el-radio>
<el-radio label="2">最高额抵押</el-radio>
</el-radio-group>
......@@ -84,7 +85,7 @@
<el-col :span="8">
<el-form-item label="抵押金额类型：">
<el-radio-group
v-model="ruleForm.diyaqList[0].dyjelx"
v-model="ruleForm.diyaq.dyjelx"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
<el-radio label="0">独立抵押</el-radio>
<el-radio label="1">整体抵押</el-radio>
......@@ -93,13 +94,13 @@
</el-col>
<el-col :span="8">
<el-form-item
label="是否存在禁止或者限制转让抵押不动产的约定："
label-width="300px">
label="是否禁止或者限制转让的约定："
label-width="200px">
<el-radio-group
v-model="ruleForm.diyaqList[0].sfczjzhxz"
v-model="ruleForm.diyaq.sfczjzhxz"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
<el-radio label="1">启用</el-radio>
<el-radio label="0">禁用</el-radio>
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
......@@ -107,15 +108,15 @@
<el-row
:gutter="10"
v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
<el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1">
<el-form-item label="被担保主债权数额：">
<el-col :span="8" v-show="ruleForm.diyaq.dyfs == 1">
<el-form-item label="被担保主债权数额：" prop="diyaq.bdbzzqse">
<div style="display: flex">
<el-input
v-model="ruleForm.diyaqList[0].bdbzzqse"
v-model="ruleForm.diyaq.bdbzzqse"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
<el-select
style="width: 68px"
v-model="ruleForm.diyaqList[0].jedw"
v-model="ruleForm.diyaq.jedw"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
<el-option
v-for="item in dictData['A57']"
......@@ -128,13 +129,13 @@
</el-form-item>
</el-col>
<el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 2">
<el-form-item label="最高债权额：">
<el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
<el-form-item label="最高债权额：" prop="diyaq.zgzqse">
<el-input
v-model="ruleForm.diyaqList[0].zgzqse"
v-model="ruleForm.diyaq.zgzqse"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
<el-select
v-model="ruleForm.diyaqList[0].jedw"
v-model="ruleForm.diyaq.jedw"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
<el-option
v-for="item in dictData['A57']"
......@@ -147,18 +148,18 @@
</el-col>
<el-col :span="8">
<el-form-item label="债务履行起始时间：">
<el-form-item label="债务履行起始时间：" prop="diyaq.zwlxqssj">
<el-date-picker
v-model="ruleForm.diyaqList[0].zwlxqssj"
v-model="ruleForm.diyaq.zwlxqssj"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
type="date">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="债务履行结束时间：">
<el-form-item label="债务履行结束时间：" prop="diyaq.zwlxjssj">
<el-date-picker
v-model="ruleForm.diyaqList[0].zwlxjssj"
v-model="ruleForm.diyaq.zwlxjssj"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
type="date">
</el-date-picker>
......@@ -169,7 +170,7 @@
<el-col :span="24">
<el-form-item label="担保范围：">
<el-input
v-model="ruleForm.diyaqList[0].dbfw"
v-model="ruleForm.diyaq.dbfw"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
</el-form-item>
</el-col>
......@@ -178,7 +179,7 @@
<el-col :span="24">
<el-form-item label="最高债权确定事实和数额：">
<el-input
v-model="ruleForm.diyaqList[0].zgzqqdss"
v-model="ruleForm.diyaq.zgzqqdss"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
</el-form-item>
</el-col>
......@@ -190,7 +191,7 @@
type="textarea"
maxlength="500"
show-word-limit
v-model="ruleForm.diyaqList[0].fj"
v-model="ruleForm.diyaq.fj"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
</el-form-item>
</el-col>
......@@ -278,17 +279,17 @@
class="textArea"
type="textarea"
:disabled="!viewEdit"
v-model="ruleForm.diyaqList[0].zxdyyy">
v-model="ruleForm.diyaq.zxdyyy">
</el-input>
</el-form-item>
<el-form-item v-else label="登记原因：" prop="diyaqList[0].djyy">
<el-form-item v-else label="登记原因：" prop="diyaq.djyy">
<el-input
class="textArea"
type="textarea"
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.diyaqList[0].djyy">
v-model="ruleForm.diyaq.djyy">
</el-input>
</el-form-item>
</el-col>
......@@ -307,6 +308,7 @@
import dyaqTable from "../commonTable/dyaqTable";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import { batchInit, saveBatchData } from "@/api/workflow/diyaqFlow.js";
import { formValidate } from "./slxxValidate";
import { mapGetters } from "vuex";
export default {
mounted () {
......@@ -332,7 +334,11 @@
}
})
that.czrOptions = that.ruleForm.qlrList;
that.isSave = that.viewEdit
that.isSave = that.viewEdit;
that.rules = formValidate(
that.ruleForm.sldyList[0].djlx,
that.ruleForm.diyaq.dyfs
);
} else {
that.isSave = false
that.$confirm(res.message, '提示', {
......@@ -361,11 +367,7 @@
ruleForm: {},
//传递参数
propsParam: {},
rules: {
'diyaqList[0].djyy': [
{ required: true, message: '请输入登记原因', trigger: 'blur' }
]
},
rules: {},
tableData: [],
};
},
......@@ -450,7 +452,7 @@
} else {
that.$message({
showClose: true,
message: "请输入登记原因",
message: "请输入红框内的相关信息！",
type: "error"
})
return false
......
......@@ -126,7 +126,8 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="原不动产证号：">
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
<el-input v-if="ruleForm.sldy.djlx=='100'" disabled ></el-input>
<el-input v-else disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
/**
* @description: 首次登记效验
* @param {*} data
* @author: renchao
*/
export function formValidate (djlx,dyfs) {
var formRules={
'diyaqList[0].djyy': [
{ required: false, message: '请输入登记原因', trigger: 'blur' }
],
'diyaqList[0].zxdyyy': [
{ required: false, message: '请输入注销登记原因', trigger: 'blur' }
],
'diyaqList[0].zwlxqssj': [
{ required: false, message: '请选择债务履行起始时间', trigger: 'blur' }
],
'diyaqList[0].zwlxjssj': [
{ required: false, message: '请选择债务履行起始时间', trigger: 'blur' }
],
'diyaqList[0].bdbzzqse': [
{ required: false, message: '请输入被担保主债权数额', trigger: 'blur' }
],
'diyaqList[0].zgzqse': [
{ required: false, message: '请输入最高债权额', trigger: 'blur' }
],
'diyaqList[0].sfczjzhxz': [
{ required: false, message: '请输入最高债权额', trigger: 'blur' }
]
}
if (djlx=="400") {
formRules["diyaqList[0].zxdyyy"][0].required=true;
}else{
if(dyfs=="1"){
formRules["diyaqList[0].bdbzzqse"][0].required=true;
}else{
formRules["diyaqList[0].zgzqse"][0].required=true;
}
formRules["diyaqList[0].zwlxqssj"][0].required=true;
formRules["diyaqList[0].zwlxjssj"][0].required=true;
formRules["diyaqList[0].sfczjzhxz"][0].required=true;
formRules["diyaqList[0].djyy"][0].required=true;
}
console.log(formRules);
return formRules;
}
/**
* @description: 首次登记效验
* @param {*} data
* @author: renchao
*/
export function fristValidate (formRules,dyfs) {
return formRules;
}
/**
* @description: 转移登记效验
* @param {*} data
* @author: renchao
*/
export function transferValidate (data) {
}
/**
* @description: 变更登记效验
* @param {*} data
* @author: renchao
*/
export function changeValidate (data) {
}
/**
* @description: 注销登记效验
* @param {*} data
* @author: renchao
*/
export function logoutValidate (data) {
}
/**
* @description: 更正登记效验
* @param {*} data
* @author: renchao
*/
export function riviseValidate (data) {
}
/**
* @description: 补证登记效验
* @param {*} data
* @author: renchao
*/
export function renewalValidate (data) {
}
/**
* @description: 换证登记效验
* @param {*} data
* @author: renchao
*/
export function replaceValidate (data) {
}
\ No newline at end of file
......@@ -2,7 +2,7 @@
<!-- 受理信息 -->
<div class="slxx">
<el-form
:model="ruleForm"
:model="ruleForm" :rules="rules"
v-Loading="loading"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -75,7 +75,7 @@
v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
<el-col :span="8">
<el-form-item label="抵押方式：">
<el-radio-group disabled v-model="ruleForm.diyaqList[0].dyfs">
<el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
<el-radio label="1">一般抵押</el-radio>
<el-radio label="2">最高额抵押</el-radio>
</el-radio-group>
......@@ -84,7 +84,7 @@
<el-col :span="8">
<el-form-item label="抵押金额类型：">
<el-radio-group
v-model="ruleForm.diyaqList[0].dyjelx"
v-model="ruleForm.diyaq.dyjelx"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
<el-radio label="0">独立抵押</el-radio>
<el-radio label="1">整体抵押</el-radio>
......@@ -95,12 +95,12 @@
<el-form-item
label="是否禁止或者限制转让约定："
label-width="200px"
prop="diyaqList[0].sfczjzhxz">
prop="diyaq.sfczjzhxz">
<el-radio-group
v-model="ruleForm.diyaqList[0].sfczjzhxz"
v-model="ruleForm.diyaq.sfczjzhxz"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
<el-radio label="1">启用</el-radio>
<el-radio label="0">禁用</el-radio>
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
......@@ -108,17 +108,17 @@
<el-row
:gutter="10"
v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
<el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1">
<el-col :span="8" v-show="ruleForm.diyaq.dyfs == 1">
<el-form-item
label="被担保主债权数额："
prop="diyaqList[0].bdbzzqse">
prop="diyaq.bdbzzqse">
<div style="display: flex">
<el-input
v-model="ruleForm.diyaqList[0].bdbzzqse"
v-model="ruleForm.diyaq.bdbzzqse"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
<el-select
style="width: 68px"
v-model="ruleForm.diyaqList[0].jedw"
v-model="ruleForm.diyaq.jedw"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
<el-option
v-for="item in dictData['A57']"
......@@ -131,13 +131,13 @@
</el-form-item>
</el-col>
<el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 2">
<el-form-item label="最高债权额：" prop="diyaqList[0].zgzqse">
<el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
<el-form-item label="最高债权额：" prop="diyaq.zgzqse">
<el-input
v-model="ruleForm.diyaqList[0].zgzqse"
v-model="ruleForm.diyaq.zgzqse"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
<el-select
v-model="ruleForm.diyaqList[0].jedw"
v-model="ruleForm.diyaq.jedw"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
<el-option
v-for="item in dictData['A57']"
......@@ -152,9 +152,9 @@
<el-col :span="8">
<el-form-item
label="债务履行起始时间："
prop="diyaqList[0].zwlxqssj">
prop="diyaq.zwlxqssj">
<el-date-picker
v-model="ruleForm.diyaqList[0].zwlxqssj"
v-model="ruleForm.diyaq.zwlxqssj"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
type="date">
</el-date-picker>
......@@ -163,9 +163,9 @@
<el-col :span="8">
<el-form-item
label="债务履行结束时间："
prop="diyaqList[0].zwlxjssj">
prop="diyaq.zwlxjssj">
<el-date-picker
v-model="ruleForm.diyaqList[0].zwlxjssj"
v-model="ruleForm.diyaq.zwlxjssj"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
type="date">
</el-date-picker>
......@@ -177,7 +177,7 @@
<el-col :span="24">
<el-form-item label="担保范围：">
<el-input
v-model="ruleForm.diyaqList[0].dbfw"
v-model="ruleForm.diyaq.dbfw"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
</el-form-item>
</el-col>
......@@ -186,9 +186,9 @@
<el-col :span="24">
<el-form-item
label="最高债权确定事实和数额："
prop="diyaqList[0].zgzqqdss">
prop="diyaq.zgzqqdss">
<el-input
v-model="ruleForm.diyaqList[0].zgzqqdss"
v-model="ruleForm.diyaq.zgzqqdss"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
</el-form-item>
</el-col>
......@@ -200,7 +200,7 @@
type="textarea"
maxlength="500"
show-word-limit
v-model="ruleForm.diyaqList[0].fj"
v-model="ruleForm.diyaq.fj"
:disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
</el-form-item>
</el-col>
......@@ -282,23 +282,22 @@
<el-col>
<el-form-item
v-if="ruleForm.sldyList[0].djlx == '400'"
label="注销抵押原因："
:prop="'diyaqList.'+0+'.zxdyyy'" :rules="{ required: true, message: '请输入注销抵押原因', trigger: 'blur' }">
label="注销抵押原因：" prop="diyaq.zxdyyy">
<el-input
class="textArea"
type="textarea"
:disabled="!viewEdit"
v-model="ruleForm.diyaqList[0].zxdyyy">
v-model="ruleForm.diyaq.zxdyyy">
</el-input>
</el-form-item>
<el-form-item v-else label="登记原因：" :prop="'diyaqList.'+0+'.djyy'" :rules="{ required: true, message: '请输入注销抵押原因', trigger: 'blur' }">
<el-form-item v-else label="登记原因：" prop="diyaq.djyy">
<el-input
class="textArea"
type="textarea"
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.diyaqList[0].djyy">
v-model="ruleForm.diyaq.djyy">
</el-input>
</el-form-item>
</el-col>
......@@ -317,7 +316,7 @@
import qlxxTable from "../commonTable/qlxxTable.vue";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import { bacthInit, saveBatchData } from "@/api/workflow/zjgcdyFlow.js";
import { formValidate } from "./bacthSlxxValidate";
import { formValidate } from "./slxxValidate";
import { mapGetters } from "vuex";
export default {
mounted () {
......@@ -345,10 +344,10 @@
});
that.czrOptions = that.ruleForm.qlrList;
that.isSave = that.viewEdit;
// that.rules = formValidate(
// that.ruleForm.sldyList[0].djlx,
// that.ruleForm.diyaqList[0].dyfs
// );
that.rules = formValidate(
that.ruleForm.sldyList[0].djlx,
that.ruleForm.diyaq.dyfs
);
} else {
that.isSave = false;
that.$confirm(res.message, "提示", {
......
......@@ -40,6 +40,7 @@ export function formValidate (djlx,dyfs) {
formRules["diyaq.sfczjzhxz"][0].required=true;
formRules["diyaq.djyy"][0].required=true;
}
console.log(formRules)
return formRules;
}
......
......@@ -31,7 +31,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="权利类型">
<el-select
v-model="queryForm.qllx"
......@@ -79,13 +79,8 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="3" class="btnColRight">
<el-form-item>
<el-button
type="primary"
native-type="submit"
@click="handleSearch">查询</el-button>
<el-col :span="2" class="btnColRight">
<el-form-item>
<el-button @click="moreQueryClick">高级查询</el-button>
</el-form-item>
</el-col>
......@@ -101,7 +96,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="申请人">
<el-input
placeholder="如需要模糊查询，前后输入%"
......@@ -121,7 +116,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="6">
<el-form-item label="坐落">
<el-input
placeholder="如需要模糊查询，前后输入%"
......@@ -131,6 +126,14 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="2" class="btnColRight">
<el-form-item>
<el-button
type="primary"
native-type="submit"
@click="handleSearch">查询</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row class="advanced-search">
<span>搜索条件：</span>
......
......@@ -32,7 +32,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="权利类型">
<el-select
v-model="queryForm.qllx"
......@@ -81,12 +81,8 @@
</el-form-item>
</el-col>
<el-col :span="3" class="btnColRight">
<el-col :span="2" class="btnColRight">
<el-form-item>
<el-button
type="primary"
native-type="submit"
@click="handleSearch">查询</el-button>
<el-button @click="moreQueryClick">高级查询</el-button>
</el-form-item>
</el-col>
......@@ -102,7 +98,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="6">
<el-form-item label="申请人">
<el-input
placeholder="如需要模糊查询，前后输入%"
......@@ -122,7 +118,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="6">
<el-form-item label="坐落">
<el-input
placeholder="如需要模糊查询，前后输入%"
......@@ -132,6 +128,14 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="2" class="btnColRight">
<el-form-item>
<el-button
type="primary"
native-type="submit"
@click="handleSearch">查询</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row class="advanced-search">
<span>搜索条件：</span>
......