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 @@ ...@@ -566,7 +566,7 @@
566 handleSelect (val) { 566 handleSelect (val) {
567 let that = this 567 let that = this
568 let bsmSldy = window.currentSelect.bsmSldy ? window.currentSelect.bsmSldy : '' 568 let bsmSldy = window.currentSelect.bsmSldy ? window.currentSelect.bsmSldy : ''
569 this.$confirm('是否同步材料信息?', '提示', { 569 this.$confirm('是否使用备案内容及材料信息?', '提示', {
570 confirmButtonText: '确定', 570 confirmButtonText: '确定',
571 cancelButtonText: '取消', 571 cancelButtonText: '取消',
572 distinguishCancelAndClose: true,//区分取消与关闭 572 distinguishCancelAndClose: true,//区分取消与关闭
...@@ -584,10 +584,10 @@ ...@@ -584,10 +584,10 @@
584 } 584 }
585 }) 585 })
586 }).catch(action => { 586 }).catch(action => {
587 if (action == 'cancel') { 587 // if (action == 'cancel') {
588 that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' })); 588 // that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
589 that.$emit("input", false); 589 // that.$emit("input", false);
590 } 590 // }
591 }) 591 })
592 }, 592 },
593 /** 593 /**
......
...@@ -111,46 +111,51 @@ ...@@ -111,46 +111,51 @@
111 data: [], 111 data: [],
112 }, 112 },
113 tableDatajf: { 113 tableDatajf: {
114 columns: [ 114 columns: [
115 { 115 {
116 prop: "jfjs", 116 prop: "bdcdyh",
117 label: "计费基数", 117 label: "不动产单元号",
118 }, 118 },
119 { 119 {
120 prop: "jflx", 120 prop: "zl",
121 label: "计费类型", 121 label: "坐落",
122 }, 122 },
123 { 123 {
124 prop: "jflxmc", 124 prop: "qlrmc",
125 label: "计费类型名称", 125 label: "权利人名称",
126 }, 126 },
127 { 127 {
128 prop: "ysje", 128 prop: "ywrmc",
129 label: "应收金额", 129 label: "义务人名称",
130 },
131
132 {
133 prop: "qlxzmc",
134 label: "性质",
130 }, 135 },
131 { 136 {
132 prop: "zkhysje", 137 prop: "qlmjmc",
133 label: "折扣后应收金额", 138 label: "面积",
134 }, 139 },
135 { 140 {
136 prop: "qlrmc", 141 prop: "qlytmc",
137 label: "权利人名称", 142 label: "用途",
138 }, 143 },
139 { 144 {
140 prop: "ywrmc", 145 prop: "jflxmc",
141 label: "义务人名称", 146 label: "计费类型",
142 }, 147 },
143 { 148 {
144 prop: "qlytmc", 149 prop: "ysje",
145 label: "权利用途名称", 150 label: "应收金额",
146 }, 151 },
147 { 152 {
148 prop: "qlxzmc", 153 prop: "jfjs",
149 label: "权利性质名称", 154 label: "计费基数",
150 }, 155 },
151 { 156 {
152 prop: "zl", 157 prop: "zkhysje",
153 label: "坐落", 158 label: "折扣后应收金额",
154 } 159 }
155 ], 160 ],
156 data: [], 161 data: [],
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 </lb-table> 5 </lb-table>
6 6
7 <div class="text-center"> 7 <div class="text-center">
8 <el-button type="primary" @click="hanldeRecharge">重新计费</el-button> 8 <el-button type="primary" @click="hanldeRecharge">重置</el-button>
9 <el-button @click="$popupCacel">取消</el-button> 9 <el-button @click="$popupCacel">取消</el-button>
10 <el-button type="primary" @click="handleSubmit" plain>保存</el-button> 10 <el-button type="primary" @click="handleSubmit" plain>保存</el-button>
11 </div> 11 </div>
......
...@@ -32,18 +32,12 @@ ...@@ -32,18 +32,12 @@
32 <el-row :gutter="10"> 32 <el-row :gutter="10">
33 <el-col :span="8"> 33 <el-col :span="8">
34 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型："> 34 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：">
35 <el-select disabled v-model="ruleForm.sldyList[0].qllx" filterable clearable placeholder="请选择权利类型"> 35 <el-input disabled v-model="ruleForm.sldyList[0].qllxmc"></el-input>
36 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
37 </el-option>
38 </el-select>
39 </el-form-item> 36 </el-form-item>
40 </el-col> 37 </el-col>
41 <el-col :span="8"> 38 <el-col :span="8">
42 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型："> 39 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：">
43 <el-select disabled v-model="ruleForm.sldyList[0].djlx" filterable clearable placeholder="请选择登记类型"> 40 <el-input disabled v-model="ruleForm.sldyList[0].djlxmc"></el-input>
44 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
45 </el-option>
46 </el-select>
47 </el-form-item> 41 </el-form-item>
48 </el-col> 42 </el-col>
49 <el-col :span="8"> 43 <el-col :span="8">
...@@ -73,12 +67,12 @@ ...@@ -73,12 +67,12 @@
73 </el-form-item> 67 </el-form-item>
74 </el-col> 68 </el-col>
75 <el-col :span="8"> 69 <el-col :span="8">
76 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" > 70 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" prop="cfdj.cfwh">
77 <el-input v-model="ruleForm.cfdj.cfwh" :disabled="!ableOperation|| isJfOperation"></el-input> 71 <el-input v-model="ruleForm.cfdj.cfwh" :disabled="!ableOperation|| isJfOperation"></el-input>
78 </el-form-item> 72 </el-form-item>
79 </el-col> 73 </el-col>
80 <el-col :span="8"> 74 <el-col :span="8">
81 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关："> 75 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关：" prop="cfdj.cfjg">
82 <el-input v-model="ruleForm.cfdj.cfjg" :disabled="!ableOperation|| isJfOperation"></el-input> 76 <el-input v-model="ruleForm.cfdj.cfjg" :disabled="!ableOperation|| isJfOperation"></el-input>
83 </el-form-item> 77 </el-form-item>
84 </el-col> 78 </el-col>
...@@ -90,13 +84,13 @@ ...@@ -90,13 +84,13 @@
90 </el-form-item> 84 </el-form-item>
91 </el-col> 85 </el-col>
92 <el-col :span="8"> 86 <el-col :span="8">
93 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间："> 87 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
94 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期" 88 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"
95 value-format="yyyy-MM-dd" :disabled="!ableOperation|| isJfOperation"></el-date-picker> 89 value-format="yyyy-MM-dd" :disabled="!ableOperation|| isJfOperation"></el-date-picker>
96 </el-form-item> 90 </el-form-item>
97 </el-col> 91 </el-col>
98 <el-col :span="8"> 92 <el-col :span="8">
99 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间："> 93 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj">
100 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" 94 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"
101 :disabled="!ableOperation|| isJfOperation" type="date" placeholder="选择日期" 95 :disabled="!ableOperation|| isJfOperation" type="date" placeholder="选择日期"
102 value-format="yyyy-MM-dd"></el-date-picker> 96 value-format="yyyy-MM-dd"></el-date-picker>
...@@ -138,18 +132,18 @@ ...@@ -138,18 +132,18 @@
138 </div> 132 </div>
139 <el-row :gutter="10"> 133 <el-row :gutter="10">
140 <el-col :span="8"> 134 <el-col :span="8">
141 <el-form-item :class="flag ? 'marginBot0' : ''" label="解封机关："> 135 <el-form-item :class="flag ? 'marginBot0' : ''" label="解封机关：" prop="cfdj.jfjg">
142 <el-input v-model="ruleForm.cfdj.jfjg" :disabled="!ableOperation"></el-input> 136 <el-input v-model="ruleForm.cfdj.jfjg" :disabled="!ableOperation"></el-input>
143 </el-form-item> 137 </el-form-item>
144 </el-col> 138 </el-col>
145 <el-col :span="8"> 139 <el-col :span="8">
146 <el-form-item :class="flag ? 'marginBot0' : ''" label="解封文件："> 140 <el-form-item :class="flag ? 'marginBot0' : ''" label="解封文号：" prop="cfdj.jfwh">
147 <el-input v-model="ruleForm.cfdj.jfwj" :disabled="!ableOperation"></el-input> 141 <el-input v-model="ruleForm.cfdj.jfwh" :disabled="!ableOperation"></el-input>
148 </el-form-item> 142 </el-form-item>
149 </el-col> 143 </el-col>
150 <el-col :span="8"> 144 <el-col :span="8">
151 <el-form-item :class="flag ? 'marginBot0' : ''" label="解封文号："> 145 <el-form-item :class="flag ? 'marginBot0' : ''" label="解封文件：">
152 <el-input v-model="ruleForm.cfdj.jfwh" :disabled="!ableOperation"></el-input> 146 <el-input v-model="ruleForm.cfdj.jfwj" :disabled="!ableOperation"></el-input>
153 </el-form-item> 147 </el-form-item>
154 </el-col> 148 </el-col>
155 </el-row> 149 </el-row>
...@@ -165,6 +159,7 @@ ...@@ -165,6 +159,7 @@
165 import qlxxTable from "../commonTable/qlxxTable.vue"; 159 import qlxxTable from "../commonTable/qlxxTable.vue";
166 import cfdjTable from "../commonTable/cfdjTable"; 160 import cfdjTable from "../commonTable/cfdjTable";
167 import { BatchInit, batchSaveData } from "@/api/workflow/cfdjFlow.js"; 161 import { BatchInit, batchSaveData } from "@/api/workflow/cfdjFlow.js";
162 import { formValidate } from "./slxxValidate";
168 import { mapGetters } from "vuex"; 163 import { mapGetters } from "vuex";
169 export default { 164 export default {
170 data () { 165 data () {
...@@ -173,11 +168,7 @@ ...@@ -173,11 +168,7 @@
173 ableOperation: true, 168 ableOperation: true,
174 disabled: true, 169 disabled: true,
175 flagTop: this.flag ? "top" : "", 170 flagTop: this.flag ? "top" : "",
176 rules: { 171 rules: {},
177 'cfdj.djyy': [
178 { required: true, message: '请输入登记原因', trigger: 'blur' }
179 ]
180 },
181 //传递参数 172 //传递参数
182 propsParam: {}, 173 propsParam: {},
183 //页面数据 174 //页面数据
...@@ -201,7 +192,8 @@ ...@@ -201,7 +192,8 @@
201 formdata.append("isEdit", this.ableOperation); 192 formdata.append("isEdit", this.ableOperation);
202 BatchInit(formdata).then((res) => { 193 BatchInit(formdata).then((res) => {
203 if (res.code === 200 && res.result) { 194 if (res.code === 200 && res.result) {
204 this.ruleForm = res.result 195 this.ruleForm = res.result;
196 this.rules = formValidate(this.ruleForm.sldyList[0].djlx);
205 } 197 }
206 }) 198 })
207 }, 199 },
...@@ -237,7 +229,7 @@ ...@@ -237,7 +229,7 @@
237 } else { 229 } else {
238 this.$message({ 230 this.$message({
239 showClose: true, 231 showClose: true,
240 message: "请输入登记原因", 232 message: "请输入红框内的相关信息！",
241 type: "error" 233 type: "error"
242 }) 234 })
243 return false; 235 return false;
......
...@@ -19,56 +19,34 @@ ...@@ -19,56 +19,34 @@
19 </div> 19 </div>
20 <el-row :gutter="10"> 20 <el-row :gutter="10">
21 <el-col :span="8"> 21 <el-col :span="8">
22 <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：" prop="slsq.ywh"> 22 <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：">
23 <el-input disabled v-model="ruleForm.flow.ywh"></el-input> 23 <el-input disabled v-model="ruleForm.flow.ywh"></el-input>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="8"> 26 <el-col :span="8">
27 <el-form-item :class="flag ? 'marginBot0' : ''" label="受理人员：" prop="slsq.slry"> 27 <el-form-item :class="flag ? 'marginBot0' : ''" label="受理人员：">
28 <el-input disabled v-model="ruleForm.slsq.slry"></el-input> 28 <el-input disabled v-model="ruleForm.slsq.slry"></el-input>
29 </el-form-item> 29 </el-form-item>
30 </el-col> 30 </el-col>
31 <el-col :span="8"> 31 <el-col :span="8">
32 <el-form-item :class="flag ? 'marginBot0' : ''" label="受理时间：" prop="slsq.slsj"> 32 <el-form-item :class="flag ? 'marginBot0' : ''" label="受理时间：">
33 <el-input disabled v-model="ruleForm.slsq.slsj"></el-input> 33 <el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 </el-row> 36 </el-row>
37 <el-row :gutter="10"> 37 <el-row :gutter="10">
38 <el-col :span="8"> 38 <el-col :span="8">
39 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：" prop="slsq.qllx"> 39 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：">
40 <el-select 40 <el-input disabled v-model="ruleForm.sldy.qllxmc"></el-input>
41 disabled
42 v-model="ruleForm.sldy.qllx"
43 filterable
44 clearable
45 placeholder="请选择权利类型">
46 <el-option
47 v-for="item in dictData['A8']"
48 :key="item.dcode"
49 :label="item.dname"
50 :value="item.dcode"></el-option>
51 </el-select>
52 </el-form-item> 41 </el-form-item>
53 </el-col> 42 </el-col>
54 <el-col :span="8"> 43 <el-col :span="8">
55 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：" prop="slsq.djlx"> 44 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：">
56 <el-select 45 <el-input disabled v-model="ruleForm.sldy.djlxmc"></el-input>
57 disabled
58 v-model="ruleForm.sldy.djlx"
59 filterable
60 clearable
61 placeholder="请选择登记类型">
62 <el-option
63 v-for="item in dictData['A21']"
64 :key="item.dcode"
65 :label="item.dname"
66 :value="item.dcode"></el-option>
67 </el-select>
68 </el-form-item> 46 </el-form-item>
69 </el-col> 47 </el-col>
70 <el-col :span="8"> 48 <el-col :span="8">
71 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：" prop="slsq.djqx"> 49 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：">
72 <el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input> 50 <el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
73 </el-form-item> 51 </el-form-item>
74 </el-col> 52 </el-col>
...@@ -92,7 +70,7 @@ ...@@ -92,7 +70,7 @@
92 </el-col> 70 </el-col>
93 71
94 <el-col :span="8"> 72 <el-col :span="8">
95 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：" prop="qlxx.bdcqzh"> 73 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：">
96 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input> 74 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
97 </el-form-item> 75 </el-form-item>
98 </el-col> 76 </el-col>
...@@ -104,7 +82,7 @@ ...@@ -104,7 +82,7 @@
104 </el-row> 82 </el-row>
105 <el-row :gutter="10"> 83 <el-row :gutter="10">
106 <el-col :span="8"> 84 <el-col :span="8">
107 <el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人：" prop="qlxx.qlrmc"> 85 <el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人：">
108 <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input> 86 <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
109 </el-form-item> 87 </el-form-item>
110 </el-col> 88 </el-col>
...@@ -121,7 +99,7 @@ ...@@ -121,7 +99,7 @@
121 </el-row> 99 </el-row>
122 <el-row :gutter="10"> 100 <el-row :gutter="10">
123 <el-col :span="8"> 101 <el-col :span="8">
124 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：" prop="qlxx.bdcdyh"> 102 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：">
125 <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input> 103 <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
126 </el-form-item> 104 </el-form-item>
127 </el-col> 105 </el-col>
......
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
565 handleSelect (val) { 565 handleSelect (val) {
566 let that = this 566 let that = this
567 let bsmSldy = window.currentSelect.bsmSldy ? window.currentSelect.bsmSldy : '' 567 let bsmSldy = window.currentSelect.bsmSldy ? window.currentSelect.bsmSldy : ''
568 this.$confirm('是否同步材料信息?', '提示', { 568 this.$confirm('是否备案内容及材料信息?', '提示', {
569 confirmButtonText: '确定', 569 confirmButtonText: '确定',
570 cancelButtonText: '取消', 570 cancelButtonText: '取消',
571 distinguishCancelAndClose: true,//区分取消与关闭 571 distinguishCancelAndClose: true,//区分取消与关闭
...@@ -583,10 +583,10 @@ ...@@ -583,10 +583,10 @@
583 } 583 }
584 }) 584 })
585 }).catch(action => { 585 }).catch(action => {
586 if (action == 'cancel') { 586 // if (action == 'cancel') {
587 that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' })); 587 // that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
588 that.$emit("input", false); 588 // that.$emit("input", false);
589 } 589 // }
590 }) 590 })
591 }, 591 },
592 /** 592 /**
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 <div class="slxx"> 3 <div class="slxx">
4 <el-form 4 <el-form
5 :model="ruleForm" 5 :model="ruleForm"
6 :rules="rules"
6 v-Loading="loading" 7 v-Loading="loading"
7 :label-position="flag ? 'top' : ''" 8 :label-position="flag ? 'top' : ''"
8 :inline="flag" 9 :inline="flag"
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
75 v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')"> 76 v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
76 <el-col :span="8"> 77 <el-col :span="8">
77 <el-form-item label="抵押方式："> 78 <el-form-item label="抵押方式：">
78 <el-radio-group disabled v-model="ruleForm.diyaqList[0].dyfs"> 79 <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
79 <el-radio label="1">一般抵押</el-radio> 80 <el-radio label="1">一般抵押</el-radio>
80 <el-radio label="2">最高额抵押</el-radio> 81 <el-radio label="2">最高额抵押</el-radio>
81 </el-radio-group> 82 </el-radio-group>
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
84 <el-col :span="8"> 85 <el-col :span="8">
85 <el-form-item label="抵押金额类型："> 86 <el-form-item label="抵押金额类型：">
86 <el-radio-group 87 <el-radio-group
87 v-model="ruleForm.diyaqList[0].dyjelx" 88 v-model="ruleForm.diyaq.dyjelx"
88 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> 89 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
89 <el-radio label="0">独立抵押</el-radio> 90 <el-radio label="0">独立抵押</el-radio>
90 <el-radio label="1">整体抵押</el-radio> 91 <el-radio label="1">整体抵押</el-radio>
...@@ -93,13 +94,13 @@ ...@@ -93,13 +94,13 @@
93 </el-col> 94 </el-col>
94 <el-col :span="8"> 95 <el-col :span="8">
95 <el-form-item 96 <el-form-item
96 label="是否存在禁止或者限制转让抵押不动产的约定：" 97 label="是否禁止或者限制转让的约定："
97 label-width="300px"> 98 label-width="200px">
98 <el-radio-group 99 <el-radio-group
99 v-model="ruleForm.diyaqList[0].sfczjzhxz" 100 v-model="ruleForm.diyaq.sfczjzhxz"
100 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> 101 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
101 <el-radio label="1">启用</el-radio> 102 <el-radio label="1">是</el-radio>
102 <el-radio label="0">禁用</el-radio> 103 <el-radio label="0">否</el-radio>
103 </el-radio-group> 104 </el-radio-group>
104 </el-form-item> 105 </el-form-item>
105 </el-col> 106 </el-col>
...@@ -107,15 +108,15 @@ ...@@ -107,15 +108,15 @@
107 <el-row 108 <el-row
108 :gutter="10" 109 :gutter="10"
109 v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')"> 110 v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
110 <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1"> 111 <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 1">
111 <el-form-item label="被担保主债权数额："> 112 <el-form-item label="被担保主债权数额：" prop="diyaq.bdbzzqse">
112 <div style="display: flex"> 113 <div style="display: flex">
113 <el-input 114 <el-input
114 v-model="ruleForm.diyaqList[0].bdbzzqse" 115 v-model="ruleForm.diyaq.bdbzzqse"
115 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 116 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
116 <el-select 117 <el-select
117 style="width: 68px" 118 style="width: 68px"
118 v-model="ruleForm.diyaqList[0].jedw" 119 v-model="ruleForm.diyaq.jedw"
119 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> 120 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
120 <el-option 121 <el-option
121 v-for="item in dictData['A57']" 122 v-for="item in dictData['A57']"
...@@ -128,13 +129,13 @@ ...@@ -128,13 +129,13 @@
128 </el-form-item> 129 </el-form-item>
129 </el-col> 130 </el-col>
130 131
131 <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 2"> 132 <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
132 <el-form-item label="最高债权额："> 133 <el-form-item label="最高债权额：" prop="diyaq.zgzqse">
133 <el-input 134 <el-input
134 v-model="ruleForm.diyaqList[0].zgzqse" 135 v-model="ruleForm.diyaq.zgzqse"
135 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 136 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
136 <el-select 137 <el-select
137 v-model="ruleForm.diyaqList[0].jedw" 138 v-model="ruleForm.diyaq.jedw"
138 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> 139 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
139 <el-option 140 <el-option
140 v-for="item in dictData['A57']" 141 v-for="item in dictData['A57']"
...@@ -147,18 +148,18 @@ ...@@ -147,18 +148,18 @@
147 </el-col> 148 </el-col>
148 149
149 <el-col :span="8"> 150 <el-col :span="8">
150 <el-form-item label="债务履行起始时间："> 151 <el-form-item label="债务履行起始时间：" prop="diyaq.zwlxqssj">
151 <el-date-picker 152 <el-date-picker
152 v-model="ruleForm.diyaqList[0].zwlxqssj" 153 v-model="ruleForm.diyaq.zwlxqssj"
153 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')" 154 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
154 type="date"> 155 type="date">
155 </el-date-picker> 156 </el-date-picker>
156 </el-form-item> 157 </el-form-item>
157 </el-col> 158 </el-col>
158 <el-col :span="8"> 159 <el-col :span="8">
159 <el-form-item label="债务履行结束时间："> 160 <el-form-item label="债务履行结束时间：" prop="diyaq.zwlxjssj">
160 <el-date-picker 161 <el-date-picker
161 v-model="ruleForm.diyaqList[0].zwlxjssj" 162 v-model="ruleForm.diyaq.zwlxjssj"
162 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')" 163 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
163 type="date"> 164 type="date">
164 </el-date-picker> 165 </el-date-picker>
...@@ -169,7 +170,7 @@ ...@@ -169,7 +170,7 @@
169 <el-col :span="24"> 170 <el-col :span="24">
170 <el-form-item label="担保范围："> 171 <el-form-item label="担保范围：">
171 <el-input 172 <el-input
172 v-model="ruleForm.diyaqList[0].dbfw" 173 v-model="ruleForm.diyaq.dbfw"
173 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 174 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
174 </el-form-item> 175 </el-form-item>
175 </el-col> 176 </el-col>
...@@ -178,7 +179,7 @@ ...@@ -178,7 +179,7 @@
178 <el-col :span="24"> 179 <el-col :span="24">
179 <el-form-item label="最高债权确定事实和数额："> 180 <el-form-item label="最高债权确定事实和数额：">
180 <el-input 181 <el-input
181 v-model="ruleForm.diyaqList[0].zgzqqdss" 182 v-model="ruleForm.diyaq.zgzqqdss"
182 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 183 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
183 </el-form-item> 184 </el-form-item>
184 </el-col> 185 </el-col>
...@@ -190,7 +191,7 @@ ...@@ -190,7 +191,7 @@
190 type="textarea" 191 type="textarea"
191 maxlength="500" 192 maxlength="500"
192 show-word-limit 193 show-word-limit
193 v-model="ruleForm.diyaqList[0].fj" 194 v-model="ruleForm.diyaq.fj"
194 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 195 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
195 </el-form-item> 196 </el-form-item>
196 </el-col> 197 </el-col>
...@@ -278,17 +279,17 @@ ...@@ -278,17 +279,17 @@
278 class="textArea" 279 class="textArea"
279 type="textarea" 280 type="textarea"
280 :disabled="!viewEdit" 281 :disabled="!viewEdit"
281 v-model="ruleForm.diyaqList[0].zxdyyy"> 282 v-model="ruleForm.diyaq.zxdyyy">
282 </el-input> 283 </el-input>
283 </el-form-item> 284 </el-form-item>
284 <el-form-item v-else label="登记原因：" prop="diyaqList[0].djyy"> 285 <el-form-item v-else label="登记原因：" prop="diyaq.djyy">
285 <el-input 286 <el-input
286 class="textArea" 287 class="textArea"
287 type="textarea" 288 type="textarea"
288 maxlength="500" 289 maxlength="500"
289 show-word-limit 290 show-word-limit
290 :disabled="!viewEdit" 291 :disabled="!viewEdit"
291 v-model="ruleForm.diyaqList[0].djyy"> 292 v-model="ruleForm.diyaq.djyy">
292 </el-input> 293 </el-input>
293 </el-form-item> 294 </el-form-item>
294 </el-col> 295 </el-col>
...@@ -307,6 +308,7 @@ ...@@ -307,6 +308,7 @@
307 import dyaqTable from "../commonTable/dyaqTable"; 308 import dyaqTable from "../commonTable/dyaqTable";
308 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 309 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
309 import { batchInit, saveBatchData } from "@/api/workflow/diyaqFlow.js"; 310 import { batchInit, saveBatchData } from "@/api/workflow/diyaqFlow.js";
311 import { formValidate } from "./slxxValidate";
310 import { mapGetters } from "vuex"; 312 import { mapGetters } from "vuex";
311 export default { 313 export default {
312 mounted () { 314 mounted () {
...@@ -332,7 +334,11 @@ ...@@ -332,7 +334,11 @@
332 } 334 }
333 }) 335 })
334 that.czrOptions = that.ruleForm.qlrList; 336 that.czrOptions = that.ruleForm.qlrList;
335 that.isSave = that.viewEdit 337 that.isSave = that.viewEdit;
338 that.rules = formValidate(
339 that.ruleForm.sldyList[0].djlx,
340 that.ruleForm.diyaq.dyfs
341 );
336 } else { 342 } else {
337 that.isSave = false 343 that.isSave = false
338 that.$confirm(res.message, '提示', { 344 that.$confirm(res.message, '提示', {
...@@ -361,11 +367,7 @@ ...@@ -361,11 +367,7 @@
361 ruleForm: {}, 367 ruleForm: {},
362 //传递参数 368 //传递参数
363 propsParam: {}, 369 propsParam: {},
364 rules: { 370 rules: {},
365 'diyaqList[0].djyy': [
366 { required: true, message: '请输入登记原因', trigger: 'blur' }
367 ]
368 },
369 tableData: [], 371 tableData: [],
370 }; 372 };
371 }, 373 },
...@@ -450,7 +452,7 @@ ...@@ -450,7 +452,7 @@
450 } else { 452 } else {
451 that.$message({ 453 that.$message({
452 showClose: true, 454 showClose: true,
453 message: "请输入登记原因", 455 message: "请输入红框内的相关信息！",
454 type: "error" 456 type: "error"
455 }) 457 })
456 return false 458 return false
......
...@@ -126,7 +126,8 @@ ...@@ -126,7 +126,8 @@
126 <el-row :gutter="10"> 126 <el-row :gutter="10">
127 <el-col :span="8"> 127 <el-col :span="8">
128 <el-form-item label="原不动产证号："> 128 <el-form-item label="原不动产证号：">
129 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input> 129 <el-input v-if="ruleForm.sldy.djlx=='100'" disabled ></el-input>
130 <el-input v-else disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
130 </el-form-item> 131 </el-form-item>
131 </el-col> 132 </el-col>
132 <el-col :span="8"> 133 <el-col :span="8">
......
1 /**
2 * @description: 首次登记效验
3 * @param {*} data
4 * @author: renchao
5 */
6 export function formValidate (djlx,dyfs) {
7 var formRules={
8 'diyaqList[0].djyy': [
9 { required: false, message: '请输入登记原因', trigger: 'blur' }
10 ],
11 'diyaqList[0].zxdyyy': [
12 { required: false, message: '请输入注销登记原因', trigger: 'blur' }
13 ],
14 'diyaqList[0].zwlxqssj': [
15 { required: false, message: '请选择债务履行起始时间', trigger: 'blur' }
16 ],
17 'diyaqList[0].zwlxjssj': [
18 { required: false, message: '请选择债务履行起始时间', trigger: 'blur' }
19 ],
20 'diyaqList[0].bdbzzqse': [
21 { required: false, message: '请输入被担保主债权数额', trigger: 'blur' }
22 ],
23 'diyaqList[0].zgzqse': [
24 { required: false, message: '请输入最高债权额', trigger: 'blur' }
25 ],
26 'diyaqList[0].sfczjzhxz': [
27 { required: false, message: '请输入最高债权额', trigger: 'blur' }
28 ]
29 }
30
31 if (djlx=="400") {
32 formRules["diyaqList[0].zxdyyy"][0].required=true;
33 }else{
34 if(dyfs=="1"){
35 formRules["diyaqList[0].bdbzzqse"][0].required=true;
36 }else{
37 formRules["diyaqList[0].zgzqse"][0].required=true;
38 }
39 formRules["diyaqList[0].zwlxqssj"][0].required=true;
40 formRules["diyaqList[0].zwlxjssj"][0].required=true;
41 formRules["diyaqList[0].sfczjzhxz"][0].required=true;
42 formRules["diyaqList[0].djyy"][0].required=true;
43 }
44 console.log(formRules);
45 return formRules;
46 }
47
48 /**
49 * @description: 首次登记效验
50 * @param {*} data
51 * @author: renchao
52 */
53 export function fristValidate (formRules,dyfs) {
54
55 return formRules;
56 }
57
58
59 /**
60 * @description: 转移登记效验
61 * @param {*} data
62 * @author: renchao
63 */
64 export function transferValidate (data) {
65
66 }
67
68 /**
69 * @description: 变更登记效验
70 * @param {*} data
71 * @author: renchao
72 */
73 export function changeValidate (data) {
74
75 }
76
77 /**
78 * @description: 注销登记效验
79 * @param {*} data
80 * @author: renchao
81 */
82 export function logoutValidate (data) {
83
84 }
85
86 /**
87 * @description: 更正登记效验
88 * @param {*} data
89 * @author: renchao
90 */
91 export function riviseValidate (data) {
92
93 }
94
95 /**
96 * @description: 补证登记效验
97 * @param {*} data
98 * @author: renchao
99 */
100 export function renewalValidate (data) {
101
102 }
103
104 /**
105 * @description: 换证登记效验
106 * @param {*} data
107 * @author: renchao
108 */
109 export function replaceValidate (data) {
110
111 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 受理信息 --> 2 <!-- 受理信息 -->
3 <div class="slxx"> 3 <div class="slxx">
4 <el-form 4 <el-form
5 :model="ruleForm" 5 :model="ruleForm" :rules="rules"
6 v-Loading="loading" 6 v-Loading="loading"
7 :label-position="flag ? 'top' : ''" 7 :label-position="flag ? 'top' : ''"
8 :inline="flag" 8 :inline="flag"
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0"> 75 v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
76 <el-col :span="8"> 76 <el-col :span="8">
77 <el-form-item label="抵押方式："> 77 <el-form-item label="抵押方式：">
78 <el-radio-group disabled v-model="ruleForm.diyaqList[0].dyfs"> 78 <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
79 <el-radio label="1">一般抵押</el-radio> 79 <el-radio label="1">一般抵押</el-radio>
80 <el-radio label="2">最高额抵押</el-radio> 80 <el-radio label="2">最高额抵押</el-radio>
81 </el-radio-group> 81 </el-radio-group>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <el-col :span="8"> 84 <el-col :span="8">
85 <el-form-item label="抵押金额类型："> 85 <el-form-item label="抵押金额类型：">
86 <el-radio-group 86 <el-radio-group
87 v-model="ruleForm.diyaqList[0].dyjelx" 87 v-model="ruleForm.diyaq.dyjelx"
88 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> 88 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
89 <el-radio label="0">独立抵押</el-radio> 89 <el-radio label="0">独立抵押</el-radio>
90 <el-radio label="1">整体抵押</el-radio> 90 <el-radio label="1">整体抵押</el-radio>
...@@ -95,12 +95,12 @@ ...@@ -95,12 +95,12 @@
95 <el-form-item 95 <el-form-item
96 label="是否禁止或者限制转让约定：" 96 label="是否禁止或者限制转让约定："
97 label-width="200px" 97 label-width="200px"
98 prop="diyaqList[0].sfczjzhxz"> 98 prop="diyaq.sfczjzhxz">
99 <el-radio-group 99 <el-radio-group
100 v-model="ruleForm.diyaqList[0].sfczjzhxz" 100 v-model="ruleForm.diyaq.sfczjzhxz"
101 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> 101 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
102 <el-radio label="1">启用</el-radio> 102 <el-radio label="1">是</el-radio>
103 <el-radio label="0">禁用</el-radio> 103 <el-radio label="0">否</el-radio>
104 </el-radio-group> 104 </el-radio-group>
105 </el-form-item> 105 </el-form-item>
106 </el-col> 106 </el-col>
...@@ -108,17 +108,17 @@ ...@@ -108,17 +108,17 @@
108 <el-row 108 <el-row
109 :gutter="10" 109 :gutter="10"
110 v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0"> 110 v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
111 <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1"> 111 <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 1">
112 <el-form-item 112 <el-form-item
113 label="被担保主债权数额：" 113 label="被担保主债权数额："
114 prop="diyaqList[0].bdbzzqse"> 114 prop="diyaq.bdbzzqse">
115 <div style="display: flex"> 115 <div style="display: flex">
116 <el-input 116 <el-input
117 v-model="ruleForm.diyaqList[0].bdbzzqse" 117 v-model="ruleForm.diyaq.bdbzzqse"
118 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 118 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
119 <el-select 119 <el-select
120 style="width: 68px" 120 style="width: 68px"
121 v-model="ruleForm.diyaqList[0].jedw" 121 v-model="ruleForm.diyaq.jedw"
122 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> 122 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
123 <el-option 123 <el-option
124 v-for="item in dictData['A57']" 124 v-for="item in dictData['A57']"
...@@ -131,13 +131,13 @@ ...@@ -131,13 +131,13 @@
131 </el-form-item> 131 </el-form-item>
132 </el-col> 132 </el-col>
133 133
134 <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 2"> 134 <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
135 <el-form-item label="最高债权额：" prop="diyaqList[0].zgzqse"> 135 <el-form-item label="最高债权额：" prop="diyaq.zgzqse">
136 <el-input 136 <el-input
137 v-model="ruleForm.diyaqList[0].zgzqse" 137 v-model="ruleForm.diyaq.zgzqse"
138 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 138 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
139 <el-select 139 <el-select
140 v-model="ruleForm.diyaqList[0].jedw" 140 v-model="ruleForm.diyaq.jedw"
141 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> 141 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')">
142 <el-option 142 <el-option
143 v-for="item in dictData['A57']" 143 v-for="item in dictData['A57']"
...@@ -152,9 +152,9 @@ ...@@ -152,9 +152,9 @@
152 <el-col :span="8"> 152 <el-col :span="8">
153 <el-form-item 153 <el-form-item
154 label="债务履行起始时间：" 154 label="债务履行起始时间："
155 prop="diyaqList[0].zwlxqssj"> 155 prop="diyaq.zwlxqssj">
156 <el-date-picker 156 <el-date-picker
157 v-model="ruleForm.diyaqList[0].zwlxqssj" 157 v-model="ruleForm.diyaq.zwlxqssj"
158 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')" 158 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
159 type="date"> 159 type="date">
160 </el-date-picker> 160 </el-date-picker>
...@@ -163,9 +163,9 @@ ...@@ -163,9 +163,9 @@
163 <el-col :span="8"> 163 <el-col :span="8">
164 <el-form-item 164 <el-form-item
165 label="债务履行结束时间：" 165 label="债务履行结束时间："
166 prop="diyaqList[0].zwlxjssj"> 166 prop="diyaq.zwlxjssj">
167 <el-date-picker 167 <el-date-picker
168 v-model="ruleForm.diyaqList[0].zwlxjssj" 168 v-model="ruleForm.diyaq.zwlxjssj"
169 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')" 169 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"
170 type="date"> 170 type="date">
171 </el-date-picker> 171 </el-date-picker>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
177 <el-col :span="24"> 177 <el-col :span="24">
178 <el-form-item label="担保范围："> 178 <el-form-item label="担保范围：">
179 <el-input 179 <el-input
180 v-model="ruleForm.diyaqList[0].dbfw" 180 v-model="ruleForm.diyaq.dbfw"
181 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 181 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
182 </el-form-item> 182 </el-form-item>
183 </el-col> 183 </el-col>
...@@ -186,9 +186,9 @@ ...@@ -186,9 +186,9 @@
186 <el-col :span="24"> 186 <el-col :span="24">
187 <el-form-item 187 <el-form-item
188 label="最高债权确定事实和数额：" 188 label="最高债权确定事实和数额："
189 prop="diyaqList[0].zgzqqdss"> 189 prop="diyaq.zgzqqdss">
190 <el-input 190 <el-input
191 v-model="ruleForm.diyaqList[0].zgzqqdss" 191 v-model="ruleForm.diyaq.zgzqqdss"
192 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 192 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
193 </el-form-item> 193 </el-form-item>
194 </el-col> 194 </el-col>
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
200 type="textarea" 200 type="textarea"
201 maxlength="500" 201 maxlength="500"
202 show-word-limit 202 show-word-limit
203 v-model="ruleForm.diyaqList[0].fj" 203 v-model="ruleForm.diyaq.fj"
204 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> 204 :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input>
205 </el-form-item> 205 </el-form-item>
206 </el-col> 206 </el-col>
...@@ -282,23 +282,22 @@ ...@@ -282,23 +282,22 @@
282 <el-col> 282 <el-col>
283 <el-form-item 283 <el-form-item
284 v-if="ruleForm.sldyList[0].djlx == '400'" 284 v-if="ruleForm.sldyList[0].djlx == '400'"
285 label="注销抵押原因：" 285 label="注销抵押原因：" prop="diyaq.zxdyyy">
286 :prop="'diyaqList.'+0+'.zxdyyy'" :rules="{ required: true, message: '请输入注销抵押原因', trigger: 'blur' }">
287 <el-input 286 <el-input
288 class="textArea" 287 class="textArea"
289 type="textarea" 288 type="textarea"
290 :disabled="!viewEdit" 289 :disabled="!viewEdit"
291 v-model="ruleForm.diyaqList[0].zxdyyy"> 290 v-model="ruleForm.diyaq.zxdyyy">
292 </el-input> 291 </el-input>
293 </el-form-item> 292 </el-form-item>
294 <el-form-item v-else label="登记原因：" :prop="'diyaqList.'+0+'.djyy'" :rules="{ required: true, message: '请输入注销抵押原因', trigger: 'blur' }"> 293 <el-form-item v-else label="登记原因：" prop="diyaq.djyy">
295 <el-input 294 <el-input
296 class="textArea" 295 class="textArea"
297 type="textarea" 296 type="textarea"
298 maxlength="500" 297 maxlength="500"
299 show-word-limit 298 show-word-limit
300 :disabled="!viewEdit" 299 :disabled="!viewEdit"
301 v-model="ruleForm.diyaqList[0].djyy"> 300 v-model="ruleForm.diyaq.djyy">
302 </el-input> 301 </el-input>
303 </el-form-item> 302 </el-form-item>
304 </el-col> 303 </el-col>
...@@ -317,7 +316,7 @@ ...@@ -317,7 +316,7 @@
317 import qlxxTable from "../commonTable/qlxxTable.vue"; 316 import qlxxTable from "../commonTable/qlxxTable.vue";
318 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 317 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
319 import { bacthInit, saveBatchData } from "@/api/workflow/zjgcdyFlow.js"; 318 import { bacthInit, saveBatchData } from "@/api/workflow/zjgcdyFlow.js";
320 import { formValidate } from "./bacthSlxxValidate"; 319 import { formValidate } from "./slxxValidate";
321 import { mapGetters } from "vuex"; 320 import { mapGetters } from "vuex";
322 export default { 321 export default {
323 mounted () { 322 mounted () {
...@@ -345,10 +344,10 @@ ...@@ -345,10 +344,10 @@
345 }); 344 });
346 that.czrOptions = that.ruleForm.qlrList; 345 that.czrOptions = that.ruleForm.qlrList;
347 that.isSave = that.viewEdit; 346 that.isSave = that.viewEdit;
348 // that.rules = formValidate( 347 that.rules = formValidate(
349 // that.ruleForm.sldyList[0].djlx, 348 that.ruleForm.sldyList[0].djlx,
350 // that.ruleForm.diyaqList[0].dyfs 349 that.ruleForm.diyaq.dyfs
351 // ); 350 );
352 } else { 351 } else {
353 that.isSave = false; 352 that.isSave = false;
354 that.$confirm(res.message, "提示", { 353 that.$confirm(res.message, "提示", {
......
...@@ -40,6 +40,7 @@ export function formValidate (djlx,dyfs) { ...@@ -40,6 +40,7 @@ export function formValidate (djlx,dyfs) {
40 formRules["diyaq.sfczjzhxz"][0].required=true; 40 formRules["diyaq.sfczjzhxz"][0].required=true;
41 formRules["diyaq.djyy"][0].required=true; 41 formRules["diyaq.djyy"][0].required=true;
42 } 42 }
43 console.log(formRules)
43 return formRules; 44 return formRules;
44 } 45 }
45 46
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 </el-select> 31 </el-select>
32 </el-form-item> 32 </el-form-item>
33 </el-col> 33 </el-col>
34 <el-col :span="5"> 34 <el-col :span="6">
35 <el-form-item label="权利类型"> 35 <el-form-item label="权利类型">
36 <el-select 36 <el-select
37 v-model="queryForm.qllx" 37 v-model="queryForm.qllx"
...@@ -79,13 +79,8 @@ ...@@ -79,13 +79,8 @@
79 </el-input> 79 </el-input>
80 </el-form-item> 80 </el-form-item>
81 </el-col> 81 </el-col>
82 82 <el-col :span="2" class="btnColRight">
83 <el-col :span="3" class="btnColRight"> 83 <el-form-item>
84 <el-form-item>
85 <el-button
86 type="primary"
87 native-type="submit"
88 @click="handleSearch">查询</el-button>
89 <el-button @click="moreQueryClick">高级查询</el-button> 84 <el-button @click="moreQueryClick">高级查询</el-button>
90 </el-form-item> 85 </el-form-item>
91 </el-col> 86 </el-col>
...@@ -101,7 +96,7 @@ ...@@ -101,7 +96,7 @@
101 </el-input> 96 </el-input>
102 </el-form-item> 97 </el-form-item>
103 </el-col> 98 </el-col>
104 <el-col :span="5"> 99 <el-col :span="6">
105 <el-form-item label="申请人"> 100 <el-form-item label="申请人">
106 <el-input 101 <el-input
107 placeholder="如需要模糊查询，前后输入%" 102 placeholder="如需要模糊查询，前后输入%"
...@@ -121,7 +116,7 @@ ...@@ -121,7 +116,7 @@
121 </el-input> 116 </el-input>
122 </el-form-item> 117 </el-form-item>
123 </el-col> 118 </el-col>
124 <el-col :span="9"> 119 <el-col :span="6">
125 <el-form-item label="坐落"> 120 <el-form-item label="坐落">
126 <el-input 121 <el-input
127 placeholder="如需要模糊查询，前后输入%" 122 placeholder="如需要模糊查询，前后输入%"
...@@ -131,6 +126,14 @@ ...@@ -131,6 +126,14 @@
131 </el-input> 126 </el-input>
132 </el-form-item> 127 </el-form-item>
133 </el-col> 128 </el-col>
129 <el-col :span="2" class="btnColRight">
130 <el-form-item>
131 <el-button
132 type="primary"
133 native-type="submit"
134 @click="handleSearch">查询</el-button>
135 </el-form-item>
136 </el-col>
134 </el-row> 137 </el-row>
135 <el-row class="advanced-search"> 138 <el-row class="advanced-search">
136 <span>搜索条件：</span> 139 <span>搜索条件：</span>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 </el-select> 32 </el-select>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="5"> 35 <el-col :span="6">
36 <el-form-item label="权利类型"> 36 <el-form-item label="权利类型">
37 <el-select 37 <el-select
38 v-model="queryForm.qllx" 38 v-model="queryForm.qllx"
...@@ -81,12 +81,8 @@ ...@@ -81,12 +81,8 @@
81 </el-form-item> 81 </el-form-item>
82 </el-col> 82 </el-col>
83 83
84 <el-col :span="3" class="btnColRight"> 84 <el-col :span="2" class="btnColRight">
85 <el-form-item> 85 <el-form-item>
86 <el-button
87 type="primary"
88 native-type="submit"
89 @click="handleSearch">查询</el-button>
90 <el-button @click="moreQueryClick">高级查询</el-button> 86 <el-button @click="moreQueryClick">高级查询</el-button>
91 </el-form-item> 87 </el-form-item>
92 </el-col> 88 </el-col>
...@@ -102,7 +98,7 @@ ...@@ -102,7 +98,7 @@
102 </el-input> 98 </el-input>
103 </el-form-item> 99 </el-form-item>
104 </el-col> 100 </el-col>
105 <el-col :span="5"> 101 <el-col :span="6">
106 <el-form-item label="申请人"> 102 <el-form-item label="申请人">
107 <el-input 103 <el-input
108 placeholder="如需要模糊查询，前后输入%" 104 placeholder="如需要模糊查询，前后输入%"
...@@ -122,7 +118,7 @@ ...@@ -122,7 +118,7 @@
122 </el-input> 118 </el-input>
123 </el-form-item> 119 </el-form-item>
124 </el-col> 120 </el-col>
125 <el-col :span="9"> 121 <el-col :span="6">
126 <el-form-item label="坐落"> 122 <el-form-item label="坐落">
127 <el-input 123 <el-input
128 placeholder="如需要模糊查询，前后输入%" 124 placeholder="如需要模糊查询，前后输入%"
...@@ -132,6 +128,14 @@ ...@@ -132,6 +128,14 @@
132 </el-input> 128 </el-input>
133 </el-form-item> 129 </el-form-item>
134 </el-col> 130 </el-col>
131 <el-col :span="2" class="btnColRight">
132 <el-form-item>
133 <el-button
134 type="primary"
135 native-type="submit"
136 @click="handleSearch">查询</el-button>
137 </el-form-item>
138 </el-col>
135 </el-row> 139 </el-row>
136 <el-row class="advanced-search"> 140 <el-row class="advanced-search">
137 <span>搜索条件：</span> 141 <span>搜索条件：</span>
......