0e3ad59d by renchao@pashanhoo.com

Merge branch 'dev'

2 parents ea7a6e14 0fa3bba0
Showing 44 changed files with 701 additions and 1001 deletions
...@@ -129,7 +129,7 @@ export function editCompanyMaterialList (data, bsmCompany) { ...@@ -129,7 +129,7 @@ export function editCompanyMaterialList (data, bsmCompany) {
129 * @description: 是否覆盖才材料信息 129 * @description: 是否覆盖才材料信息
130 * @author: renchao 130 * @author: renchao
131 */ 131 */
132 export function replace (bsmCompany, bsmSldy, bsmSlsq) { 132 export function replace (bsmCompany, bsmSlsq, bsmSldy) {
133 return request({ 133 return request({
134 url: SERVER.SERVERAPI + '/rest/sys/company/replace', 134 url: SERVER.SERVERAPI + '/rest/sys/company/replace',
135 method: 'get', 135 method: 'get',
......
1 <template> 1 <template>
2 <dialogBox title="房屋明细查询" @closeDialog="closeDialog" width="75%" :isButton="false" v-model="myValue"> 2 <div v-Loading="Loading">
3 <el-steps :active="activeStep" finish-status="success"> 3
4 <el-steps :active="activeStep" finish-status="success" v-if="isADD">
4 <el-step title="条件录入"></el-step> 5 <el-step title="条件录入"></el-step>
5 <el-step title="结果查询"></el-step> 6 <el-step title="查询结果"></el-step>
6 <el-step title="结果展示"></el-step> 7 </el-steps>
8 <el-steps :active="activeStep" finish-status="success" v-else>
9 <el-step title="条件录入" @click.native="on_click(0)" class="pointer"></el-step>
10 <el-step title="查询结果" @click.native="on_click(2)" class="pointer"></el-step>
7 </el-steps> 11 </el-steps>
8 <div v-if="isSearch"> 12 <div v-if="isSearch">
9 <dydjbInfo ref="dydjbInfo" /> 13 <dydjbInfo ref="dydjbInfo" />
...@@ -42,39 +46,42 @@ ...@@ -42,39 +46,42 @@
42 <lb-table :column="qlrColumns" key="ql2r" :data="form.qlrList" :maxHeight="200" heightNumSetting 46 <lb-table :column="qlrColumns" key="ql2r" :data="form.qlrList" :maxHeight="200" heightNumSetting
43 :pagination="false"> 47 :pagination="false">
44 </lb-table> 48 </lb-table>
45 <div class="submit-button" style="padding-bottom:50px"> 49 </div>
46 <el-button @click="resetClick" v-show="!isSearch">重置</el-button> 50 <div class="submit-button" style="padding-bottom:50px" v-if="this.formData.sqcxBsm==''">
47 <el-button type="primary" @click="queryChick" v-show="!isSearch">查询</el-button> 51 <el-button @click="resetClick" v-show="!isSearch">重置</el-button>
48 <el-button @click="closeDialog">关闭</el-button> 52 <el-button type="primary" @click="queryChick" v-show="!isSearch">查询</el-button>
49 </div> 53 <el-button @click="closeDialog">关闭</el-button>
50 </div> 54 </div>
51 </div> 55 </div>
52 </dialogBox> 56 </div>
53 </template> 57 </template>
54
55 <script> 58 <script>
59 import { mapGetters } from "vuex";
60 import store from '@/store/index.js'
61 import dydjbInfo from "./dydjbInfo.vue";
62 import { getLodop } from "@/utils/LodopFuncs"
63 import { datas, sendThis } from "./dydjbdata";
56 import { addFwmxCxjgXx, getFwmxInfo, printJtcfInfo } from "@/api/jtfc.js"; 64 import { addFwmxCxjgXx, getFwmxInfo, printJtcfInfo } from "@/api/jtfc.js";
57 import { getPrintTemplateByCode } from "@/api/print"; 65 import { getPrintTemplateByCode } from "@/api/print";
58 import { datas, sendThis } from "./dydjbdata";
59 import { getLodop } from "@/utils/LodopFuncs"
60 import dydjbInfo from "./dydjbInfo.vue";
61 import { mapGetters } from "vuex";
62 export default { 66 export default {
63 computed: { 67 computed: {
64 ...mapGetters(["dictData"]), 68 ...mapGetters(["dictData"]),
65 }, 69 },
66 components: { dydjbInfo }, 70 components: { dydjbInfo },
67 props: { 71 props: {
68 value: { type: Boolean, default: false }, 72 formData: {
69 sqcxBsm: { type: String, default: "" }, 73 type: Object,
74 default: () => { },
75 }
70 }, 76 },
71 mounted () { 77 mounted () {
72 sendThis(this); 78 sendThis(this);
73 }, 79 },
74 data () { 80 data () {
75 return { 81 return {
82 isADD: true,
83 Loading: false,
76 activeStep: 0, 84 activeStep: 0,
77 myValue: this.value,
78 //是否查询 85 //是否查询
79 isSearch: false, 86 isSearch: false,
80 //查询结果列表字段 87 //查询结果列表字段
...@@ -99,22 +106,15 @@ ...@@ -99,22 +106,15 @@
99 }, 106 },
100 }; 107 };
101 }, 108 },
109 mounted () {
110 this.loadData()
111 this.isADD = this.formData.isAdd
112 if (this.formData.sqcxBsm != '') {
113 this.activeStep = 2;
114 this.isSearch = true;
115 }
116 },
102 watch: { 117 watch: {
103 value (val) {
104 this.myValue = val;
105 let that = this
106 if (val) {
107 this.form.sqrList = []
108 this.form.qlrList = []
109 this.isSearch = false
110 if (this.sqcxBsm == "") {
111 that.add("sqr");
112 that.add("qlr");
113 } else {
114 that.loadData();
115 }
116 }
117 },
118 "form.djSqcxDO.ycqrgx" (val) { 118 "form.djSqcxDO.ycqrgx" (val) {
119 if (val == "1") { 119 if (val == "1") {
120 this.form.qlrList = _.cloneDeep(this.form.sqrList); 120 this.form.qlrList = _.cloneDeep(this.form.sqrList);
...@@ -123,13 +123,25 @@ ...@@ -123,13 +123,25 @@
123 this.add("qlr"); 123 this.add("qlr");
124 } 124 }
125 }, 125 },
126 "form.sqrList" (val) { 126 "form.sqrList": {
127 if (this.form.djSqcxDO.ycqrgx == '1') { 127 handler: function (val) {
128 this.form.qlrList = _.cloneDeep(this.form.sqrList) 128 if (this.form.djSqcxDO.ycqrgx == '1') {
129 } 129 this.form.qlrList = _.cloneDeep(val)
130 }
131 },
132 deep: true
130 } 133 }
131 }, 134 },
132 methods: { 135 methods: {
136 // 步骤条
137 on_click (e) {
138 if (e != '' || e != null) { this.activeStep = e }
139 if (e == 0) {
140 this.isSearch = false
141 } else {
142 this.isSearch = true
143 }
144 },
133 /** 145 /**
134 * @description: closeDialog 146 * @description: closeDialog
135 * @author: renchao 147 * @author: renchao
...@@ -145,49 +157,44 @@ ...@@ -145,49 +157,44 @@
145 dyjlList: [], 157 dyjlList: [],
146 } 158 }
147 }, 159 },
148 //加载详细信息
149 /** 160 /**
150 * @description: 加载详细信息 161 * @description: 加载详细信息
151 * @author: renchao 162 * @author: renchao
152 */ 163 */
153 loadData () { 164 loadData () {
154 this.$startLoading(); 165 this.Loading = true
155 getFwmxInfo({ sqcxBsm: this.sqcxBsm }).then((res) => { 166 getFwmxInfo({ sqcxBsm: this.formData.sqcxBsm }).then((res) => {
156 this.$endLoading(); 167 this.Loading = false
157 if (res.code == 200) { 168 if (res.code == 200) {
158 this.activeStep = 2;
159 this.isSearch = true;
160 this.$nextTick(() => { 169 this.$nextTick(() => {
161 this.$refs.dydjbInfo.setResult(res.result) 170 this.$refs.dydjbInfo.setResult(res.result)
162 }) 171 })
163 } 172 }
164 }); 173 }).catch(() => {
174 this.Loading = false
175 })
165 }, 176 },
166 //查询结果
167 /** 177 /**
168 * @description: 查询结果 178 * @description: 查询结果
169 * @author: renchao 179 * @author: renchao
170 */ 180 */
171 queryChick () { 181 queryChick () {
172 this.$startLoading(); 182 this.Loading = true
173 this.activeStep = 1; 183 this.activeStep = 1;
184 store.dispatch('user/reWorkFresh', false)
174 addFwmxCxjgXx(this.form).then((res) => { 185 addFwmxCxjgXx(this.form).then((res) => {
175 this.$endLoading(); 186 this.Loading = false
176 if (res.code == 200) { 187 if (res.code == 200) {
188 store.dispatch('user/reWorkFresh', true)
177 this.activeStep = 2; 189 this.activeStep = 2;
178 this.isSearch = true; 190 this.isSearch = true;
191 this.isADD = false
179 this.$nextTick(() => { 192 this.$nextTick(() => {
180 this.$refs.dydjbInfo.setResult(res.result) 193 this.$refs.dydjbInfo.setResult(res.result)
181 }) 194 })
182 this.$parent.queryClick();
183 } 195 }
184 }); 196 })
185 }, 197 },
186 //重置
187 /**
188 * @description: 重置
189 * @author: renchao
190 */
191 resetClick () { 198 resetClick () {
192 this.form.djSqcxDO = { ycqrgx: "1", cxyt: "", bdcqzh: "" }; 199 this.form.djSqcxDO = { ycqrgx: "1", cxyt: "", bdcqzh: "" };
193 this.form.sqrList = _.cloneDeep([this.newData]); 200 this.form.sqrList = _.cloneDeep([this.newData]);
...@@ -214,7 +221,6 @@ ...@@ -214,7 +221,6 @@
214 this.form.qlrList.push(_.cloneDeep(this.newData)); 221 this.form.qlrList.push(_.cloneDeep(this.newData));
215 } 222 }
216 }, 223 },
217 //移除申请人或权利人
218 /** 224 /**
219 * @description: 移除申请人或权利人 225 * @description: 移除申请人或权利人
220 * @param {*} index 226 * @param {*} index
...@@ -229,7 +235,6 @@ ...@@ -229,7 +235,6 @@
229 this.form.qlrList.splice(index, 1); 235 this.form.qlrList.splice(index, 1);
230 } 236 }
231 }, 237 },
232 //电话号码校验
233 /** 238 /**
234 * @description: 电话号码校验 239 * @description: 电话号码校验
235 * @param {*} row 240 * @param {*} row
...@@ -249,9 +254,12 @@ ...@@ -249,9 +254,12 @@
249 }; 254 };
250 </script> 255 </script>
251 <style scoped lang="scss"> 256 <style scoped lang="scss">
252 @import "~@/styles/mixin.scss"; 257 @import "~@/styles/mixin.scss";
253 @import "~@/styles/public.scss"; 258 @import "~@/styles/public.scss";
254 /deep/.dialog_title::before{ 259 /deep/.el-step__title {
260 margin-left: -15px;
261 }
262 /deep/.dialog_title::before {
255 content: ""; 263 content: "";
256 display: block; 264 display: block;
257 width: 4px; 265 width: 4px;
...@@ -261,25 +269,21 @@ ...@@ -261,25 +269,21 @@
261 top: -4px; 269 top: -4px;
262 left: 0px; 270 left: 0px;
263 } 271 }
264 .title { 272 .title {
265 padding-bottom: 10px; 273 padding-bottom: 10px;
266 margin-bottom: 10px; 274 margin-bottom: 10px;
267 display: block; 275 display: block;
268 border-bottom: 1px solid $borderColor; 276 border-bottom: 1px solid $borderColor;
269 } 277 }
270 278 .jtfccx-edit-con {
279 height: 80vh;
280 overflow-y: scroll;
281 }
271 .jtfccx-edit { 282 .jtfccx-edit {
272 @include flex; 283 @include flex;
273 flex-direction: column; 284 flex-direction: column;
274 overflow-y: hidden;
275 max-height: 85vh;
276 padding: 0 2px; 285 padding: 0 2px;
277 286 height: 82vh;
278 .jtfccx-edit-con {
279 flex: 1;
280 height: 100%;
281 overflow-y: scroll;
282 }
283 287
284 .submit-button { 288 .submit-button {
285 text-align: center; 289 text-align: center;
...@@ -289,27 +293,27 @@ ...@@ -289,27 +293,27 @@
289 } 293 }
290 } 294 }
291 295
292 /deep/.el-dialog__headerbtn .el-dialog__close { 296 /deep/.el-dialog__headerbtn .el-dialog__close {
293 color: #6B7A99 !important; 297 color: #6b7a99 !important;
294 position: relative; 298 position: relative;
295 top: -7px; 299 top: -7px;
296 }
297 /deep/.dialogBox .dialog_title{
298 .el-icon-full-screen{
299 color: #409eff!important;
300 } 300 }
301 b { 301 /deep/.dialogBox .dialog_title {
302 color: white; 302 .el-icon-full-screen {
303 flex: 0.1; 303 color: #409eff !important;
304 margin: auto; 304 }
305 text-align: center; 305 b {
306 align-items: center; 306 color: white;
307 } 307 flex: 0.1;
308 } 308 margin: auto;
309 /deep/.el-dialog__header { 309 text-align: center;
310 background: linear-gradient(3deg, #409eff, #a7cbee); 310 align-items: center;
311 } 311 }
312 /deep/.el-dialog__headerbtn .el-dialog__close{ 312 }
313 color: #409eff!important; 313 /deep/.el-dialog__header {
314 } 314 background: linear-gradient(3deg, #409eff, #a7cbee);
315 }
316 /deep/.el-dialog__headerbtn .el-dialog__close {
317 color: #409eff !important;
318 }
315 </style> 319 </style>
......
...@@ -2,31 +2,38 @@ ...@@ -2,31 +2,38 @@
2 <div class="jtfccx-edit-con"> 2 <div class="jtfccx-edit-con">
3 <b class="title"></b> 3 <b class="title"></b>
4 <b class="title">房屋状况</b> 4 <b class="title">房屋状况</b>
5 <lb-table :column="fwColumns" key="fwzk" :data="resultData.hdetailList" :maxHeight="200" heightNumSetting 5 <lb-table :column="fwColumns" key="fwzk" :data="resultData.hdetailList"
6 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25'
6 :pagination="false"> 7 :pagination="false">
7 </lb-table> 8 </lb-table>
8 <b class="title">土地状况</b> 9 <b class="title">土地状况</b>
9 <lb-table :column="tdColumns" key="tdzk" :data="resultData.zdjbxxDetail" :maxHeight="200" heightNumSetting 10 <lb-table :column="tdColumns" key="tdzk" :data="resultData.zdjbxxDetail"
11 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25'
10 :pagination="false"> 12 :pagination="false">
11 </lb-table> 13 </lb-table>
12 <b class="title">权属状况</b> 14 <b class="title">权属状况</b>
13 <lb-table :column="qszkColumns" key="qszk" :data="resultData.qsxxDetail" :maxHeight="200" heightNumSetting 15 <lb-table :column="qszkColumns" key="qszk" :data="resultData.qsxxDetail"
16 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25'
14 :pagination="false"> 17 :pagination="false">
15 </lb-table> 18 </lb-table>
16 <b class="title">抵押登记</b> 19 <b class="title">抵押登记</b>
17 <lb-table :column="diyaColumns" key="dydj" :data="resultData.dyaqDetail" :maxHeight="200" heightNumSetting 20 <lb-table :column="diyaColumns" key="dydj" :data="resultData.dyaqDetail"
21 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25'
18 :pagination="false"> 22 :pagination="false">
19 </lb-table> 23 </lb-table>
20 <b class="title">预告登记</b> 24 <b class="title">预告登记</b>
21 <lb-table :column="ygdjColumns" key="ygdj" :data="resultData.ygdjDetail" :maxHeight="200" heightNumSetting 25 <lb-table :column="ygdjColumns" key="ygdj" :data="resultData.ygdjDetail"
26 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25'
22 :pagination="false"> 27 :pagination="false">
23 </lb-table> 28 </lb-table>
24 <b class="title">查封状况</b> 29 <b class="title">查封状况</b>
25 <lb-table :column="cfdjColumns" key="cfdj" :data="resultData.cfdjDetail" :maxHeight="200" heightNumSetting 30 <lb-table :column="cfdjColumns" key="cfdj" :data="resultData.cfdjDetail"
31 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25'
26 :pagination="false"> 32 :pagination="false">
27 </lb-table> 33 </lb-table>
28 <b class="title">异议登记</b> 34 <b class="title">异议登记</b>
29 <lb-table :column="yydjColumns" key="yydj" :data="resultData.yydjDetail" :maxHeight="200" heightNumSetting 35 <lb-table :column="yydjColumns" key="yydj" :data="resultData.yydjDetail"
36 :heightNumSetting="true" :minHeight="150" :rowStyleHeight='25'
30 :pagination="false"> 37 :pagination="false">
31 </lb-table> 38 </lb-table>
32 </div> 39 </div>
...@@ -98,10 +105,6 @@ ...@@ -98,10 +105,6 @@
98 </script> 105 </script>
99 <style scoped lang="scss"> 106 <style scoped lang="scss">
100 @import "~@/styles/mixin.scss"; 107 @import "~@/styles/mixin.scss";
101 .jtfccx-edit-con {
102 max-height: 85vh;
103 overflow-y: scroll;
104 }
105 .table1 { 108 .table1 {
106 border-spacing: 0; 109 border-spacing: 0;
107 border-collapse: collapse; 110 border-collapse: collapse;
......
...@@ -9,7 +9,7 @@ class data extends filter { ...@@ -9,7 +9,7 @@ class data extends filter {
9 constructor() { 9 constructor() {
10 super() 10 super()
11 } 11 }
12 columns() { 12 columns () {
13 return [ 13 return [
14 { 14 {
15 prop: 'qszt', 15 prop: 'qszt',
...@@ -45,11 +45,11 @@ class data extends filter { ...@@ -45,11 +45,11 @@ class data extends filter {
45 } 45 }
46 ] 46 ]
47 } 47 }
48 fwCol() { 48 fwCol () {
49 return [ 49 return [
50 { 50 {
51 prop: 'zdymc', 51 prop: 'zdymc',
52 label: '幢号111', 52 label: '幢号',
53 }, 53 },
54 { 54 {
55 prop: 'hh', 55 prop: 'hh',
...@@ -85,7 +85,7 @@ class data extends filter { ...@@ -85,7 +85,7 @@ class data extends filter {
85 } 85 }
86 ] 86 ]
87 } 87 }
88 tdCol() { 88 tdCol () {
89 return [ 89 return [
90 { 90 {
91 prop: 'qsxz', 91 prop: 'qsxz',
...@@ -121,17 +121,17 @@ class data extends filter { ...@@ -121,17 +121,17 @@ class data extends filter {
121 } 121 }
122 ] 122 ]
123 } 123 }
124 diyaCol() { 124 diyaCol () {
125 return [ 125 return [
126 { 126 {
127 prop: 'dyfs', 127 prop: 'dyfs',
128 label: '抵押方式', 128 label: '抵押方式',
129 render: (h, scope) => { 129 render: (h, scope) => {
130 switch(scope.row.dyfs) { 130 switch (scope.row.dyfs) {
131 case '1': 131 case '1':
132 return <div>一般抵押</div> 132 return <div>一般抵押</div>
133 case '2': 133 case '2':
134 return <div>最高额抵押</div> 134 return <div>最高额抵押</div>
135 } 135 }
136 } 136 }
137 }, 137 },
...@@ -161,7 +161,7 @@ class data extends filter { ...@@ -161,7 +161,7 @@ class data extends filter {
161 } 161 }
162 ] 162 ]
163 } 163 }
164 ygdjCol() { 164 ygdjCol () {
165 return [ 165 return [
166 { 166 {
167 prop: 'ygdjzl', 167 prop: 'ygdjzl',
...@@ -193,7 +193,7 @@ class data extends filter { ...@@ -193,7 +193,7 @@ class data extends filter {
193 } 193 }
194 ] 194 ]
195 } 195 }
196 cfdjCol() { 196 cfdjCol () {
197 return [ 197 return [
198 { 198 {
199 prop: 'cfjg', 199 prop: 'cfjg',
...@@ -217,7 +217,7 @@ class data extends filter { ...@@ -217,7 +217,7 @@ class data extends filter {
217 } 217 }
218 ] 218 ]
219 } 219 }
220 yydjCol() { 220 yydjCol () {
221 return [ 221 return [
222 { 222 {
223 prop: 'yysqr', 223 prop: 'yysqr',
......
...@@ -34,24 +34,22 @@ ...@@ -34,24 +34,22 @@
34 </el-form> 34 </el-form>
35 </div> 35 </div>
36 <!-- 表格 --> 36 <!-- 表格 -->
37 <div class="from-clues-content"> 37 <div class="from-clues-content loadingtext">
38 <lb-table :page-size="pageData.size" class="loadingtext" border @sort-change="handleSort" 38 <lb-table :page-size="pageData.size" border @sort-change="handleSort"
39 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange" 39 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
40 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 40 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
41 </lb-table> 41 </lb-table>
42 </div> 42 </div>
43 <addDydjb v-model="isDialog" :sqcxBsm="sqcxBsm" />
44 </div> 43 </div>
45 </template> 44 </template>
46 <script> 45 <script>
47 import { mapGetters } from "vuex"; 46 import { mapGetters } from "vuex";
48 import table from "@/utils/mixin/table"; 47 import table from "@/utils/mixin/table";
48 import store from '@/store/index.js'
49 import { datas, sendThis } from "./dydjbdata"; 49 import { datas, sendThis } from "./dydjbdata";
50 import addDydjb from "./components/addDydjb.vue";
51 import { getSqcxPage } from "@/api/jtfc.js"; 50 import { getSqcxPage } from "@/api/jtfc.js";
52 export default { 51 export default {
53 name: "dydjb", 52 name: "dydjb",
54 components: { addDydjb },
55 mixins: [table], 53 mixins: [table],
56 mounted () { 54 mounted () {
57 sendThis(this); 55 sendThis(this);
...@@ -79,8 +77,21 @@ ...@@ -79,8 +77,21 @@
79 activated () { 77 activated () {
80 this.queryClick(); 78 this.queryClick();
81 }, 79 },
80 computed: {
81 workFresh () {
82 return store.state.user.workFresh
83 }
84 },
85 watch: {
86 workFresh: {
87 handler (newValue, oldValue) {
88 this.queryClick()
89 },
90 deep: true,
91 immediate: true
92 }
93 },
82 methods: { 94 methods: {
83 // 初始化数据
84 /** 95 /**
85 * @description: 初始化数据 96 * @description: 初始化数据
86 * @author: renchao 97 * @author: renchao
...@@ -102,8 +113,8 @@ ...@@ -102,8 +113,8 @@
102 * @author: renchao 113 * @author: renchao
103 */ 114 */
104 dydjbClick (scope) { 115 dydjbClick (scope) {
105 this.$popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", { 116 this.$popupDialog("明细详情", "sqcx/dydjb/components/addDydjb", {
106 bsmSqcx: scope.row.bsmSqcx, 117 sqcxBsm: scope.row.bsmSqcx,
107 }) 118 })
108 }, 119 },
109 /** 120 /**
...@@ -120,8 +131,10 @@ ...@@ -120,8 +131,10 @@
120 * @author: renchao 131 * @author: renchao
121 */ 132 */
122 openAddDialog () { 133 openAddDialog () {
123 this.isDialog = true 134 this.$popupDialog("房屋明细查询", "sqcx/dydjb/components/addDydjb", {
124 this.sqcxBsm = '' 135 sqcxBsm: '',
136 isAdd: true
137 })
125 } 138 }
126 }, 139 },
127 }; 140 };
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-15 16:28:13 4 * @LastEditTime: 2024-03-27 10:03:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
109 }, '80%') 109 }, '80%')
110 }, 110 },
111 /** 111 /**
112 * @description: handleAdd 112 * @description: handleViewClick
113 * @param {*} row 113 * @param {*} row
114 * @author: renchao 114 * @author: renchao
115 */ 115 */
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="6"> 35 <el-col :span="6">
36 <el-form-item label="查询用途:" label-width="90px">{{ form.djSqcxDO.cxyt }} 36 <el-form-item label="查询用途:">{{ form.djSqcxDO.cxyt }}
37 </el-form-item> 37 </el-form-item>
38 </el-col> 38 </el-col>
39 <el-col :span="6"> 39 <el-col :span="6">
...@@ -163,12 +163,11 @@ ...@@ -163,12 +163,11 @@
163 </script> 163 </script>
164 <style scoped lang="scss"> 164 <style scoped lang="scss">
165 @import "~@/styles/mixin.scss"; 165 @import "~@/styles/mixin.scss";
166
167 /deep/.el-form-item {
168 margin-bottom: 0 !important;
169 }
170 .sqcxjlInfo { 166 .sqcxjlInfo {
171 max-height: 85vh; 167 height: 82vh;
172 overflow-y: scroll; 168 overflow-y: scroll;
173 } 169 }
170 /deep/.el-form-item {
171 margin-bottom: 0 !important;
172 }
174 </style> 173 </style>
......
...@@ -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">
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 </el-form-item> 119 </el-form-item>
120 </el-col> 120 </el-col>
121 <el-col :span="8"> 121 <el-col :span="8">
122 <el-form-item label="取得价格:"> 122 <el-form-item label="取得价格:" prop="jsydsyq.qdjg">
123 <div style="display: flex"> 123 <div style="display: flex">
124 <el-input 124 <el-input
125 maxlength="11" 125 maxlength="11"
......
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
75 </el-form-item> 75 </el-form-item>
76 </el-col> 76 </el-col>
77 <el-col :span="16"> 77 <el-col :span="16">
78 <el-form-item label="坐落:"> 78 <el-form-item label="坐落:" prop="sldy.zl">
79 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 79 <el-input v-model="ruleForm.sldy.zl"></el-input>
80 </el-form-item> 80 </el-form-item>
81 </el-col> 81 </el-col>
82 </el-row> 82 </el-row>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
92 </el-form-item> 92 </el-form-item>
93 </el-col> 93 </el-col>
94 <el-col :span="8"> 94 <el-col :span="8">
95 <el-form-item label="使用权(承包)面积:"> 95 <el-form-item label="使用权(承包)面积:" prop="lq.syqmj">
96 <el-input v-model="ruleForm.lq.syqmj" :disabled="!viewEdit"></el-input> 96 <el-input v-model="ruleForm.lq.syqmj" :disabled="!viewEdit"></el-input>
97 </el-form-item> 97 </el-form-item>
98 </el-col> 98 </el-col>
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
291 </div> 291 </div>
292 <el-row :gutter="10"> 292 <el-row :gutter="10">
293 <el-col> 293 <el-col>
294 <el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="lq.djyy"> 294 <el-form-item label="登记原因:" prop="lq.djyy">
295 <el-input 295 <el-input
296 class="textArea" 296 class="textArea"
297 type="textarea" 297 type="textarea"
...@@ -348,7 +348,8 @@ ...@@ -348,7 +348,8 @@
348 }) 348 })
349 that.czrOptions = that.ruleForm.qlrList; 349 that.czrOptions = that.ruleForm.qlrList;
350 that.ruleForm.lq.zlnd ? that.$set(that.ruleForm.lq, 'zlnd', that.ruleForm.lq.zlnd.toString()) : that.$set(that.ruleForm.lq, 'zlnd', "") 350 that.ruleForm.lq.zlnd ? that.$set(that.ruleForm.lq, 'zlnd', that.ruleForm.lq.zlnd.toString()) : that.$set(that.ruleForm.lq, 'zlnd', "")
351 that.isSave = that.viewEdit 351 that.isSave = that.viewEdit;
352 this.rules = formValidate(this.ruleForm.sldy.djlx);
352 } else { 353 } else {
353 that.isSave = false 354 that.isSave = false
354 that.$confirm(res.message, '提示', { 355 that.$confirm(res.message, '提示', {
...@@ -399,11 +400,7 @@ ...@@ -399,11 +400,7 @@
399 propsParam: this.$attrs, 400 propsParam: this.$attrs,
400 //表单是否可操作 401 //表单是否可操作
401 viewEdit: true, 402 viewEdit: true,
402 rules: { 403 rules: {}
403 'lq.djyy': [
404 { required: true, message: '请输入登记原因', trigger: 'blur' }
405 ]
406 }
407 }; 404 };
408 }, 405 },
409 methods: { 406 methods: {
...@@ -530,7 +527,7 @@ ...@@ -530,7 +527,7 @@
530 } else { 527 } else {
531 this.$message({ 528 this.$message({
532 showClose: true, 529 showClose: true,
533 message: "请输入登记原因", 530 message: "请输入红框内的相关信息!",
534 type: "error" 531 type: "error"
535 }) 532 })
536 return false 533 return false
......
...@@ -4,22 +4,19 @@ ...@@ -4,22 +4,19 @@
4 * @author: renchao 4 * @author: renchao
5 */ 5 */
6 export function formValidate (djlx) { 6 export function formValidate (djlx) {
7 switch (djlx) { 7 var formRules={
8 case "100": 8 'sldy.zl': [
9 return fristValidate(); 9 { required: true, message: '坐落:', trigger: 'blur' }
10 case "200": 10 ],
11 return transferValidate(); 11 'lq.syqmj': [
12 case "300": 12 { required: true, message: '使用权(承包)面积:', trigger: 'blur' }
13 return changeValidate(); 13 ],
14 case "400": 14 'lq.djyy': [
15 return logoutValidate(); 15 { required: true, message: '登记原因:', trigger: 'blur' }
16 case "500": 16 ]
17 return riviseValidate(); 17 }
18 case "901": 18
19 return renewalValidate(); 19 return formRules;
20 case "902":
21 return replaceValidate();
22 }
23 } 20 }
24 21
25 /** 22 /**
...@@ -27,13 +24,7 @@ export function formValidate (djlx) { ...@@ -27,13 +24,7 @@ export function formValidate (djlx) {
27 * @param {*} data 24 * @param {*} data
28 * @author: renchao 25 * @author: renchao
29 */ 26 */
30 export function fristValidate () { 27 export function fristValidate () {
31 var formRules={
32 'diyaq.djyy': [
33 { required: true, message: '请输入登记原因', trigger: 'blur' }
34 ]
35 }
36 return formRules;
37 } 28 }
38 29
39 30
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 </el-row> 86 </el-row>
87 <el-row :gutter="10"> 87 <el-row :gutter="10">
88 <el-col :span="8"> 88 <el-col :span="8">
89 <el-form-item label="宗地面积:"> 89 <el-form-item label="宗地面积:" prop="zdjbxx.zdmj">
90 <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input> 90 <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
91 </el-form-item> 91 </el-form-item>
92 </el-col> 92 </el-col>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 </el-row> 103 </el-row>
104 <el-row :gutter="10"> 104 <el-row :gutter="10">
105 <el-col :span="16"> 105 <el-col :span="16">
106 <el-form-item label="坐落:"> 106 <el-form-item label="坐落:" prop="sldy.zl">
107 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 107 <el-input disabled v-model="ruleForm.sldy.zl"></el-input>
108 </el-form-item> 108 </el-form-item>
109 </el-col> 109 </el-col>
...@@ -359,7 +359,8 @@ ...@@ -359,7 +359,8 @@
359 } 359 }
360 }) 360 })
361 that.czrOptions = that.ruleForm.qlrList; 361 that.czrOptions = that.ruleForm.qlrList;
362 that.isSave = that.viewEdit 362 that.isSave = that.viewEdit;
363 this.rules = formValidate(this.ruleForm.sldy.djlx);
363 } else { 364 } else {
364 that.isSave = false 365 that.isSave = false
365 that.$confirm(res.message, '提示', { 366 that.$confirm(res.message, '提示', {
...@@ -405,11 +406,7 @@ ...@@ -405,11 +406,7 @@
405 propsParam: {}, 406 propsParam: {},
406 //表单是否可操作 407 //表单是否可操作
407 viewEdit: true, 408 viewEdit: true,
408 rules: { 409 rules: {},
409 'nydsyq.djyy': [
410 { required: true, message: '请输入登记原因', trigger: 'blur' }
411 ]
412 },
413 }; 410 };
414 }, 411 },
415 methods: { 412 methods: {
...@@ -494,7 +491,7 @@ ...@@ -494,7 +491,7 @@
494 } else { 491 } else {
495 this.$message({ 492 this.$message({
496 showClose: true, 493 showClose: true,
497 message: "请输入登记原因", 494 message: "请输入红框内的相关信息!",
498 type: "error" 495 type: "error"
499 }) 496 })
500 return false 497 return false
......
...@@ -4,22 +4,19 @@ ...@@ -4,22 +4,19 @@
4 * @author: renchao 4 * @author: renchao
5 */ 5 */
6 export function formValidate (djlx) { 6 export function formValidate (djlx) {
7 switch (djlx) { 7 var formRules={
8 case "100": 8 'sldy.zl': [
9 return fristValidate(); 9 { required: true, message: '坐落:', trigger: 'blur' }
10 case "200": 10 ],
11 return transferValidate(); 11 'zdjbxx.zdmj': [
12 case "300": 12 { required: true, message: '宗地面积:', trigger: 'blur' }
13 return changeValidate(); 13 ],
14 case "400": 14 'nydsyq.djyy': [
15 return logoutValidate(); 15 { required: true, message: '登记原因:', trigger: 'blur' }
16 case "500": 16 ]
17 return riviseValidate(); 17 }
18 case "901": 18
19 return renewalValidate(); 19 return formRules;
20 case "902":
21 return replaceValidate();
22 }
23 } 20 }
24 21
25 /** 22 /**
...@@ -27,13 +24,7 @@ export function formValidate (djlx) { ...@@ -27,13 +24,7 @@ export function formValidate (djlx) {
27 * @param {*} data 24 * @param {*} data
28 * @author: renchao 25 * @author: renchao
29 */ 26 */
30 export function fristValidate () { 27 export function fristValidate () {
31 var formRules={
32 'diyaq.djyy': [
33 { required: true, message: '请输入登记原因', trigger: 'blur' }
34 ]
35 }
36 return formRules;
37 } 28 }
38 29
39 30
......
...@@ -4,22 +4,19 @@ ...@@ -4,22 +4,19 @@
4 * @author: renchao 4 * @author: renchao
5 */ 5 */
6 export function formValidate (djlx) { 6 export function formValidate (djlx) {
7 switch (djlx) { 7 var formRules={
8 case "100": 8 'sldy.zl': [
9 return fristValidate(); 9 { required: true, message: '坐落:', trigger: 'blur' }
10 case "200": 10 ],
11 return transferValidate(); 11 'lq.syqmj': [
12 case "300": 12 { required: true, message: '使用权(承包)面积:', trigger: 'blur' }
13 return changeValidate(); 13 ],
14 case "400": 14 'lq.djyy': [
15 return logoutValidate(); 15 { required: true, message: '登记原因:', trigger: 'blur' }
16 case "500": 16 ]
17 return riviseValidate(); 17 }
18 case "901": 18
19 return renewalValidate(); 19 return formRules;
20 case "902":
21 return replaceValidate();
22 }
23 } 20 }
24 21
25 /** 22 /**
...@@ -27,13 +24,7 @@ export function formValidate (djlx) { ...@@ -27,13 +24,7 @@ export function formValidate (djlx) {
27 * @param {*} data 24 * @param {*} data
28 * @author: renchao 25 * @author: renchao
29 */ 26 */
30 export function fristValidate () { 27 export function fristValidate () {
31 var formRules={
32 'diyaq.djyy': [
33 { required: true, message: '请输入登记原因', trigger: 'blur' }
34 ]
35 }
36 return formRules;
37 } 28 }
38 29
39 30
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
85 </el-form-item> 85 </el-form-item>
86 </el-col> 86 </el-col>
87 <el-col :span="8"> 87 <el-col :span="8">
88 <el-form-item label="权利性质:"> 88 <el-form-item label="权利性质:" prop="zdjbxx.qlxz">
89 <treeselect 89 <treeselect
90 v-model="ruleForm.zdjbxx.qlxz" 90 v-model="ruleForm.zdjbxx.qlxz"
91 noOptionsText="暂无数据" 91 noOptionsText="暂无数据"
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
183 </el-form-item> 183 </el-form-item>
184 </el-col> 184 </el-col>
185 <el-col :span="8"> 185 <el-col :span="8">
186 <el-form-item label="确权面积:"> 186 <el-form-item label="确权面积:" prop="tdcbjyq.qqmj">
187 <div class="flex"> 187 <div class="flex">
188 <el-input 188 <el-input
189 :disabled="!viewEdit" 189 :disabled="!viewEdit"
...@@ -378,7 +378,8 @@ ...@@ -378,7 +378,8 @@
378 } 378 }
379 }) 379 })
380 that.czrOptions = that.ruleForm.qlrList; 380 that.czrOptions = that.ruleForm.qlrList;
381 that.isSave = that.viewEdit 381 that.isSave = that.viewEdit;
382 this.rules = formValidate(this.ruleForm.sldy.djlx);
382 } else { 383 } else {
383 that.isSave = false 384 that.isSave = false
384 that.$confirm(res.message, '提示', { 385 that.$confirm(res.message, '提示', {
...@@ -449,11 +450,7 @@ ...@@ -449,11 +450,7 @@
449 ruleForm: {}, 450 ruleForm: {},
450 //传递参数 451 //传递参数
451 propsParam: {}, 452 propsParam: {},
452 rules: { 453 rules: {}
453 'tdcbjyq.djyy': [
454 { required: true, message: '请输入登记原因', trigger: 'blur' }
455 ]
456 }
457 } 454 }
458 }, 455 },
459 methods: { 456 methods: {
...@@ -592,7 +589,7 @@ ...@@ -592,7 +589,7 @@
592 } else { 589 } else {
593 that.$message({ 590 that.$message({
594 showClose: true, 591 showClose: true,
595 message: "请输入登记原因", 592 message: "请输入红框内的相关信息!",
596 type: "error" 593 type: "error"
597 }) 594 })
598 return false 595 return false
......
...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
4 * @author: renchao 4 * @author: renchao
5 */ 5 */
6 export function formValidate (djlx) { 6 export function formValidate (djlx) {
7 switch (djlx) { 7 var formRules={
8 case "100": 8 'sldy.zl': [
9 return fristValidate(); 9 { required: true, message: '坐落:', trigger: 'blur' }
10 case "200": 10 ],
11 return transferValidate(); 11 'zdjbxx.qlxz': [
12 case "300": 12 { required: true, message: '权利性质:', trigger: 'blur' }
13 return changeValidate(); 13 ],
14 case "400": 14 'tdcbjyq.qqmj': [
15 return logoutValidate(); 15 { required: true, message: '确权面积:', trigger: 'blur' }
16 case "500": 16 ],
17 return riviseValidate(); 17 'lq.djyy': [
18 case "901": 18 { required: true, message: '登记原因:', trigger: 'blur' }
19 return renewalValidate(); 19 ]
20 case "902": 20 }
21 return replaceValidate(); 21
22 } 22 return formRules;
23 } 23 }
24 24
25 /** 25 /**
...@@ -27,13 +27,7 @@ export function formValidate (djlx) { ...@@ -27,13 +27,7 @@ export function formValidate (djlx) {
27 * @param {*} data 27 * @param {*} data
28 * @author: renchao 28 * @author: renchao
29 */ 29 */
30 export function fristValidate () { 30 export function fristValidate () {
31 var formRules={
32 'diyaq.djyy': [
33 { required: true, message: '请输入登记原因', trigger: 'blur' }
34 ]
35 }
36 return formRules;
37 } 31 }
38 32
39 33
......
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
71 </el-form-item> 71 </el-form-item>
72 </el-col> 72 </el-col>
73 <el-col :span="8"> 73 <el-col :span="8">
74 <el-form-item label="坐落:"> 74 <el-form-item label="坐落:" prop="sldy.zl">
75 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 75 <el-input v-model="ruleForm.sldy.zl"></el-input>
76 </el-form-item> 76 </el-form-item>
77 </el-col> 77 </el-col>
78 </el-row> 78 </el-row>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
88 </el-form-item> 88 </el-form-item>
89 </el-col> 89 </el-col>
90 <el-col :span="8"> 90 <el-col :span="8">
91 <el-form-item label="房屋性质:"> 91 <el-form-item label="房屋性质:" prop="ygdj.fwxz">
92 <el-select v-model="ruleForm.ygdj.fwxz" :disabled="!viewEdit"> 92 <el-select v-model="ruleForm.ygdj.fwxz" :disabled="!viewEdit">
93 <el-option 93 <el-option
94 v-for="item in dictData['A19']" 94 v-for="item in dictData['A19']"
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 </el-row> 102 </el-row>
103 <el-row :gutter="10" v-if="ruleForm.qlxx"> 103 <el-row :gutter="10" v-if="ruleForm.qlxx">
104 <el-col :span="8"> 104 <el-col :span="8">
105 <el-form-item label="房屋用途:"> 105 <el-form-item label="房屋用途:" prop="ygdj.ghyt">
106 <el-select v-model="ruleForm.ygdj.ghyt" :disabled="!viewEdit"> 106 <el-select v-model="ruleForm.ygdj.ghyt" :disabled="!viewEdit">
107 <el-option 107 <el-option
108 v-for="item in dictData['A17']" 108 v-for="item in dictData['A17']"
...@@ -114,12 +114,12 @@ ...@@ -114,12 +114,12 @@
114 </el-form-item> 114 </el-form-item>
115 </el-col> 115 </el-col>
116 <el-col :span="8"> 116 <el-col :span="8">
117 <el-form-item label="所在层:"> 117 <el-form-item label="所在层:" prop="ygdj.szc">
118 <el-input maxlength="20" :disabled="!viewEdit" v-model="ruleForm.ygdj.szc"></el-input> 118 <el-input maxlength="20" :disabled="!viewEdit" v-model="ruleForm.ygdj.szc"></el-input>
119 </el-form-item> 119 </el-form-item>
120 </el-col> 120 </el-col>
121 <el-col :span="8"> 121 <el-col :span="8">
122 <el-form-item label="总层数:"> 122 <el-form-item label="总层数:" prop="ygdj.zcs">
123 <el-input 123 <el-input
124 :disabled="!viewEdit" 124 :disabled="!viewEdit"
125 maxlength="4" 125 maxlength="4"
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 </el-row> 130 </el-row>
131 <el-row :gutter="10" v-if="ruleForm.qlxx"> 131 <el-row :gutter="10" v-if="ruleForm.qlxx">
132 <el-col :span="8"> 132 <el-col :span="8">
133 <el-form-item label="房屋结构:"> 133 <el-form-item label="房屋结构:" prop="ygdj.fwjg">
134 <el-select v-model="ruleForm.ygdj.fwjg" :disabled="!viewEdit"> 134 <el-select v-model="ruleForm.ygdj.fwjg" :disabled="!viewEdit">
135 <el-option 135 <el-option
136 v-for="item in dictData['A46']" 136 v-for="item in dictData['A46']"
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
143 </el-col> 143 </el-col>
144 144
145 <el-col :span="8"> 145 <el-col :span="8">
146 <el-form-item label="建筑面积:"> 146 <el-form-item label="建筑面积:" prop="ygdj.jzmj">
147 <div class="flex"> 147 <div class="flex">
148 <el-input 148 <el-input
149 maxlength="12" 149 maxlength="12"
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
262 </div> 262 </div>
263 <el-row :gutter="10"> 263 <el-row :gutter="10">
264 <el-col> 264 <el-col>
265 <el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因:" prop="djyy"> 265 <el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因:" prop="ygdj.zxyy">
266 <el-input 266 <el-input
267 class="textArea" 267 class="textArea"
268 type="textarea" 268 type="textarea"
...@@ -324,7 +324,8 @@ ...@@ -324,7 +324,8 @@
324 } 324 }
325 }) 325 })
326 that.czrOptions = this.ruleForm.qlrList 326 that.czrOptions = this.ruleForm.qlrList
327 that.isSave = that.viewEdit 327 that.isSave = that.viewEdit;
328 this.rules = formValidate(this.ruleForm.sldy.djlx);
328 } else { 329 } else {
329 that.isSave = false 330 that.isSave = false
330 that.$confirm(res.message, '提示', { 331 that.$confirm(res.message, '提示', {
...@@ -362,11 +363,7 @@ ...@@ -362,11 +363,7 @@
362 }, 363 },
363 //传递参数 364 //传递参数
364 propsParam: this.$attrs, 365 propsParam: this.$attrs,
365 rules: { 366 rules: {}
366 'ygdj.djyy': [
367 { required: true, message: '请输入登记原因', trigger: 'blur' }
368 ]
369 }
370 } 367 }
371 }, 368 },
372 methods: { 369 methods: {
...@@ -500,7 +497,7 @@ ...@@ -500,7 +497,7 @@
500 } else { 497 } else {
501 that.$message({ 498 that.$message({
502 showClose: true, 499 showClose: true,
503 message: "请输入登记原因", 500 message: "请输入红框内的相关信息!",
504 type: "error" 501 type: "error"
505 }) 502 })
506 return false 503 return false
......
...@@ -4,89 +4,111 @@ ...@@ -4,89 +4,111 @@
4 * @author: renchao 4 * @author: renchao
5 */ 5 */
6 export function formValidate (djlx) { 6 export function formValidate (djlx) {
7 switch (djlx) { 7 var formRules={
8 case "100": 8 'sldy.zl': [
9 return fristValidate(); 9 { required: false, message: '坐落:', trigger: 'blur' }
10 case "200": 10 ],
11 return transferValidate(); 11 'ygdj.fwxz': [
12 case "300": 12 { required: false, message: '房屋性质:', trigger: 'blur' }
13 return changeValidate(); 13 ],
14 case "400": 14 'ygdj.ghyt': [
15 return logoutValidate(); 15 { required: false, message: '房屋用途:', trigger: 'blur' }
16 case "500": 16 ],
17 return riviseValidate(); 17 'ygdj.szc': [
18 case "901": 18 { required: false, message: '所在层:', trigger: 'blur' }
19 return renewalValidate(); 19 ],
20 case "902": 20 'ygdj.zcs': [
21 return replaceValidate(); 21 { required: false, message: '总层数:', trigger: 'blur' }
22 } 22 ],
23 } 23 'ygdj.fwjg': [
24 24 { required: false, message: '房屋结构:', trigger: 'blur' }
25 /** 25 ],
26 * @description: 首次登记效验 26 'ygdj.jzmj': [
27 * @param {*} data 27 { required: false, message: '建筑面积:', trigger: 'blur' }
28 * @author: renchao 28 ],
29 */ 29 'ygdj.djyy': [
30 export function fristValidate () { 30 { required: false, message: '请输入登记原因', trigger: 'blur' }
31 var formRules={ 31 ],
32 'diyaq.djyy': [ 32 'ygdj.zxyy': [
33 { required: true, message: '请输入登记原因', trigger: 'blur' } 33 { required: false, message: '请输入注销登记原因', trigger: 'blur' }
34 ] 34 ]
35 }
36 if (djlx=="400") {
37 formRules["ygdj.zxyy"][0].required=true;
38 }else{
39 formRules["sldy.zl"][0].required=true;
40 formRules["ygdj.fwxz"][0].required=true;
41 formRules["ygdj.ghyt"][0].required=true;
42 formRules["ygdj.szc"][0].required=true;
43 formRules["ygdj.zcs"][0].required=true;
44 formRules["ygdj.fwjg"][0].required=true;
45 formRules["ygdj.jzmj"][0].required=true;
46 formRules["ygdj.djyy"][0].required=true;
47 }
48 return formRules;
35 } 49 }
36 return formRules;
37 }
38
39
40 /**
41 * @description: 转移登记效验
42 * @param {*} data
43 * @author: renchao
44 */
45 export function transferValidate (data) {
46
47 }
48
49 /**
50 * @description: 变更登记效验
51 * @param {*} data
52 * @author: renchao
53 */
54 export function changeValidate (data) {
55
56 }
57
58 /**
59 * @description: 注销登记效验
60 * @param {*} data
61 * @author: renchao
62 */
63 export function logoutValidate (data) {
64
65 }
66
67 /**
68 * @description: 更正登记效验
69 * @param {*} data
70 * @author: renchao
71 */
72 export function riviseValidate (data) {
73
74 }
75
76 /**
77 * @description: 补证登记效验
78 * @param {*} data
79 * @author: renchao
80 */
81 export function renewalValidate (data) {
82
83 }
84
85 /**
86 * @description: 换证登记效验
87 * @param {*} data
88 * @author: renchao
89 */
90 export function replaceValidate (data) {
91
92 }
...\ No newline at end of file ...\ No newline at end of file
50
51 /**
52 * @description: 首次登记效验
53 * @param {*} data
54 * @author: renchao
55 */
56 export function fristValidate (formRules,dyfs) {
57
58 return formRules;
59 }
60
61
62 /**
63 * @description: 转移登记效验
64 * @param {*} data
65 * @author: renchao
66 */
67 export function transferValidate (data) {
68
69 }
70
71 /**
72 * @description: 变更登记效验
73 * @param {*} data
74 * @author: renchao
75 */
76 export function changeValidate (data) {
77
78 }
79
80 /**
81 * @description: 注销登记效验
82 * @param {*} data
83 * @author: renchao
84 */
85 export function logoutValidate (data) {
86
87 }
88
89 /**
90 * @description: 更正登记效验
91 * @param {*} data
92 * @author: renchao
93 */
94 export function riviseValidate (data) {
95
96 }
97
98 /**
99 * @description: 补证登记效验
100 * @param {*} data
101 * @author: renchao
102 */
103 export function renewalValidate (data) {
104
105 }
106
107 /**
108 * @description: 换证登记效验
109 * @param {*} data
110 * @author: renchao
111 */
112 export function replaceValidate (data) {
113
114 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,89 +4,99 @@ ...@@ -4,89 +4,99 @@
4 * @author: renchao 4 * @author: renchao
5 */ 5 */
6 export function formValidate (djlx) { 6 export function formValidate (djlx) {
7 switch (djlx) { 7 var formRules={
8 case "100": 8 'ygdj.sfczjzhxz': [
9 return fristValidate(); 9 { required: false, message: '是否禁止或者限制转让约定:', trigger: 'blur' }
10 case "200": 10 ],
11 return transferValidate(); 11 'ygdj.qdjg': [
12 case "300": 12 { required: false, message: '被担保主债权数额:', trigger: 'blur' }
13 return changeValidate(); 13 ],
14 case "400": 14 'ygdj.zwlxqssj': [
15 return logoutValidate(); 15 { required: false, message: '债务履行起始时间:', trigger: 'blur' }
16 case "500": 16 ],
17 return riviseValidate(); 17 'ygdj.zwlxjssj': [
18 case "901": 18 { required: false, message: '债务履行结束时间:', trigger: 'blur' }
19 return renewalValidate(); 19 ],
20 case "902": 20 'ygdj.djyy': [
21 return replaceValidate(); 21 { required: false, message: '请输入登记原因', trigger: 'blur' }
22 } 22 ],
23 } 23 'ygdj.zxyy': [
24 24 { required: false, message: '请输入注销登记原因', trigger: 'blur' }
25 /** 25 ]
26 * @description: 首次登记效验 26 }
27 * @param {*} data 27 if (djlx=="400") {
28 * @author: renchao 28 formRules["ygdj.zxyy"][0].required=true;
29 */ 29 }else{
30 export function fristValidate () { 30 formRules["ygdj.sfczjzhxz"][0].required=true;
31 var formRules={ 31 formRules["ygdj.qdjg"][0].required=true;
32 'diyaq.djyy': [ 32 formRules["ygdj.zwlxqssj"][0].required=true;
33 { required: true, message: '请输入登记原因', trigger: 'blur' } 33 formRules["ygdj.zwlxjssj"][0].required=true;
34 ] 34 formRules["ygdj.djyy"][0].required=true;
35 }
36 return formRules;
35 } 37 }
36 return formRules;
37 }
38
39
40 /**
41 * @description: 转移登记效验
42 * @param {*} data
43 * @author: renchao
44 */
45 export function transferValidate (data) {
46
47 }
48
49 /**
50 * @description: 变更登记效验
51 * @param {*} data
52 * @author: renchao
53 */
54 export function changeValidate (data) {
55
56 }
57
58 /**
59 * @description: 注销登记效验
60 * @param {*} data
61 * @author: renchao
62 */
63 export function logoutValidate (data) {
64
65 }
66
67 /**
68 * @description: 更正登记效验
69 * @param {*} data
70 * @author: renchao
71 */
72 export function riviseValidate (data) {
73
74 }
75
76 /**
77 * @description: 补证登记效验
78 * @param {*} data
79 * @author: renchao
80 */
81 export function renewalValidate (data) {
82
83 }
84
85 /**
86 * @description: 换证登记效验
87 * @param {*} data
88 * @author: renchao
89 */
90 export function replaceValidate (data) {
91
92 }
...\ No newline at end of file ...\ No newline at end of file
38
39 /**
40 * @description: 首次登记效验
41 * @param {*} data
42 * @author: renchao
43 */
44 export function fristValidate (formRules,dyfs) {
45
46 return formRules;
47 }
48
49
50 /**
51 * @description: 转移登记效验
52 * @param {*} data
53 * @author: renchao
54 */
55 export function transferValidate (data) {
56
57 }
58
59 /**
60 * @description: 变更登记效验
61 * @param {*} data
62 * @author: renchao
63 */
64 export function changeValidate (data) {
65
66 }
67
68 /**
69 * @description: 注销登记效验
70 * @param {*} data
71 * @author: renchao
72 */
73 export function logoutValidate (data) {
74
75 }
76
77 /**
78 * @description: 更正登记效验
79 * @param {*} data
80 * @author: renchao
81 */
82 export function riviseValidate (data) {
83
84 }
85
86 /**
87 * @description: 补证登记效验
88 * @param {*} data
89 * @author: renchao
90 */
91 export function renewalValidate (data) {
92
93 }
94
95 /**
96 * @description: 换证登记效验
97 * @param {*} data
98 * @author: renchao
99 */
100 export function replaceValidate (data) {
101
102 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,90 +3,108 @@ ...@@ -3,90 +3,108 @@
3 * @param {*} data 3 * @param {*} data
4 * @author: renchao 4 * @author: renchao
5 */ 5 */
6 export function formValidate (djlx) { 6 export function formValidate (djlx,dyfs) {
7 switch (djlx) { 7 var formRules={
8 case "100": 8 'diyaq.djyy': [
9 return fristValidate(); 9 { required: false, message: '请输入登记原因', trigger: 'blur' }
10 case "200": 10 ],
11 return transferValidate(); 11 'diyaq.zxdyyy': [
12 case "300": 12 { required: false, message: '请输入注销登记原因', trigger: 'blur' }
13 return changeValidate(); 13 ],
14 case "400": 14 'diyaq.zwlxqssj': [
15 return logoutValidate(); 15 { required: false, message: '请选择债务履行起始时间', trigger: 'blur' }
16 case "500": 16 ],
17 return riviseValidate(); 17 'diyaq.zwlxjssj': [
18 case "901": 18 { required: false, message: '请选择债务履行起始时间', trigger: 'blur' }
19 return renewalValidate(); 19 ],
20 case "902": 20 'diyaq.bdbzzqse': [
21 return replaceValidate(); 21 { required: false, message: '请输入被担保主债权数额', trigger: 'blur' }
22 } 22 ],
23 } 23 'diyaq.zgzqse': [
24 24 { required: false, message: '请输入最高债权额', trigger: 'blur' }
25 /** 25 ],
26 * @description: 首次登记效验 26 'diyaq.sfczjzhxz': [
27 * @param {*} data 27 { required: false, message: '请输入最高债权额', trigger: 'blur' }
28 * @author: renchao 28 ]
29 */ 29 }
30 export function fristValidate () { 30 if (djlx=="400") {
31 var formRules={ 31 formRules["diyaq.zxdyyy"][0].required=true;
32 'diyaq.djyy': [ 32 }else{
33 { required: true, message: '请输入登记原因', trigger: 'blur' } 33 if(dyfs=="1"){
34 ] 34 formRules["diyaq.bdbzzqse"][0].required=true;
35 }else{
36 formRules["diyaq.zgzqse"][0].required=true;
37 }
38 formRules["diyaq.zwlxqssj"][0].required=true;
39 formRules["diyaq.zwlxjssj"][0].required=true;
40 formRules["diyaq.sfczjzhxz"][0].required=true;
41 formRules["diyaq.djyy"][0].required=true;
42 }
43 console.log(formRules)
44 return formRules;
35 } 45 }
36 return formRules;
37 }
38
39
40 /**
41 * @description: 转移登记效验
42 * @param {*} data
43 * @author: renchao
44 */
45 export function transferValidate (data) {
46
47 }
48
49 /**
50 * @description: 变更登记效验
51 * @param {*} data
52 * @author: renchao
53 */
54 export function changeValidate (data) {
55
56 }
57
58 /**
59 * @description: 注销登记效验
60 * @param {*} data
61 * @author: renchao
62 */
63 export function logoutValidate (data) {
64
65 }
66
67 /**
68 * @description: 更正登记效验
69 * @param {*} data
70 * @author: renchao
71 */
72 export function riviseValidate (data) {
73
74 }
75
76 /**
77 * @description: 补证登记效验
78 * @param {*} data
79 * @author: renchao
80 */
81 export function renewalValidate (data) {
82
83 }
84
85 /**
86 * @description: 换证登记效验
87 * @param {*} data
88 * @author: renchao
89 */
90 export function replaceValidate (data) {
91
92 }
...\ No newline at end of file ...\ No newline at end of file
46
47 /**
48 * @description: 首次登记效验
49 * @param {*} data
50 * @author: renchao
51 */
52 export function fristValidate (formRules,dyfs) {
53
54 return formRules;
55 }
56
57
58 /**
59 * @description: 转移登记效验
60 * @param {*} data
61 * @author: renchao
62 */
63 export function transferValidate (data) {
64
65 }
66
67 /**
68 * @description: 变更登记效验
69 * @param {*} data
70 * @author: renchao
71 */
72 export function changeValidate (data) {
73
74 }
75
76 /**
77 * @description: 注销登记效验
78 * @param {*} data
79 * @author: renchao
80 */
81 export function logoutValidate (data) {
82
83 }
84
85 /**
86 * @description: 更正登记效验
87 * @param {*} data
88 * @author: renchao
89 */
90 export function riviseValidate (data) {
91
92 }
93
94 /**
95 * @description: 补证登记效验
96 * @param {*} data
97 * @author: renchao
98 */
99 export function renewalValidate (data) {
100
101 }
102
103 /**
104 * @description: 换证登记效验
105 * @param {*} data
106 * @author: renchao
107 */
108 export function replaceValidate (data) {
109
110 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description:补充材料通知书 2 * @Description:补充材料通知书
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-26 09:04:04 4 * @LastEditTime: 2024-03-27 11:24:03
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 selectList: [], 36 selectList: [],
37 loading: false, 37 loading: false,
38 sortable: null, 38 sortable: null,
39 newDate: getNewDate(), 39 newDate: getNewDate(),
40 column: [ 40 column: [
41 { 41 {
42 type: 'selection', 42 type: 'selection',
...@@ -134,22 +134,20 @@ ...@@ -134,22 +134,20 @@
134 } 134 }
135 getPrintTemplateByCode({ tmpno: 'bdcdjbccltts' }).then(res => { 135 getPrintTemplateByCode({ tmpno: 'bdcdjbccltts' }).then(res => {
136 if (res.code === 200) { 136 if (res.code === 200) {
137 console.log("this.selectListssssssssss",this.selectList);
138 getPrintSupplementalMaterials(this.formData.bsmSldy, this.selectList).then(infoRes => { 137 getPrintSupplementalMaterials(this.formData.bsmSldy, this.selectList).then(infoRes => {
139 this.loading = false 138 this.loading = false
140 if (infoRes.code === 200) { 139 if (infoRes.code === 200) {
141 console.log("infoRes.resultsssssssssss",infoRes.result);
142 if (infoRes.result.fileList && infoRes.result.fileList.length > 0) { 140 if (infoRes.result.fileList && infoRes.result.fileList.length > 0) {
143 infoRes.result.fileList.forEach((it, index) => { 141 infoRes.result.fileList.forEach((it, index) => {
144 let key = index + 1 142 let key = index + 1
145 this.$set(infoRes.result, "file" + key, it.sjmc) 143 this.$set(infoRes.result, "file" + key, it.sjmc)
146 this.$set(infoRes.result, "file" + key + 'ys', it.ys) 144 this.$set(infoRes.result, "file" + key + 'ys', it.ys)
147 this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件") 145 this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
148 }) 146 })
149 } 147 }
150 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 148 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
151 infoRes.result.nowyue = this.newDate.slice(5,7) 149 infoRes.result.nowyue = this.newDate.slice(5, 7)
152 infoRes.result.nowri = this.newDate.slice(8,10) 150 infoRes.result.nowri = this.newDate.slice(8, 10)
153 let date = infoRes.result.sqrq 151 let date = infoRes.result.sqrq
154 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 152 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
155 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 153 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
77 this.ruleForm = { 77 this.ruleForm = {
78 cllx: "", 78 cllx: "",
79 clmc: "", 79 clmc: "",
80 clbm: ""
80 } 81 }
81 }, 82 },
82 /** 83 /**
...@@ -90,6 +91,7 @@ ...@@ -90,6 +91,7 @@
90 this.ruleForm = { 91 this.ruleForm = {
91 cllx: "", 92 cllx: "",
92 clmc: "", 93 clmc: "",
94 clbm: ""
93 } 95 }
94 this.$emit("input", false); 96 this.$emit("input", false);
95 } else { 97 } else {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-24 17:18:02 4 * @LastEditTime: 2024-03-27 16:38:39
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -247,7 +247,8 @@ ...@@ -247,7 +247,8 @@
247 let obj = { 247 let obj = {
248 bsmCompany: this.formData.bsmCompany, 248 bsmCompany: this.formData.bsmCompany,
249 clmc: data.clmc, 249 clmc: data.clmc,
250 cllx: data.cllx 250 cllx: data.cllx,
251 clbm: data.clbm
251 }; 252 };
252 addCompanyMaterial(obj).then(async (res) => { 253 addCompanyMaterial(obj).then(async (res) => {
253 if (res.code == 200) { 254 if (res.code == 200) {
...@@ -374,7 +375,7 @@ ...@@ -374,7 +375,7 @@
374 display: flex; 375 display: flex;
375 376
376 .menu-tree { 377 .menu-tree {
377 width: 20%; 378 width: 30%;
378 min-width: 160px; 379 min-width: 160px;
379 height: 100%; 380 height: 100%;
380 margin-right: 10px; 381 margin-right: 10px;
...@@ -405,7 +406,8 @@ ...@@ -405,7 +406,8 @@
405 border-radius: 6px; 406 border-radius: 6px;
406 line-height: 20px; 407 line-height: 20px;
407 transition: all 0.3s; 408 transition: all 0.3s;
408 padding: 8px 0; 409 padding: 3px 0;
410 word-wrap: break-word;
409 } 411 }
410 412
411 .child:hover { 413 .child:hover {
...@@ -421,7 +423,7 @@ ...@@ -421,7 +423,7 @@
421 } 423 }
422 424
423 .clyl-img { 425 .clyl-img {
424 width: 75%; 426 width: 70%;
425 height: 100%; 427 height: 100%;
426 background: #f3f4f7; 428 background: #f3f4f7;
427 margin: 0 auto; 429 margin: 0 auto;
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 }; 100 };
101 import store from '@/store/index.js' 101 import store from '@/store/index.js'
102 import { addQy, update, addYh } from "@/api/xxba.js" 102 import { addQy, update, addYh } from "@/api/xxba.js"
103 import clxx from './clxx/index.vue' 103 import clxx from '../../components/clxx/index.vue'
104 export default { 104 export default {
105 props: { 105 props: {
106 formData: { 106 formData: {
......
1 <template> 1 <template>
2 <div style="height:650px"> 2 <div style="height:650px">
3 <el-tabs v-model="activeName" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" @tab-click="handleClick">
4 <el-tab-pane label="银行信息" name="1"></el-tab-pane> 4 <el-tab-pane label="企业信息" name="1"></el-tab-pane>
5 <el-tab-pane label="材料信息" v-if="formData.isAdd==2" name="2"></el-tab-pane> 5 <el-tab-pane label="材料信息" v-if="formData.isAdd==2" name="2"></el-tab-pane>
6 </el-tabs> 6 </el-tabs>
7 <el-form ref="ruleForm" :model="ruleForm" label-width="100px" style="height:90%" v-if="activeName==1" :rules="rules"> 7 <el-form ref="ruleForm" :model="ruleForm" label-width="100px" style="height:90%" v-if="activeName==1" :rules="rules">
8 <div style="height:90%"> 8 <div style="height:90%">
9 <el-row> 9 <el-row>
10 <el-col :span="12"> 10 <el-col :span="12">
11 <el-form-item label="银行名称:" prop="qymc"> 11 <el-form-item label="企业名称:" prop="qymc">
12 <el-input v-model="ruleForm.qymc"></el-input> 12 <el-input v-model="ruleForm.qymc"></el-input>
13 </el-form-item> 13 </el-form-item>
14 </el-col> 14 </el-col>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 }; 100 };
101 import store from '@/store/index.js' 101 import store from '@/store/index.js'
102 import { addQy, update, addYh } from "@/api/xxba.js" 102 import { addQy, update, addYh } from "@/api/xxba.js"
103 import clxx from './clxx/index.vue' 103 import clxx from '../../components/clxx/index.vue'
104 export default { 104 export default {
105 props: { 105 props: {
106 formData: { 106 formData: {
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
149 ], 149 ],
150 rules: { 150 rules: {
151 qymc: [ 151 qymc: [
152 { required: true, message: '银行名称不能为空', trigger: 'blur' } 152 { required: true, message: '企业名称不能为空', trigger: 'blur' }
153 ], 153 ],
154 dh: [ 154 dh: [
155 { required: true, validator: checkPhone, trigger: ["blur"] }, 155 { required: true, validator: checkPhone, trigger: ["blur"] },
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 15:50:26
5 -->
6 <template>
7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
8 :isFullscreen="false">
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px">
10 <el-row>
11 <el-col :span="24">
12 <el-form-item label="材料类型" prop="cllx">
13 <el-select v-model="ruleForm.cllx" class="width100" placeholder="请选择">
14 <el-option v-for="item in cllxList" :key="item.dcode" :label="item.dname" :value="item.dcode">
15 </el-option>
16 </el-select>
17 </el-form-item>
18 </el-col>
19 </el-row>
20 <el-row :gutter="20">
21 <el-col :span="24">
22 <el-form-item label="材料名称" prop="clmc">
23 <el-input v-model="ruleForm.clmc"></el-input>
24 </el-form-item>
25 </el-col>
26 </el-row>
27 <el-row :gutter="20">
28 <el-col :span="24">
29 <el-form-item label="材料编码" prop="clbm">
30 <el-input v-model="ruleForm.clbm"></el-input>
31 </el-form-item>
32 </el-col>
33 </el-row>
34 </el-form>
35 </dialogBox>
36 </template>
37 <script>
38 import store from '@/store/index.js'
39 export default {
40 props: {
41 value: { type: Boolean, default: false },
42 },
43 data () {
44 return {
45 cllxList: store.getters.dictData['A40'],
46 myValue: this.value,
47 ruleForm: {
48 cllx: "",
49 clmc: "",
50 clbm: ""
51 },
52 rules: {
53 cllx: [
54 { required: true, message: '请选择材料类型', trigger: 'change' }
55 ],
56 clmc: [
57 { required: true, message: '请输入材料名称', trigger: 'blur' }
58 ],
59 clbm: [
60 { required: true, message: '请输入材料编码', trigger: 'blur' }
61 ],
62 }
63 }
64 },
65 watch: {
66 value (val) {
67 this.myValue = val;
68 },
69 },
70 methods: {
71 /**
72 * @description: closeDialog
73 * @author: renchao
74 */
75 closeDialog () {
76 this.$emit("input", false);
77 this.ruleForm = {
78 cllx: "",
79 clmc: "",
80 }
81 },
82 /**
83 * @description: handleSubmit
84 * @author: renchao
85 */
86 handleSubmit () {
87 this.$refs['ruleForm'].validate((valid) => {
88 if (valid) {
89 this.$parent.addSave(this.ruleForm);
90 this.ruleForm = {
91 cllx: "",
92 clmc: "",
93 }
94 this.$emit("input", false);
95 } else {
96 return false;
97 }
98 })
99 }
100 }
101 };
102 </script>
103 <style scoped lang="scss">
104 .submit-button {
105 text-align: center;
106 height: 52px;
107 padding-top: 10px;
108 background-color: #fff;
109 }
110 </style>
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 15:38:53
5 -->
6 <template>
7 <div class="clmlmx-box">
8 <lb-table :column="column" :key="key" row-key="bsmMaterial" ref="listTable" :heightNumSetting="true" :calcHeight="500" :pagination="false"
9 :data="tableData">
10 </lb-table>
11 <div class="text-center">
12 <el-button @click="handleCancel">取消</el-button>
13 <el-button type="primary" @click="handleSubmit" :loading="loading">保存</el-button>
14 </div>
15 </div>
16 </template>
17 <script>
18 import store from '@/store/index.js'
19 import Sortable from 'sortablejs'
20 import { ywPopupCacel } from "@/utils/popup.js";
21 import { editCompanyMaterialList } from "@/api/company.js";
22 export default {
23 props: {
24 formData: {
25 type: Object,
26 default: () => {
27 return {}
28 }
29 }
30 },
31 data () {
32 return {
33 loading: false,
34 sortable: null,
35 column: [
36 {
37 label: "材料名称",
38 render: (h, scope) => {
39 return (
40 <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input>
41 )
42 }
43 },
44 {
45 label: "材料编码",
46 render: (h, scope) => {
47 return (
48 <el-input value={scope.row.clbm} onInput={(val) => { scope.row.clbm = val }}></el-input>
49 )
50 }
51 },
52 {
53 label: "材料类型",
54 width: "110",
55 render: (h, scope) => {
56 return (
57 <el-select value={scope.row.cllx}
58 onChange={(val) => { scope.row.cllx = val }}>
59 {
60 store.getters.dictData['A40'].map(option => {
61 return (
62 <el-option label={option.dname} value={option.dcode}></el-option>
63 )
64 })
65 }
66 </el-select>
67 )
68 }
69 },
70 {
71 label: "页数",
72 width: "80",
73 render: (h, scope) => {
74 if (scope.row.count && scope.row.count > 0) {
75 return (
76 <div>
77 <span>{scope.row.count}</span>
78 </div>
79 );
80 } else {
81 return (
82 <div>
83 <span>0</span>
84 </div>
85 );
86 }
87 },
88 },
89 {
90 label: "操作",
91 width: "100",
92 render: (h, scope) => {
93 return (
94 <el-button
95 type="text"
96 icon="el-icon-delete"
97 disabled={scope.row.count != 0}
98 onClick={() => {
99 this.handleDelete(scope.$index, scope.row);
100 }}
101 >
102 删除
103 </el-button>
104 )
105 }
106 }
107 ],
108 key: 0,
109 tableData: []
110 }
111 },
112 mounted () {
113 this.initSort()
114 this.tableData = _.cloneDeep(this.formData.data)
115 },
116 beforeDestroy () {
117 if (this.sortable) {
118 this.sortable.destroy();
119 }
120 },
121 watch: {
122 'formData.data': {
123 handler: function (val, oldVal) {
124 this.tableData = _.cloneDeep(val)
125 },
126 immediate: true,
127 deep: true
128 }
129 },
130 methods: {
131 handleCancel () {
132 ywPopupCacel()
133 },
134 handleSubmit () {
135 this.loading = true
136 store.dispatch('user/reWorkFresh', false)
137 editCompanyMaterialList(this.tableData, this.formData.bsmCompany).then(res => {
138 this.loading = false
139 if (res.code == 200) {
140 this.$message({
141 message: '保存成功',
142 type: 'success'
143 })
144 store.dispatch('user/reWorkFresh', true)
145 ywPopupCacel()
146 }
147 }).catch(() => {
148 this.loading = false
149 })
150 },
151 /**
152 * @description: 材料目录删除
153 * @param {*} index
154 * @param {*} row
155 * @author: renchao
156 */
157 handleDelete (index, row) {
158 this.$confirm('此操作将永久删除该 是否继续?', '提示', {
159 confirmButtonText: '确定',
160 cancelButtonText: '取消',
161 type: 'warning'
162 }).then(() => {
163 this.tableData.splice(index, 1);
164 }).catch(() => {
165 this.$message({
166 type: 'info',
167 message: '已取消删除'
168 })
169 })
170 },
171 initSort () {
172 const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
173 this.sortable = Sortable.create(el, {
174 ghostClass: 'sortable-ghost',
175 setData: function (dataTransfer) {
176 dataTransfer.setData('Text', '')
177 },
178 onEnd: evt => {
179 const targetRow = this.tableData.splice(evt.oldIndex, 1)[0];
180 this.tableData.splice(evt.newIndex, 0, targetRow);
181 }
182 })
183 }
184 }
185 }
186 </script>
187 <style scoped lang='scss'>
188 @import "~@/styles/mixin.scss";
189 .clmlmx-box {
190 margin: 0 auto;
191 .title {
192 text-align: center;
193 height: 60px;
194 line-height: 60px;
195 border: 1px solid #dfe6ec;
196 font-size: 20px;
197 background: #81d3f81a;
198 margin-bottom: -1px;
199 }
200 }
201 </style>
...@@ -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>
......